.dockerignore

@@ -7,22 +7,6 @@
 # Allow demo assets (AIUI pre-built dist)
 !demo/
 
-# Allow the Bitcoin UI + ElectrumX UI mock shells (served from /docker/*)
-!docker/
-docker/*
-!docker/bitcoin-ui/
-!docker/electrs-ui/
-!docker/lnd-ui/
-!docker/fedimint-ui/
-
-# Allow backend source for ISO source builds
-!core/
-!scripts/
-!image-recipe/
-image-recipe/build/
-image-recipe/results/
-image-recipe/output/
-
 # Exclude nested node_modules (will npm install in container)
 neode-ui/node_modules
 neode-ui/dist

.gitea/workflows/build-iso-dev.yml

@@ -112,7 +112,7 @@ jobs:
         run: |
           sudo mkdir -p /etc/containers/registries.conf.d
           echo '[[registry]]
-          location = "146.59.87.168:3000"
+          location = "git.tx1138.com"
           insecure = true' | sudo tee /etc/containers/registries.conf.d/archipelago.conf
 
       - name: Build unbundled ISO

.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

@@ -1,74 +0,0 @@
-name: Demo images
-
-# Builds and pushes the public-demo images on every change to the UI / mock
-# backend, so the separated `archy-demo` Portainer stack auto-tracks the real
-# code (see demo-deploy/ and docs/demo-deployment-design.md).
-#
-# Required repo configuration:
-#   vars.DEMO_REGISTRY        e.g. 146.59.87.168:3000/lfg2025
-#   vars.DEMO_REGISTRY_HOST   registry host for docker login (no org suffix)
-#   secrets.DEMO_REGISTRY_USER
-#   secrets.DEMO_REGISTRY_TOKEN
-# Optional:
-#   secrets.PORTAINER_WEBHOOK  redeploy hook called after a successful push
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'neode-ui/**'
-      - 'docker-compose.demo.yml'
-      - '.gitea/workflows/demo-images.yml'
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build & push demo images
-    runs-on: ubuntu-latest
-    # Skip cleanly on forks / before registry config is set.
-    if: ${{ vars.DEMO_REGISTRY != '' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          # The demo registry is plain HTTP — teach buildkit to push without TLS
-          # (the host docker daemon needs it in insecure-registries for login too).
-          buildkitd-config-inline: |
-            [registry."${{ vars.DEMO_REGISTRY_HOST || vars.DEMO_REGISTRY }}"]
-              http = true
-
-      - name: Log in to registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.DEMO_REGISTRY_HOST || vars.DEMO_REGISTRY }}
-          username: ${{ secrets.DEMO_REGISTRY_USER }}
-          password: ${{ secrets.DEMO_REGISTRY_TOKEN }}
-
-      - name: Build & push backend
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: neode-ui/Dockerfile.backend
-          push: true
-          tags: |
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-backend:demo
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-backend:${{ github.sha }}
-
-      - name: Build & push web
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: neode-ui/Dockerfile.web
-          push: true
-          build-args: |
-            VITE_DEMO=1
-          tags: |
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-web:demo
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-web:${{ github.sha }}
-
-      - name: Trigger Portainer redeploy
-        if: ${{ success() && secrets.PORTAINER_WEBHOOK != '' }}
-        run: curl -fsS -X POST "${{ secrets.PORTAINER_WEBHOOK }}"

.githooks/pre-push

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-# Keep the served companion APK in sync with main on every push.
-#
-# When a push to main includes Android changes, rebuild the APK, refresh
-# neode-ui/public/packages/archipelago-companion.apk, commit it, and ask
-# you to push again (so the refreshed APK rides along in the same push).
-#
-# Enable once per clone:  git config core.hooksPath .githooks
-set -euo pipefail
-
-ROOT="$(git rev-parse --show-toplevel)"
-cd "$ROOT"
-
-# ship-companion.sh already (re)published the APK for this push — don't redo it.
-[ -n "${SHIP_COMPANION:-}" ] && exit 0
-
-PUSH_MAIN=0; RANGE_OLD=""; RANGE_NEW=""
-while read -r _local_ref local_sha remote_ref remote_sha; do
-  if [ "${remote_ref##*/}" = "main" ]; then
-    PUSH_MAIN=1; RANGE_OLD="$remote_sha"; RANGE_NEW="$local_sha"
-  fi
-done
-[ "$PUSH_MAIN" = "1" ] || exit 0
-
-# Loop-break: if the tip is already the auto APK commit, let the push proceed.
-case "$(git log -1 --pretty=%s)" in
-  *"companion APK"*) exit 0 ;;
-esac
-
-# Only rebuild when this push actually touches the Android app.
-ZEROS="0000000000000000000000000000000000000000"
-if [ -z "$RANGE_OLD" ] || [ "$RANGE_OLD" = "$ZEROS" ]; then
-  ANDROID_CHANGED=1
-elif git diff --quiet "$RANGE_OLD" "$RANGE_NEW" -- Android/ 2>/dev/null; then
-  ANDROID_CHANGED=0
-else
-  ANDROID_CHANGED=1
-fi
-[ "$ANDROID_CHANGED" = "1" ] || exit 0
-
-bash scripts/publish-companion-apk.sh || exit 0
-
-DEST="neode-ui/public/packages/archipelago-companion.apk"
-if git diff --cached --quiet -- "$DEST"; then
-  exit 0   # APK unchanged — nothing to do
-fi
-
-git commit -q -m "chore(android): update companion APK download [skip ci]"
-echo "" >&2
-echo "▶ Companion APK rebuilt and committed. Run your push again to include it." >&2
-exit 1

.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

.github/workflows/demo-images.yml

@@ -1,74 +0,0 @@
-name: Demo images
-
-# Builds and pushes the public-demo images on every change to the UI / mock
-# backend, so the separated `archy-demo` Portainer stack auto-tracks the real
-# code (see demo-deploy/ and docs/demo-deployment-design.md).
-#
-# Required repo configuration:
-#   vars.DEMO_REGISTRY        e.g. 146.59.87.168:3000/lfg2025
-#   vars.DEMO_REGISTRY_HOST   registry host for docker login (no org suffix)
-#   secrets.DEMO_REGISTRY_USER
-#   secrets.DEMO_REGISTRY_TOKEN
-# Optional:
-#   secrets.PORTAINER_WEBHOOK  redeploy hook called after a successful push
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'neode-ui/**'
-      - 'docker-compose.demo.yml'
-      - '.github/workflows/demo-images.yml'
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build & push demo images
-    runs-on: ubuntu-latest
-    # Skip cleanly on forks / before registry config is set.
-    if: ${{ vars.DEMO_REGISTRY != '' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          # The demo registry is plain HTTP — teach buildkit to push without TLS
-          # (the host docker daemon needs it in insecure-registries for login too).
-          buildkitd-config-inline: |
-            [registry."${{ vars.DEMO_REGISTRY_HOST || vars.DEMO_REGISTRY }}"]
-              http = true
-
-      - name: Log in to registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.DEMO_REGISTRY_HOST || vars.DEMO_REGISTRY }}
-          username: ${{ secrets.DEMO_REGISTRY_USER }}
-          password: ${{ secrets.DEMO_REGISTRY_TOKEN }}
-
-      - name: Build & push backend
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: neode-ui/Dockerfile.backend
-          push: true
-          tags: |
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-backend:demo
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-backend:${{ github.sha }}
-
-      - name: Build & push web
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: neode-ui/Dockerfile.web
-          push: true
-          build-args: |
-            VITE_DEMO=1
-          tags: |
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-web:demo
-            ${{ vars.DEMO_REGISTRY }}/archy-demo-web:${{ github.sha }}
-
-      - name: Trigger Portainer redeploy
-        if: ${{ success() && secrets.PORTAINER_WEBHOOK != '' }}
-        run: curl -fsS -X POST "${{ secrets.PORTAINER_WEBHOOK }}"

.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,44 @@ 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.
-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,19 +73,3 @@ loop/loop.log.bak
 # Separate repos nested in tree
 web/
 
-# Resilience harness reports contain session cookies.
-scripts/resilience/reports/
-
-# Codex / pnpm / python caches / editor backups
-.codex
-.codex-target-*/
-.codex-tmp/
-.claude/
-.pnpm-store/
-**/__pycache__/
-*.bak
-
-# Local evidence screenshots; intentional UI screenshots should live under an
-# app/docs asset path with a descriptive filename.
-Screenshot *.png
-uploads/

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "indeedhub"]
 	path = indeedhub
-	url = http://146.59.87.168:3000/lfg2025/indeehub.git
+	url = https://git.tx1138.com/lfg2025/indeehub.git

Android/.gitignore

@@ -14,12 +14,3 @@ local.properties
 *.aab
 *.jks
 *.keystore
-# Exception: the repo-dedicated *debug* keystore is committed on purpose so every
-# machine (and the published companion download) signs debug builds identically —
-# 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

@@ -1,101 +0,0 @@
-# Companion App — Build, Ship & "App Not Installed" Runbook
-
-Canonical procedure for releasing the Archipelago Companion Android app and for
-debugging install failures. Read this before touching the companion release flow.
-Hard lessons from 2026-06-26 are baked in below — don't relearn them.
-
-## Ship the companion (the only sanctioned way)
-
-```bash
-./Android/ship-companion.sh
-```
-
-This calls `scripts/publish-companion-apk.sh` (the single source of truth, also
-used by the `.githooks/pre-push` hook), which:
-
-1. **Removes/rejects resource dirs whose names contain spaces.** Empty stray
-   `mipmap-* NNN` dirs (left by icon-export tools) break a *clean* build with
-   `Invalid resource directory name`. Incremental builds hide them — clean builds
-   don't.
-2. **Always does a CLEAN build** (`:app:clean :app:assembleDebug`).
-3. **Forces v1 + v2 + v3 signing** via `zipalign` + `apksigner`.
-4. **Verifies all three schemes** (`apksigner verify --min-sdk-version 21`) and
-   **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
-APK shipped.
-
-### Bump the version first
-Edit `Android/app/build.gradle.kts` — `versionCode` (must strictly increase) and
-`versionName`. The committed value can drift AHEAD of what's actually built into
-the served APK, so verify the served APK's real version after shipping:
-`aapt2 dump badging neode-ui/public/packages/archipelago-companion.apk | grep version`.
-
-## Signing facts (important)
-
-- Debug builds are signed with the **committed** `Android/app/debug.keystore`
-  (store/key pass `android`, alias `androiddebugkey`) so every machine and the
-  served download share ONE signing key. Cert SHA-256: `D6:22:E0:7E:…:66:4D`.
-- **AGP silently ignores `enableV1Signing = true` for `minSdk ≥ 24`**, so a plain
-  gradle build produces a **v2-only** APK. The `apksigner` step in the publish
-  script is what actually guarantees v1+v2+v3 — do not remove it.
-- **Changing the signing key forces every existing install to be uninstalled
-  once.** Android blocks in-place upgrades across different signatures. Treat the
-  keystore as permanent; never regenerate it casually.
-
-## Debugging "App Not Installed" — DIAGNOSE FIRST
-
-Do **not** theorize about signing schemes / OEM quirks. Get the real reason:
-
-```bash
-adb install ~/Desktop/archipelago-companion-<ver>.apk
-# -> Failure [INSTALL_FAILED_<REASON>: ...]
-```
-
-Map the reason:
-
-| `INSTALL_FAILED_*` | Cause | Fix |
-|---|---|---|
-| `UPDATE_INCOMPATIBLE … signatures do not match` | Old install signed with a **different key** (e.g. pre-shared-keystore per-machine key `58:31:12…`). | Uninstall the old package, then install. **One-time** per device after a key change. |
-| `INVALID_APK` / parse error | Corrupt/incomplete download or bad signing. | Re-download; re-run the publish script. |
-| `INSUFFICIENT_STORAGE` | Storage. | Free space. |
-| `OLDER_SDK` | Device below `minSdk` (26 = Android 8.0). | Unsupported device. |
-
-> A manual uninstall on the phone may NOT clear `UPDATE_INCOMPATIBLE` if the
-> package is registered under another user/profile — `pm path <pkg>` under user 0
-> can show nothing while the conflict persists. `adb uninstall <pkg>` clears it
-> across all users.
-
-## Phone / adb safety (non-negotiable)
-
-When acting on the user's physical phone, be surgical — the user once had all
-home-screen app layouts wiped by an over-broad action.
-
-- Default to **read-only** adb (`devices`, `getprop`, `pm path/list`, `dumpsys`).
-- Mutations (`adb install`, `adb uninstall com.archipelago.app.debug`) only with
-  explicit go-ahead and **scoped to our exact package** — echo it first.
-- **Never** run launcher/system resets: no `pm clear` on launchers, no
-  `reset-permissions`, no factory wipe, no uninstalling apps you didn't build.
-
-## 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:
-
-```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
-```

Android/app/build.gradle.kts

@@ -11,46 +11,15 @@ android {
         applicationId = "com.archipelago.app"
         minSdk = 26
         targetSdk = 35
-        versionCode = 45
-        versionName = "0.5.25"
+        versionCode = 6
+        versionName = "0.4.2"
 
         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 {
-        // Repo-dedicated debug keystore (committed at app/debug.keystore) so every
-        // machine — and the published companion download — signs debug builds with
-        // the SAME key. Without this, Gradle falls back to each machine's
-        // ~/.android/debug.keystore, so a build from a different machine has a
-        // different signature and the phone rejects the update ("App not installed").
-        getByName("debug") {
-            storeFile = file("debug.keystore")
-            storePassword = "android"
-            keyAlias = "androiddebugkey"
-            keyPassword = "android"
-            // Force both legacy JAR (v1) and APK Signature Scheme v2. AGP drops v1
-            // for minSdk>=24, but some OEM package installers (e.g. Samsung) reject
-            // a v2-only sideload with "App not installed" — keep v1 for max compat.
-            enableV1Signing = true
-            enableV2Signing = true
-        }
     }
 
     buildTypes {
-        debug {
-            // Separate app ID so a debug/test build installs alongside the
-            // release app instead of colliding on signature.
-            applicationIdSuffix = ".debug"
-            versionNameSuffix = "-debug"
-            signingConfig = signingConfigs.getByName("debug")
-        }
         release {
             isMinifyEnabled = true
             isShrinkResources = true
@@ -85,44 +54,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 +85,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

@@ -18,46 +18,20 @@ data class ServerEntry(
     val useHttps: Boolean,
     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)
+    fun serialize(): String = "$address|$useHttps|$port|$password"
 
     companion object {
         fun deserialize(raw: String): ServerEntry? {
@@ -68,9 +42,6 @@ data class ServerEntry(
                 useHttps = parts[1].toBooleanStrictOrNull() ?: false,
                 port = parts.getOrElse(2) { "" },
                 password = parts.getOrElse(3) { "" },
-                name = parts.getOrElse(4) { "" },
-                meshIp = parts.getOrElse(5) { "" },
-                npub = parts.getOrElse(6) { "" },
             )
         }
     }
@@ -82,12 +53,8 @@ class ServerPreferences(private val context: Context) {
     private val activeHttpsKey = booleanPreferencesKey("active_https")
     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
@@ -96,9 +63,6 @@ class ServerPreferences(private val context: Context) {
             useHttps = prefs[activeHttpsKey] ?: false,
             port = prefs[activePortKey] ?: "",
             password = prefs[activePasswordKey] ?: "",
-            name = prefs[activeNameKey] ?: "",
-            meshIp = prefs[activeMeshIpKey] ?: "",
-            npub = prefs[activeNpubKey] ?: "",
         )
     }
 
@@ -111,20 +75,12 @@ 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
             prefs[activeHttpsKey] = server.useHttps
             prefs[activePortKey] = server.port
             prefs[activePasswordKey] = server.password
-            prefs[activeNameKey] = server.name
-            prefs[activeMeshIpKey] = server.meshIp
-            prefs[activeNpubKey] = server.npub
         }
         addSavedServer(server)
     }
@@ -135,9 +91,6 @@ class ServerPreferences(private val context: Context) {
             prefs.remove(activeHttpsKey)
             prefs.remove(activePortKey)
             prefs.remove(activePasswordKey)
-            prefs.remove(activeNameKey)
-            prefs.remove(activeMeshIpKey)
-            prefs.remove(activeNpubKey)
         }
     }
 
@@ -148,82 +101,10 @@ 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.
-     */
-    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
-            }.toSet()
-            prefs[savedServersKey] = filtered + toStore.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
-                    )
-            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
-            }
-        }
-    }
-
-    /**
-     * 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.
-            prefs[savedServersKey] = current.filterNot { raw ->
-                ServerEntry.deserialize(raw)?.sameNode(server) == true
-            }.toSet()
+            prefs[savedServersKey] = current - server.serialize()
         }
     }
 
@@ -232,10 +113,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/network/InputWebSocket.kt

@@ -35,13 +35,6 @@ class InputWebSocket(
     /** Player ID for arcade mode (0 = broadcast, 1 = P1, 2 = P2) */
     var playerId: Int = 0
 
-    /**
-     * Invoked when the kiosk asks us to open a URL in the phone's default
-     * browser ({"t":"o","url":"…"}). "Open in external browser" apps can't be
-     * usefully opened on the kiosk, so the kiosk forwards them here.
-     */
-    var onExternalOpen: ((String) -> Unit)? = null
-
     private val _state = MutableStateFlow(ConnectionState.DISCONNECTED)
     val state: StateFlow<ConnectionState> = _state
 
@@ -134,20 +127,6 @@ class InputWebSocket(
                 reconnectAttempt = 0
             }
 
-            override fun onMessage(webSocket: WebSocket, text: String) {
-                // The only inbound message we act on is an external-open request
-                // forwarded from the kiosk: {"t":"o","url":"https://…"}.
-                try {
-                    val obj = org.json.JSONObject(text)
-                    if (obj.optString("t") == "o") {
-                        val url = obj.optString("url")
-                        if (url.startsWith("http://") || url.startsWith("https://")) {
-                            onExternalOpen?.invoke(url)
-                        }
-                    }
-                } catch (_: Exception) {}
-            }
-
             override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
                 _state.value = ConnectionState.ERROR
                 scheduleReconnect()

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

@@ -108,9 +108,7 @@ private fun Btn(icon: ImageVector, key: String, onDir: (String) -> Unit) {
             .pointerInput(key) {
                 detectTapGestures(onPress = {
                     p = true; onDir(key)
-                    // 500ms initial delay so a normal tap sends one key, not two
-                    // (a touch tap often exceeds 350ms → doubled nav sound).
-                    job = scope.launch { delay(500); while (true) { onDir(key); delay(100) } }
+                    job = scope.launch { delay(350); while (true) { onDir(key); delay(100) } }
                     tryAwaitRelease(); p = false; job?.cancel()
                 })
             },

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
@@ -84,16 +83,13 @@ val ClassicPalette = NESPalette(
     inlayBg = Color(0xFF080808), inlayBorder = Color(0xFF999999),
 )
 
-// Glassmorphism-black (OS design): translucent dark surfaces so the backdrop
-// shows through the controller, subtle white-alpha borders, translucent-white
-// buttons. Accents come from each button's ring.
 val DarkPalette = NESPalette(
-    body = Color(0xA6121216), face = Color(0x8C0E0E12), ridge = Color(0x14FFFFFF),
-    label = Color(0xFF9A9A9A), labelMuted = Color(0xFF777777),
-    dpad = Color(0xFF202024), dpadHi = Color(0xFF33333A),
-    btn = Color(0x14FFFFFF), btnPress = Color(0x0AFFFFFF),
-    capsule = Color(0x12FFFFFF), capsulePress = Color(0x08FFFFFF),
-    inlayBg = Color(0x990A0A0A), inlayBorder = Color(0x1FFFFFFF),
+    body = NES.DarkBody, face = NES.DarkFace, ridge = NES.DarkRidge,
+    label = NES.DarkLabel, labelMuted = NES.DarkLabelMuted,
+    dpad = Color(0xFF080808), dpadHi = Color(0xFF141418),
+    btn = NES.DarkButtonMain, btnPress = NES.DarkButtonMainPress,
+    capsule = Color(0xFF121216), capsulePress = Color(0xFF0A0A0C),
+    inlayBg = Color(0xFF060608), inlayBorder = Color(0xFF444448),
 )
 
 fun paletteFor(style: ControllerStyle) = if (style == ControllerStyle.CLASSIC) ClassicPalette else DarkPalette
@@ -109,7 +105,6 @@ fun NESController(
     onKey: (String) -> Unit,
     onMenu: () -> Unit,
     onPlayerToggle: () -> Unit = {},
-    onToggleStyle: (() -> Unit)? = null,
     modifier: Modifier = Modifier,
 ) {
     val c = paletteFor(style)
@@ -118,10 +113,20 @@ fun NESController(
     Box(
         modifier = modifier
             .fillMaxSize()
-            .threeFingerHold(onMenu)
+            .background(Color(0xFF0C0C0C))  // Slightly lighter than black for shadow visibility
+            .twoFingerHold(onMenu)
             .padding(horizontal = 40.dp, vertical = 24.dp),
         contentAlignment = Alignment.Center,
     ) {
+        // Shadow platform
+        Box(
+            modifier = Modifier
+                .fillMaxWidth(0.86f)
+                .aspectRatio(2.3f)
+                .padding(top = 6.dp)
+                .clip(RoundedCornerShape(18.dp))
+                .background(Color(0xFF000000)),
+        )
         // Controller body
         Box(
             Modifier
@@ -130,7 +135,7 @@ fun NESController(
                 .shadow(32.dp, RoundedCornerShape(16.dp), ambientColor = Color(0xFF000000), spotColor = Color(0xFF000000))
                 .clip(RoundedCornerShape(16.dp))
                 .background(
-                    Brush.verticalGradient(listOf(c.body, c.body))
+                    Brush.verticalGradient(listOf(c.body, c.body.copy(alpha = 0.95f)))
                 )
                 .border(1.dp, Color.White.copy(alpha = if (isClassic) 0.08f else 0.04f), RoundedCornerShape(16.dp)),
         ) {
@@ -188,13 +193,13 @@ fun NESController(
                         horizontalAlignment = Alignment.CenterHorizontally,
                         verticalArrangement = Arrangement.Center,
                     ) {
-                        // C on top
-                        GlassFaceBtn("C", Color(0xFFBBBBBB), 44.dp) { onKey("c") }
+                        // C on top (white)
+                        ColorBtn(Color(0xFF888888), Color(0xFFAAAAAA), 44.dp) { onKey("c") }
                         Spacer(Modifier.height(6.dp))
                         // B + A on bottom row
                         Row(horizontalArrangement = Arrangement.spacedBy(12.dp)) {
-                            GlassFaceBtn("B", Color(0xFF60A5FA), 44.dp) { onKey("b") }
-                            GlassFaceBtn("A", Color(0xFFF7931A), 44.dp) { onKey("a") }
+                            ColorBtn(Color(0xFF3B82F6), Color(0xFF60A5FA), 44.dp) { onKey("b") }
+                            ColorBtn(Color(0xFFEA580C), Color(0xFFFB923C), 44.dp) { onKey("a") }
                         }
                     }
                 }
@@ -207,7 +212,6 @@ fun NESController(
                 ) {
                     PlayerPill(c, playerId, onPlayerToggle)
                     SettingsBtn(c, Modifier, onMenu)
-                    onToggleStyle?.let { StyleBtn(c, Modifier, it) }
                 }
             }
         }
@@ -260,9 +264,7 @@ fun OnePointDPad(c: NESPalette, size: Dp, onDir: (String) -> Unit) {
                         }
                         activeDir = dir; onDir(dir)
                         job?.cancel()
-                        // 500ms initial delay so a normal tap sends one key, not
-                        // two (a touch tap often exceeds 300ms → doubled nav sound).
-                        job = scope.launch { delay(500); while (true) { onDir(dir); delay(90) } }
+                        job = scope.launch { delay(300); while (true) { onDir(dir); delay(90) } }
                         tryAwaitRelease()
                         job?.cancel(); activeDir = null
                     },
@@ -373,28 +375,6 @@ fun ColorBtn(color: Color, pressColor: Color, sz: Dp = 48.dp, onClick: () -> Uni
     }
 }
 
-/** Glass face button — dark translucent fill, colored ring + letter (OS style) */
-@Composable
-fun GlassFaceBtn(label: String, accent: Color, sz: Dp = 44.dp, onClick: () -> Unit) {
-    var p by remember { mutableStateOf(false) }
-    Box(
-        Modifier
-            .size(sz)
-            .clip(CircleShape)
-            .background(
-                Brush.verticalGradient(
-                    if (p) listOf(Color.White.copy(alpha = 0.05f), Color.White.copy(alpha = 0.02f))
-                    else listOf(Color.White.copy(alpha = 0.10f), Color.White.copy(alpha = 0.03f))
-                )
-            )
-            .border(1.5.dp, accent.copy(alpha = if (p) 0.95f else 0.55f), CircleShape)
-            .pointerInput(Unit) { detectTapGestures(onPress = { p = true; onClick(); tryAwaitRelease(); p = false }) },
-        contentAlignment = Alignment.Center,
-    ) {
-        Text(label, color = accent.copy(alpha = if (p) 1f else 0.85f), fontSize = 16.sp, fontWeight = FontWeight.Bold)
-    }
-}
-
 /** START/SELECT capsule */
 @Composable
 fun CapsuleBtn(label: String, c: NESPalette, w: Dp = 64.dp, h: Dp = 28.dp, onClick: () -> Unit) {
@@ -434,23 +414,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 +434,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

@@ -3,8 +3,6 @@ package com.archipelago.app.ui.components
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.scaleIn
-import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -21,103 +19,54 @@ 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
 import androidx.compose.ui.text.input.KeyboardType
 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.SurfaceDark
-import com.archipelago.app.ui.theme.TextMuted
-import com.archipelago.app.ui.theme.TextPrimary
+import com.archipelago.app.ui.theme.ControllerStyle
+import com.archipelago.app.ui.theme.NES
 
-// Glassmorphism palette (OS design): near-black surfaces, subtle white borders,
-// Bitcoin-orange accent.
-private val PanelBg = SurfaceDark                       // #0A0A0A
-private val PanelBorder = Color.White.copy(alpha = 0.12f)
-private val RowBg = Color.White.copy(alpha = 0.05f)
-private val RowBorder = Color.White.copy(alpha = 0.08f)
-private val FieldBg = Color.White.copy(alpha = 0.04f)
-
-private val PANEL_R = 20.dp
-private val ROW_R = 14.dp
-private val ROW_H = 54.dp
-private val FIELD_H = 58.dp
-
-/** Glassmorphism modal menu — #0A0A0A surface, subtle white borders. */
+/** NES-styled modal menu — dark blue panel with white borders */
 @Composable
 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, onRemoveServer, onToggleMode, onToggleStyle, onBackToWebView)
         }
     }
 }
@@ -126,414 +75,110 @@ 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.
-    var editing by remember { mutableStateOf<ServerEntry?>(null) }
-    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
-    }
-
-    fun startEdit(server: ServerEntry) {
-        editing = server
-        nm = server.name; addr = server.address; pwd = server.password; https = server.useHttps
-        showAdd = false
-    }
-
-    fun submit() {
-        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))
-        } else {
-            onAddServer(ServerEntry(addr, https, 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))
-            .border(1.dp, PanelBorder, RoundedCornerShape(PANEL_R))
+            .widthIn(max = 360.dp)
+            .clip(RoundedCornerShape(4.dp))
+            .background(NES.MenuPanel)
+            .border(3.dp, NES.MenuBorder, RoundedCornerShape(4.dp))
             .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) {}
-            .verticalScroll(rememberScrollState())
-            .padding(20.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp),
+            .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(6.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() }
-            }
-        }
+        // Title
+        Text("- MENU -", color = NES.MenuText, fontSize = 14.sp, fontWeight = FontWeight.Bold, letterSpacing = 4.sp,
+            modifier = Modifier.fillMaxWidth(), textAlign = androidx.compose.ui.text.style.TextAlign.Center)
         Spacer(Modifier.height(4.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 = (if (active) "\u25B6 " else "  ") + server.address,
+                selected = active,
+                onClick = { onSelectServer(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 = NES.MenuMuted, fontSize = 11.sp, modifier = Modifier.padding(vertical = 4.dp))
+        }
+
+        // Add server
+        if (showAdd) {
             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),
+                Modifier.fillMaxWidth().background(Color.Black.copy(alpha = 0.3f)).padding(8.dp),
+                verticalArrangement = Arrangement.spacedBy(6.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())
-                    Text(
-                        "Your node reaches this phone over the mesh by its npub — no ports opened to the internet.",
-                        color = TextMuted, fontSize = 11.sp,
-                    )
-                    MenuItem(
-                        label = "Reconnect mesh",
-                        labelColor = BitcoinOrange,
-                        onClick = {
-                            FipsManager.requestMeshRestart(context)
-                            info = null
-                            if (!embedded) expanded = false
-                        },
+                OutlinedTextField(
+                    value = addr, onValueChange = { addr = it.trim() },
+                    placeholder = { Text("192.168.1.100", color = NES.MenuMuted, fontSize = 11.sp) },
+                    modifier = Modifier.fillMaxWidth().height(48.dp), singleLine = true,
+                    textStyle = androidx.compose.ui.text.TextStyle(color = NES.MenuText, fontSize = 12.sp),
+                    colors = nesFieldColors(),
+                    shape = RoundedCornerShape(2.dp),
+                )
+                Row(horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically) {
+                    OutlinedTextField(
+                        value = pwd, onValueChange = { pwd = it },
+                        placeholder = { Text("PASSWORD", color = NES.MenuMuted, fontSize = 11.sp) },
+                        modifier = Modifier.weight(1f).height(48.dp), singleLine = true,
+                        visualTransformation = PasswordVisualTransformation(),
+                        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),
+                        keyboardActions = KeyboardActions(onGo = {
+                            if (addr.isNotBlank()) { onAddServer(ServerEntry(addr, false, password = pwd)); addr = ""; pwd = ""; showAdd = false }
+                        }),
+                        textStyle = androidx.compose.ui.text.TextStyle(color = NES.MenuText, fontSize = 12.sp),
+                        colors = nesFieldColors(),
+                        shape = RoundedCornerShape(2.dp),
                     )
+                    Box(
+                        Modifier.size(48.dp).clip(RoundedCornerShape(2.dp)).background(NES.MenuSelected)
+                            .clickable {
+                                if (addr.isNotBlank()) { onAddServer(ServerEntry(addr, false, password = pwd)); addr = ""; pwd = ""; showAdd = false }
+                            },
+                        contentAlignment = Alignment.Center,
+                    ) { Text("OK", color = NES.MenuText, fontSize = 10.sp, fontWeight = FontWeight.Bold) }
                 }
             }
+        } else {
+            MenuItem(label = "  ADD SERVER", 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(NES.MenuBorder.copy(alpha = 0.3f)))
+        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)
         }
     }
 }
@@ -542,79 +187,32 @@ private fun FipsRow(
 private fun MenuItem(
     label: String,
     selected: Boolean = false,
-    labelColor: Color = TextPrimary,
     onClick: () -> Unit,
-    onEdit: (() -> Unit)? = null,
     onRemove: (() -> Unit)? = null,
 ) {
     Row(
         Modifier
             .fillMaxWidth()
-            .height(ROW_H)
-            .clip(RoundedCornerShape(ROW_R))
-            .background(if (selected) BitcoinOrange.copy(alpha = 0.12f) else RowBg)
-            .border(1.dp, if (selected) BitcoinOrange.copy(alpha = 0.4f) else RowBorder, RoundedCornerShape(ROW_R))
+            .height(32.dp)
+            .background(if (selected) NES.MenuSelected.copy(alpha = 0.15f) else Color.Transparent)
             .clickable { onClick() }
-            .padding(horizontal = 16.dp),
+            .padding(horizontal = 8.dp),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween,
     ) {
-        Text(
-            label,
-            color = if (selected) BitcoinOrange else labelColor,
-            fontSize = 16.sp,
-            fontWeight = FontWeight.Medium,
-            modifier = Modifier.weight(1f),
-        )
-        if (onEdit != null) {
-            Text(
-                "✎",
-                color = TextMuted,
-                fontSize = 16.sp,
-                modifier = Modifier.clickable { onEdit() }.padding(horizontal = 8.dp),
-            )
-        }
+        Text(label, color = if (selected) NES.MenuSelected else NES.MenuText, fontSize = 11.sp, fontWeight = FontWeight.Medium)
         if (onRemove != null) {
-            Text(
-                "✕",
-                color = TextMuted,
-                fontSize = 16.sp,
-                modifier = Modifier.clickable { onRemove() }.padding(horizontal = 8.dp),
-            )
+            Text("\u2715", color = NES.MenuMuted, fontSize = 10.sp,
+                modifier = Modifier.clickable { onRemove() }.padding(horizontal = 8.dp))
         }
     }
 }
 
-/** Glass text field with centered input text. */
 @Composable
-private fun GlassField(
-    value: String,
-    onValueChange: (String) -> Unit,
-    placeholder: String,
-    modifier: Modifier = Modifier,
-    visualTransformation: androidx.compose.ui.text.input.VisualTransformation = androidx.compose.ui.text.input.VisualTransformation.None,
-    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    keyboardActions: KeyboardActions = KeyboardActions.Default,
-) {
-    OutlinedTextField(
-        value = value,
-        onValueChange = onValueChange,
-        placeholder = {
-            Text(placeholder, color = TextMuted, fontSize = 15.sp, modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
-        },
-        modifier = modifier.fillMaxWidth().height(FIELD_H),
-        singleLine = true,
-        visualTransformation = visualTransformation,
-        keyboardOptions = keyboardOptions,
-        keyboardActions = keyboardActions,
-        textStyle = TextStyle(color = TextPrimary, fontSize = 16.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),
-    )
-}
+private fun nesFieldColors() = OutlinedTextFieldDefaults.colors(
+    focusedBorderColor = NES.MenuBorder,
+    unfocusedBorderColor = NES.MenuMuted,
+    cursorColor = NES.MenuText,
+    focusedTextColor = NES.MenuText,
+    unfocusedTextColor = NES.MenuText,
+)

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,8 @@ fun NESPortraitController(
     Box(
         Modifier
             .fillMaxSize()
-            .threeFingerHold(onMenu)
+            .background(Color(0xFF0C0C0C))
+            .twoFingerHold(onMenu)
             .padding(horizontal = 40.dp, vertical = 24.dp),
         contentAlignment = Alignment.Center,
     ) {
@@ -62,7 +62,7 @@ fun NESPortraitController(
                 .fillMaxSize()
                 .shadow(28.dp, RoundedCornerShape(20.dp), ambientColor = Color.Black, spotColor = Color.Black)
                 .clip(RoundedCornerShape(20.dp))
-                .background(Brush.verticalGradient(listOf(c.body, c.body)))
+                .background(Brush.verticalGradient(listOf(c.body, c.body.copy(alpha = 0.95f))))
                 .border(1.dp, Color.White.copy(alpha = if (isClassic) 0.08f else 0.04f), RoundedCornerShape(20.dp)),
         ) {
             // Top highlight
@@ -88,7 +88,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),
@@ -119,11 +119,11 @@ fun NESPortraitController(
                         Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 8.dp),
                         horizontalAlignment = Alignment.CenterHorizontally,
                     ) {
-                        GlassFaceBtn("C", Color(0xFFBBBBBB), 46.dp) { onKey("c") }
+                        ColorBtn(Color(0xFF888888), Color(0xFFAAAAAA), 46.dp) { onKey("c") }
                         Spacer(Modifier.height(6.dp))
                         Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) {
-                            GlassFaceBtn("B", Color(0xFF60A5FA), 46.dp) { onKey("b") }
-                            GlassFaceBtn("A", Color(0xFFF7931A), 46.dp) { onKey("a") }
+                            ColorBtn(Color(0xFF3B82F6), Color(0xFF60A5FA), 46.dp) { onKey("b") }
+                            ColorBtn(Color(0xFFEA580C), Color(0xFFFB923C), 46.dp) { onKey("a") }
                         }
                     }
                 }
@@ -152,10 +152,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

@@ -23,7 +23,6 @@ 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.material3.MaterialTheme
@@ -42,7 +41,7 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
@@ -55,12 +54,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) }
 
@@ -73,45 +67,26 @@ fun IntroScreen(
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(SurfaceBlack),
+            .background(SurfaceBlack)
+            .windowInsetsPadding(WindowInsets.safeDrawing),
+        contentAlignment = Alignment.Center,
     ) {
-        // Reddish synthwave backdrop
-        Image(
-            painter = painterResource(id = R.drawable.bg_synthwave),
-            contentDescription = null,
-            modifier = Modifier.fillMaxSize(),
-            contentScale = ContentScale.Crop,
-        )
-        // Dark scrim so the title/buttons stay legible over the art
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(
-                    Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Black.copy(alpha = 0.55f),
-                            Color.Black.copy(alpha = 0.35f),
-                            Color.Black.copy(alpha = 0.75f),
-                        ),
-                    )
-                ),
-        )
         Column(
             modifier = Modifier
-                .align(Alignment.Center)
                 .fillMaxWidth()
-                .windowInsetsPadding(WindowInsets.safeDrawing)
                 .padding(horizontal = 32.dp),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center,
         ) {
-            // Circular badge logo
+            // Wide pixel-art logo
             Image(
-                painter = painterResource(id = R.drawable.ic_logo),
+                painter = painterResource(id = R.drawable.ic_logo_wide),
                 contentDescription = "Archipelago",
                 modifier = Modifier
-                    .size(160.dp)
+                    .fillMaxWidth()
+                    .padding(horizontal = 8.dp)
                     .alpha(logoAlpha.value),
+                colorFilter = ColorFilter.tint(Color.White),
             )
 
             Spacer(modifier = Modifier.height(48.dp))
@@ -127,7 +102,7 @@ fun IntroScreen(
                     Text(
                         text = stringResource(R.string.welcome_title),
                         style = MaterialTheme.typography.headlineLarge,
-                        color = Color(0xFFFAFAFA),
+                        color = TextPrimary,
                         textAlign = TextAlign.Center,
                     )
 
@@ -136,7 +111,7 @@ fun IntroScreen(
                     Text(
                         text = stringResource(R.string.welcome_subtitle),
                         style = MaterialTheme.typography.bodyLarge,
-                        color = Color(0xFFFAFAFA),
+                        color = TextMuted,
                         textAlign = TextAlign.Center,
                         lineHeight = 26.sp,
                     )
@@ -148,14 +123,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

@@ -2,12 +2,9 @@ package com.archipelago.app.ui.screens
 
 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
@@ -27,26 +24,20 @@ 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.Brush
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
-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 +47,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,36 +56,17 @@ 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 controllerStyle by remember { mutableStateOf(ControllerStyle.CLASSIC) }
     var playerId by remember { mutableStateOf(0) }  // 0 = broadcast, 1 = P1, 2 = P2
 
     val ws = remember { InputWebSocket(scope) }
 
-    // When the kiosk forwards an "open in external browser" app, launch it in
-    // the phone's default browser.
-    DisposableEffect(ws) {
-        ws.onExternalOpen = { url ->
-            try {
-                val intent = android.content.Intent(
-                    android.content.Intent.ACTION_VIEW,
-                    android.net.Uri.parse(url),
-                ).apply { addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) }
-                context.startActivity(intent)
-            } catch (_: Exception) {}
-        }
-        onDispose { ws.onExternalOpen = null }
-    }
-
     fun togglePlayer() {
         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
 
@@ -131,31 +98,9 @@ fun RemoteInputScreen(
     Box(
         Modifier
             .fillMaxSize()
-            .background(Color(0xFF0C0C0C)),
+            .background(Color(0xFF0C0C0C))
+            .windowInsetsPadding(WindowInsets.safeDrawing),
     ) {
-        // Reddish synthwave backdrop behind the controller
-        Image(
-            painter = painterResource(id = R.drawable.bg_synthwave),
-            contentDescription = null,
-            modifier = Modifier.fillMaxSize(),
-            contentScale = ContentScale.Crop,
-        )
-        // Light scrim — the controller body provides its own contrast, so keep
-        // this subtle and let the backdrop show through around it.
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(
-                    Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Black.copy(alpha = 0.4f),
-                            Color.Black.copy(alpha = 0.25f),
-                            Color.Black.copy(alpha = 0.45f),
-                        ),
-                    )
-                ),
-        )
-        Box(Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.safeDrawing)) {
         when {
             isGamepadMode && isLandscape -> NESController(
                 style = controllerStyle,
@@ -163,7 +108,6 @@ fun RemoteInputScreen(
                 onKey = { ws.sendKey(it) },
                 onMenu = { showModal = true },
                 onPlayerToggle = ::togglePlayer,
-                onToggleStyle = ::toggleStyle,
             )
             isGamepadMode && !isLandscape -> NESPortraitController(
                 style = controllerStyle,
@@ -174,7 +118,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 +127,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 +137,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 },
+                    )
                 }
             }
         }
@@ -224,12 +159,13 @@ fun RemoteInputScreen(
                     }
                 ),
         )
-        }
 
         NESMenu(
             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,51 +173,12 @@ 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)
-                    // If the edited server is the live one, reconnect with the new
-                    // address/credentials so the change takes effect immediately.
-                    if (original.serialize() == activeServer?.serialize()) {
-                        ws.disconnect()
-                        prefs.setActiveServer(updated)
-                    }
-                }
+            onRemoveServer = { server -> scope.launch { prefs.removeSavedServer(server) } },
+            onToggleMode = { isGamepadMode = !isGamepadMode; showModal = false },
+            onToggleStyle = {
+                controllerStyle = if (controllerStyle == ControllerStyle.CLASSIC) ControllerStyle.DARK else ControllerStyle.CLASSIC
             },
-            onRemoveServer = { server ->
-                scope.launch {
-                    prefs.removeSavedServer(server)
-                    // Deleting the last server leaves nothing to control — drop the
-                    // active server and return to the Connect screen.
-                    val remaining = savedServers.count { it.serialize() != server.serialize() }
-                    if (remaining == 0) {
-                        ws.disconnect()
-                        prefs.clearActiveServer()
-                        showModal = false
-                        onBack()
-                    }
-                }
-            },
-            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)
-                }
-            },
         )
     }
 }

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

@@ -30,7 +30,6 @@ import androidx.compose.material.icons.filled.VisibilityOff
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Lock
 import androidx.compose.material.icons.filled.LockOpen
 import androidx.compose.material3.CircularProgressIndicator
@@ -43,7 +42,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
@@ -57,7 +55,6 @@ import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
@@ -71,12 +68,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 +79,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,16 +91,12 @@ 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) }
     val scope = rememberCoroutineScope()
     val keyboard = LocalSoftwareKeyboardController.current
 
-    var name by remember { mutableStateOf("") }
     var address by remember { mutableStateOf("") }
     var port by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
@@ -116,53 +104,9 @@ fun ServerConnectScreen(
     var useHttps by remember { mutableStateOf(false) }
     var isConnecting by remember { mutableStateOf(false) }
     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())
 
-    fun clearForm() {
-        name = ""
-        address = ""
-        port = ""
-        password = ""
-        useHttps = false
-        passwordVisible = false
-        errorMessage = null
-    }
-
-    fun startEdit(server: ServerEntry) {
-        editingServer = server
-        name = server.name
-        address = server.address
-        port = server.port
-        password = server.password
-        useHttps = server.useHttps
-        passwordVisible = false
-        errorMessage = null
-    }
-
-    fun cancelEdit() {
-        editingServer = null
-        clearForm()
-    }
-
-    fun saveEdit() {
-        val original = editingServer ?: return
-        if (address.isBlank()) {
-            errorMessage = "Enter a server address"
-            return
-        }
-        val updated = ServerEntry(address, useHttps, port, password, name)
-        scope.launch {
-            prefs.updateSavedServer(original, updated)
-            cancelEdit()
-        }
-    }
-
     fun connect(server: ServerEntry) {
         if (isConnecting) return
         if (server.address.isBlank()) {
@@ -173,35 +117,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,99 +129,43 @@ 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()
-            .background(SurfaceBlack),
+            .background(SurfaceBlack)
+            .windowInsetsPadding(WindowInsets.safeDrawing),
     ) {
-        // Reddish synthwave backdrop
-        Image(
-            painter = painterResource(id = R.drawable.bg_synthwave),
-            contentDescription = null,
-            modifier = Modifier.fillMaxSize(),
-            contentScale = ContentScale.Crop,
-        )
-        // Dark scrim so the form stays legible over the art
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(
-                    Brush.verticalGradient(
-                        colors = listOf(
-                            Color.Black.copy(alpha = 0.6f),
-                            Color.Black.copy(alpha = 0.45f),
-                            Color.Black.copy(alpha = 0.8f),
-                        ),
-                    )
-                ),
-        )
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .windowInsetsPadding(WindowInsets.safeDrawing)
                 .verticalScroll(state = rememberScrollState())
                 .drawWithContent { drawContent() }
                 .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
+            // Wide logo
             Image(
-                painter = painterResource(id = R.drawable.ic_logo),
+                painter = painterResource(id = R.drawable.ic_logo_wide),
                 contentDescription = "Archipelago",
-                modifier = Modifier.size(96.dp),
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp),
+                colorFilter = ColorFilter.tint(Color.White),
             )
 
             Spacer(modifier = Modifier.height(4.dp))
 
             Text(
-                text = if (editingServer != null) stringResource(R.string.edit_server_title) else "Connect to Server",
+                text = "Connect to Server",
                 style = MaterialTheme.typography.headlineMedium,
                 color = TextPrimary,
                 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,29 +173,11 @@ 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))
-                    .background(Color.Black.copy(alpha = 0.6f))
                     .background(
                         Brush.verticalGradient(
                             colors = listOf(
@@ -345,34 +190,6 @@ fun ServerConnectScreen(
                     .padding(20.dp),
             ) {
                 Column {
-                    OutlinedTextField(
-                        value = name,
-                        onValueChange = {
-                            name = it
-                            errorMessage = null
-                        },
-                        label = { Text(stringResource(R.string.server_name_label)) },
-                        placeholder = { Text(stringResource(R.string.server_name_placeholder)) },
-                        modifier = Modifier.fillMaxWidth(),
-                        singleLine = true,
-                        keyboardOptions = KeyboardOptions(
-                            keyboardType = KeyboardType.Text,
-                            imeAction = ImeAction.Next,
-                        ),
-                        colors = OutlinedTextFieldDefaults.colors(
-                            focusedBorderColor = Color.White.copy(alpha = 0.3f),
-                            unfocusedBorderColor = Color.White.copy(alpha = 0.12f),
-                            cursorColor = Color.White,
-                            focusedLabelColor = Color.White.copy(alpha = 0.7f),
-                            unfocusedLabelColor = TextMuted,
-                            focusedTextColor = TextPrimary,
-                            unfocusedTextColor = TextPrimary,
-                        ),
-                        shape = RoundedCornerShape(12.dp),
-                    )
-
-                    Spacer(modifier = Modifier.height(12.dp))
-
                     OutlinedTextField(
                         value = address,
                         onValueChange = {
@@ -458,11 +275,7 @@ fun ServerConnectScreen(
                             keyboardActions = KeyboardActions(
                                 onGo = {
                                     keyboard?.hide()
-                                    if (editingServer != null) {
-                                        saveEdit()
-                                    } else {
-                                        connect(ServerEntry(address, useHttps, port, password, name))
-                                    }
+                                    connect(ServerEntry(address, useHttps, port, password))
                                 },
                             ),
                             colors = OutlinedTextFieldDefaults.colors(
@@ -527,54 +340,15 @@ fun ServerConnectScreen(
                 }
             }
 
-            if (editingServer != null) {
-                // Save / Cancel while editing an existing saved server
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    horizontalArrangement = Arrangement.spacedBy(12.dp),
-                ) {
-                    GlassButton(
-                        text = stringResource(R.string.cancel),
-                        onClick = {
-                            keyboard?.hide()
-                            cancelEdit()
-                        },
-                        modifier = Modifier.weight(1f).height(56.dp),
-                    )
-                    GlassButton(
-                        text = stringResource(R.string.save_changes),
-                        onClick = {
-                            keyboard?.hide()
-                            saveEdit()
-                        },
-                        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),
-                    )
-                }
-            }
+            // 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))
+                },
+                modifier = Modifier.fillMaxWidth().height(56.dp),
+            )
 
             if (isConnecting) {
                 CircularProgressIndicator(
@@ -584,8 +358,8 @@ fun ServerConnectScreen(
                 )
             }
 
-            // Saved servers (hidden while editing one to keep focus on the form)
-            if (editingServer == null && savedServers.isNotEmpty()) {
+            // Saved servers
+            if (savedServers.isNotEmpty()) {
                 Spacer(modifier = Modifier.height(8.dp))
                 Text(
                     text = stringResource(R.string.saved_servers),
@@ -599,26 +373,11 @@ fun ServerConnectScreen(
                     SavedServerItem(
                         server = server,
                         onConnect = { connect(it) },
-                        onEdit = { startEdit(it) },
                         onRemove = { scope.launch { prefs.removeSavedServer(it) } },
                     )
                 }
             }
         }
-
-        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()
-        }
     }
 }
 
@@ -626,14 +385,12 @@ fun ServerConnectScreen(
 private fun SavedServerItem(
     server: ServerEntry,
     onConnect: (ServerEntry) -> Unit,
-    onEdit: (ServerEntry) -> Unit,
     onRemove: (ServerEntry) -> Unit,
 ) {
     Row(
         modifier = Modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(12.dp))
-            .background(Color.Black.copy(alpha = 0.6f))
             .background(
                 Brush.verticalGradient(
                     colors = listOf(
@@ -657,21 +414,12 @@ private fun SavedServerItem(
             )
             Spacer(modifier = Modifier.width(12.dp))
             Column {
-                Text(text = server.displayName(), style = MaterialTheme.typography.bodyMedium, color = TextPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis)
-                val secondary = buildString {
-                    if (server.name.isNotBlank()) append(server.address)
-                    if (server.port.isNotBlank()) {
-                        if (isNotEmpty()) append(":${server.port}") else append("Port ${server.port}")
-                    }
-                }
-                if (secondary.isNotBlank()) {
-                    Text(text = secondary, style = MaterialTheme.typography.labelMedium, color = TextMuted, maxLines = 1, overflow = TextOverflow.Ellipsis)
+                Text(text = server.address, style = MaterialTheme.typography.bodyMedium, color = TextPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis)
+                if (server.port.isNotBlank()) {
+                    Text(text = "Port ${server.port}", style = MaterialTheme.typography.labelMedium, color = TextMuted)
                 }
             }
         }
-        IconButton(onClick = { onEdit(server) }) {
-            Icon(imageVector = Icons.Default.Edit, contentDescription = stringResource(R.string.edit_server), modifier = Modifier.size(18.dp), tint = TextMuted)
-        }
         IconButton(onClick = { onRemove(server) }) {
             Icon(imageVector = Icons.Default.Close, contentDescription = stringResource(R.string.remove_server), modifier = Modifier.size(18.dp), tint = TextMuted)
         }
@@ -686,10 +434,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 +455,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/drawable/ic_launcher_background.xml

@@ -1,53 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Whole badge lives here (background renders to the mask edge with no
-     safe-zone cropping, unlike the foreground): dark fill + metallic ring pulled
-     inward to ~0.88 so the mask can't clip it + grid at ~0.58. Matches the
-     locally-rendered preview. Foreground is transparent. -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="752"
-    android:viewportHeight="752">
-
+    android:viewportWidth="108"
+    android:viewportHeight="108">
     <path
-        android:fillColor="#0A0A0A"
-        android:pathData="M0,0h752v752H0z" />
-
-    <!-- Ring matching logo.svg's gradient (#000->#666). Scale 0.65 places it at
-         the home-screen's visible edge (calibrated from a device home screenshot;
-         launcher3 crops less than the Settings App-info view). -->
-    <group
-        android:pivotX="376"
-        android:pivotY="376"
-        android:scaleX="0.65"
-        android:scaleY="0.65">
-        <path
-            android:fillColor="#00000000"
-            android:strokeWidth="22.8834"
-            android:pathData="M11.441,375.669a364.227,364.227 0 1,0 728.454,0a364.227,364.227 0 1,0 -728.454,0z">
-            <aapt:attr name="android:strokeColor">
-                <gradient
-                    android:type="linear"
-                    android:startX="751.337"
-                    android:startY="751.338"
-                    android:endX="0"
-                    android:endY="0.000976562">
-                    <item android:offset="0" android:color="#FF000000" />
-                    <item android:offset="1" android:color="#FF666666" />
-                </gradient>
-            </aapt:attr>
-        </path>
-    </group>
-
-    <!-- White Archipelago grid -->
-    <group
-        android:pivotX="376"
-        android:pivotY="376"
-        android:scaleX="0.55"
-        android:scaleY="0.55">
-        <path
-            android:fillColor="#FFFFFF"
-            android:pathData="M253.805,278.37V222.28H309.853V278.37H253.805ZM315.797,278.37V222.28H372.694V278.37H315.797ZM378.639,278.37V222.28H435.536V278.37H378.639ZM441.481,278.37V222.28H497.529V278.37H441.481ZM441.481,341.259V284.319H497.529V341.259H441.481ZM503.473,341.259V284.319H560.37V341.259H503.473ZM190.963,404.148V347.208H247.86V404.148H190.963ZM253.805,404.148V347.208H309.853V404.148H253.805ZM315.797,404.148V347.208H372.694V404.148H315.797ZM378.639,404.148V347.208H435.536V404.148H378.639ZM441.481,404.148V347.208H497.529V404.148H441.481ZM503.473,404.148V347.208H560.37V404.148H503.473ZM190.963,466.187V410.097H247.86V466.187H190.963ZM253.805,466.187V410.097H309.853V466.187H253.805ZM441.481,466.187V410.097H497.529V466.187H441.481ZM503.473,466.187V410.097H560.37V466.187H503.473ZM253.805,529.076V472.136H309.853V529.076H253.805ZM315.797,529.076V472.136H372.694V529.076H315.797ZM378.639,529.076V472.136H435.536V529.076H378.639ZM441.481,529.076V472.136H497.529V529.076H441.481Z" />
-    </group>
+        android:fillColor="#030202"
+        android:pathData="M0,0h108v108H0z" />
 </vector>

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

@@ -1,12 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Transparent — the whole badge (ring + grid) is in the background layer so it
-     renders to the mask edge without safe-zone cropping. -->
+<!-- Archipelago pixel-art "A" logo — scaled 90% and centered -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,0h108v108H0z" />
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+
+    <group
+        android:pivotX="512"
+        android:pivotY="512"
+        android:scaleX="0.55"
+        android:scaleY="0.55">
+
+        <!-- Row 1: 4 blocks -->
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,318h71.007v70.936h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M436.152,318h72.082v70.936h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M515.766,318h72.082v70.936h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,318h71.007v70.936h-71.007z" />
+
+        <!-- Row 2: 2 blocks (right side) -->
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,396.46h71.007v72.011h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M673.917,396.46h72.083v72.011h-72.083z" />
+
+        <!-- Row 3: 6 blocks (full width) -->
+        <path android:fillColor="#FFFFFF" android:pathData="M278,475.994h72.083v72.012h-72.083z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,475.994h71.007v72.012h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M436.152,475.994h72.082v72.012h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M515.766,475.994h72.082v72.012h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,475.994h71.007v72.012h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M673.917,475.994h72.083v72.012h-72.083z" />
+
+        <!-- Row 4: 4 blocks (sides only — the "A" gap) -->
+        <path android:fillColor="#FFFFFF" android:pathData="M278,555.529h72.083v70.936h-72.083z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,555.529h71.007v70.936h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,555.529h71.007v70.936h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M673.917,555.529h72.083v70.936h-72.083z" />
+
+        <!-- Row 5: 4 blocks (bottom) -->
+        <path android:fillColor="#FFFFFF" android:pathData="M357.614,633.989h71.007v72.011h-71.007z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M436.152,633.989h72.082v72.011h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M515.766,633.989h72.082v72.011h-72.082z" />
+        <path android:fillColor="#FFFFFF" android:pathData="M595.379,633.989h71.007v72.011h-71.007z" />
+    </group>
 </vector>

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

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Archipelago circular badge logo (from logo.svg):
-     dark circle with a black→grey gradient ring + white pixel-grid mark. -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="120dp"
-    android:height="120dp"
-    android:viewportWidth="752"
-    android:viewportHeight="752">
-
-    <!-- Ringed circle (circle converted to a path; stroke carries the gradient) -->
-    <path
-        android:fillColor="#0A0A0A"
-        android:strokeWidth="22.8834"
-        android:pathData="M11.441,375.669a364.227,364.227 0 1,0 728.454,0a364.227,364.227 0 1,0 -728.454,0z">
-        <aapt:attr name="android:strokeColor">
-            <gradient
-                android:type="linear"
-                android:startX="751.337"
-                android:startY="751.338"
-                android:endX="0"
-                android:endY="0">
-                <item android:offset="0" android:color="#FF000000" />
-                <item android:offset="1" android:color="#FF666666" />
-            </gradient>
-        </aapt:attr>
-    </path>
-
-    <!-- White Archipelago pixel grid -->
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M253.805,278.37V222.28H309.853V278.37H253.805ZM315.797,278.37V222.28H372.694V278.37H315.797ZM378.639,278.37V222.28H435.536V278.37H378.639ZM441.481,278.37V222.28H497.529V278.37H441.481ZM441.481,341.259V284.319H497.529V341.259H441.481ZM503.473,341.259V284.319H560.37V341.259H503.473ZM190.963,404.148V347.208H247.86V404.148H190.963ZM253.805,404.148V347.208H309.853V404.148H253.805ZM315.797,404.148V347.208H372.694V404.148H315.797ZM378.639,404.148V347.208H435.536V404.148H378.639ZM441.481,404.148V347.208H497.529V404.148H441.481ZM503.473,404.148V347.208H560.37V404.148H503.473ZM190.963,466.187V410.097H247.86V466.187H190.963ZM253.805,466.187V410.097H309.853V466.187H253.805ZM441.481,466.187V410.097H497.529V466.187H441.481ZM503.473,466.187V410.097H560.37V466.187H503.473ZM253.805,529.076V472.136H309.853V529.076H253.805ZM315.797,529.076V472.136H372.694V529.076H315.797ZM378.639,529.076V472.136H435.536V529.076H378.639ZM441.481,529.076V472.136H497.529V529.076H441.481Z" />
-</vector>

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

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M15,19l-7,-7 7,-7"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="2"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-</vector>

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

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M6,18L18,6M6,6l12,12"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="2"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-</vector>

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

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M9,5l7,7 -7,7"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="2"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-</vector>

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

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M10,6H6a2,2 0,0 0,-2 2v10a2,2 0,0 0,2 2h10a2,2 0,0 0,2 -2v-4M14,4h6m0,0v6m0,-6L10,14"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="2"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-</vector>

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

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M4,4v6h6M20,20v-6h-6M5.64,15.36A8,8 0,0 0,18.36 18M18.36,8.64A8,8 0,0 0,5.64 6"
-        android:strokeColor="#FFFFFF"
-        android:strokeWidth="2"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-</vector>

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>
@@ -22,31 +21,4 @@
     <string name="retry">Retry</string>
     <string name="remote_input">Remote Control</string>
     <string name="remote_input_hint">Use your phone as a keyboard and mouse for the kiosk</string>
-    <string name="close">Close</string>
-    <string name="open_in_browser">Open in browser</string>
-    <string name="back">Back</string>
-    <string name="forward">Forward</string>
-    <string name="refresh">Refresh</string>
-    <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/logo.svg

@@ -1,10 +0,0 @@
-<svg width="752" height="752" viewBox="0 0 752 752" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="375.668" cy="375.669" r="364.227" fill="#0A0A0A" stroke="url(#paint0_linear_877_1990)" stroke-width="22.8834"/>
-<path d="M253.805 278.37V222.28H309.853V278.37H253.805ZM315.797 278.37V222.28H372.694V278.37H315.797ZM378.639 278.37V222.28H435.536V278.37H378.639ZM441.481 278.37V222.28H497.529V278.37H441.481ZM441.481 341.259V284.319H497.529V341.259H441.481ZM503.473 341.259V284.319H560.37V341.259H503.473ZM190.963 404.148V347.208H247.86V404.148H190.963ZM253.805 404.148V347.208H309.853V404.148H253.805ZM315.797 404.148V347.208H372.694V404.148H315.797ZM378.639 404.148V347.208H435.536V404.148H378.639ZM441.481 404.148V347.208H497.529V404.148H441.481ZM503.473 404.148V347.208H560.37V404.148H503.473ZM190.963 466.187V410.097H247.86V466.187H190.963ZM253.805 466.187V410.097H309.853V466.187H253.805ZM441.481 466.187V410.097H497.529V466.187H441.481ZM503.473 466.187V410.097H560.37V466.187H503.473ZM253.805 529.076V472.136H309.853V529.076H253.805ZM315.797 529.076V472.136H372.694V529.076H315.797ZM378.639 529.076V472.136H435.536V529.076H378.639ZM441.481 529.076V472.136H497.529V529.076H441.481Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_877_1990" x1="751.337" y1="751.338" x2="0" y2="0.000976562" gradientUnits="userSpaceOnUse">
-<stop/>
-<stop offset="1" stop-color="#666666"/>
-</linearGradient>
-</defs>
-</svg>

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"));
-    }
-}

Android/ship-companion.sh

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-#
-# Build the Android companion app and publish it as the served download
-# (neode-ui/public/packages/archipelago-companion.apk — a plain APK a phone can
-# install straight from the link), then commit + push.
-#
-# Use this INSTEAD of `git push` when shipping the companion app, so the
-# downloadable APK on the node always matches what's on main.
-#
-#   ./Android/ship-companion.sh
-#
-# The actual build/sign/verify/stage is done by scripts/publish-companion-apk.sh
-# (single source of truth, shared with the pre-push hook). It does a CLEAN build,
-# forces v1+v2+v3 signing, and ABORTS if any signature scheme is missing — so a
-# broken or v2-only APK can never be shipped.
-set -euo pipefail
-
-ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-cd "$ROOT"
-
-export JAVA_HOME="${JAVA_HOME:-/opt/homebrew/opt/openjdk@17}"
-export ANDROID_HOME="${ANDROID_HOME:-$HOME/Library/Android/sdk}"
-
-DEST="neode-ui/public/packages/archipelago-companion.apk"
-
-echo "==> Building + signing + verifying companion APK"
-bash scripts/publish-companion-apk.sh
-
-[ -f "$DEST" ] || { echo "ERROR: served APK not found at $DEST" >&2; exit 1; }
-
-if git diff --cached --quiet -- "$DEST"; then
-  echo "==> Nothing to commit (APK unchanged)"
-else
-  git commit -q -m "chore(android): update companion apk download"
-  echo "==> Committed"
-fi
-
-echo "==> Pushing $(git branch --show-current)"
-# SHIP_COMPANION lets the pre-push guard know the APK was just refreshed.
-SHIP_COMPANION=1 git push origin "$(git branch --show-current)"
-echo "==> Done — companion APK published and pushed."

CHANGELOG.md

@@ -1,654 +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.
-- Lightning grew up: your LND wallet's recovery seed is captured at setup and kept as an encrypted backup you can reveal from Settings, there's a new Channels tab with a fee control when opening channels, and on-chain and Lightning balances now show side by side.
-- Installing Lightning (and other Bitcoin-dependent apps) on a fresh node no longer fails repeatedly — the node now waits until Bitcoin is genuinely ready to answer before starting them, and Bitcoin sizes its storage to your actual disk and its memory cache to your RAM, so small machines stop swapping and stalling.
-- The wallet understands more money: Cashu v4 tokens are supported, you can pay for a peer's files from either your Cashu or Fedimint ecash, and the Transactions view now shows your Lightning, Cashu, and Fedimint activity together — with a payment confirmation screen and an automatic refund if a purchase fails.
-- Mesh radios got a major upgrade: Meshtastic direct messages are now true end-to-end-encrypted radio messages that interoperate with off-the-shelf Meshtastic phone apps, your radio's region and a shared channel are provisioned automatically, and a new setup window appears when a radio is plugged in — with board pictures, full radio settings, and signal-strength indicators.
-- Reticulum joins as a third mesh radio protocol with RNode LoRa hardware support, including sending images and voice messages over the radio — and every chat message now carries a small pill showing how it travelled (Mesh, FIPS, or Tor).
-- Your node can manage an OpenWrt router: set up its internet uplink from the UI with a Wi-Fi network scan, turn it into a TollGate pay-for-Wi-Fi hotspot with a real captive portal, and sweep the router's earnings into your node's wallet. The gateway's status appears on the Home screen's Network tile.
-- Peering is now trust-aware: "Invite a Peer" grants view-only Observer access while "Link Your Nodes" grants Trusted access, incoming requests ask for your confirmation with an optional message, Node Visibility is a single clear switch plus a list of discoverable nodes you can peer with, and the Fleet view shows your trusted nodes' health.
-- Updates and apps are verified end-to-end: release updates are cryptographically signed and checked against a key baked into your node, app definitions arrive via the signed catalog, and container images are checked against trusted sources before anything installs or runs.
-- Dozens of reliability fixes: failed installs no longer leave phantom app cards, uninstalling can't hang forever, apps you stopped stay stopped, crashed apps heal themselves (even "running" containers whose process actually died), the login page no longer refresh-loops, and the mobile layout fits real phone screens instead of hiding the last row behind the browser bar.
-
-### Also in this release
-
-- Ask your node things over the radio: send "!archy" for node status with no AI involved, or "!ai <your question>" in a direct message for an AI answer that comes back on the same path it arrived — with a model dropdown (Haiku, Sonnet, or Opus) and an "always allow" list in the Mesh AI Assistant panel.
-- The off-grid mesh radio no longer posts cryptic identity codes ("ARCHY:") to the shared public channel every minute.
-- Mesh contacts take care of themselves: new radios you hear are added automatically, "Clear All" really removes contacts (they return when in range), each contact shows a reachability dot, and the Peers list has a search box.
-- You can message standard meshcore phone apps and they can message you — readable text both ways, private replies instead of public-channel broadcasts.
-- Federated Archipelago nodes now appear on the Mesh Map.
-- Apps open as an overlay on top of whatever page you're on, in every display mode, instead of yanking you to a different screen; the Services tab groups apps by category with proper icons.
-- BTCPay Server keeps its plugins across restarts, connects to your node's own LND out of the box, and its invoices stay payable over private Lightning channels.
-- Fedimint federations show up in Wallet Settings again (the client app's configuration error is fixed), and Wallet Settings has tabbed sections for Cashu and Fedimint.
-- The phone companion app can upload and download files, edit saved server entries, opens non-embeddable apps in an in-app browser, and got a proper round launcher icon.
-- Six placeholder "apps" that were just web bookmarks (484.kitchen, arch-presentation, call-the-operator, nwnn, syntropy-institute, t-zero) are gone from the store.
-- The Bitcoin dashboard works fully offline (no more loading its styling from the internet), Gitea opens on the right port, and mempool, strfry, and Electrum stopped their restart/health-check loops.
-- Kiosk displays: HDMI audio no longer stutters, and a bad display-clone state no longer sticks after reboot.
-- Consistent dropdowns, toggles, tabs, and modal styling across Settings, Federation, and the rest of the UI; in Mesh chat, scrolling the conversation no longer also scrolls the contact list; "App Updates" and "App Registry" sit directly under Account in Settings.
-- A fresh node no longer reinstalls apps just because their definition file exists on disk — only apps you actually installed come back.
-
-## v1.7.99-alpha (2026-06-17)
-
-- Your node can now hold Fedimint ecash as well as Cashu. Wallet Settings now has tabbed sections for each: keep your list of trusted Cashu mints, or paste a Fedimint invite code to join a federation, and the home wallet card shows both your Cashu and Fedimint balances side by side. A new "Fedimint Client" app in the catalog powers the federation side.
-- You can now buy files shared by another node, right from their cloud. When you open a peer's paid file you get a simple "Buy this file" picker with several ways to pay — instantly from this node's ecash balance, from your node's own Lightning wallet, on-chain from your node, or by scanning a Lightning QR code with any outside wallet. Once payment settles, the file downloads automatically.
-- Your node can now act as an AI assistant on the off-grid mesh radio network. If your node has a local AI model available (via Ollama), other people on the mesh can ask it a question by starting their message with "!ai" and get an answer back over the radio — handy where there's no internet. A new Mesh assistant panel lets you turn this on or off and shows whether a local AI model was detected.
-- You can now view your node's 24-word recovery phrase whenever you need it. Settings has a new "Recovery phrase" option that, after you confirm your password (and 2FA code if you use one), reveals the words behind a tap-to-show blur with a copy button — so you can write them down and store them safely offline.
-- Setting up a brand-new node is smoother and less alarming. If the node is still starting up while you generate or confirm your recovery phrase, it now quietly waits and retries instead of flashing a scary error, and offers a clear "Try again" button only when something genuinely goes wrong. The final setup screen also shows a gentle "securing your private connection…" status that turns to "ready" on its own, so you can tell the encrypted transport is coming up rather than stuck.
-- The NetBird VPN app now actually logs in. It was failing to reach its sign-in screen because the dashboard needs a secure (HTTPS) connection that wasn't being provided; the node now serves it over HTTPS and opens it in a browser tab, so the login flow completes.
-- When you use your phone to remote-control a node's attached screen, two-finger scrolling now works inside apps and panels, not just the main page. And tapping an app that's meant to open in an external browser now hands the link to your phone to open there, instead of trying to open it on the (often unattended) attached display.
-- You can now choose whether your node shares Bitcoin block headers over the mesh. The Mesh Bitcoin panel has new switches to announce headers to peers and to accept headers from them, and your choices are remembered.
-- Version numbers now display cleanly everywhere. In a few places the interface was showing a doubled "v" (like "vv1.7.98"); it now always shows a single, tidy version label.
-- The "Back" buttons throughout the cloud and other detail screens now look and behave consistently on both desktop and mobile, including when browsing another node's files.
-- For advanced testing, Settings now includes an optional "update & app source" choice between the usual trusted origin and an experimental peer-to-peer (DHT swarm) mode that pulls updates and app content from other nodes first, falling back to the origin automatically. The trusted origin remains the default.
-
-## v1.7.98-alpha (2026-06-16)
-
-- Apps that crash now recover on their own. Multi-part apps like Immich and IndeedHub could have one of their pieces stop and stay stopped until the whole node was rebooted; the node now checks every couple of minutes and restarts any crashed piece automatically (while still leaving apps you deliberately stopped alone).
-- The on-screen kiosk display can no longer slow the whole node down. On machines without a graphics chip the kiosk browser could spin a CPU core at full tilt, starving everything else (including the wallet, which then timed out); it's now capped and uses lighter rendering on those machines.
-- If an update download fails, you're taken back to the Download button to retry, instead of being stranded on an Install button for an update that didn't actually finish downloading.
-- Your node's identity is clearer and always visible: Settings now shows your Node DID on every node (it previously only appeared if your browser had cached it) plus your node's npub, both with copy buttons. There's also a terminal tool to cryptographically prove all your node's keys come from your one seed phrase.
-- The "all nodes over Tor" group chat sends quickly now — the "sending" spinner clears as soon as the reachable nodes have the message, instead of hanging on a slow or offline node.
-- Message notifications now have a close button and open the relevant chat when tapped.
-- The encrypted mesh transport (FIPS) turns itself on automatically after setup — no button to press — and connects to peers more reliably (it retries and keeps connections warm), so node-to-node features use the fast path more often instead of falling back to Tor.
-- Your chat history with other nodes is saved reliably and now encrypted on disk, so it survives restarts and updates and can't be read from a stolen drive (only clearing chat removes it).
-- Peer media shows a "connecting" loader before a video or audio file plays, and audio errors are accurate instead of blaming File Browser.
-- The Fedimint app now displays with its proper styling, and the Connected Nodes screen stays compact — it shows a few nodes and scrolls, you can tap a node to jump to it in Federation, or tap Message to open its chat.
-- App updates can now arrive on their own without waiting for a full system release, so individual apps can be improved and shipped faster.
-
-## v1.7.97-alpha (2026-06-16)
-
-- The Bitcoin sync status on the home screen no longer disappears for a moment when it refreshes. If the node was briefly busy, the panel used to vanish and pop back; it now stays put and simply shows "Updating…" until the next reading arrives, while a genuinely stopped node still correctly shows as not running.
-- Bitcoin sync progress on the home screen now updates more promptly, so the percentage and block height keep pace with the node instead of lagging behind.
-- The Lightning wallet "connect your wallet" screen loads its details and QR code again across all nodes, instead of failing to fetch them.
-- Your list of trusted nodes is now clean: the same node no longer appears several times under different names, and removed nodes stay removed. In chat, a node that previously showed up as two separate contacts now appears just once.
-- Browsing another node's cloud is smoother: music and video files from a peer now preview and play properly (including seeking partway through), and the connection now shows a small badge telling you whether it's using the fast encrypted mesh or the slower Tor network.
-- Opening "My Folders" in the cloud now shows a clear, friendly message when the file app isn't running, instead of a confusing error.
-- The Electrum server app opens on its own once it's ready, instead of sometimes leaving a loading spinner stuck on top of the screen.
-- The Fedimint app now displays with its proper styling and icons, instead of appearing unstyled with a missing image.
-- The Mempool app now connects to your Bitcoin node whether the node is Bitcoin Core or Bitcoin Knots, instead of only working with one of them.
-- Nodes start up cleanly after a reboot. On some boots the node's main service was trying to start before its data drive had finished mounting, so it failed and retried about twenty times over roughly five minutes — showing a wall of "Failed to start" messages — before finally coming up. It now waits for the data drive to be ready first, so it starts on the first try.
-- The background images throughout the interface now load faster — they've been made significantly smaller with no loss of quality.
-
-## v1.7.96-alpha (2026-06-15)
-
-- The screen attached to your node now shows the normal Archipelago interface and your dashboard after you sign in, instead of a separate, stripped-down grid of app icons that could appear in its place. That extra screen has been removed so the attached display matches what you see everywhere else.
-- On a brand-new node, the attached screen now walks through the same welcome and setup steps you'd see on a phone or laptop, and shows the normal sign-in screen once the node is set up — so the on-device display always matches the rest of the interface.
-- When adding a FIPS network anchor, you can now choose whether it connects over TCP (for a public anchor reached across the internet) or UDP (for one on your local network), instead of it always assuming the local-network option.
-- Behind the scenes, a new automated two-node test now exercises real node-to-node features — browsing another node's shared files and handling a removed node — against live nodes before each release, so node-to-node problems are caught earlier.
-
-## v1.7.95-alpha (2026-06-15)
-
-- Browsing another node's shared files now works over the fast encrypted mesh. Opening a peer's cloud could fail with a generic "Operation failed" message because the request for their file list wasn't permitted over the mesh and came back as "not found" — and it never retried over Tor. The mesh now serves the file list directly, and if a peer can't answer over the mesh the node automatically falls back to Tor instead of giving up.
-- Nodes you remove from your federation now stay removed. Previously a deleted node could quietly come back the next time you synced with another node that still listed it. Removed nodes are now remembered as removed and won't reappear on their own — only if you add them back yourself.
-- The app credentials pop-up now appears as a normal centred box with a dimmed background over the whole screen, instead of stretching to fill the entire screen.
-
-## v1.7.94-alpha (2026-06-15)
-
-- Your node now joins the private encrypted mesh network on its own. A wrong built-in setting meant nodes were quietly never reaching the shared mesh meeting point, so everything between nodes fell back to the slower Tor network. Every node now connects to the mesh automatically on startup, so node-to-node features like file sharing use the faster encrypted mesh first and only fall back to Tor when a peer is genuinely offline. (Confirmed live: a node with its mesh setting wiped re-connected to the mesh by itself within a second of starting.)
-- You can now bring the mesh networking software up to the latest stable version straight from the node, with one action — it fetches the new version, checks it's genuine before installing, and restarts the mesh on its own. (Confirmed live end to end: a node on an older build was upgraded to the current stable release and rejoined the mesh automatically.)
-- The Lightning wallet screen connects again on nodes where it was showing a "failed to fetch" error instead of your balance and channels. The wallet app and the node now talk to each other correctly, and the connection quietly repairs itself if its details drift after a restart.
-
-## v1.7.93-alpha (2026-06-14)
-
-- Receiving Bitcoin and Lightning works again on nodes where the Lightning wallet was stuck locked. After some updates the wallet could come back locked with a password the node no longer had, so "generate a receive address" kept failing with a "wallet is locked" message that nothing could clear. The node now detects this and repairs itself automatically.
-- Each node now secures its Lightning wallet with its own unique, randomly generated password instead of a shared built-in one, and remembers it safely so the wallet unlocks on its own after every restart or update — no more getting stuck locked.
-- If a wallet is found locked with an unrecoverable password, the node rebuilds it cleanly so Bitcoin and Lightning start working again. (On these early-access nodes the wallet holds no funds, so nothing is lost — a wallet locked with an unknown password was already inaccessible.)
-- The self-repair was validated end to end on live nodes: a stuck, locked wallet was detected, rebuilt, and came back unlocked on its own, and stayed unlocked across restarts.
-
-## v1.7.92-alpha (2026-06-14)
-
-- The Electrum server app no longer flashes a "can't connect, try again" error over its loading screen while it's still catching up. If ElectrumX is building its index or waiting on the Bitcoin node, you now just see the sync progress, and the app opens on its own once it's ready.
-- Behind the scenes, the reboot-survival test now confirms the whole system is genuinely healthy after a restart — every app reachable, updates not stuck, core services answering — instead of only checking that containers came back, so update-related problems are caught before shipping.
-- Settings → What's New now lists the notes for every recent release again. The screen had quietly fallen several versions behind, so the last eight releases of changes weren't showing up there — they're all back now, and a release check keeps it from drifting again.
-
-## v1.7.91-alpha (2026-06-14)
-
-- Apps you've installed now reliably show their "Open" button again. Some apps — including Jellyfin, BTCPay Server, Fedimint, Gitea and Portainer — were running fine but their launch link sometimes went missing, so there was no way to open them from the home screen. They now open correctly.
-- Receiving Bitcoin is more dependable: if the wallet's internal connection details drift after a restart, it now repairs them on its own, and any error it does hit is reported clearly instead of as a generic failure or a misleading "wallet locked" message.
-- Installing Bitcoin now sets itself up correctly without manual help — a security credential that could previously be missing and stop Bitcoin from starting is created automatically before it launches.
-- The Electrum server app is back on the home screen and can be launched again.
-- Behind the scenes, the release now runs an expanded automated test suite before shipping, so these kinds of issues are caught earlier.
-
-## v1.7.90-alpha (2026-06-13)
-
-- Generating a Bitcoin receive address works again — the wallet now requests the correct address type, fixing the "400 Bad Request" error when creating an address.
-- In the companion app, the on-screen pointer can now click into apps and type — including the app store search box — instead of clicks and keystrokes not reaching app content.
-- "Open in a new tab" from the companion app now opens the app in your phone's browser, instead of doing nothing. The normal mobile browser keeps working as before.
-- The login/credentials pop-up on phones is once again a centered, properly sized window rather than stretching the full height of the screen.
-- The Electrum server now recovers on its own if its index ever gets corrupted, and shows a clear progress screen (with percent complete and block height) while it builds its index, instead of a blank or broken page.
-- Software updates are more reliable on slow internet connections — downloads are given much more time to finish before giving up.
-
-## v1.7.89-alpha (2026-06-12)
-
-- The AI assistant looks the way it always did again: no extra back button or close button on phones, and the desktop view fills the whole screen without a gap at the bottom.
-- System updates are much more reliable: updates that previously got stuck partway or failed to install now complete cleanly, and a failed update can no longer block all future updates.
-- After an update, the system now checks itself correctly on every node type, so working updates are no longer mistakenly undone.
-- Generating a Bitcoin receive address works again on nodes where a network proxy previously got in the way.
-- The Lightning wallet now recovers and unlocks itself properly after restarts.
-
-## v1.7.88-alpha (2026-06-12)
-
-- AIUI now loads immediately again instead of waiting on a production availability probe and cache-busted iframe URL, restoring the lighter launch behavior from before the regression.
-- Bitcoin receive now uses LND's GET-based newaddress flow with the native SegWit address type, fixing the `501 Method Not Allowed` response from the previous POST attempt.
-- Validation pending on the AIUI rollback; the rest of the release train remains unchanged.
-
-## v1.7.87-alpha (2026-06-12)
-
-- Bitcoin receive now calls LND's on-chain address endpoint with the correct REST method, and backend failures keep the specific address-generation error instead of collapsing into the generic operation-failed message.
-- App launch credential interstitials now render as true full-screen overlays, and the launcher loading indicator uses the neutral brand palette instead of a blue spinner.
-- Validation passed with `git diff --check`, `npm run type-check`, and the focused frontend tests for `bitcoinReceive` and `AppIconGrid`.
-
-## v1.7.86-alpha (2026-06-12)
-
-- Fleet now preserves the last known node list, alerts, and selection locally while telemetry refreshes in the background, so the dashboard no longer blanks on tab switches or update scans.
-- Connected nodes and identities now reuse their last loaded data instead of reloading the visible list every time the user revisits the tab.
-- The Fleet matrix and detail views now show actual node names and host information instead of raw node id prefixes.
-- The network map only redraws when its graph data actually changes, which stops the D3 scene from visually resetting on every refresh tick.
-- Mobile federation and system-update actions now stack full width, and the ElectrumX app health check allows a long startup window so slow sync nodes do not restart mid-index.
-- Validation passed with `git diff --check`, focused frontend tests, and `npm run type-check`.
-
-## v1.7.85-alpha (2026-06-12)
-
-- ElectrumX now runs with less cache pressure and more memory headroom, reducing the restart loop seen during sync catch-up.
-- Portainer is pinned to `2.19.4` instead of `latest`, avoiding schema-drift restarts from surprise image updates.
-- LND receive-address creation now asks for a native SegWit address and returns clearer wallet/readiness failures when an address is not available.
-- Fleet telemetry now carries server name, hostname, and server URL, and the Fleet dashboard shows those names instead of hashed node ids.
-- Trusted federation peers are still auto-added transitively, but the local node no longer imports itself back into the fleet list.
-- Validation passed locally for the touched frontend helpers, `git diff --check`, and Rust formatting.
-
-## v1.7.84-alpha (2026-06-11)
-
-- Bitcoin trusted-node relay approvals now generate restricted `txrelay` RPC credentials when needed and restart the active Bitcoin backend so bitcoind loads the new `rpcauth` whitelist.
-- Kiosk mode now includes a browser safe-area path for HDMI displays that crop edges, and self-update refreshes kiosk launcher/systemd files so display fixes ship to existing nodes. The experimental X11 scaling safe-area is opt-in to avoid stretching TV output.
-- Wi-Fi setup now reports scan errors instead of showing an empty network list, supports retrying scans from the modal, parses escaped `nmcli` SSIDs correctly, and can join open networks without forcing a WPA password.
-- Bitcoin Core now matches Bitcoin Knots for restricted relay RPC support, including the txrelay secret injection and transaction broadcast whitelist.
-- The restricted Bitcoin relay whitelist now includes `submitpackage` and `gettxout`, covering newer wallet/package-relay broadcast flows without opening wallet/admin RPC.
-- The Bitcoin UI companion image is pinned to `1.7.84-alpha` across release metadata and the Quadlet fallback path, avoiding stale `latest` detection during OTA updates.
-- Container scanning now uses an RAII in-flight guard so timeout and error paths cannot leave the scanner stuck in a permanently busy state.
-- Validation passed with `cargo fmt`, `cargo check -p archipelago`, `git diff --check`, and focused source review of the relay message/approval path.
-
-## v1.7.83-alpha (2026-06-11)
-
-- App launch metadata now derives more consistently from app manifests, with typed launch interfaces and catalog generation updates that keep packaged apps aligned with their runtime ports and launch surfaces.
-- Revoked or unsupported app surfaces were removed from the catalog and release path, including OnlyOffice and the unvalidated Saleor surface, so the Marketplace no longer exposes apps that cannot be safely supported in this release.
-- The frontend production build now passes strict TypeScript checks after tightening app details, Web5, cloud refresh, and credential test typing.
-- Mobile and desktop app surfaces received release polish: improved mobile app layout, safer mesh desktop/tablet scrolling, and the Home system card now routes directly to monitoring.
-- Bitcoin UI status rendering now avoids false stale/reconnecting states when fresh block snapshots advance, and guards optional DOM updates so the standalone Bitcoin UI is more resilient.
-- Deploy tooling now excludes local Codex scratch output, archived image-build artifacts, and upload screenshots from target syncs, and bounded optional IndeedHub fixups so a stuck Podman helper cannot hold the deploy.
-- Validation passed with `npm run type-check`, production `npm run build`, backend `cargo build --release`, catalog/release manifest checks, focused frontend tests, and live `.198` deploy verification through the frontend/service restart phase.
-
-## v1.7.82-alpha (2026-05-22)
-
-- Saleor storefront proxying now forwards `X-Forwarded-Host`, fixing Next.js Server Actions requests that compared the browser origin with the internal `storefront-app:3000` upstream host.
-- Saleor storefront media now routes `/thumbnail/` and `/media/` through the same `9011` proxy to the Saleor API, fixing product image optimizer failures caused by `localhost:8000` media URLs.
-- The Saleor storefront container receives an explicit internal media origin so rewritten media URLs resolve inside the Podman network without exposing private API ports to browsers.
-- Validation passed with `cargo fmt --all --check --manifest-path core/Cargo.toml`, `cargo check -p archipelago --manifest-path core/Cargo.toml`, and live checks on `100.114.134.21` for storefront HTML, static assets, GraphQL, media redirects, and optimized product images.
-
-## v1.7.81-alpha (2026-05-21)
-
-- Saleor storefront installs now use the prebuilt registry image instead of building the Next.js app on-device, avoiding Podman build failures during stack installation.
-- Existing Saleor stacks are repaired on adoption by recreating missing storefront containers, forcing the storefront app to bind `0.0.0.0:3000`, and resolving nginx upstreams dynamically after container restarts.
-- The shipped Saleor storefront image now includes public assets and omits Vercel-only Speed Insights injection, fixing broken static asset responses and the local `/_vercel/speed-insights/script.js` browser warning.
-- Validation passed with `cargo fmt --all --check --manifest-path core/Cargo.toml`, `cargo check -p archipelago --manifest-path core/Cargo.toml`, and live checks on `100.114.134.21` for `9011` storefront, static assets, and proxied GraphQL.
-
-## v1.7.80-alpha (2026-05-21)
-
-- Saleor storefront proxying now falls back to the direct request scheme when no forwarded protocol header is present, fixing direct `http://node:9011` launches that could generate an invalid same-origin GraphQL URL.
-- The Saleor storefront release path keeps public proxy support intact by still honoring forwarded HTTPS headers for Nginx Proxy Manager domains while repairing local/direct port launches.
-- Validation passed with `cargo fmt --check` and `cargo check` for the Archipelago backend before release staging.
-
-## v1.7.79-alpha (2026-05-20)
-
-- Saleor now installs the official Saleor Storefront as part of the stack, built from the pinned `saleor/storefront` source and served as the customer-facing shop on port `9011`.
-- Saleor app launches now open the storefront while the admin dashboard remains available on port `9010` with the generated `admin@example.com` credentials shown in Archipelago.
-- Public Nginx Proxy Manager hosts forwarding to the Saleor storefront also expose same-origin `/graphql/`, so public storefront domains can talk to the local Saleor API without mixed-content or private-LAN reachability failures.
-- Saleor stack metadata, marketplace descriptions, catalog ports, scanner exclusions, and app-session routing now describe the storefront/dashboard/API split explicitly.
-
-## v1.7.78-alpha (2026-05-20)
-
-- Public Nginx Proxy Manager hosts for Saleor now keep browser GraphQL calls same-origin at `/graphql/` and proxy them to the local API on `8000`, fixing `Failed to fetch` when a public domain such as `noderunner.shop` was loaded from devices that cannot reach the node's private LAN/tailnet API address.
-- Saleor's validated stack changes are now release-ready: dashboard origins on port `9010` are explicitly allowed for dashboard/API calls, preserving the working test-node install path for production nodes.
-- NetBird launches now stay pinned to the unified dashboard/proxy origin on port `8087` instead of following stale runtime-discovered server URLs on `8086`.
-- NetBird's local nginx proxy now routes browser API, OAuth, relay, and WebSocket traffic through `host.containers.internal:8086` instead of a hard-coded rootless Podman gateway IP, and includes the upstream `management.ProxyService` gRPC path.
-- The mobile credentials interstitial now keeps credential lists scrollable and action buttons reachable in both My Apps and the mobile app icon grid.
-- Android WebView popup windows now hand external popup URLs to the system browser, covering app login/signup flows that open secondary windows.
-- Validation passed with `git diff --check`, `cargo check -p archipelago`, and the focused `npm test -- src/views/appSession/__tests__/appSessionConfig.test.ts` suite.
-
-## v1.7.77-alpha (2026-05-20)
-
-- Saleor first-use now exposes generated credentials through Archipelago instead of leaving users at an unexplained dashboard login: App Details shows copyable `admin@example.com` credentials, and My Apps/mobile icon launches show a pre-launch credentials modal.
-- Saleor installs now create or repair the `admin@example.com` staff account idempotently after sample data loads, use the correct dashboard mount path, and re-check stack containers after startup so stopped containers are caught.
-- NetBird embedded login now uses the upstream-compatible IdP signing-key behavior and sends ID tokens from the dashboard to the management API, fixing the post-signup `Unauthenticated` state while preserving the unified local proxy/logout routes.
-- Transient unnamed Podman helper containers created during app install tasks are hidden from My Apps, so generated names like `eager_keldysh` no longer appear as user applications.
-- Validation passed with catalog/release JSON checks, `npm run type-check`, and `cargo fmt --all --check --manifest-path core/Cargo.toml`; live checks on `100.114.134.21` confirmed Saleor dashboard/API availability, generated Saleor admin login, NetBird OAuth availability, and NetBird logout redirects.
-
-## v1.7.76-alpha (2026-05-20)
-
-- Saleor installs now use dashboard port `9010`, avoiding the existing Portainer `9000` binding on the test node while keeping API `8000`, Mailpit `8025`, and Jaeger `16686` unchanged.
-- Saleor's Valkey cache no longer bind-mounts `/var/lib/archipelago/saleor-cache`, and the dashboard container has the minimal rootless nginx capabilities it needs to chown cache files, bind port 80 inside the container, and drop workers to the nginx user.
-- NetBird's browser proxy now sends API, OAuth, relay, WebSocket, and management traffic through the stable host-published server port at `169.254.1.2:8086`, avoiding stale rootless Podman DNS/IPs after `netbird-server` restarts.
-- Mobile App Store category chips now stay visible above the tab bar, Discover is available on mobile, and category selection updates the page route/query so the selected category is actually shown.
-- Apps that require a real browser tab now open directly from the app icon tap instead of first entering an in-shell app-session route, including BTCPay, Grafana, Home Assistant, Vaultwarden, Nextcloud, Portainer, OnlyOffice, Tailscale, Uptime Kuma, Gitea, and Nginx Proxy Manager.
-- Validation passed with catalog JSON checks, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`; live checks on `100.70.96.88` confirmed Saleor dashboard `9010`/API `8000` and NetBird API/OAuth routes survive `netbird-server` restart.
-
-## v1.7.75-alpha (2026-05-19)
-
-- Saleor is now published as a recommended commerce app with catalog metadata, icon, direct app-session launch on port `9000`, scanner metadata, image pins, and a full stack installer for dashboard, API, worker, PostgreSQL, Valkey, Mailpit, and Jaeger.
-- Existing NetBird installs are repaired more aggressively by rewriting unified-origin config, recreating the dashboard/proxy containers, restarting the server, preserving data, and handling exact `/api` and `/oauth2` routes plus dashboard logout redirects through the local proxy.
-- Desktop dashboard scrolling now hands focus back from the sidebar to the main content when the pointer or wheel moves over the main pane, preventing the sidebar scroll area from trapping wheel input on short screens.
-- Validation passed with catalog JSON checks, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml` before release.
-
-## v1.7.74-alpha (2026-05-19)
-
-- App-session right panels now re-focus the iframe after load and when the frame area is activated, so wheel/touch scrolling works immediately after switching tabs or selecting an app on shorter screens.
-- NetBird now launches through a unified local origin on port `8087` that proxies the dashboard plus `/oauth2`, `/api`, relay, WebSocket, and gRPC routes to `netbird-server`, fixing the embedded login flow that previously ended in `Unauthenticated` or `404 page not found` after logout.
-- Existing NetBird installs are repaired on adopt/start by rewriting `config.yaml`, `dashboard.env`, and the local nginx proxy config, then creating the missing `netbird-dashboard` and `netbird` proxy containers when needed while preserving NetBird data.
-- Saleor is still pending and is not included in this release; its registry/installer work remains local until it can be validated separately.
-- Validation passed with catalog JSON checks, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`.
-
-## v1.7.73-alpha (2026-05-19)
-
-- Mobile app launches for iframe-blocked apps now open the direct app URL in a new browser tab immediately instead of landing in a broken in-shell webview that requires a second tap.
-- Mobile My Apps/Websites tabs now react to route query changes, App Store pages label the mobile view as Discover, mobile filters have safe bottom spacing, and App Store search ignores the current category so searches cover all available apps.
-- My Apps search now surfaces matching App Store entries when the app is not installed, making it possible to jump directly from a failed My Apps search to the installable app details.
-- NetBird self-host installs now prefer a `100.x` tailnet/CGNAT address for dashboard, management, relay, STUN, and auth redirect origins when one is present; live repair on `100.89.209.89` updated the existing stack from LAN origins to `100.89.209.89` and restored `netbird-server`.
-- App-session iframe frames now focus automatically and wrap the iframe in a scroll host so wheel/touch scrolling works in the active right frame without requiring an initial click.
-
-## v1.7.72-alpha (2026-05-19)
-
-- Settings What's New now includes the missing release notes for `v1.7.68-alpha` through `v1.7.71-alpha`, so the modal reflects the current OTA history instead of stopping at `v1.7.67-alpha`.
-- The follow-up release carries the NetBird install fix, Gitea icon polish, mobile app-session fallback updates, and rounder app icon masks from `v1.7.71-alpha` with the Settings modal notes included.
-- The local Cargo lockfile version metadata is kept in sync with the release bump after the previous release build updated it.
-
-## v1.7.71-alpha (2026-05-19)
-
-- NetBird stack installs now pre-create `/var/lib/archipelago/netbird/data` before binding it into `netbird-server`, fixing the failed install/start path seen on `100.70.96.88` where Podman rejected the missing host directory.
-- NetBird start/restart ordering now starts `netbird-server` before the dashboard container so lifecycle actions bring the control plane up before the UI.
-- App-session invalid IDs and panel-mode fallbacks now return to `/dashboard/apps`, avoiding the stale `/apps` route that could render a 404.
-- Mobile launches for apps that block iframes now stay inside the Archipelago app-session fallback instead of automatically opening an external browser tab.
-- Installed Gitea containers now report the packaged Gitea icon, and app icon masks use a rounder radius on mobile grids, app cards, and detail headers.
-- Validation passed with `npm run type-check`, focused Vitest app-session/app-grid tests, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`.
-
-## v1.7.70-alpha (2026-05-19)
-
-- NetBird is being corrected from the peer/client daemon image to the self-hosted NetBird control-plane stack with a launchable dashboard on port `8087`, a combined management/signal/relay server on `8086`, and STUN on UDP `3478`.
-- App sessions now always launch local apps through direct host ports and carry an explicit dashboard return target, so closing an iframe returns to the launching dashboard screen instead of falling through to browser history or a 404.
-- Mobile app launches ignore stale desktop panel state and route into the full app-session webview consistently.
-- The desktop sidebar now pins the logo/version at the top and controller/online/mode controls at the bottom, with only the navigation section scrolling on shorter screens.
-- Validation passed with catalog JSON checks, `scripts/image-versions.sh` syntax check, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`.
-
-## v1.7.69-alpha (2026-05-19)
-
-- App installs now allow up to 10 minutes for the initial `package.install` RPC to return, matching slow container image pulls and preventing apps from disappearing from My Apps while the backend is still pulling or retrying mirrors.
-- Live diagnostics on `100.70.96.88` confirmed the Gitea install did not fail; the primary registry pull timed out after 300 seconds, the fallback mirror succeeded, and Gitea came up healthy on `3001` while the frontend had already timed out at 15 seconds.
-- Gitea and other Docker-image app installs now stay visible during slow registry pulls instead of being marked as failed by the browser before backend install progress can complete.
-- Gitea is now categorized as a known Data app in My Apps, so a running Gitea container appears with installed apps instead of being filtered into the Websites/Services split.
-- NetBird `0.71.2` is now available in the app catalog and fallback marketplace data as a recommended networking app using the official `docker.io/netbirdio/netbird:0.71.2` image.
-- NetBird installs get persistent state under `/var/lib/archipelago/netbird`, `NET_ADMIN`/`NET_RAW`, `/dev/net/tun`, `slirp4netns`, image-version pinning, backend metadata, and health checks through `netbird status`.
-- The Archipelago terminal now includes `nano` on new disk installs and ISO builds, and self-update installs it on existing nodes if it is missing.
-- Validation passed with catalog JSON checks, shell syntax checks, `npm run type-check`, `cargo fmt --all --check --manifest-path core/Cargo.toml`, and `cargo check -p archipelago --manifest-path core/Cargo.toml`.
-
-## v1.7.68-alpha (2026-05-19)
-
-- BTCPay Server now ships on the official `docker.io/btcpayserver/btcpayserver:2.3.9` image, fixing the plugin catalog crash caused by newer plugin dependency version metadata while preserving existing datadirs and Postgres databases.
-- BTCPay release and first-boot health checks no longer depend on `curl` inside the container; they use a bash TCP probe that works with the official image out of the box.
-- Host nginx now serves Nginx Proxy Manager HTTP-01 challenge files before the Archipelago SPA fallback and is marked as the default HTTP/HTTPS virtual host, so public proxy hosts can issue certificates without hijacking local API traffic.
-- Nginx Proxy Manager first-boot, runtime repair, and container-doctor paths now pre-create the ACME webroot, keep bind mounts owned by the rootless Archipelago user, and sync issued public proxy hosts into host nginx vhosts.
-- The Nginx Proxy Manager host-nginx sync now skips proxy hosts with missing certificate files and rolls back the generated nginx include if validation fails, preventing a bad certificate path from poisoning later nginx reloads.
-- App session close buttons now return to the previous dashboard screen when possible and otherwise fall back to My Apps, avoiding the 404 page after closing an app launched from an invalid or stale history entry.
-- System Update confirmation and mirror modals now teleport to the document body with a full-screen overlay, so they cover the whole app instead of only the right-hand dashboard panel.
-- Mobile app launches stay inside Archipelago's app-session webview and hide desktop-only new-tab launch affordances, including apps such as Home Assistant that previously looked like they would leave the mobile shell.
-- Live recovery on `100.70.96.88` upgraded only the `btcpay-server` container to `docker.io/btcpayserver/btcpayserver:2.3.9`, preserved the existing datadir and Postgres database, and confirmed the container is healthy after a pre-upgrade backup.
-- Public validation confirmed `spay.tx1138.com`/`www` redirect to BTCPay login over HTTPS and `sapien.tx1138.com`/`www` serve the L484 page over HTTPS using the issued Let's Encrypt certificates.
-
-## v1.7.67-alpha (2026-05-18)
-
-- Home dashboard status cards now keep the last known good system, VPN, Bitcoin, and FIPS values while route changes or transient RPC failures are in flight, avoiding false "not configured" or "not running" flashes.
-- Home, Web5 Monitoring, and the Monitoring page headline cards now share the same live system-stat snapshot for CPU, memory, disk, uptime, and load so the visible numbers agree across the UI.
-- Settings What's New is filled through `v1.7.67-alpha`, including the missing historical `v1.7.44-alpha` through `v1.7.66-alpha` entries.
-- Bitcoin/Knots/Core shell lifecycle specs now match the Rust app config memory policy: 8 GiB on normal hosts, 4 GiB on low-memory hosts, and pruned Knots uses a larger dbcache on hosts with enough RAM to improve IBD throughput.
-- ElectrumX/electrs shell lifecycle specs now match the 4 GiB memory policy used by the Rust app config, reducing drift between first boot, reconcile, and app lifecycle paths.
-- Live assessment of `100.70.96.88` identified the current IBD bottlenecks as CPU/thermal/I/O pressure rather than RAM exhaustion, with follow-up work planned for existing-node swap repair, kiosk Chromium CPU reduction, and reconcile failure cleanup.
-
-## v1.7.66-alpha (2026-05-18)
-
-- Nginx Proxy Manager stale-port repair now detects stopped or `Created` Podman records by inspecting `podman ps -a` port metadata, covering records where `podman port nginx-proxy-manager` returns no mapping until start.
-- Live recovery on `100.70.96.88` removed only the stale Nginx Proxy Manager container record and recreated it with `8081:81`, `8084:80`, and `8444:443`, preserving `/var/lib/archipelago/nginx-proxy-manager` data.
-- Validation confirmed Nginx Proxy Manager recovered as healthy and responds through direct admin port `8081`, host compatibility port `81`, and `/app/nginx-proxy-manager/`.
-
-## v1.7.65-alpha (2026-05-18)
-
-- Orchestrator-backed app starts now run the same pre-start repairs as the legacy Podman path, so Nginx Proxy Manager stale `81:81` container metadata is removed and recreated before the orchestrator tries to start it.
-- Live diagnostics on `100.70.96.88` confirmed host nginx is healthy while Nginx Proxy Manager has no listeners on `8081`, `8084`, or `8444`, causing host nginx `502` responses for NPM proxy paths.
-
-## v1.7.64-alpha (2026-05-18)
-
-- Update apply rate limiting is relaxed for authenticated admins from 2 attempts per 10 minutes to 10 attempts per minute, preventing the System Update page from getting stuck behind `429 Too Many Requests` during legitimate OTA retry/troubleshooting flows.
-- The corrected backend artifact rebuild protection from `v1.7.63-alpha` remains in place, so this release is built from a fresh Rust backend binary before publishing.
-
-## v1.7.63-alpha (2026-05-18)
-
-- Release automation now rebuilds the Rust backend after bumping the version and before hashing release artifacts, preventing OTA manifests from pointing at a stale backend binary.
-- This corrected release carries the Nginx Proxy Manager stale-port repair in an updated backend binary, so nodes running `1.7.61-alpha` can actually receive and execute the fix.
-- Validation confirmed the previously published `v1.7.62-alpha` backend artifact still contained `1.7.61-alpha`, explaining why nodes did not advance after applying that update.
-
-## v1.7.62-alpha (2026-05-18)
-
-- Nginx Proxy Manager start and restart now repair stale Podman containers that still publish the admin UI on host port `81`, which conflicts with host nginx on updated nodes.
-- The repair recreates only the stale Nginx Proxy Manager container metadata while preserving `/var/lib/archipelago/nginx-proxy-manager` data and using the current `8081:81`, `8084:80`, and `8444:443` mappings.
-- Runtime stale-listener cleanup for Nginx Proxy Manager is shared across start and restart paths so rootless port helper leftovers are still cleared before lifecycle retries.
-- Validation passed with `cargo fmt --all --check --manifest-path core/Cargo.toml` and `cargo check -p archipelago --manifest-path core/Cargo.toml`.
-
-## v1.7.61-alpha (2026-05-18)
-
-- Multi-container stack installs now keep their app card in the `Installing` state for up to 20 minutes while dependency containers are being pulled and prepared.
-- BTCPay Server installs no longer appear to vanish or fail after two minutes while Postgres and NBXplorer are still being created before the primary `btcpay-server` container exists.
-- The stale-transition escape hatch remains short for start, stop, restart, update, and removal operations, so genuinely wedged lifecycle actions still recover quickly.
-- Live validation on `100.70.96.88` confirmed BTCPay Server completed installation and responds on port `23000` with the expected HTTP redirect.
-
-## v1.7.60-alpha (2026-05-18)
-
-- Meshtastic serial detection now rejects malformed or incomplete handshakes instead of accepting unrelated serial devices as a fallback Meshtastic radio.
-- Mesh radio auto-detection now skips known non-mesh serial devices such as Sierra Wireless LTE modems and Zooz/Z-Wave sticks, avoiding interference with production peripherals.
-- Meshtastic config sync now sends `want_config_id` with the correct protobuf wire type, fixing radio-side `ignore malformed toradio` errors and allowing node-info/contact ingestion.
-- The stable `/dev/mesh-radio` udev rule no longer claims every `ttyACM*` device; it only matches known mesh USB serial adapters and known USB CDC ACM radio vendors.
-- Live validation on `100.70.96.88` confirmed Archipelago selects `/dev/ttyUSB0`, identifies the Meshtastic node, and refreshes 103 mesh contacts.
-
-## v1.7.59-alpha (2026-05-17)
-
-- Mobile app launching now keeps known container apps inside Archipelago's app-session flow instead of forcing desktop-only new-tab behavior on phones.
-- App sessions on mobile now respect the status-bar safe area so foreground iframe content starts below the device chrome while the fullscreen backdrop remains edge-to-edge.
-- Prepackaged website launch buttons now resolve their curated website URLs before website-container fallback logic, restoring launches for the L484 sites and adding the Arch Presentation bookmark.
-- Meshtastic contact discovery now drains the radio config stream through completion and retries config sync when the contact cache is empty, so nearby nodes already known by the radio are more likely to appear in Archipelago.
-- The Apps page now includes a compact sideload button and modal for installing trusted Docker images with optional title, description, and port mapping metadata.
-- Sideloaded app title and description metadata now persist through the backend app-config file so refreshed package scans do not collapse custom apps back to generic IDs.
-- Validation passed with `npm test -- appLauncher`, `npm run build`, `cargo check -p archipelago`, and `cargo fmt --all --check`.
-
-## v1.7.58-alpha (2026-05-17)
-
-- Mesh networking now supports Meshtastic radios over the Meshtastic serial API in addition to existing MeshCore Companion USB radios.
-- The mesh listener now probes preferred and auto-detected serial paths for both MeshCore and Meshtastic firmware, preserving the existing reconnect loop so unplug/replug and firmware hot-swap behavior stays consistent.
-- Meshtastic text packets are translated into the existing Archipelago mesh frame pipeline, so current RPC handlers, transport routing, message storage, typed-message decoding, and UI state continue to work without a separate frontend path.
-- Meshtastic node information is surfaced as normal mesh contacts using stable synthetic public keys derived from Meshtastic node numbers, allowing peer refresh and message attribution to reuse existing MeshCore contact handling.
-- Outbound Archipelago mesh messages can now be sent through Meshtastic as channel text packets using the same command path used by MeshCore channel broadcasts.
-- Device status now reports the detected firmware family as `meshcore` or `meshtastic` from the shared listener abstraction.
-- Radio udev rules now include USB CDC ACM serial devices (`ttyACM*`) alongside CP2102, CH340, and FTDI adapters so Meshtastic boards are more likely to appear through the stable `/dev/mesh-radio` symlink.
-- Host nginx now serves `/assets/*` hashed frontend chunks as immutable static files with a hard 404 on misses instead of falling back to `index.html`, preventing strict MIME errors when a browser has a stale pre-update HTML shell.
-- The SPA HTML shell and service-worker files now revalidate on every load, reducing stale frontend references after OTA updates.
-- OTA runtime promotion now installs the bundled `nginx-archipelago.conf` into `/etc/nginx/sites-available/archipelago` and reloads nginx after a successful config test, so frontend cache/fallback fixes reach existing nodes without a manual deploy.
-- Local validation passed with `cargo check -p archipelago`; live SSH testing against `100.70.96.88` was not completed because temporary public-key authentication was rejected on the target.
-
-## v1.7.57-alpha (2026-05-17)
-
-- Nginx Proxy Manager now avoids privileged rootless Podman host port `81`, preferring `8081:81` while host nginx keeps a compatibility proxy on `:81` for stale cached launch buttons.
-- App installs now allocate ports by checking live host bind availability, falling back to a free high port when preferred ports are already occupied.
-- Portainer-created launchable containers are separated into a `Websites` tab and launch through their discovered published host port instead of hard-coded app URLs.
-- Internal BuildKit helper containers such as `buildx_buildkit_default` are hidden from the Apps UI.
-- Portainer works out of the box on Debian 13/Podman installs by including `catatonit` and by preserving the Podman socket mount as a socket rather than creating it as a directory.
-
-## v1.7.56-alpha (2026-05-15)
-
-- Health notifications now clear when an app is no longer unhealthy, including stale alerts for removed containers such as Portainer.
-- Fresh installs now include the full Wi-Fi userspace stack (`wpasupplicant`, `wireless-regdb`, `iw`, `rfkill`, `polkitd`, `pciutils`, and `usbutils`) so NetworkManager can scan and connect with Intel Wi-Fi cards out of the box.
-- The installed system now grants the `archipelago` service user explicit NetworkManager PolicyKit access for web-triggered Wi-Fi scans and connection changes.
-- Wi-Fi connect now replaces stale/partial NetworkManager profiles and creates an explicit WPA-PSK profile with the supplied password, avoiding no-secret retry failures after a failed attempt.
-- Settings password changes now update the Linux/SSH password through non-interactive sudo, so the web password and SSH password stay in sync when the checkbox is enabled.
-- Quadlet environment values with spaces or shell metacharacters are quoted consistently, preventing env drift recreate loops for apps like nostr-rs-relay and Grafana.
-- Boot/bootstrap reconcile avoids restarting running Bitcoin containers while repairing RPC config, preserving IBD progress on active nodes.
-- Exit code 137 is labeled as SIGKILL instead of assuming OOM, avoiding false OOM alerts for orchestrator-managed recreates.
-- Container reconcile force-recreates Podman records stuck in `Stopping`, preserving bind-mounted app data while recovering wedged containers automatically.
-- Container health reporting is honest for running containers: Archipelago surfaces Podman's actual health state instead of marking every running container healthy.
-- Quadlet reconciliation restarts services when stale health gates, port bindings, network aliases, exec commands, or healthchecks drift from the current manifest.
-- Bitcoin Knots sync performance improves on fresh installs and updates with 8Gi container memory, a 4Gi dbcache, and full CPU parallelism.
-- ElectrumX initial indexing gets more headroom: CPU caps are removed, memory is raised to 4Gi, cache is raised to 3Gi, and oversized sends are allowed for heavier wallet/indexing workloads.
-- Mempool/ElectrumX lifecycle qualification respects pruned/non-archival Bitcoin nodes instead of installing a half-running stack with unhealthy dependencies.
-- LND wallet/RPC helpers are more tolerant of container-owned files and updated REST port metadata, improving LND lifecycle and wallet-connect flows.
-- Marketplace/catalog metadata carries richer container config so remote lifecycle tests install apps using the same settings users get from the UI.
-- The app screensaver no longer activates during media-heavy app sessions such as IndeeHub, Jellyfin, Immich, PhotoPrism, and File Browser; apps can also pause/resume it with media playback messages.
-- A fresh `1.7.56-alpha` unbundled installer ISO is built from the same primary VPS2 release line for easy download and USB flashing.
-
-## v1.7.55-alpha (2026-05-13)
-
-- Container reconcile now force-recreates Podman records stuck in `Stopping`, preserving bind-mounted app data while recovering wedged containers automatically.
-- `.198` is green after the container-layer hardening pass: focused and broad non-destructive lifecycle audits pass, raw Podman health/state sweep is clean, and direct app probes return healthy responses.
-- Release-candidate artifacts are staged separately from live update publishing while Gitea artifact hosting is repaired.
-
-## v1.7.54-alpha (2026-05-06)
-
-- Existing installs now self-repair nginx backend proxy locations for `/bitcoin-status` and `/api/app-catalog`, including hosts where `sites-enabled/archipelago` is a copied active file instead of a symlink.
-- LND UI is consistently served on `18083` across first boot, Tor config, companion Quadlet reconciliation, OTA runtime payloads, and ISO scripts; stale companion units/images are rewritten instead of only checking service active state.
-- OTA frontend tarballs now carry a clean runtime payload with updated scripts, docker UI sources, and canonical nginx config, preventing startup promotion from reintroducing stale host assets.
-- Release ISO builds now support the primary HTTP app registry when bundling core images, so unbundled media includes File Browser/Cloud support instead of requiring a post-install Marketplace download.
-- `.116` was live-updated with the new backend and runtime scripts; focused non-destructive lifecycle audit passes for Bitcoin Knots, LND, BTCPay, Mempool, and Grafana.
-
-## v1.7.53-alpha (2026-05-05)
-
-- Bitcoin Knots/Core config generation no longer duplicates RPC bind and port settings between `bitcoin.conf` and container command args, fixing `Unable to bind all endpoints for RPC server` startup failures.
-- Legacy Bitcoin container healthchecks no longer depend on `bitcoin-cli`, which is absent from current Knots images and can wedge Podman healthcheck runners.
-- Update checks now prefer manifest OTA releases over stale git remotes unless `ARCHIPELAGO_GIT_UPDATES` is explicitly enabled, so installed nodes can see published releases from the VPS mirror.
-
-## v1.7.52-alpha (2026-05-05)
-
-- Tailscale now launches the local installed web UI on port `8240` and starts `tailscaled` before `tailscale web`, fixing unreachable installs after container creation.
-- Grafana install/start/restart now repairs missing rootless host listeners on port `3000`, matching the existing SearXNG, Uptime Kuma, and Gitea recovery path.
-- Debian 13/Trixie ISO and disk-install paths now force security updates from `trixie-security` during image/install creation so rebuilt release media includes patched base packages.
-- Broad `.198` lifecycle audit passes with the current qualified app set; known absent blockers remain `electrumx`, `photoprism`, `dwn`, and `ollama`.
-
-## v1.7.49-alpha (2026-04-30)
-
-- Bitcoin Knots/Core UI now reports connection, reconnecting, syncing, and error states from a backend status bridge instead of showing a stale "Unable to connect" message while the node is warming up.
-- ElectrumX UI now exposes indexed height, local Bitcoin height, known headers, status, and progress source so indexing/waiting states are readable during long initial sync.
-- Added container doctor timer and smoke/lifecycle test coverage for Bitcoin Knots/Core, ElectrumX, Mempool, BTCPay/NBXplorer, and UI surface availability.
-- Bitcoin Core and Bitcoin Knots are mutually exclusive variants, with a real Bitcoin Core manifest and corrected install conflict handling.
-- IndeeHub now launches only on direct web UI port `7778`; the broken `/app/indeedhub/` path proxy was removed, and port `7777` remains the Nostr relay.
-- BTCPay/NBXplorer Postgres environment formatting fixed so installs do not carry malformed connection strings.
-
-## v1.7.48-alpha (2026-04-29)
-
-- archipelago.service no longer fails to start with "Failed to set up mount namespacing: /run/containers: No such file or directory" on nodes where /run/containers wasn't pre-created. ExecStartPre now creates it. Existing nodes need a one-time `systemctl edit archipelago` to add the mkdir; ISO installs from this version forward have the fix baked in.
-
-## v1.7.47-alpha (2026-04-29)
-
-- Bitcoin Knots/Core sync is now significantly faster. The container now uses every available core for script verification (was capped at 2) and has 8GB of memory instead of 4GB so its 4GB UTXO cache has headroom for the mempool and peer connections. Existing nodes pick up the new limits on next install/update; freshly-installed nodes start at full speed.
-- ElectrumX initial indexing is faster too. Its CPU cap is removed, container memory is 4GB, and its internal cache is now 3GB (default was 1.2GB).
-
-## v1.7.46-alpha (2026-04-29)
-
-- Health monitor no longer pages "Auto-restart failed" for orphaned containers. After a variant switch (bitcoin-core ↔ bitcoin-knots) the previous variant's container could survive uninstall and the health monitor would try restarting it forever. Now skipped silently with a debug log.
-- Apps no longer disappear from My Apps when an install fails. The card stays visible with state=Stopped so the user can retry or uninstall, with the failure reason surfaced via the new install_progress.message field.
-- "Downloading…" progress now actually advances during multi-image stack pulls. Was sticking at 20% until all pulls finished; now interpolates 20%→70% based on which image of N has landed.
-- Pulled four docker.io images (bitcoin, gitea, nextcloud, valkey) into the lfg2025 registries on OVH and tx1138. Removes a docker.io dependency from first-boot installs.
-- Resilience harness improvements: install-fail entries no longer vanish, install/uninstall/probe cells are timing-tolerant (60s retry on ui_probe and auth_probe), dep snapshots no longer leak companion containers into the dependent app's "new containers" set.
-
-## v1.7.45-alpha (2026-04-29)
-
-- Bitcoin RPC auth is durable. The dashboard reliably connects across container restart, image update, and reboot. Was failing on registry-pulled images that shipped a stale baked-in password.
-- Multi-container apps show real install progress. IndeedHub (7), BTCPay (4), Mempool (3), Immich (3) — bar advances through Preparing → Pulling → Creating → Done instead of sitting at 0% until the very end.
-- Apps no longer disappear from the dashboard mid-install. The container scanner now respects in-flight installs and updates instead of evicting an entry while its containers are still being created.
-- IndeedHub installs cleanly on a fresh node. Five missing environment variables fixed; Nostr sign-in works on first install.
-- Tailscale install no longer fails with "executable not found". Container command was a malformed shell string; now a proper command array.
-- Removed three catalog entries that hung installs for ten minutes (dwn, endurain, ollama — no source images in our registries). Restored Nextcloud, sourced from docker.io.
-- Bitcoin Core update path uses the correct image name (was pulling from a non-existent path).
-- New ISO installs now allocate swap (sized to RAM, capped at 8GB, on the encrypted data partition). Without swap, container image builds and memory spikes were hitting OOM under load.
-
-## v1.7.44-alpha (2026-04-28)
-
-43de3b73 feat(orchestrator): complete container migration and release hardening
-ce39430b feat(self-update): sync and rebuild UI containers on OTA
-72dec5aa fix(lnd-ui): align container port across all specs
-83aacdf2 chore(release): archive ISO build recipes, tarball-only releases
-
-
 All notable changes to Archipelago will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

CLAUDE.md

@@ -1,84 +0,0 @@
-# Archipelago — agent guide
-
-## ✅ Single-node production gate is GREEN (2026-06-23)
-
-`tests/lifecycle/run-gate.sh` is **5/5 on .228, 0 failures** — the single-node exit
-criterion is met and the priority banner is demoted. Next exit-criteria: the
-**multinode pass** (`docs/multinode-testing-plan.md`) and workstreams B/C/D.
-
-**For day-to-day work, use `docs/UNIFIED-TASK-TRACKER.md`** — the consolidated,
-priority-ordered "what's left" list across the 1.8.0 OTA and master-plan docs
-(fastest/simplest tasks first). It supersedes hunting through the two source docs
-below for open items; those remain the narrative/history.
-
-**Read `docs/PRODUCTION-MASTER-PLAN.md` first** — it is still the authoritative plan
-for the north star: a world-class, **developer-ready app platform** where every app
-is manifest-driven, manifests ship via the **signed registry** (not OTA disk files),
-and **third-party developers publish apps via an external/decentralized registry** —
-all rootless, secure, robust, and 100%-uptime-capable. It no longer overrides all
-ad-hoc direction now that the gate is green, but it remains the source of truth for
-sequencing the remaining workstreams.
-
-Detailed sub-plans (all linked from the master):
-- App platform / packaging phases + security model → `docs/APP-PACKAGING-MIGRATION-PLAN.md`
-- Registry-distributed manifests (in progress) → `docs/registry-manifest-design.md`
-- External/decentralized marketplace for devs → `docs/marketplace-protocol.md`
-- Current per-app state → `docs/archive/app-registry-status-2026-06-21.md`
-- Production test gate (exit criterion) → `tests/lifecycle/TESTING.md`
-
-## Commit & push every unit of work (never violate)
-
-**The #1 process rule: work is not "done" until it is committed AND pushed.** This
-exists because finished work has been lost/clobbered by sitting uncommitted in the
-shared tree across agents and sessions. To prevent that:
-
-- **Commit each feature/fix the moment it works** — one focused, self-contained
-  commit per logical change (it compiles and its targeted tests pass). Do not let
-  unrelated changes accumulate uncommitted.
-- **Push immediately after committing** so nothing lives only on one machine. `main`
-  is protected → push via `git push gitea-ai main` (account `ai`, see the memory
-  note); feature branches push to their own remote.
-- **Never leave a stack of finished work uncommitted** overnight or when handing off
-  between agents — if you must pause mid-change, commit a clearly-labelled WIP
-  checkpoint rather than leaving it dirty.
-- **Stage explicitly by path** (`git add <paths>`) when another agent's uncommitted
-  work shares the tree — never `git add -A` / `git commit -a`, which clobbers or
-  entangles their changes.
-- **Never commit or push secrets** (mnemonics, private keys, API tokens). Signing is
-  done offline; artifacts (catalog/manifest) are signed, not the keys.
-- Commit messages end with the `Co-Authored-By: Claude …` trailer.
-
-## Invariants (never violate)
-
-- **Rootless Podman only.** No rootful, no Docker-socket mounts, no privileged
-  containers unless explicitly approved.
-- **No per-app Rust installers / no OS-level reliance.** Apps are declarative;
-  the orchestrator owns the lifecycle. `install_immich_stack` (hardcoded
-  `podman run` + `sudo chown`) is the anti-pattern being deleted, not a template.
-- **Secrets are manifest-declared** (`generated_secrets`, materialised by
-  `container::secrets`, 0600/rootless) — never hardcoded, per-app, or logged.
-- **Migrations never destroy data** — preserve `/var/lib/archipelago/<app>`,
-  secrets, credentials, ports, and adoption container names; keep a rollback path.
-- **Verify on the real node .228 before any tag.** (Fleet-wide multinode
-  verification is a separate plan: `docs/multinode-testing-plan.md`.)
-
-## Build / verify
-
-- Rust workspace root is `core/` (no Cargo.toml at repo root). `cargo` from `core/`.
-- If a `cargo test`/build hits `rust-lld: undefined hidden symbol`, it's
-  incremental-cache corruption — rebuild with `CARGO_INCREMENTAL=0`.
-- Frontend: `neode-ui/` → `npm run build` outputs to `web/dist/neode-ui/`.
-  Grep the built bundle for new strings before shipping (build can silently no-op).
-- App manifests load from disk on nodes at `/opt/archipelago/apps/*/manifest.yml`
-  (today); the goal is to distribute them via the signed catalog instead.
-
-## Production test gate (definition of done)
-
-`tests/lifecycle/run-gate.sh` green across install / UI / stop / start / restart /
-reinstall / reboot-survive / archipelago-restart-survive / uninstall — **5× on
-.228** (`ARCHY_ITERATIONS=5`). **Run the gate ON the node** (it uses local podman/systemctl/bitcoin
-probes), not via RPC from another host. **✅ GREEN 2026-06-23 (5/5, 0 not-ok)** — keep it
-green (re-run after orchestrator/lifecycle changes); regressions are top priority again.
-**Multinode testing (.198 + the rest of the fleet) is a SEPARATE plan** —
-`docs/multinode-testing-plan.md` — not part of this single-node gate criterion, and is
-the next exit criterion now that single-node is green.

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
+2. Clone your fork: `git clone https://github.com/YOUR_USERNAME/archy.git`
+3. Set up the dev environment (see `docs/development-setup.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.

INSTALL.sh

@@ -122,7 +122,7 @@ echo ""
 # Install custom app dependencies
 echo "Installing custom app dependencies..."
 
-for app in did-wallet morphos-server router; do
+for app in did-wallet endurain morphos-server router web5-dwn; do
     if [ -d "apps/$app" ]; then
         echo "  - Installing $app dependencies..."
         cd "apps/$app"
@@ -161,6 +161,6 @@ echo "   http://localhost:8100"
 echo ""
 echo "For more information, see:"
 echo "  - README.md"
-echo "  - docs/developer-guide.md"
+echo "  - docs/development-setup.md"
 echo "  - apps/QUICKSTART.md"
 echo ""

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,113 +1,157 @@
 # 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, 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)
 [![Rust](https://img.shields.io/badge/rust-stable-orange)](https://www.rust-lang.org/)
 [![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)]()
+[![Version](https://img.shields.io/badge/version-1.3.1--beta-blue)]()
 
-## What is here
+## Features
 
-- `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.
+### Bitcoin Infrastructure
+- **Bitcoin Knots** full node with pruning support
+- **LND** Lightning Network daemon with channel management
+- **ElectrumX** Electrum server for wallet connectivity
+- **BTCPay Server** for accepting Bitcoin payments
+- **Mempool** block explorer and fee estimator
+- **Fedimint** federation guardian and gateway
 
-## Platform model
+### Self-Hosted Apps (30)
+Bitcoin (ThunderHub), Storage (FileBrowser, Immich, Nextcloud), Productivity (Penpot, OnlyOffice, Vaultwarden), Media (Jellyfin, PhotoPrism), Search (SearXNG), AI (Ollama), Network (Tailscale, Nginx Proxy Manager), Home (Home Assistant), Nostr (nostr-rs-relay, Nostrudel), Dev (Grafana, Portainer), and more.
 
-Archipelago is built as a developer-ready app platform, not a fixed appliance:
+### Decentralized Identity
+- Ed25519 node identity with DID Documents (did:key)
+- Multi-identity management (Personal/Business/Anonymous)
+- W3C Verifiable Credentials issuance and verification
+- Decentralized Web Node (DWN) with bidirectional sync over Tor
+- Nostr relay integration and NIP-07 signing for iframe apps
 
-- 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.
+### Multi-Node Federation
+- Invite-based node joining over Tor hidden services
+- Trust levels (Trusted/Verified/Untrusted) with DID-based auth
+- Bidirectional DWN state sync between federated nodes
+- File sharing with access controls (free/peers-only/paid)
 
-Start with:
+### Mesh Networking
+- LoRa radio communication via Meshcore protocol
+- Device discovery and mesh routing
+- Off-grid Bitcoin balance checks (planned)
 
-- [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)
+### System Updates
+- OTA updates from self-hosted Gitea (git.tx1138.com) with SHA256 verification
+- Three update modes: Manual, Daily Check, Auto Apply (3 AM window)
+- Rollback support with automatic backup before applying
+- Full UI for update management in Settings
 
-## Quick start
+### Security
+- ChaCha20-Poly1305 encrypted secrets at rest, Argon2id password hashing
+- Rootless Podman: read-only root, cap-drop ALL, non-root user, no-new-privileges
+- TOTP two-factor authentication
+- Per-endpoint rate limiting, CSRF protection, input validation
+- AppArmor profiles for container confinement
+- Tor hidden services for all inter-node communication
+- All crypto and container dependencies pinned to exact versions
+- Full penetration test completed (33 findings, all remediated)
 
-### Frontend
+## Quick Start
+
+### Install from ISO
+
+1. Download the ISO for your architecture (x86_64 or ARM64)
+2. Flash to USB drive with Balena Etcher or `dd`
+3. Boot from USB on target hardware
+4. Follow the automated installer
+5. Access the web UI at `http://<device-ip>`
+6. Set your password and start the onboarding wizard
+
+### 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 full Bitcoin node)
+
+## 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
+### Deploy to Server
 
 ```bash
-cd core
-cargo build
-cargo test --all-features
+./scripts/deploy-to-target.sh --live   # Deploy to primary dev server
+./scripts/deploy-to-target.sh --both   # Deploy to both LAN servers
 ```
 
-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
+### Build ISO
 
 ```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
+ssh archipelago@<server>
+cd ~/archy/image-recipe
+sudo ./build-auto-installer-iso.sh
 ```
 
-`scripts/generate-app-catalog.py` requires Python with PyYAML installed.
+## Architecture
 
-## Documentation map
+```
+Debian 13 (Trixie)
+  ├── Rootless Podman (30 containers, archy-net DNS)
+  ├── Nginx (reverse proxy, security headers, rate limiting)
+  ├── Rust Backend (JSON-RPC API on 127.0.0.1:5678)
+  │     ├── core/archipelago/  — RPC endpoints, auth, identity, federation, mesh
+  │     ├── core/container/    — PodmanClient (REST API socket), manifests, health
+  │     ├── core/security/     — AppArmor, secrets, Cosign image verification
+  │     └── 6 more crates      — models, helpers, js-engine, performance, etc.
+  ├── Vue 3 Frontend (Composition API + TypeScript strict + Pinia + Tailwind)
+  └── System Tor (hidden services, SOCKS5 proxy)
+```
+
+~49,000 lines of Rust | ~47,000 lines of TypeScript/Vue | 78 shell scripts | 30 container apps
+
+## 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, codebase stats, data paths |
+| [Architecture Review (HTML)](docs/architecture-review.html) | Interactive guide with diagrams and learning path |
+| [Developer Guide](docs/developer-guide.md) | Dev setup, workflow, code conventions |
+| [API Reference](docs/api-reference.md) | Complete RPC endpoint reference |
+| [App Developer Guide](docs/app-developer-guide.md) | Building and publishing apps |
+| [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 |
+| [Security Audit](docs/security-code-audit-2026-03.md) | Penetration test findings |
+| [Master Plan](docs/MASTER_PLAN.md) | Phased roadmap and task tracking |
 
 ## 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 [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/), [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/README.md

@@ -21,7 +21,7 @@ Add an entry to `catalog.json`:
   "icon": "/assets/img/app-icons/my-app.svg",
   "author": "Author",
   "category": "data",
-  "dockerImage": "146.59.87.168:3000/lfg2025/my-app:1.0.0",
+  "dockerImage": "git.tx1138.com/lfg2025/my-app:1.0.0",
   "repoUrl": "https://github.com/...",
   "containerConfig": {
     "ports": ["8080:8080"],

app-catalog/catalog.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
-  "updated": "2026-04-22T00:00:00Z",
-  "registry": "146.59.87.168:3000/lfg2025",
+  "updated": "2026-04-12T00:00:00Z",
+  "registry": "git.tx1138.com/lfg2025",
   "featured": {
     "id": "indeedhub",
     "banner": "/assets/img/featured/indeedhub-banner.jpg",
@@ -11,542 +11,232 @@
   },
   "apps": [
     {
-      "id": "bitcoin-knots",
-      "title": "Bitcoin Knots",
-      "version": "28.1.0",
-      "description": "Full Bitcoin Knots node with dynamic prune/full-mode startup based on host disk.",
+      "id": "bitcoin-knots", "title": "Bitcoin Knots", "version": "28.1.0",
+      "description": "Run a full Bitcoin node. Validate and relay blocks and transactions.",
       "icon": "/assets/img/app-icons/bitcoin-knots.webp",
-      "author": "Bitcoin Knots",
-      "category": "money",
-      "tier": "core",
-      "dockerImage": "146.59.87.168:3000/lfg2025/bitcoin-knots:latest",
+      "author": "Bitcoin Knots", "category": "money", "tier": "core",
+      "dockerImage": "git.tx1138.com/lfg2025/bitcoin-knots:latest",
       "repoUrl": "https://github.com/bitcoinknots/bitcoin"
     },
     {
-      "id": "bitcoin-core",
-      "title": "Bitcoin Core",
-      "version": "28.4.0",
-      "description": "Reference Bitcoin Core node with dynamic prune/full-mode startup based on host disk.",
-      "icon": "/assets/img/app-icons/bitcoin-core.svg",
-      "author": "Bitcoin Core contributors",
-      "category": "money",
-      "tier": "optional",
-      "dockerImage": "146.59.87.168:3000/lfg2025/bitcoin:28.4",
-      "repoUrl": "https://github.com/bitcoin/bitcoin"
-    },
-    {
-      "id": "lnd",
-      "title": "LND",
-      "version": "0.18.4",
-      "description": "Lightning Network implementation by Lightning Labs. Enables instant, low-cost Bitcoin payments.",
-      "icon": "/assets/img/app-icons/lnd.png",
-      "author": "Lightning Labs",
-      "category": "money",
-      "tier": "core",
-      "dockerImage": "146.59.87.168:3000/lfg2025/lnd:v0.18.4-beta",
+      "id": "lnd", "title": "LND", "version": "0.18.4",
+      "description": "Lightning Network Daemon. Fast Bitcoin payments through Lightning.",
+      "icon": "/assets/img/app-icons/lnd.svg",
+      "author": "Lightning Labs", "category": "money", "tier": "core",
+      "dockerImage": "git.tx1138.com/lfg2025/lnd:v0.18.4-beta",
       "repoUrl": "https://github.com/lightningnetwork/lnd",
-      "requires": [
-        "bitcoin-knots"
-      ]
+      "requires": ["bitcoin-knots"]
     },
     {
-      "id": "btcpay-server",
-      "title": "BTCPay Server",
-      "version": "2.3.9",
-      "description": "Self-hosted Bitcoin payment processor. Accept Bitcoin payments without intermediaries.",
+      "id": "btcpay-server", "title": "BTCPay Server", "version": "1.13.7",
+      "description": "Self-hosted Bitcoin payment processor.",
       "icon": "/assets/img/app-icons/btcpay-server.png",
-      "author": "BTCPay Server Foundation",
-      "category": "commerce",
-      "tier": "core",
-      "dockerImage": "docker.io/btcpayserver/btcpayserver:2.3.9",
+      "author": "BTCPay Server Foundation", "category": "commerce", "tier": "core",
+      "dockerImage": "git.tx1138.com/lfg2025/btcpayserver:1.13.7",
       "repoUrl": "https://github.com/btcpayserver/btcpayserver",
-      "requires": [
-        "bitcoin-knots"
-      ]
+      "requires": ["bitcoin-knots"]
     },
     {
-      "id": "mempool",
-      "title": "Mempool Explorer",
-      "version": "3.0.0",
-      "description": "Bitcoin mempool and blockchain explorer. Real-time transaction and block visualization.",
+      "id": "mempool", "title": "Mempool Explorer", "version": "3.0.0",
+      "description": "Self-hosted Bitcoin blockchain and mempool visualizer.",
       "icon": "/assets/img/app-icons/mempool.webp",
-      "author": "Mempool",
-      "category": "money",
-      "tier": "core",
-      "dockerImage": "146.59.87.168:3000/lfg2025/mempool-frontend:v3.0.1",
+      "author": "Mempool", "category": "money", "tier": "core",
+      "dockerImage": "git.tx1138.com/lfg2025/mempool-frontend:v3.0.0",
       "repoUrl": "https://github.com/mempool/mempool",
-      "requires": [
-        "bitcoin-knots",
-        "electrumx"
-      ]
+      "requires": ["bitcoin-knots", "electrumx"]
     },
     {
-      "id": "electrumx",
-      "title": "ElectrumX",
-      "version": "1.18.0",
-      "description": "Electrum server indexing Bitcoin chain data for lightweight wallet queries.",
-      "icon": "/assets/img/app-icons/electrumx.png",
-      "author": "Luke Childs",
-      "category": "money",
-      "tier": "core",
-      "dockerImage": "146.59.87.168:3000/lfg2025/electrumx:v1.18.0",
+      "id": "electrumx", "title": "ElectrumX", "version": "1.18.0",
+      "description": "Electrum protocol server. Index the blockchain for fast wallet lookups.",
+      "icon": "/assets/img/app-icons/electrumx.webp",
+      "author": "Luke Childs", "category": "money", "tier": "core",
+      "dockerImage": "git.tx1138.com/lfg2025/electrumx:v1.18.0",
       "repoUrl": "https://github.com/spesmilo/electrumx",
-      "requires": [
-        "bitcoin-knots"
-      ]
+      "requires": ["bitcoin-knots"]
     },
     {
-      "id": "indeedhub",
-      "title": "IndeeHub",
-      "version": "1.0.0",
-      "description": "Bitcoin documentary streaming platform featuring God Bless Bitcoin and other educational content about Bitcoin, sovereignty, and decentralized technology. Sign in with your Nostr identity.",
+      "id": "indeedhub", "title": "IndeeHub", "version": "1.0.0",
+      "description": "Bitcoin documentary streaming with Nostr identity.",
       "icon": "/assets/img/app-icons/indeedhub.png",
-      "author": "IndeeHub",
-      "category": "community",
-      "dockerImage": "146.59.87.168:3000/lfg2025/indeedhub:1.0.0",
+      "author": "IndeeHub", "category": "community",
+      "dockerImage": "git.tx1138.com/lfg2025/indeedhub:1.0.0",
       "repoUrl": "https://github.com/indeedhub/indeedhub"
     },
     {
-      "id": "botfights",
-      "title": "BotFights",
-      "version": "1.1.0",
-      "description": "Bot competition arena with 2-player arcade fighting mode. AI bots battle in trivia challenges while humans duke it out with controllers. Built for Bitcoiners.",
+      "id": "botfights", "title": "BotFights", "version": "1.1.0",
+      "description": "Bot arena + 2-player arcade fighter with controller support and Adventure Mode.",
       "icon": "/assets/img/app-icons/botfights.svg",
-      "author": "BotFights",
-      "category": "community",
-      "dockerImage": "146.59.87.168:3000/lfg2025/botfights:1.1.0",
-      "repoUrl": "https://botfights.net",
-      "containerConfig": {
-        "ports": [
-          "9100:9100"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/botfights:/app/server/data"
-        ],
-        "env": [
-          "NODE_ENV=production",
-          "PORT=9100",
-          "FIGHT_LOOP_ENABLED=true",
-          "ARCHY_EMBEDDED=1"
-        ]
-      }
+      "author": "BotFights", "category": "community",
+      "dockerImage": "git.tx1138.com/lfg2025/botfights:1.1.0",
+      "repoUrl": "https://botfights.net"
     },
     {
-      "id": "gitea",
-      "title": "Gitea",
-      "version": "1.23",
-      "description": "Self-hosted Git service with built-in container registry, CI/CD, and package hosting.",
+      "id": "gitea", "title": "Gitea", "version": "1.23",
+      "description": "Self-hosted Git service with container registry, CI/CD, issue tracking.",
       "icon": "/assets/img/app-icons/gitea.svg",
-      "author": "Gitea",
-      "category": "development",
+      "author": "Gitea", "category": "development",
       "dockerImage": "docker.io/gitea/gitea:1.23",
-      "repoUrl": "https://gitea.com",
-      "containerConfig": {
-        "ports": [
-          "3001:3000",
-          "2222:22"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/gitea/data:/data",
-          "/var/lib/archipelago/gitea/config:/etc/gitea"
-        ],
-        "env": [
-          "GITEA__database__DB_TYPE=sqlite3",
-          "GITEA__server__SSH_PORT=2222",
-          "GITEA__server__SSH_LISTEN_PORT=22",
-          "GITEA__server__LFS_START_SERVER=true",
-          "GITEA__packages__ENABLED=true",
-          "GITEA__repository__ENABLE_PUSH_CREATE_USER=true",
-          "GITEA__repository__ENABLE_PUSH_CREATE_ORG=true",
-          "GITEA__security__X_FRAME_OPTIONS="
-        ]
-      },
-      "tier": "optional"
+      "repoUrl": "https://gitea.com"
     },
     {
-      "id": "filebrowser",
-      "title": "File Browser",
-      "version": "2.27.0",
-      "description": "Baseline Archipelago file manager service.",
+      "id": "filebrowser", "title": "File Browser", "version": "2.27.0",
+      "description": "Web-based file manager.",
       "icon": "/assets/img/app-icons/file-browser.webp",
-      "author": "File Browser",
-      "category": "data",
-      "tier": "core",
-      "dockerImage": "146.59.87.168:3000/lfg2025/filebrowser:v2.27.0",
-      "repoUrl": "https://github.com/filebrowser/filebrowser",
-      "containerConfig": {
-        "ports": [
-          "8083:80"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/filebrowser:/srv",
-          "/var/lib/archipelago/filebrowser-data:/data"
-        ],
-        "args": [
-          "--database=/data/database.db",
-          "--root=/srv",
-          "--address=0.0.0.0",
-          "--port=80"
-        ]
-      }
+      "author": "File Browser", "category": "data", "tier": "core",
+      "dockerImage": "git.tx1138.com/lfg2025/filebrowser:v2.27.0",
+      "repoUrl": "https://github.com/filebrowser/filebrowser"
     },
     {
-      "id": "nostr-rs-relay",
-      "title": "Nostr Relay (Rust)",
-      "version": "0.8.0",
-      "description": "High-performance Nostr relay written in Rust. Host your own decentralized social media relay and earn networking profits.",
-      "icon": "/assets/img/app-icons/nostrudel.svg",
-      "author": "Nostr RS Relay",
-      "category": "community",
-      "tier": "recommended",
-      "dockerImage": "scsibug/nostr-rs-relay:0.8.9",
-      "repoUrl": "https://github.com/scsibug/nostr-rs-relay",
-      "containerConfig": {
-        "ports": [
-          "8081:8080"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/nostr-relay:/usr/src/app/db"
-        ],
-        "env": [
-          "RELAY_NAME=Archipelago Nostr Relay",
-          "RELAY_DESCRIPTION=Self-hosted Nostr relay on Archipelago"
-        ]
-      }
-    },
-    {
-      "id": "vaultwarden",
-      "title": "Vaultwarden",
-      "version": "1.30.0",
+      "id": "vaultwarden", "title": "Vaultwarden", "version": "1.30.0",
       "description": "Self-hosted password vault with zero-knowledge encryption.",
       "icon": "/assets/img/app-icons/vaultwarden.webp",
-      "author": "Vaultwarden",
-      "category": "data",
-      "tier": "recommended",
-      "dockerImage": "146.59.87.168:3000/lfg2025/vaultwarden:1.30.0-alpine",
-      "repoUrl": "https://github.com/dani-garcia/vaultwarden",
-      "containerConfig": {
-        "ports": [
-          "8082:80"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/vaultwarden:/data"
-        ]
-      }
+      "author": "Vaultwarden", "category": "data", "tier": "recommended",
+      "dockerImage": "git.tx1138.com/lfg2025/vaultwarden:1.30.0-alpine",
+      "repoUrl": "https://github.com/dani-garcia/vaultwarden"
     },
     {
-      "id": "searxng",
-      "title": "SearXNG",
-      "version": "1.0.0",
-      "description": "Privacy-respecting metasearch engine. Search the web without tracking.",
+      "id": "searxng", "title": "SearXNG", "version": "2024.1.0",
+      "description": "Privacy-respecting metasearch engine.",
       "icon": "/assets/img/app-icons/searxng.png",
-      "author": "SearXNG",
-      "category": "data",
-      "tier": "recommended",
-      "dockerImage": "146.59.87.168:3000/lfg2025/searxng:latest",
-      "repoUrl": "https://github.com/searxng/searxng",
-      "containerConfig": {
-        "ports": [
-          "8888:8080"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/searxng:/etc/searxng"
-        ]
-      }
+      "author": "SearXNG", "category": "data", "tier": "recommended",
+      "dockerImage": "git.tx1138.com/lfg2025/searxng:latest",
+      "repoUrl": "https://github.com/searxng/searxng"
     },
     {
-      "id": "fedimint",
-      "title": "Fedimint Guardian",
-      "version": "0.10.0",
-      "description": "Federated Bitcoin minting service with built-in Guardian UI. Privacy-preserving Bitcoin custody.",
+      "id": "nostr-rs-relay", "title": "Nostr Relay", "version": "0.9.0",
+      "description": "Your own Nostr relay. Store events locally, relay for friends.",
+      "icon": "/assets/img/app-icons/nostr-rs-relay.svg",
+      "author": "scsiblade", "category": "nostr",
+      "dockerImage": "git.tx1138.com/lfg2025/nostr-rs-relay:0.9.0",
+      "repoUrl": "https://sr.ht/~gheartsfield/nostr-rs-relay/"
+    },
+    {
+      "id": "fedimint", "title": "Fedimint", "version": "0.10.0",
+      "description": "Federated Bitcoin mint with privacy through federated guardians.",
       "icon": "/assets/img/app-icons/fedimint.png",
-      "author": "Fedimint",
-      "category": "money",
-      "dockerImage": "146.59.87.168:3000/lfg2025/fedimintd:v0.10.0",
+      "author": "Fedimint", "category": "money",
+      "dockerImage": "git.tx1138.com/lfg2025/fedimintd:v0.10.0",
       "repoUrl": "https://github.com/fedimint/fedimint"
     },
     {
-      "id": "fedimint-clientd",
-      "title": "Fedimint Client",
-      "version": "0.8.0",
-      "description": "Fedimint ecash client daemon (fmcd). Lets the node hold Fedimint ecash and join federations; the wallet talks to it over a local REST API.",
-      "icon": "/assets/img/app-icons/fedimint.png",
-      "author": "Fedimint",
-      "category": "money",
-      "tier": "core",
-      "dockerImage": "146.59.87.168:3000/lfg2025/fmcd:0.8.1",
-      "repoUrl": "https://github.com/minmoto/fmcd"
+      "id": "ollama", "title": "Ollama", "version": "0.5.4",
+      "description": "Run AI models locally. Private and on your hardware.",
+      "icon": "/assets/img/app-icons/ollama.png",
+      "author": "Ollama", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/ollama:latest",
+      "repoUrl": "https://github.com/ollama/ollama"
     },
     {
-      "id": "fedimint-gateway",
-      "title": "Fedimint Gateway",
-      "version": "0.10.0",
-      "description": "Fedimint gateway service with automatic LND-or-LDK backend selection.",
-      "icon": "/assets/img/app-icons/fedimint.png",
-      "author": "Fedimint",
-      "category": "money",
-      "dockerImage": "146.59.87.168:3000/lfg2025/gatewayd:v0.10.0",
-      "repoUrl": "https://github.com/fedimint/fedimint",
-      "containerConfig": {
-        "ports": [
-          "8176:8176",
-          "9737:9737"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/fedimint-gateway:/data",
-          "/var/lib/archipelago/lnd:/lnd:ro"
-        ]
-      }
+      "id": "nextcloud", "title": "Nextcloud", "version": "28",
+      "description": "Your own private cloud. File sync, calendars, contacts.",
+      "icon": "/assets/img/app-icons/nextcloud.webp",
+      "author": "Nextcloud", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/nextcloud:28",
+      "repoUrl": "https://github.com/nextcloud/server"
     },
     {
-      "id": "barkd",
-      "title": "Ark Wallet",
-      "version": "0.3.0",
-      "description": "Ark protocol wallet daemon (barkd). Lets the node hold self-custodial off-chain bitcoin via an Ark server; the wallet talks to it over a local REST API. Signet by default while Ark matures.",
-      "icon": "/assets/img/app-icons/bark.png",
-      "author": "Second",
-      "category": "money",
-      "dockerImage": "146.59.87.168:3000/lfg2025/barkd:0.3.0",
-      "repoUrl": "https://gitlab.com/ark-bitcoin/bark",
-      "containerConfig": {
-        "ports": [
-          "3535:3535"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/barkd:/data"
-        ]
-      }
-    },
-    {
-      "id": "jellyfin",
-      "title": "Jellyfin",
-      "version": "10.8.13",
+      "id": "jellyfin", "title": "Jellyfin", "version": "10.8.13",
       "description": "Free media server. Stream movies, music, and photos.",
       "icon": "/assets/img/app-icons/jellyfin.webp",
-      "author": "Jellyfin",
-      "category": "data",
-      "dockerImage": "146.59.87.168:3000/lfg2025/jellyfin:10.8.13",
-      "repoUrl": "https://github.com/jellyfin/jellyfin",
-      "containerConfig": {
-        "ports": [
-          "8096:8096"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/jellyfin/config:/config",
-          "/var/lib/archipelago/jellyfin/cache:/cache"
-        ]
-      }
+      "author": "Jellyfin", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/jellyfin:10.8.13",
+      "repoUrl": "https://github.com/jellyfin/jellyfin"
     },
     {
-      "id": "immich",
-      "title": "Immich",
-      "version": "2.7.4",
-      "description": "Self-hosted photo and video backup with mobile apps and search.",
+      "id": "immich", "title": "Immich", "version": "1.90.0",
+      "description": "High-performance photo and video backup with ML.",
       "icon": "/assets/img/app-icons/immich.png",
-      "author": "Immich",
-      "category": "data",
-      "dockerImage": "146.59.87.168:3000/lfg2025/immich-server:release",
+      "author": "Immich", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/immich-server:release",
       "repoUrl": "https://github.com/immich-app/immich"
     },
     {
-      "id": "homeassistant",
-      "title": "Home Assistant",
-      "version": "2026.7.3",
-      "description": "Open source home automation platform. Control and monitor your smart home devices.",
+      "id": "homeassistant", "title": "Home Assistant", "version": "2024.1",
+      "description": "Open-source home automation.",
       "icon": "/assets/img/app-icons/homeassistant.png",
-      "author": "Home Assistant",
-      "category": "home",
-      "dockerImage": "146.59.87.168:3000/lfg2025/home-assistant:2026.7.3",
-      "repoUrl": "https://github.com/home-assistant/core",
-      "containerConfig": {
-        "ports": [
-          "8123:8123"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/home-assistant:/config"
-        ],
-        "env": [
-          "TZ=UTC"
-        ]
-      }
+      "author": "Home Assistant", "category": "home",
+      "dockerImage": "git.tx1138.com/lfg2025/home-assistant:2024.1",
+      "repoUrl": "https://github.com/home-assistant/core"
     },
     {
-      "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",
-      "version": "10.2.0",
-      "description": "Analytics and monitoring platform. Visualize metrics and create dashboards.",
+      "id": "grafana", "title": "Grafana", "version": "10.2.0",
+      "description": "Analytics and monitoring dashboards.",
       "icon": "/assets/img/app-icons/grafana.png",
-      "author": "Grafana Labs",
-      "category": "data",
-      "tier": "recommended",
-      "dockerImage": "grafana/grafana:10.2.0",
-      "repoUrl": "https://github.com/grafana/grafana",
-      "containerConfig": {
-        "ports": [
-          "3000:3000"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/grafana:/var/lib/grafana"
-        ],
-        "env": [
-          "GF_PATHS_DATA=/var/lib/grafana",
-          "GF_USERS_ALLOW_SIGN_UP=false"
-        ]
-      }
+      "author": "Grafana Labs", "category": "data", "tier": "recommended",
+      "dockerImage": "git.tx1138.com/lfg2025/grafana:10.2.0",
+      "repoUrl": "https://github.com/grafana/grafana"
     },
     {
-      "id": "tailscale",
-      "title": "Tailscale",
-      "version": "1.78.0",
+      "id": "tailscale", "title": "Tailscale", "version": "1.78.0",
       "description": "Zero-config VPN with WireGuard mesh networking.",
       "icon": "/assets/img/app-icons/tailscale.webp",
-      "author": "Tailscale",
-      "category": "networking",
-      "tier": "recommended",
-      "dockerImage": "146.59.87.168:3000/lfg2025/tailscale:stable",
-      "repoUrl": "https://github.com/tailscale/tailscale",
-      "containerConfig": {
-        "ports": [
-          "8240:8240"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/tailscale:/var/lib/tailscale"
-        ],
-        "env": [
-          "TS_STATE_DIR=/var/lib/tailscale"
-        ],
-        "args": [
-          "sh",
-          "-c",
-          "tailscaled --tun=userspace-networking & for i in $(seq 1 30); do [ -S /var/run/tailscale/tailscaled.sock ] && break; sleep 1; done; tailscale web --listen 0.0.0.0:8240 & wait"
-        ]
-      }
+      "author": "Tailscale", "category": "networking", "tier": "recommended",
+      "dockerImage": "git.tx1138.com/lfg2025/tailscale:stable",
+      "repoUrl": "https://github.com/tailscale/tailscale"
     },
     {
-      "id": "portainer",
-      "title": "Portainer",
-      "version": "2.19.4",
-      "description": "Container management web UI for the local Podman socket.",
-      "icon": "/assets/img/app-icons/portainer.webp",
-      "author": "Portainer",
-      "category": "development",
-      "tier": "optional",
-      "dockerImage": "146.59.87.168:3000/lfg2025/portainer:2.19.4",
-      "repoUrl": "https://github.com/portainer/portainer",
-      "containerConfig": {
-        "ports": [
-          "9000:9000"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/portainer:/data",
-          "/run/user/1000/podman/podman.sock:/var/run/docker.sock"
-        ],
-        "notes": "Uses the manifest-owned Podman socket bind mount preparation path."
-      }
-    },
-    {
-      "id": "netbird",
-      "title": "NetBird",
-      "version": "2.38.0",
-      "description": "Self-hosted WireGuard mesh VPN control plane with dashboard, embedded identity provider, management API, signal, relay, and STUN. The user-facing entry point — a TLS proxy in front of the dashboard + server.",
-      "icon": "/assets/img/app-icons/netbird.svg",
-      "author": "NetBird",
-      "category": "networking",
-      "tier": "recommended",
-      "dockerImage": "docker.io/library/nginx:1.27-alpine",
-      "repoUrl": "https://github.com/netbirdio/netbird",
-      "containerConfig": {
-        "ports": [
-          "8087:80",
-          "8086:80",
-          "3478:3478/udp"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/netbird:/var/lib/netbird"
-        ],
-        "notes": "Installed as a two-container stack: netbird dashboard on 8087 and netbird-server control plane on 8086 plus UDP 3478. For production clients, publish a DNS name over HTTPS with gRPC/WebSocket routing."
-      }
-    },
-    {
-      "id": "uptime-kuma",
-      "title": "Uptime Kuma",
-      "version": "1.23.0",
+      "id": "uptime-kuma", "title": "Uptime Kuma", "version": "1.23.0",
       "description": "Self-hosted uptime monitoring.",
       "icon": "/assets/img/app-icons/uptime-kuma.webp",
-      "author": "Uptime Kuma",
-      "category": "data",
-      "tier": "recommended",
-      "dockerImage": "146.59.87.168:3000/lfg2025/uptime-kuma:1",
-      "repoUrl": "https://github.com/louislam/uptime-kuma",
-      "containerConfig": {
-        "ports": [
-          "3002:3001"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/uptime-kuma:/app/data"
-        ],
-        "env": [
-          "TZ=UTC"
-        ],
-        "args": [
-          "--",
-          "node",
-          "server/server.js"
-        ]
-      }
+      "author": "Uptime Kuma", "category": "data", "tier": "recommended",
+      "dockerImage": "git.tx1138.com/lfg2025/uptime-kuma:1",
+      "repoUrl": "https://github.com/louislam/uptime-kuma"
     },
     {
-      "id": "photoprism",
-      "title": "PhotoPrism",
-      "version": "240915",
+      "id": "nostr-vpn", "title": "Nostr VPN", "version": "0.3.7",
+      "description": "Tailscale-style mesh VPN with Nostr control plane.",
+      "icon": "/assets/img/app-icons/nostr-vpn.svg",
+      "author": "Martti Malmi", "category": "networking",
+      "dockerImage": "git.tx1138.com/lfg2025/nostr-vpn:v0.3.7",
+      "repoUrl": "https://github.com/mmalmi/nostr-vpn"
+    },
+    {
+      "id": "fips", "title": "FIPS", "version": "0.1.0",
+      "description": "Free Internetworking Peering System. Encrypted mesh network.",
+      "icon": "/assets/img/app-icons/fips.svg",
+      "author": "Jim Corgan", "category": "networking",
+      "dockerImage": "git.tx1138.com/lfg2025/fips:v0.1.0",
+      "repoUrl": "https://github.com/jmcorgan/fips"
+    },
+    {
+      "id": "routstr", "title": "Routstr", "version": "0.4.3",
+      "description": "Decentralized AI inference proxy with Cashu ecash.",
+      "icon": "/assets/img/app-icons/routstr.svg",
+      "author": "Routstr", "category": "community",
+      "dockerImage": "git.tx1138.com/lfg2025/routstr:v0.4.3",
+      "repoUrl": "https://github.com/routstr/routstr-core"
+    },
+    {
+      "id": "dwn", "title": "Decentralized Web Node", "version": "0.4.0",
+      "description": "Own your data with DID-based access control.",
+      "icon": "/assets/img/app-icons/dwn.svg",
+      "author": "TBD", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/dwn-server:main",
+      "repoUrl": "https://github.com/TBD54566975/dwn-server"
+    },
+    {
+      "id": "endurain", "title": "Endurain", "version": "0.8.0",
+      "description": "Self-hosted fitness tracking. Strava alternative.",
+      "icon": "/assets/img/app-icons/endurain.png",
+      "author": "Endurain", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/endurain:0.8.0",
+      "repoUrl": "https://github.com/joaovitoriasilva/endurain"
+    },
+    {
+      "id": "penpot", "title": "Penpot", "version": "2.4",
+      "description": "Open-source design platform. Self-hosted Figma alternative.",
+      "icon": "/assets/img/app-icons/penpot.webp",
+      "author": "Penpot", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/penpot-frontend:2.4",
+      "repoUrl": "https://github.com/penpot/penpot"
+    },
+    {
+      "id": "photoprism", "title": "PhotoPrism", "version": "240915",
       "description": "AI-powered photo management with facial recognition.",
       "icon": "/assets/img/app-icons/photoprism.svg",
-      "author": "PhotoPrism",
-      "category": "data",
-      "dockerImage": "146.59.87.168:3000/lfg2025/photoprism:240915",
-      "repoUrl": "https://github.com/photoprism/photoprism",
-      "containerConfig": {
-        "ports": [
-          "2342:2342"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/photoprism:/photoprism/storage"
-        ],
-        "env": [
-          "PHOTOPRISM_ADMIN_PASSWORD=archipelago",
-          "PHOTOPRISM_DEFAULT_LOCALE=en"
-        ]
-      }
-    },
-    {
-      "id": "nextcloud",
-      "title": "Nextcloud",
-      "version": "29",
-      "description": "Your own private cloud. File sync, calendars, contacts.",
-      "icon": "/assets/img/app-icons/nextcloud.webp",
-      "author": "Nextcloud",
-      "category": "data",
-      "dockerImage": "146.59.87.168:3000/lfg2025/nextcloud:29",
-      "repoUrl": "https://github.com/nextcloud/server",
-      "containerConfig": {
-        "ports": [
-          "8085:80"
-        ],
-        "volumes": [
-          "/var/lib/archipelago/nextcloud:/var/www/html"
-        ]
-      }
+      "author": "PhotoPrism", "category": "data",
+      "dockerImage": "git.tx1138.com/lfg2025/photoprism:240915",
+      "repoUrl": "https://github.com/photoprism/photoprism"
     }
   ]
 }

apps/DEVELOPMENT.md

@@ -8,6 +8,7 @@
 | bitcoin-knots | 8332 (RPC), 8333 (P2P) | v28.1 |
 | lnd | 9735 (P2P), 10009 (gRPC), 8080 (REST) | v0.17.4-beta |
 | btcpay-server | 23000 (HTTP) | v1.13.5 |
+| thunderhub | 3010 (HTTP) | v0.13.31 |
 | mempool | 4080 (HTTP) | v2.5.0 |
 | electrumx | 50001 (TCP), 50002 (SSL) | latest |
 | fedimint | 8173 (API), 8174 (Web) | v0.10.0 |
@@ -32,6 +33,7 @@
 | ollama | 11434 | v0.5.4 |
 | grafana | 3001 | v10.2.0 |
 | portainer | 9000 | v2.19.4 |
+| onlyoffice | 8088 | v7.5.1 |
 | penpot | 8089 | v2.4 |
 
 ## Building Apps
@@ -42,7 +44,7 @@ cd apps
 ./build.sh <app-id>  # Build specific app
 ```
 
-Custom apps with local source: `router`, `did-wallet`. All other apps use official container images.
+Custom apps with local source: `router`, `did-wallet`, `web5-dwn`. All other apps use official container images.
 
 ## App Structure
 
@@ -76,17 +78,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/PORTS.md

@@ -17,13 +17,15 @@ This document lists all port assignments for Archipelago apps.
 | mempool | 4080 | TCP | Web UI | 14080 |
 | ollama | 11434 | TCP | API | 21434 |
 | searxng | 8888 | TCP | Web UI | 18888 |
+| onlyoffice | 8088 | TCP | Web UI | 18088 |
 | penpot | 8089 | TCP | Web UI | 18089 |
-| lnd | 9735, 10009, 18080 | TCP | P2P, gRPC, REST | 19735, 20009, 28080 |
+| lnd | 9735, 10009, 8080 | TCP | P2P, gRPC, REST | 19735, 20009, 18080 |
 | core-lightning | 9736, 9835 | TCP | P2P, gRPC | 19736, 19835 |
 | nostr-rs-relay | 8081 | TCP | HTTP/WebSocket | 18081 |
 | strfry | 8082 | TCP | HTTP/WebSocket | 18082 |
 | did-wallet | 8083 | TCP | Web UI | 18083 |
 | router | 8084, 5353, 1900 | TCP/UDP | Web UI, mDNS, SSDP | 18084, 15353, 11900 |
+| web5-dwn | 3000 | TCP | HTTP API | 13000 |
 | meshtastic | 4403, 1883 | TCP | HTTP API, MQTT | 14403, 11883 |
 
 ## Development Ports (Offset: +10000)
@@ -45,6 +47,7 @@ In development mode, all ports are offset by 10000 to avoid conflicts with produ
 | Mempool | http://localhost:14080 |
 | Ollama | http://localhost:21434 |
 | SearXNG | http://localhost:18888 |
+| OnlyOffice | http://localhost:18088 |
 | Penpot | http://localhost:18089 |
 | LND REST | http://localhost:18080 |
 | Core Lightning | http://localhost:19835 |
@@ -52,6 +55,7 @@ In development mode, all ports are offset by 10000 to avoid conflicts with produ
 | Strfry | http://localhost:18082 |
 | DID Wallet | http://localhost:18083 |
 | Router | http://localhost:18084 |
+| Web5 DWN | http://localhost:13000 |
 | Meshtastic | http://localhost:14403 |
 
 ## Port Conflict Resolution

apps/QUICKSTART.md

@@ -30,13 +30,14 @@ cd apps
 ./build.sh
 ```
 
-This will build all apps that have Dockerfiles. Standard apps (bitcoin-core, lnd, etc.) will use their official images, while custom apps (router, did-wallet) will be built from source.
+This will build all apps that have Dockerfiles. Standard apps (bitcoin-core, lnd, etc.) will use their official images, while custom apps (router, did-wallet, web5-dwn) will be built from source.
 
 ### Build Specific App
 
 ```bash
 ./build.sh router
 ./build.sh did-wallet
+./build.sh web5-dwn
 ```
 
 ## Running Apps via Archipelago
@@ -63,6 +64,7 @@ In development mode, apps are accessible on offset ports:
 
 - **Router**: http://localhost:18084
 - **DID Wallet**: http://localhost:18083
+- **Web5 DWN**: http://localhost:13000
 - **Nostr RS Relay**: http://localhost:18081
 - **Strfry**: http://localhost:18082
 
@@ -70,7 +72,7 @@ See [PORTS.md](./PORTS.md) for complete port mapping.
 
 ## Development Workflow
 
-### For Custom Apps (router, did-wallet)
+### For Custom Apps (router, did-wallet, web5-dwn)
 
 1. **Make changes** to source code in `apps/<app-id>/src/`
 2. **Rebuild** the container:

apps/README.md

@@ -8,6 +8,7 @@ Containerized applications for the Archipelago Bitcoin Node OS. All apps run in
 - **bitcoin-knots** — Full Bitcoin node (v28.1)
 - **lnd** — Lightning Network Daemon (v0.17.4-beta)
 - **btcpay-server** — Payment processor (v1.13.5)
+- **thunderhub** — Lightning management UI (v0.13.31)
 - **mempool** — Block explorer and fee estimator (v2.5.0)
 - **electrumx** — Electrum server
 - **fedimint** — Federated Bitcoin minting (v0.10.0)
@@ -17,11 +18,12 @@ Containerized applications for the Archipelago Bitcoin Node OS. All apps run in
 - **nostrudel** — Nostr web client (v0.40.0)
 
 ### Web5 & Identity
+- **web5-dwn** — Decentralized Web Node (v0.4.0)
 - **did-wallet** — Web5 DID Wallet
 
 ### Self-Hosted Services
 - **nextcloud** (v28), **jellyfin** (v10.8.13), **immich** (release), **photoprism** (v240915)
-- **vaultwarden** (v1.30.0-alpine), **penpot** (v2.4)
+- **vaultwarden** (v1.30.0-alpine), **onlyoffice** (v7.5.1), **penpot** (v2.4)
 - **homeassistant** (v2024.1), **filebrowser** (v2.27.0), **searxng** (2024.11.17)
 - **ollama** (v0.5.4), **grafana** (v10.2.0), **portainer** (v2.19.4)
 
@@ -31,7 +33,7 @@ Containerized applications for the Archipelago Bitcoin Node OS. All apps run in
 ### Custom & External
 - **indeedhub** — Bitcoin documentary streaming (custom build)
 - **router** — Mesh routing and network management
-- **botfights** — External web app
+- **botfights**, **nwnn**, **484-kitchen**, **call-the-operator**, **arch-presentation**, **syntropy-institute**, **t-zero** — External web apps
 
 ## Manifest Format
 

apps/archy-btcpay-db/manifest.yml

@@ -1,49 +0,0 @@
-app:
-  id: archy-btcpay-db
-  name: BTCPay Postgres
-  version: "15.17"
-  description: Postgres backend for BTCPay and NBXplorer.
-
-  container:
-    image: 146.59.87.168:3000/lfg2025/postgres:15.17
-    pull_policy: if-not-present
-    network: archy-net
-    data_uid: "100998:100998"
-    secret_env:
-      - key: POSTGRES_PASSWORD
-        secret_file: btcpay-db-password
-
-  dependencies:
-    - storage: 20Gi
-
-  resources:
-    memory_limit: 1Gi
-    disk_limit: 20Gi
-
-  security:
-    capabilities: [CHOWN, FOWNER, SETUID, SETGID, DAC_OVERRIDE]
-    readonly_root: false
-    network_policy: isolated
-
-  ports: []
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/postgres-btcpay
-      target: /var/lib/postgresql/data
-      options: [rw]
-
-  environment:
-    - POSTGRES_DB=btcpay
-    - POSTGRES_USER=btcpay
-
-  health_check:
-    type: tcp
-    endpoint: localhost:5432
-    interval: 30s
-    timeout: 5s
-    retries: 3
-
-  bitcoin_integration:
-    rpc_access: none
-    sync_required: false

apps/archy-mempool-db/manifest.yml

@@ -1,51 +0,0 @@
-app:
-  id: archy-mempool-db
-  name: Mempool MariaDB
-  version: 11.4.10
-  description: MariaDB backend for the mempool explorer stack.
-
-  container:
-    image: 146.59.87.168:3000/lfg2025/mariadb:11.4.10
-    pull_policy: if-not-present
-    network: archy-net
-    data_uid: "100998:100998"
-    secret_env:
-      - key: MYSQL_PASSWORD
-        secret_file: mempool-db-password
-      - key: MYSQL_ROOT_PASSWORD
-        secret_file: mysql-root-db-password
-
-  dependencies:
-    - storage: 20Gi
-
-  resources:
-    memory_limit: 512Mi
-    disk_limit: 20Gi
-
-  security:
-    capabilities: [CHOWN, FOWNER, SETUID, SETGID, DAC_OVERRIDE]
-    readonly_root: false
-    network_policy: isolated
-
-  ports: []
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/mysql-mempool
-      target: /var/lib/mysql
-      options: [rw]
-
-  environment:
-    - MYSQL_DATABASE=mempool
-    - MYSQL_USER=mempool
-
-  health_check:
-    type: tcp
-    endpoint: localhost:3306
-    interval: 30s
-    timeout: 5s
-    retries: 3
-
-  bitcoin_integration:
-    rpc_access: none
-    sync_required: false

apps/archy-mempool-web/manifest.yml

@@ -1,47 +0,0 @@
-app:
-  id: archy-mempool-web
-  name: Mempool Web
-  version: 3.0.1
-  description: Frontend web UI for mempool explorer.
-  container_name: mempool
-
-  container:
-    image: 146.59.87.168:3000/lfg2025/mempool-frontend:v3.0.1
-    pull_policy: if-not-present
-    network: archy-net
-
-  dependencies:
-    - app_id: mempool-api
-      version: ">=3.0.0"
-
-  resources:
-    memory_limit: 512Mi
-
-  security:
-    capabilities: []
-    readonly_root: false
-    network_policy: isolated
-
-  ports:
-    - host: 4080
-      container: 8080
-      protocol: tcp
-
-  environment:
-    - FRONTEND_HTTP_PORT=8080
-    - BACKEND_MAINNET_HTTP_HOST=mempool-api
-
-  health_check:
-    type: http
-    # 127.0.0.1 not localhost: the image's wget resolves localhost to ::1 (IPv6)
-    # first, but nginx binds 0.0.0.0:8080 (IPv4) only -> localhost probe gets
-    # "connection refused" -> perpetual unhealthy -> health_monitor restart loop.
-    endpoint: http://127.0.0.1:8080
-    path: /
-    interval: 30s
-    timeout: 5s
-    retries: 3
-
-  bitcoin_integration:
-    rpc_access: none
-    sync_required: false

apps/archy-nbxplorer/manifest.yml

@@ -1,64 +0,0 @@
-app:
-  id: archy-nbxplorer
-  name: NBXplorer
-  version: 2.6.0
-  description: BTCPay blockchain indexer service.
-
-  container:
-    image: 146.59.87.168:3000/lfg2025/nbxplorer:2.6.0
-    pull_policy: if-not-present
-    network: archy-net
-    secret_env:
-      - key: NBXPLORER_BTCRPCPASSWORD
-        secret_file: bitcoin-rpc-password
-      - key: BTCPAY_DB_PASS
-        secret_file: btcpay-db-password
-
-  dependencies:
-    - app_id: bitcoin-core
-      version: ">=26.0"
-    - app_id: archy-btcpay-db
-      version: ">=15.17"
-
-  resources:
-    memory_limit: 2Gi
-    disk_limit: 20Gi
-
-  security:
-    capabilities: []
-    readonly_root: false
-    network_policy: isolated
-
-  ports:
-    - host: 32838
-      container: 32838
-      protocol: tcp
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/nbxplorer
-      target: /data
-      options: [rw]
-
-  environment:
-    - NBXPLORER_DATADIR=/data
-    - NBXPLORER_NETWORK=mainnet
-    - NBXPLORER_CHAINS=btc
-    - NBXPLORER_BIND=0.0.0.0:32838
-    - NBXPLORER_BTCRPCURL=http://bitcoin-knots:8332
-    - NBXPLORER_BTCRPCUSER=archipelago
-    - NBXPLORER_BTCNODEENDPOINT=bitcoin-knots:8333
-    - NBXPLORER_NOAUTH=1
-    - NBXPLORER_POSTGRES=Username=btcpay;Password=${BTCPAY_DB_PASS};Host=archy-btcpay-db;Port=5432;Database=nbxplorer
-
-  health_check:
-    type: http
-    endpoint: http://localhost:32838
-    path: /
-    interval: 30s
-    timeout: 30s
-    retries: 5
-
-  bitcoin_integration:
-    rpc_access: read-only
-    sync_required: true

apps/barkd/Dockerfile

@@ -1,32 +0,0 @@
-# barkd — Ark protocol wallet daemon (https://gitlab.com/ark-bitcoin/bark).
-# No official upstream image exists (their GitLab registry is empty), so we
-# package the pinned, checksum-verified release binary ourselves and push to
-# the node registry — same approach as fmcd. Keep the version in lockstep with
-# the REST shapes coded in core/archipelago/src/wallet/ark_client.rs (0.3.0).
-FROM debian:bookworm-slim
-
-ARG BARKD_VERSION=0.3.0
-ARG BARKD_SHA256=8562fa27386bae666ed62fa95c92d40f7bdb20d22525f75799adfc16adaaedb3
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates curl && \
-    curl -fsSL "https://gitlab.com/api/v4/projects/ark-bitcoin%2Fbark/packages/generic/release-assets/bark-${BARKD_VERSION}/barkd-${BARKD_VERSION}-linux-x86_64" \
-        -o /usr/local/bin/barkd && \
-    echo "${BARKD_SHA256}  /usr/local/bin/barkd" | sha256sum -c - && \
-    chmod a+x /usr/local/bin/barkd && \
-    apt-get purge -y curl && apt-get autoremove -y && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod a+x /entrypoint.sh
-
-# The wallet itself is created over REST by the node's Ark bridge
-# (wallet.ark-* RPCs) — the container just runs the daemon.
-ENV BARKD_DATADIR=/data \
-    BARKD_BIND_HOST=0.0.0.0 \
-    BARKD_BIND_PORT=3535
-
-EXPOSE 3535
-VOLUME /data
-
-ENTRYPOINT ["/entrypoint.sh"]

apps/barkd/entrypoint.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-# Install the node-provided auth secret (64-char hex from the manifest's
-# generated barkd-secret) so the wallet bridge can derive the matching Bearer
-# token, then start the daemon. Without BARKD_SECRET, barkd generates its own
-# random token in the datadir and the bridge won't authenticate — so treat a
-# failed refresh as fatal rather than starting an unreachable daemon.
-set -eu
-
-if [ -n "${BARKD_SECRET:-}" ]; then
-    # `secret refresh` prints the Bearer token on stdout — never log it.
-    barkd secret refresh --secret "$BARKD_SECRET" >/dev/null
-    unset BARKD_SECRET
-fi
-
-exec barkd

apps/barkd/manifest.yml

@@ -1,76 +0,0 @@
-app:
-  id: barkd
-  name: Ark Wallet
-  version: 0.3.0
-  description: Ark protocol wallet daemon (barkd). Lets the node hold self-custodial off-chain bitcoin via an Ark server; the wallet talks to it over a local REST API. Signet by default while Ark matures.
-
-  container:
-    # barkd packaged from the pinned upstream release binary (no usable
-    # upstream image exists — their registry is empty). Built from
-    # apps/barkd/Dockerfile and pushed to the node registry. Pin the tag to
-    # match the REST shapes coded in core/archipelago/src/wallet/ark_client.rs
-    # (validated against barkd 0.3.0 on signet, 2026-07-14).
-    image: 146.59.87.168:3000/lfg2025/barkd:0.3.0
-    pull_policy: if-not-present
-    network: archy-net
-    # The entrypoint installs the shared secret below via `barkd secret
-    # refresh` (so the wallet bridge can derive the matching Bearer token) and
-    # execs the daemon. The Ark wallet itself is created over REST by the
-    # bridge on first use (wallet.ark-* RPCs) with the node's ark_config
-    # (default: Second's public signet server) — no host provisioning needed.
-    generated_secrets:
-      - name: barkd-secret
-        kind: hex32
-    secret_env:
-      - key: BARKD_SECRET
-        secret_file: barkd-secret
-    data_uid: "1000:1000"
-
-  dependencies:
-    - storage: 1Gi
-
-  resources:
-    # barkd is a single wallet daemon (SQLite + a gRPC conn to the Ark server
-    # + esplora polling); steady state is tiny. Cap it so a stuck sync can't
-    # starve the node.
-    cpu_limit: 1
-    memory_limit: 512Mi
-    disk_limit: 1Gi
-
-  security:
-    readonly_root: true
-    # Needs outbound HTTPS to the Ark server (ark.signet.2nd.dev) and the
-    # esplora chain source, plus the published REST port for the wallet
-    # bridge. No inbound requirements beyond that.
-    network_policy: bridge
-
-  ports:
-    # barkd REST bound to 3535 in-container (BARKD_BIND_PORT); 3535 is free on
-    # the host (see port_allocator.rs). The Rust bridge targets
-    # http://127.0.0.1:3535.
-    - host: 3535
-      container: 3535
-      protocol: tcp
-
-  volumes:
-    # Holds the wallet DB, mnemonic and auth token. ARK funds are recoverable
-    # on-chain from this datadir (unilateral exit) — include it in backups.
-    - type: bind
-      source: /var/lib/archipelago/barkd
-      target: /data
-      options: [rw]
-
-  environment:
-    - BARKD_DATADIR=/data
-    - BARKD_BIND_HOST=0.0.0.0
-    - BARKD_BIND_PORT=3535
-
-  # All /api/v1/* routes require the Bearer token, so an HTTP probe would 401
-  # forever — use a TCP probe like fmcd (the host-side lifecycle layer
-  # verifies reachability).
-  health_check:
-    type: tcp
-    endpoint: localhost:3535
-    interval: 30s
-    timeout: 5s
-    retries: 3

apps/bitcoin-core/Dockerfile

@@ -1,34 +1,5 @@
-# Bitcoin Core — minimal rootless image built from the OFFICIAL upstream release.
-#
-# The CANONICAL, verified build path is scripts/build-bitcoin-image.sh, which
-# downloads the upstream tarball, verifies SHA-256 + the OpenPGP signature
-# (fail-closed), and tags/pushes <registry>/bitcoin:<version>. This Dockerfile
-# mirrors that image for a manual/local build and replaces the old stale
-# community base (`FROM bitcoin/bitcoin:24.0`).
-#
-# Build (binaries must be pre-fetched + verified into ./bin — see the script):
-#   scripts/build-bitcoin-image.sh core 31.0
-FROM debian:bookworm-slim
-ARG BITCOIN_VERSION=31.0
-RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends ca-certificates; \
-    rm -rf /var/lib/apt/lists/*; \
-    useradd -m -u 1000 -s /bin/bash bitcoin; \
-    mkdir -p /home/bitcoin/.bitcoin; \
-    chown -R bitcoin:bitcoin /home/bitcoin
-# bin/ holds the SHA-256 + GPG-verified bitcoind / bitcoin-cli (Guix-built,
-# x86_64-linux-gnu) extracted from the official release tarball.
-COPY bin/bitcoind /usr/local/bin/bitcoind
-COPY bin/bitcoin-cli /usr/local/bin/bitcoin-cli
-RUN chmod 0755 /usr/local/bin/bitcoind /usr/local/bin/bitcoin-cli
-# Run as (container) root, like the legacy hand-built :latest image. Rootless
-# Podman maps container-root to the unprivileged host service user; the manifest
-# grants CAP_DAC_OVERRIDE so bitcoind can read its data dir, which the
-# orchestrator chowns to the data_uid (host 100101 / container uid 102), not to
-# this image's `bitcoin` user. A non-root USER can't read existing chain data and
-# bitcoind crash-loops with "Error initializing block database".
-WORKDIR /home/bitcoin
-VOLUME ["/home/bitcoin/.bitcoin"]
-EXPOSE 8332 8333
-ENTRYPOINT ["bitcoind"]
+# Bitcoin Core - uses official image
+FROM bitcoin/bitcoin:24.0
+
+# Default user is already 'bitcoin'
+# No additional setup needed

apps/bitcoin-core/manifest.yml

@@ -2,111 +2,60 @@ app:
   id: bitcoin-core
   name: Bitcoin Core
   version: 28.4.0
-  description: Reference Bitcoin Core node with dynamic prune/full-mode startup based on host disk.
-
-  container_name: bitcoin-core
+  description: Full Bitcoin node implementation. The reference implementation of the Bitcoin protocol.
 
   container:
-    image: 146.59.87.168:3000/lfg2025/bitcoin:28.4
-    pull_policy: if-not-present
-    network: archy-net
-    entrypoint: ["sh", "-lc"]
-    custom_args:
-      # Sync-speed flags: -par=0 uses every core (was capped at 2 by
-      # --cpus=2, now removed for bitcoin/electrumx). -dbcache sized to
-      # the IBD sweet spot - 4GB on full nodes, 1GB on pruned. Container
-      # --memory=8g (config.rs::get_memory_limit) leaves headroom for
-      # mempool + connections.
-      #
-      # -printtoconsole=0: foreground bitcoind defaults console logging ON,
-      # which pushed every IBD "UpdateTip" line through conmon into journald
-      # (>1 GB/day on a fresh node). bitcoind still writes debug.log in the
-      # datadir (/var/lib/archipelago/bitcoin/debug.log, self-shrunk on
-      # restart) — use that for deep debugging; podman logs only carries
-      # entrypoint/startup errors.
-      - >-
-        BITCOIND="$(command -v bitcoind || true)";
-        if [ -z "$BITCOIND" ]; then
-          BITCOIND="$(find /opt -path '*/bin/bitcoind' -type f 2>/dev/null | sort | tail -n 1)";
-        fi;
-        if [ -z "$BITCOIND" ]; then
-          echo "bitcoind not found in image" >&2;
-          exit 127;
-        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";
-        RPC_TXRELAY_FLAGS="-rpcwhitelistdefault=0";
-        if [ -n "$RPC_TXRELAY_AUTH" ]; then
-          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;
-        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;
-        fi
-    derived_env:
-      - key: DISK_GB
-        template: "{{DISK_GB}}"
-    secret_env:
-      - key: BITCOIN_RPC_PASS
-        secret_file: bitcoin-rpc-password
-      - key: BITCOIN_RPC_TXRELAY_RPCAUTH
-        secret_file: bitcoin-rpc-txrelay-rpcauth
-    data_uid: "100101:100101"
-
+    image: bitcoin/bitcoin:28.4
+    image_signature: cosign://...
+    pull_policy: verify-signature
+    
   dependencies:
-    - storage: 500Gi
-
+    - storage: 500Gi  # Minimum disk space for mainnet
+    
   resources:
-    cpu_limit: 0
-    memory_limit: 4Gi
+    cpu_limit: 0      # 0 = unlimited; bitcoind uses -par=auto across all cores
+    memory_limit: 4Gi # matches container-specs.sh bitcoin-knots large-disk dbcache=4096
     disk_limit: 500Gi
-
+    
   security:
-    capabilities: [CHOWN, FOWNER, SETUID, SETGID, DAC_OVERRIDE]
-    readonly_root: false
+    capabilities: []  # No special capabilities needed
+    readonly_root: true
+    no_new_privileges: true
+    user: 1000
+    seccomp_profile: default
     network_policy: isolated
-
+    apparmor_profile: bitcoin-core
+    
   ports:
-    # RPC is auth-only: publish host-local ONLY - the LAN cannot reach
-    # nodeIP:8332. In-node consumers (lnd, fedimint, btcpay, mempool-api)
-    # dial the container's archy-net alias directly (bitcoin-core:8332),
-    # which needs no publish at all. Do NOT bind the archy-net gateway
-    # (10.89.0.1): rootlessport binds in the HOST netns where that address
-    # does not exist, and the whole unit crash-loops (2026-07-09, .228).
-    # P2P 8333 stays public.
     - host: 8332
       container: 8332
-      protocol: tcp
-      bind: 127.0.0.1
+      protocol: tcp  # RPC
     - host: 8333
       container: 8333
-      protocol: tcp
-
+      protocol: tcp  # P2P
+    
   volumes:
     - type: bind
       source: /var/lib/archipelago/bitcoin
       target: /home/bitcoin/.bitcoin
       options: [rw]
-
+      
   environment:
-    - BITCOIN_RPC_USER=archipelago
-
+    - NETWORK=mainnet
+    - RPC_USER=${BITCOIN_RPC_USER}
+    - RPC_PASSWORD=${BITCOIN_RPC_PASSWORD}
+    - PRUNE=0  # Full node (set to 550 for pruned)
+    
   health_check:
-    type: tcp
-    endpoint: localhost:8332
+    type: http
+    endpoint: http://localhost:8332
+    path: /
     interval: 30s
     timeout: 5s
     retries: 3
-
+    
   bitcoin_integration:
     rpc_access: admin
     sync_required: true
-    testnet_support: false
+    testnet_support: true
     pruning_support: true

apps/bitcoin-knots/Dockerfile

@@ -1,35 +0,0 @@
-# Bitcoin Knots — minimal rootless image built from the OFFICIAL upstream release.
-#
-# Knots previously had NO Dockerfile (the :latest tag was built/pushed by hand).
-# The CANONICAL, verified build path is scripts/build-bitcoin-image.sh, which
-# downloads the upstream tarball, verifies SHA-256 + the OpenPGP signature
-# (fail-closed, Luke-Jr release key), and tags/pushes
-# <registry>/bitcoin-knots:<version>. Knots version strings embed a build date,
-# e.g. 29.3.knots20260508 — the full string is the tag.
-#
-# Build (binaries must be pre-fetched + verified into ./bin — see the script):
-#   scripts/build-bitcoin-image.sh knots 29.3.knots20260508
-FROM debian:bookworm-slim
-ARG KNOTS_VERSION=29.3.knots20260508
-RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends ca-certificates; \
-    rm -rf /var/lib/apt/lists/*; \
-    useradd -m -u 1000 -s /bin/bash bitcoin; \
-    mkdir -p /home/bitcoin/.bitcoin; \
-    chown -R bitcoin:bitcoin /home/bitcoin
-# bin/ holds the SHA-256 + GPG-verified bitcoind / bitcoin-cli (Knots, Guix-built,
-# x86_64-linux-gnu) extracted from the official release tarball.
-COPY bin/bitcoind /usr/local/bin/bitcoind
-COPY bin/bitcoin-cli /usr/local/bin/bitcoin-cli
-RUN chmod 0755 /usr/local/bin/bitcoind /usr/local/bin/bitcoin-cli
-# Run as (container) root, like the legacy hand-built :latest image. Rootless
-# Podman maps container-root to the unprivileged host service user; the manifest
-# grants CAP_DAC_OVERRIDE so bitcoind can read its data dir, which the
-# orchestrator chowns to the data_uid (host 100101 / container uid 102), not to
-# this image's `bitcoin` user. A non-root USER can't read existing chain data and
-# bitcoind crash-loops with "Error initializing block database".
-WORKDIR /home/bitcoin
-VOLUME ["/home/bitcoin/.bitcoin"]
-EXPOSE 8332 8333
-ENTRYPOINT ["bitcoind"]

apps/bitcoin-knots/manifest.yml

@@ -1,112 +0,0 @@
-app:
-  id: bitcoin-knots
-  name: Bitcoin Knots
-  version: 28.1.0
-  description: Full Bitcoin Knots node with dynamic prune/full-mode startup based on host disk.
-
-  container_name: bitcoin-knots
-
-  container:
-    image: 146.59.87.168:3000/lfg2025/bitcoin-knots:latest
-    pull_policy: if-not-present
-    network: archy-net
-    entrypoint: ["sh", "-lc"]
-    custom_args:
-      # Sync-speed flags: -par=0 uses every core (was capped at 2 by
-      # --cpus=2, now removed for bitcoin/electrumx). -dbcache sized to
-      # the IBD sweet spot - 4GB on full nodes, 1GB on pruned. Container
-      # --memory=8g (config.rs::get_memory_limit) leaves headroom for
-      # mempool + connections.
-      #
-      # -printtoconsole=0: foreground bitcoind defaults console logging ON,
-      # which pushed every IBD "UpdateTip" line through conmon into journald
-      # (>1 GB/day on a fresh node). bitcoind still writes debug.log in the
-      # datadir (/var/lib/archipelago/bitcoin/debug.log, self-shrunk on
-      # restart) — use that for deep debugging; podman logs only carries
-      # entrypoint/startup errors.
-      - >-
-        BITCOIND="$(command -v bitcoind || true)";
-        if [ -z "$BITCOIND" ]; then
-          BITCOIND="$(find /opt -path '*/bin/bitcoind' -type f 2>/dev/null | sort | tail -n 1)";
-        fi;
-        if [ -z "$BITCOIND" ]; then
-          echo "bitcoind not found in image" >&2;
-          exit 127;
-        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";
-        RPC_TXRELAY_FLAGS="-rpcwhitelistdefault=0";
-        if [ -n "$RPC_TXRELAY_AUTH" ]; then
-          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;
-        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;
-        fi
-    derived_env:
-      - key: DISK_GB
-        template: "{{DISK_GB}}"
-    secret_env:
-      - key: BITCOIN_RPC_PASS
-        secret_file: bitcoin-rpc-password
-      - key: BITCOIN_RPC_TXRELAY_RPCAUTH
-        secret_file: bitcoin-rpc-txrelay-rpcauth
-    data_uid: "100101:100101"
-
-  dependencies:
-    - storage: 500Gi
-
-  resources:
-    cpu_limit: 0
-    memory_limit: 8Gi
-    disk_limit: 500Gi
-
-  security:
-    capabilities: [CHOWN, FOWNER, SETUID, SETGID, DAC_OVERRIDE]
-    readonly_root: false
-    network_policy: isolated
-
-  ports:
-    # RPC is auth-only: publish host-local ONLY - the LAN cannot reach
-    # nodeIP:8332. In-node consumers (lnd, fedimint, btcpay, mempool-api)
-    # dial the container's archy-net alias directly (bitcoin-knots:8332),
-    # which needs no publish at all. Do NOT bind the archy-net gateway
-    # (10.89.0.1): rootlessport binds in the HOST netns where that address
-    # does not exist, and the whole unit crash-loops (2026-07-09, .228).
-    # P2P 8333 stays public.
-    - host: 8332
-      container: 8332
-      protocol: tcp
-      bind: 127.0.0.1
-    - host: 8333
-      container: 8333
-      protocol: tcp
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/bitcoin
-      target: /home/bitcoin/.bitcoin
-      options: [rw]
-
-  environment:
-    - BITCOIN_RPC_USER=archipelago
-
-  health_check:
-    type: tcp
-    endpoint: localhost:8332
-    interval: 30s
-    timeout: 5s
-    retries: 3
-
-  bitcoin_integration:
-    rpc_access: admin
-    sync_required: true
-    testnet_support: false
-    pruning_support: true

apps/bitcoin-ui/manifest.yml

@@ -1,56 +0,0 @@
-app:
-  id: bitcoin-ui
-  name: Bitcoin UI
-  version: 1.0.0
-  description: |
-    Archipelago-native HTTP proxy + static site for interacting with the
-    Bitcoin Core / Bitcoin Knots JSON-RPC. Runs nginx inside a container
-    and reverse-proxies /bitcoin-rpc/ to 127.0.0.1:8332 on the host. The
-    upstream Authorization header is substituted from
-    /var/lib/archipelago/secrets/bitcoin-rpc-password by the prod
-    orchestrator's pre-start hook, rendered into an nginx.conf that is
-    bind-mounted read-only at container start.
-
-  container:
-    build:
-      context: /opt/archipelago/docker/bitcoin-ui
-      dockerfile: Dockerfile
-      tag: localhost/bitcoin-ui:local
-
-  dependencies:
-    - app_id: bitcoin-core
-
-  resources:
-    memory_limit: 128Mi
-
-  security:
-    readonly_root: false
-    network_policy: host
-
-  # Host networking: nginx listens on 8334 directly on the host IP, and
-  # proxies to 127.0.0.1:8332 which is where the bitcoin backend binds
-  # its RPC. `ports:` is intentionally empty because host networking
-  # bypasses port mapping.
-  ports: []
-
-  volumes:
-    # Bind-mount the rendered nginx.conf read-only. The prod orchestrator
-    # renders /var/lib/archipelago/bitcoin-ui/nginx.conf on every install
-    # and every reconcile pass, substituting the base64 RPC auth from
-    # the plaintext password secret. If the rendered bytes change (the
-    # password rotated, or the template was updated by OTA), the
-    # reconciler restarts this container so nginx re-reads the config.
-    - type: bind
-      source: /var/lib/archipelago/bitcoin-ui/nginx.conf
-      target: /etc/nginx/conf.d/default.conf
-      options: [ro]
-
-  environment: []
-
-  health_check:
-    type: http
-    endpoint: http://127.0.0.1:8334
-    path: /
-    interval: 30s
-    timeout: 5s
-    retries: 3

apps/botfights/manifest.yml

@@ -1,12 +1,12 @@
 app:
   id: botfights
   name: BotFights
-  version: 1.1.0
+  version: 1.0.0
   description: Bot competition arena with 2-player arcade fighting mode. AI bots battle in trivia challenges while humans duke it out with controllers. Built for Bitcoiners.
   category: community
 
   container:
-    image: 146.59.87.168:3000/lfg2025/botfights:1.1.0
+    image: git.tx1138.com/lfg2025/botfights:1.1.0
     pull_policy: always
 
   dependencies:
@@ -62,8 +62,6 @@ app:
 
   metadata:
     author: Dorian
-    repo: https://botfights.net
-    icon: /assets/img/app-icons/botfights.svg
     license: MIT
     tags:
       - bitcoin

apps/btcpay-server/manifest.yml

@@ -1,95 +1,66 @@
 app:
   id: btcpay-server
   name: BTCPay Server
-  version: 2.3.9
+  version: 1.12.0
   description: Self-hosted Bitcoin payment processor. Accept Bitcoin payments without intermediaries.
-
+  
   container:
-    image: docker.io/btcpayserver/btcpayserver:2.3.9
-    pull_policy: if-not-present
-    network: archy-net
-    secret_env:
-      - key: BTCPAY_BTCRPCPASSWORD
-        secret_file: bitcoin-rpc-password
-      - key: BTCPAY_DB_PASS
-        secret_file: btcpay-db-password
-      # Internal LND node. Generated by the daemon (lnd macaroon as hex +
-      # tls.cert thumbprint) — see container::lnd::ensure_btcpay_lnd_connection_secret.
-      # Optional: nodes without LND run btcpay without an internal node.
-      - key: BTCPAY_BTCLIGHTNING
-        secret_file: btcpay-lnd-connection
-        optional: true
-    derived_env:
-      - key: BTCPAY_HOST
-        template: "{{HOST_IP}}:23000"
-
+    image: btcpayserver/btcpayserver:1.12.0
+    image_signature: cosign://...
+    pull_policy: verify-signature
+    
   dependencies:
     - app_id: bitcoin-core
       version: ">=26.0"
-    - app_id: archy-btcpay-db
-      version: ">=15.17"
-    - app_id: archy-nbxplorer
-      version: ">=2.6.0"
-
+    - app_id: lnd
+      version: ">=0.18.0"
+    
   resources:
     cpu_limit: 2
     memory_limit: 2Gi
     disk_limit: 20Gi
-
+    
   security:
-    capabilities: []
-    readonly_root: false
+    capabilities: [NET_BIND_SERVICE]
+    readonly_root: true
+    no_new_privileges: true
+    user: 1000
+    seccomp_profile: default
     network_policy: isolated
-
+    apparmor_profile: btcpay
+    
   ports:
-    - host: 23000
-      container: 49392
+    - host: 80
+      container: 80
       protocol: tcp
-
+    - host: 443
+      container: 443
+      protocol: tcp
+    
   volumes:
     - type: bind
       source: /var/lib/archipelago/btcpay
       target: /datadir
       options: [rw]
-
+      
   environment:
-    - ASPNETCORE_URLS=http://0.0.0.0:49392
-    - BTCPAY_PROTOCOL=http
-    - BTCPAY_CHAINS=btc
-    # Plugins must live on the persistent volume: the image default
-    # (/root/.btcpayserver/Plugins) is container-local, so every recreate
-    # silently wiped installed plugins.
-    - BTCPAY_PLUGINDIR=/datadir/Plugins
-    - BTCPAY_BTCEXPLORERURL=http://archy-nbxplorer:32838
-    - BTCPAY_BTCRPCURL=http://bitcoin-knots:8332
-    - BTCPAY_BTCRPCUSER=archipelago
-    - BTCPAY_POSTGRES=Username=btcpay;Password=${BTCPAY_DB_PASS};Host=archy-btcpay-db;Port=5432;Database=btcpay
-
+    - BTCPAY_NETWORK=mainnet
+    - BTCPAY_CHAIN=btc
+    - BTCPAY_BTCEXPLORERURL=http://bitcoin-core:8332
+    - BTCPAY_LIGHTNING=type=lnd-rest;server=http://lnd:8080;allowinsecure=true
+    
   health_check:
     type: http
-    endpoint: http://localhost:49392
-    path: /
+    endpoint: http://localhost
+    path: /health
     interval: 30s
-    timeout: 30s
-    retries: 5
-
+    timeout: 5s
+    retries: 3
+    
   bitcoin_integration:
     rpc_access: read-only
     sync_required: true
-
+    
   lightning_integration:
-    payment_processing: false
+    payment_processing: true
     invoice_management: true
-
-  interfaces:
-    main:
-      name: Web UI
-      description: BTCPay Server dashboard
-      type: ui
-      port: 23000
-      protocol: http
-      path: /
-
-  metadata:
-    launch:
-      open_in_new_tab: true

apps/did-wallet/manifest.yml

@@ -10,6 +10,8 @@ app:
     pull_policy: if-not-present
     
   dependencies:
+    - app_id: web5-dwn
+      version: ">=1.0.0"
     - storage: 2Gi
     
   resources:
@@ -27,7 +29,7 @@ app:
     apparmor_profile: did-wallet
     
   ports:
-    - host: 8088
+    - host: 8083
       container: 8080
       protocol: tcp  # Web UI
     
@@ -38,11 +40,12 @@ app:
       options: [rw]
       
   environment:
+    - DWN_ENDPOINT=http://web5-dwn:3000
     - WALLET_STORAGE=/app/wallet
     
   health_check:
     type: http
-    endpoint: http://127.0.0.1:8080
+    endpoint: http://localhost:8083
     path: /health
     interval: 30s
     timeout: 5s

apps/did-wallet/src/index.ts

@@ -34,4 +34,5 @@ app.post('/api/wallet/did/create', async (req, res) => {
 // Start server
 app.listen(port, '0.0.0.0', () => {
   console.log(`DID Wallet listening on port ${port}`);
+  console.log(`DWN endpoint: ${process.env.DWN_ENDPOINT || 'http://web5-dwn:3000'}`);
 });

apps/electrs-ui/manifest.yml

@@ -1,38 +0,0 @@
-app:
-  id: electrs-ui
-  name: Electrs UI
-  version: 1.0.0
-  description: |
-    Archipelago-native HTTP frontend for electrs/electrumx status. Runs
-    nginx inside a container, serves static assets, and proxies
-    /electrs-status to the archipelago backend on 127.0.0.1:5678.
-
-  container:
-    build:
-      context: /opt/archipelago/docker/electrs-ui
-      dockerfile: Dockerfile
-      tag: localhost/electrs-ui:local
-
-  dependencies: []
-
-  resources:
-    memory_limit: 64Mi
-
-  security:
-    readonly_root: false
-    network_policy: host
-
-  # Host networking: nginx listens on 50002 directly on the host IP.
-  ports: []
-
-  volumes: []
-
-  environment: []
-
-  health_check:
-    type: http
-    endpoint: http://127.0.0.1:50002
-    path: /
-    interval: 30s
-    timeout: 5s
-    retries: 3

apps/electrumx/manifest.yml

@@ -1,87 +0,0 @@
-app:
-  id: electrumx
-  name: ElectrumX
-  version: 1.18.0
-  description: Electrum server indexing Bitcoin chain data for lightweight wallet queries.
-
-  container:
-    image: 146.59.87.168:3000/lfg2025/electrumx:v1.18.0
-    pull_policy: if-not-present
-    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/";
-        exec electrumx_server
-    secret_env:
-      - key: BITCOIN_RPC_PASS
-        secret_file: bitcoin-rpc-password
-
-  dependencies:
-    - app_id: bitcoin-knots
-      version: ">=26.0"
-    - storage: 50Gi
-    - bitcoin:archival
-
-  resources:
-    cpu_limit: 0
-    memory_limit: 6Gi
-    disk_limit: 50Gi
-
-  security:
-    capabilities: [DAC_OVERRIDE]
-    readonly_root: false
-    network_policy: isolated
-
-  ports:
-    - host: 50001
-      container: 50001
-      protocol: tcp
-
-  volumes:
-    - type: bind
-      source: /var/lib/archipelago/electrumx
-      target: /data
-      options: [rw]
-
-  environment:
-    - COIN=Bitcoin
-    - DB_DIRECTORY=/data
-    - SERVICES=tcp://:50001,rpc://0.0.0.0:8000
-    - CACHE_MB=1024
-    - MAX_SEND=10000000
-
-  # The ElectrumX dashboard tile is served by the host-networked companion UI
-  # (archy-electrs-ui) on port 50002, NOT by this container. Declaring it here
-  # lets the catalog generator emit electrumx -> 50002 into GENERATED_APP_PORTS
-  # so the tile resolves a launch URL without relying on the hand-maintained
-  # override in appSessionConfig.ts (which the generator can clobber). The
-  # backend only validates this block — it does not proxy/health-check it.
-  interfaces:
-    main:
-      name: Web UI
-      description: ElectrumX server status and connection details
-      type: ui
-      port: 50002
-      protocol: http
-
-  health_check:
-    type: tcp
-    endpoint: localhost:50001
-    interval: 30s
-    timeout: 5s
-    retries: 3
-    start_period: 10m
-
-  bitcoin_integration:
-    rpc_access: read-only
-    sync_required: true
-    pruning_support: false

apps/endurain/.dockerignore

@@ -0,0 +1,6 @@
+node_modules
+dist
+*.log
+.git
+.gitignore
+README.md

apps/endurain/Dockerfile

@@ -0,0 +1,37 @@
+FROM node:20-alpine AS builder
+
+WORKDIR /app
+
+# Copy package files
+COPY package*.json ./
+RUN npm ci --only=production
+
+# Copy source code
+COPY . .
+
+# Build the application
+RUN npm run build
+
+# Production stage
+FROM node:20-alpine
+
+WORKDIR /app
+
+# Copy built application
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./
+
+# Create non-root user
+RUN addgroup -g 1000 appuser && \
+    adduser -D -u 1000 -G appuser appuser && \
+    mkdir -p /app/data && \
+    chown -R appuser:appuser /app
+
+USER appuser
+
+EXPOSE 8080
+
+ENV ENDURAIN_DATA_DIR=/app/data
+
+CMD ["node", "dist/index.js"]

apps/endurain/manifest.yml

@@ -0,0 +1,50 @@
+app:
+  id: endurain
+  name: Endurain
+  version: 1.0.0
+  description: Endurain application platform. Custom application runtime.
+  
+  container:
+    image: archipelago/endurain:1.0.0
+    image_signature: cosign://...
+    pull_policy: if-not-present
+    
+  dependencies:
+    - storage: 2Gi
+    
+  resources:
+    cpu_limit: 2
+    memory_limit: 1Gi
+    disk_limit: 2Gi
+    
+  security:
+    capabilities: []
+    readonly_root: true
+    no_new_privileges: true
+    user: 1000
+    seccomp_profile: default
+    network_policy: isolated
+    apparmor_profile: endurain
+    
+  ports:
+    - host: 8085
+      container: 8080
+      protocol: tcp  # Web UI
+    
+  volumes:
+    - type: bind
+      source: /var/lib/archipelago/endurain
+      target: /app/data
+      options: [rw]
+      
+  environment:
+    - ENDURAIN_ENV=production
+    - ENDURAIN_DATA_DIR=/app/data
+    
+  health_check:
+    type: http
+    endpoint: http://localhost:8085
+    path: /health
+    interval: 30s
+    timeout: 5s
+    retries: 3

apps/endurain/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "endurain",
+  "version": "1.0.0",
+  "description": "Endurain application platform",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc",
+    "start": "node dist/index.js",
+    "dev": "ts-node src/index.ts"
+  },
+  "dependencies": {
+    "express": "^4.18.2"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.21",
+    "@types/node": "^20.10.0",
+    "typescript": "^5.3.3",
+    "ts-node": "^10.9.2"
+  }
+}

apps/endurain/src/index.ts

@@ -0,0 +1,27 @@
+import express from 'express';
+
+const app = express();
+const port = 8080;
+
+// Middleware
+app.use(express.json());
+
+// Health check endpoint
+app.get('/health', (req, res) => {
+  res.json({ status: 'ok', service: 'endurain', version: '1.0.0' });
+});
+
+// API endpoints
+app.get('/api/info', (req, res) => {
+  res.json({
+    name: 'Endurain',
+    version: '1.0.0',
+    status: 'running'
+  });
+});
+
+// Start server
+app.listen(port, '0.0.0.0', () => {
+  console.log(`Endurain listening on port ${port}`);
+  console.log(`Data directory: ${process.env.ENDURAIN_DATA_DIR || '/app/data'}`);
+});

apps/endurain/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "commonjs",
+    "lib": ["ES2020"],
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}