Game menu: Update with a newer version… for Linux apps and PC VR games (#161 )

Follow-up to "Update with a newer APK…": Linux apps take their new AppImage/archive or folder (a file or a folder picker, like the app was added), PC VR games their new game folder. pipeline.replace_linux_app / replace_rift_game re-run the add path (add_linux_app(replace=) / add_rift_game(replace=)): the entry keeps its package (so the Steam shortcut), name, artwork, tags, switches and the user's recipe; a folder keeps the program chosen before if it's still there, else FramePort picks again (and asks, for ambiguous PC VR games). A name that looks like another app's is allowed with a heads-up. The entry gets a new source_id, recorded in the deployment's recipe at install (no agent change): components.source_replaced shows the Frame copy (and a PC install, pc_outdated) as outdated until then. Such an install also re-sends same-size files changed after the last install (installer.changed_since), since uploads otherwise skip files the Frame has with the same size. The old PC VR folder is left out of later scans (replaced_dirs). CLI: frameport new-version <game> <path> (APKs too). Docs: INSTALL.md.
2026-10-16 17:01:35 +02:00 · 2026-10-15 20:02:27 -04:00
44 changed files with 150 additions and 2585 deletions
@@ -138,7 +138,6 @@ Read `docs/PLAYBOOK.md` (symptom → fix) before debugging a game, and `docs/FRA
    uploads are interruptible (Cancel checked per MiB) and resumable (big files via SFTP `.part` append, small files
    streamed in tar batches; the agent counts files already in `incoming/`). Multi-select in the Library queues
    installs after asking every needed question up front. Failures end in one pop-up (Resume / Uninstall / log).
-  - Library folders (GitHub discussion #351): `core/folders.py` (no Flet) owns setting `scan.roots` (remember/add/remove/status/rescan_roots; the origin-based fallback only while the setting was never set, so removing every folder doesn't guess them back), Settings → Library folders (`settings.library_folders`, status read via run_bg), CLI `frameport folders [--add/--remove/--json]` + `frameport rescan`. Scans relink moved games (`pipeline.ScanReport`: a library game found elsewhere whose own files are gone and the copy is the same build (Quest: source_sha256, else versionName; Rift: same program path + size from the fingerprint, matched by game id or, renamed, by program) → only paths change (`relink_quest`/`_relink_rift`), user fields/builds/installs stay; another version → Scan a folder… takes it via `replace_apk(found=)`/`replace_rift_game`, Rescan only reports it; the old copy still there → kept). `add_game` no longer overwrites a user recipe (refreshes `suggested` only). Linux apps aren't scanned. PC installs of a moved Rift game (Steam shortcut path) untested.
  - Other drives (GitHub #90, agent v63): anchors stay in ~/Applications/quest-frame, a game's files may live in
    `<mount>/FramePort/<pkg>` (`deployment.json` base). Agent `drives` (/proc/mounts, /run/media + Steam library
    drives; vfat/exfat/ntfs/read-only refused), prepare*/finalize_linux `dest` (unmounted = error, never a fallback;
@@ -275,15 +274,6 @@ Rick and Morty runs on the Frame via its catalog recipe (OpenVR, no Revive),
    `working-config.yml` issue → maintainer label `catalog-accepted` (a plain issue needs `working-config` added by
    hand) → `catalog-from-issue.yml` workflow (`scripts/catalog_from_issue.py` validates) opens a catalog PR. App log:
    `core/applog.py` (`<data>/logs/app.log`, finished GUI jobs in `<data>/logs/jobs/`).
-  - Announcements (2026-10-15, announcements/README.md; app only, the owner dropped the site pop-up): source of
-    truth `announcements/current.md` on `main` (front matter id/title/date + optional image/image_alt/button+url/
-    expires/active, Markdown body; ships `active: false`). `announcements.py` (no Flet; raw GitHub via
-    `cache.cached_text`, 6 h) + `ui/announcer.py` (pop-up 20 s after start / every 6 h when no dialog is open and not
-    on welcome; `C.dialog` with the portal edge, image downloaded + Pillow-checked into `<data>/announcements/`, shown
-    by asset URL). Shown only if the user was around before `date` (setting `announce.since`, set once at the GUI's
-    first start: 0 when `USED_BEFORE` settings exist, else now), once: any close (X, outside click, Escape, button)
-    stores the id (`announce.dismissed`, last 50). New announcement = new id; same id = typo fix.
-    `FRAMEPORT_NO_ANNOUNCEMENTS`; `ui_smoke.py --announcement` renders it.
  - Self-update (docs/ARCHITECTURE.md "Self-update", docs/INSTALL.md "Updating"): `_version.py` = the only version
    (`frameport.__version__`; pyproject reads it via hatch `dynamic`; app log, diagnostics, User-Agent, Settings use
    it — never `importlib.metadata`, bundles have no dist-info). `updates.py` (no Flet): `check()` = GitHub
@@ -921,13 +911,6 @@ hide_space_warp / vk_hide_fdm / no Valve layers; FNAF HW (#135) "freeze" = first
 on Zink (threads busy in zink/disk cache), not a hang; VR4 (#199) reporter's patch.203 OBB truncated. Upload benchmark
 (`scripts/upload_bench.py`, #242): home Wi-Fi caps every method at ~11 MB/s; paramiko uses ~3x OpenSSH's CPU; Windows
 OpenSSH refuses FramePort's key file (ACL "bad permissions") until its permissions are tightened.
-**OpenSSH uploads (2026-10-15, #324/#242):** sftp escapes `* ? [` inside double quotes itself (and undoes it for
-put's destination), so `native_upload.quote` escapes only `\\`/`"`; Win32 sftp turns every local backslash into `/`
-(escapes too) → local paths go as `C:/…`. Logins: `Frame.auth` = the attempt that worked (app_key / user_key = a key
-file from Settings → Installing → SSH keys, library `ssh.extra_keys`, CLI `frame ssh-keys` / agent / password).
-OpenSSH strict (FramePort + Settings keys, IdentitiesOnly) unless auth was "agent"; a refused strict login retries
-relaxed (+ private copies of ~/.ssh/id_{rsa,dsa,ecdsa,ed25519}: OpenSSH skips its defaults once any -i is given, + the
-agent); `-v` key lines go into the error. FramePort doesn't add its key to the Frame for this. Windows-tested.
 **Meta user id (GitHub #182, 2026-10-11):** OVRPort's platform loader (runtimes 3.4.3-23204ea and -aa54c3f) answers
 `ovr_GetLoggedInUserID` (and two other callers) without a Meta account with a made-up id from a helper (`stp; mov x29,
 sp; bl random; …; mov/movk x9 = 0x53444835ec580000 (6e18); add x0, x8, x9; ldp; ret`), kept only in memory → a new id
@@ -1,40 +0,0 @@
-# Announcements
-
-`current.md` is the one announcement FramePort shows as a pop-up in the app. Edit it on `main`: the app reads it
-from GitHub `main` (raw.githubusercontent.com) at most every 6 hours, so a push reaches everyone without a release.
-
-## Who sees it
-
- **Only people who already used FramePort before the announcement's `date`.** A new install never shows one, and
-  nor does an announcement published before FramePort was installed.
- **Once.** Closing it in any way (the X, a click outside it, Escape, or its button) dismisses it for good. The app
-  remembers dismissals in its settings (`announce.dismissed`).
- **A new announcement = a new `id`.** Fixing a typo with the same `id` doesn't show it again to anyone who closed it.
-  A new `id` shows to everyone who used FramePort before its `date`, whether they closed the earlier one or not.
-
-## The file
-
-```markdown
---
-active: true                    # false = nothing is shown (the fields are still checked)
-id: meetup-2026-11             # letters, digits, . _ -  — change it for every new announcement
-title: Steam Frame meetup on Discord  # required
-date: 2026-11-02T18:00:00Z      # required: when it was published (UTC; a bare date = midnight UTC)
-image: announcements/meetup.png # optional: a file in this folder, or an https URL (PNG, JPEG, WebP, GIF; ≤ 5 MiB)
-image_alt: The meetup poster    # optional: what the picture shows (screen readers)
-button: Join the meetup         # optional: an action button, with url
-url: https://example.com/meetup
-expires: 2026-11-30             # optional: not shown after this day (UTC, inclusive)
---
-The body, in Markdown: **bold**, *italic*, `code`, [links](https://frameport.app/), lists, headings.
-```
-
-The body is Markdown (no HTML). A `date` in the future works as a schedule: nobody sees it before then.
-
-Images look best at about 2:1 (e.g. 1200×600). The pop-up is 600 px wide and shows between 140 and 320 px of the
-picture's height.
-
-`pytest tests/test_announcements.py` checks this file, so a broken announcement fails CI instead of silently showing
-nothing.
-
-To turn announcements off for testing: `FRAMEPORT_NO_ANNOUNCEMENTS=1`.
@@ -1,16 +0,0 @@
---
-# The announcement FramePort shows once (announcements/README.md). Switched off: set active: true.
-active: false
-id: example-2026-10
-title: Example announcement
-date: 2026-10-15T12:00:00Z
-# image: announcements/example.png
-# image_alt: What the picture shows
-# button: Read more
-# url: https://frameport.app/changelog/
-# expires: 2026-11-30
---
-This is where the text goes, in **Markdown**: *emphasis*, `code`, [links](https://frameport.app/) and lists.
-
- Keep it short: one or two paragraphs.
- Change `id` for every new announcement.
@@ -34,11 +34,7 @@ say "Letting FramePort log in"
 key=$(curl -fsS "$PC_URL/key?code=$PAIR_CODE")
 [[ "$key" == ssh-ed25519\ * ]] || { echo "Couldn't reach FramePort at $PC_URL. Is it still open?"; exit 1; }
 mkdir -p ~/.ssh && chmod 700 ~/.ssh && touch ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys
-# a file without a final newline would glue our key onto its last line, where sshd never matches it (GitHub #242)
-grep -qxF "$key" ~/.ssh/authorized_keys || {
-  [ -n "$(tail -c1 ~/.ssh/authorized_keys)" ] && echo >> ~/.ssh/authorized_keys
-  echo "$key" >> ~/.ssh/authorized_keys
-}
+grep -qxF "$key" ~/.ssh/authorized_keys || echo "$key" >> ~/.ssh/authorized_keys

 say "Setting up Lepton's containers"
 # rootless podman leaks one kernel keyring per container start; ~200 game launches would exhaust the quota
@@ -1,20 +0,0 @@
-package: com.CreaTeam.Sclerosis
-title: Sclerosis
-status: works
-notes: Copy the "Amnesia The Dark Descent" folder from a Windows/Proton install to "FramePort/com.CreaTeam.Sclerosis/lepton-data/external".
-  Default hand positions are rather askew and should be amended via VR Controller Mappings in Steam itself. FOV
-  warping effects are EXTREMELY disorienting in VR, beware. Otherwise seems to work without issue.
-tested_version: 1.10.7
-engine: Unity
-xr: OpenXR
-frame:
- frame.unity_text_input
-device:
- device.text_input_window
-verified:
-  date: '2026-10-16'
-  known_good_sha256: e17421ad9894f5e57fb9b1b8110544715166756ef924b5a86831f6f20e70a6d5
-  app: 1.2.0
-  overport_cli: 1.2.5
-  issue: 339
-source_hint: Sclerosis_v1.10.7
@@ -1,24 +0,0 @@
-package: com.Curve.LawnMowingSimulatorVR
-title: Lawn Mowing Simulator VR
-status: issues
-notes: Left eye textures flicker only when mowing in specific areas.
-tested_version: 1.0.50
-engine: Unity
-xr: OpenXR
-frame:
- frame.unity_text_input
-device:
- device.text_input_window
-adapter:
-  haptic_fix: 1
-  pose_consistency: 1
-  hide_space_warp: 1
-verified:
-  date: '2026-10-16'
-  known_good_sha256: 2653e9b1dfbd11d607b5dd17b9c07ab19d9e98e1004ef9b14cb52867b5f959dc
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 344
-source_hint: com.Curve.LawnMowingSimulatorVR
@@ -1,22 +0,0 @@
-package: com.HypetrainDigitalLtd.Breathedge
-title: Breathedge VR
-status: works
-notes: Loading fade is broken and only shows a small square but the game works!
-tested_version: 1.0.7
-engine: Unreal
-xr: VrApi
-alt_overport:
- patch_remove_unreal_force_quit
-frame:
- frame.hw_video_decode
-adapter:
-  haptic_fix: 1
-verified:
-  date: '2026-10-16'
-  known_good_sha256: 4975a32fbf36b4d417142a944bf7d771c18a184dc0320b5937ac2c67bd013575
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 347
-source_hint: Breathadge
@@ -1,28 +0,0 @@
-package: com.Miragesoft.RealVrFishingQ
-title: Real VR Fishing
-status: issues
-notes: Seems to be almost 100% functional with meta permissions enabled.  In the new Mixed Reality mode, the room
-  scan doesn't seem to do anything and I can't seem to manually place anything either.
-tested_version: '3.06096'
-engine: Unity
-xr: OpenXR
-frame:
- frame.vivox_audio_route
- frame.unity_text_input
- frame.oculusos
- frame.meta_permissions
-device:
- device.text_input_window
-adapter:
-  haptic_fix: 1
-  scene_emul: 1
-  controller_models: 1
-verified:
-  date: '2026-10-16'
-  known_good_sha256: 8b17dd26ef0486618ec006f9d948a60dabea4d7763bbe6061db07ee8aad27c76
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261007.6125817'
-  agent: 91
-  issue: 333
-source_hint: Real VR Fishing
@@ -1,22 +0,0 @@
-package: com.SchellGames.LostRecipes
-title: Lost Recipes
-status: works
-tested_version: 1.0.1+273175
-engine: Unreal
-xr: VrApi
-alt_overport:
- patch_remove_unreal_force_quit
-frame:
- frame.unreal_skip_obb_check
- frame.hw_video_decode
-adapter:
-  haptic_fix: 1
-verified:
-  date: '2026-10-16'
-  known_good_sha256: f071a1deea3e3b6dce0c3a923127f540a48b88532106536c1838f496e9d3e6c9
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 340
-source_hint: Lost Recipes
@@ -1,24 +1,22 @@
 package: com.UNIVRS.Freedom
-title: 'Attack on Titan VR: Unbreakable'
-status: works
-notes: Keep the extra files that come with the APK and OBB next to the OBB (they hold the audio). Cutscenes are
-  detached from the head but still viewable.
+title: Freedom
+status: issues
+notes: Volume can't be changed in the game.
 tested_version: 1.0.2950
 engine: Unity
 xr: OpenXR
 frame:
 - frame.unity_text_input
- frame.asset_files
 device:
 - device.text_input_window
 adapter:
  haptic_fix: 1
 verified:
-  date: '2026-10-16'
-  known_good_sha256: 1b3ced1a24b3b708f66aba6aa879863b667c0e502ef153d8a8cfa03e529d21fd
-  app: 1.2.0
+  date: '2026-10-10'
+  known_good_sha256: 24662272c4cbe5dc7c4f3c803bdb9dead9661ac3d59bf80cca2e260256acc4bc
+  app: 0.12.0
  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 337
-source_hint: Aot
+  frame_build: '20261007.6125817'
+  agent: 59
+  issue: 132
+source_hint: AOT VR
@@ -1,5 +1,5 @@
 package: com.asg.clockworkdev
-title: The Last Clockwinder
+title: Clockwork
 status: works
 tested_version: '1.29'
 engine: Unity
@@ -1,21 +0,0 @@
-package: com.crytek.climb
-title: The Climb
-status: works
-tested_version: '666.0'
-engine: CryEngine
-xr: VrApi
-frame:
- frame.vrapi_bridge
-device_files:
-  user.cfg: 'r_vr_foveated = 0
-
-    '
-verified:
-  date: '2026-10-16'
-  known_good_sha256: 3899967dd6d3ee0ce3409e94d543405c779e9c282ead29536abe93b3531ca285
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 341
-source_hint: TheClimb
@@ -1,22 +0,0 @@
-package: com.fasttravelgames.mascot
-title: 'Cities: VR'
-status: works
-notes: Loading screen Cities VR Logo doesn't load right.
-tested_version: 1.00.502
-engine: Unity
-xr: OpenXR
-frame:
- frame.unity_text_input
-device:
- device.text_input_window
-adapter:
-  haptic_fix: 1
-verified:
-  date: '2026-10-16'
-  known_good_sha256: 5537e4e9333a04eda8c1b2f96cdc9572c1bbed52a9d3af42269ba442ce9ba801
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 345
-source_hint: CitiesSkylines
@@ -1,22 +0,0 @@
-package: com.s3d.ExplodingKittensVR.TestRelease
-title: Exploding Kittens VR
-status: issues
-notes: Requires online for most modes. Practice lobby does work though.
-tested_version: 1.4.25779
-engine: Unreal
-xr: OpenXR
-alt_overport:
- patch_remove_unreal_force_quit
-frame:
- frame.hw_video_decode
-adapter:
-  haptic_fix: 1
-verified:
-  date: '2026-10-16'
-  known_good_sha256: 4b0a2348a5553851dcec820835e02c93a1a64927a30533d554943a9b81b3baa0
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 343
-source_hint: com.s3d.ExplodingKittensVR.TestRelease
@@ -1,24 +0,0 @@
-package: jp.co.hit_point.vneko
-title: Neko Atsume Purrfect
-status: works
-tested_version: 2.3.0
-engine: Unity
-xr: OpenXR
-frame:
- frame.unity_text_input
- frame.oculusos
-device:
- device.text_input_window
-adapter:
-  controller_models: 1
-  haptic_fix: 1
-  scene_emul: 1
-verified:
-  date: '2026-10-16'
-  known_good_sha256: da0196efa495d6ea7b34be2cea5b279acf23489134bb1dd1acef7cf54aa57da6
-  app: 1.2.0
-  overport_cli: 1.2.5
-  frame_build: '20261015.6141207'
-  agent: 91
-  issue: 338
-source_hint: jp.co.hit_point.vneko
@@ -1,18 +0,0 @@
-package: org.crisiszone.vr
-title: Crisis Zone VR
-status: works
-notes: Played the beginning of the first mission without issues.
-tested_version: 0.1.4
-engine: Other
-xr: OpenXR
-frame:
- frame.sdl_clipboard
-verified:
-  date: '2026-10-15'
-  known_good_sha256: 747d1e6613ae443ef03e509b509e4ec89039eec1aecf3689643db4057e53266a
-  app: 1.2.1.dev433
-  overport_cli: 1.2.5
-  frame_build: '20261007.6125817'
-  agent: 91
-  issue: 331
-source_hint: CrisisZoneVR-v0.1.4-quest3
@@ -1,18 +0,0 @@
-package: org.smarttube.stable
-title: SmartTube
-status: issues
-notes: Android's home screen shows for a few seconds while the app starts (normal for flat Android apps; longest on the
-  first start after an install). Froze once in the reporter's session.
-tested_version: '32.56'
-engine: Other
-xr: '?'
-as_is: true
-frame:
- frame.hw_video_decode
-verified:
-  date: '2026-10-16'
-  known_good_sha256: cc53f1aedac52ea0d4e77803acd580e32e7e5179adc96b55db7267b63a16c864
-  app: 1.2.0
-  overport_cli: 1.2.5
-  issue: 350
-source_hint: SmartTube_stable_arm64-v8a
@@ -1,9 +1,9 @@
 package: xyz.TheAviary.Vermillion
 title: Vermillion
-status: works
-notes: "The canvas used to hide the hand and brush while painting (the Frame draws the game's canvas layer in front
-  of everything); the recipe makes the game draw canvases in the scene instead (fix found by Klownicle, GitHub #200).
-  Confirmed in the headset by Klownicle."
+status: issues
+notes: Runs. The canvas used to hide the hand and brush while painting (the Frame draws the game's canvas layer in
+  front of everything); the recipe makes the game draw canvases in the scene instead (fix found by Klownicle, GitHub
+  #200). Not yet confirmed in the headset with this patch.
 tested_version: 1.7.2
 engine: Unity
 xr: OpenXR
@@ -16,10 +16,10 @@ adapter:
  haptic_fix: 1
  scene_emul: 1
 verified:
-  date: '2026-10-15'
+  date: '2026-10-11'
  app: 1.0.1
  frame_build: '20261007.6125817'
  agent: 79
  issue: 200
-updated: '2026-10-15'
+updated: '2026-10-12'
 source_hint: Vermillion - VR Painting
@@ -26,25 +26,6 @@ Games/                                  ← scan this folder (Add games → Scan
 Not sure of the package name? It's in the OBB file names (`main.<version>.<package name>.obb`), and the game's page
 shows it under **Details**.

-## I moved my games to another folder or drive. How do I update the library?
-
-Scan the new folder (**Add games → Scan a folder…**, or **Settings → Library folders → Add folder…**). A game whose
-files are gone from their old place and that FramePort finds again in the new folder keeps its library entry: only
-where its files are changes. Its name, tags, artwork, your own recipe and what's installed on the Frame stay; you don't
-have to remove it from the library first. **Rescan folders** in the Library does the same for every library folder.
-
- **Removing a folder:** **Settings → Library folders** lists every folder FramePort scans, with how many library games
-  come from it and whether it's there now (a folder on an unplugged drive shows as not found). The bin icon stops
-  scanning a folder; its games stay in the library. `frameport folders [--add DIR] [--remove DIR]` does the same on the
-  command line, `frameport rescan` rescans.
- **Another version in the new folder** (a different APK or game build): **Scan a folder…** on that folder takes it, as
-  **Update with a newer APK…** would (name, tags, art and your own recipe stay). **Rescan folders** leaves such games
-  alone and says so; use the game's **Update with a newer APK…** / **…version…** to switch.
- **Two copies** (the old folder is still there): the library keeps the copy it has. To use the other one, delete or
-  rename the old copy and rescan.
- PC VR games are recognised by their folder name, or a renamed folder by its program file. Linux apps aren't part of
-  folder scans: add the moved app again with **Add a Linux app…** (it keeps its name, art and switches).
-
 ## Can I scan SideQuest backups or AXRB downloads directly?

 Yes. Scan the folder as it is; FramePort finds the APK and its OBB files in both layouts:
@@ -13,7 +13,6 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Arkio | Quest | ✅ Works |  |
 | Asgard's Wrath 2 | Quest | ✅ Works |  |
 | Assassin's Creed Nexus | Quest | ✅ Works |  |
-| Attack on Titan VR: Unbreakable | Quest | ✅ Works |  |
 | Audica | Quest | ✅ Works |  |
 | AugmentedEmpire | Quest | ✅ Works |  |
 | BAM | Quest | ✅ Works |  |
@@ -30,15 +29,13 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | BlazeRush | Quest | ✅ Works |  |
 | BodyCombat | Quest | ✅ Works |  |
 | BONELAB | Quest | ✅ Works |  |
-| Breathedge VR | Quest | ✅ Works |  |
 | Carve Snowboarding | Quest | ✅ Works |  |
 | Caves | Quest | ✅ Works |  |
-| Cities: VR | Quest | ✅ Works |  |
+| Clockwork | Quest | ✅ Works |  |
 | COMPOUND | Quest | ✅ Works |  |
 | Cook-Out | Quest | ✅ Works |  |
 | Cosmodread | Quest | ✅ Works |  |
 | Creed | Quest | ✅ Works |  |
-| Crisis Zone VR | Quest | ✅ Works |  |
 | cubism | Quest | ✅ Works |  |
 | Dance Central | Quest | ✅ Works |  |
 | Deep Cuts | Quest | ✅ Works |  |
@@ -76,7 +73,6 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Ladder | Quest | ✅ Works |  |
 | Lambda1VR | Quest | ✅ Works |  |
 | LEGO® Bricktales | Quest | ✅ Works |  |
-| Lost Recipes | Quest | ✅ Works |  |
 | Lucky's Tale | Quest | ✅ Works |  |
 | Maestro | Quest | ✅ Works |  |
 | Marvel's Deadpool VR | Quest | ✅ Works |  |
@@ -90,7 +86,6 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Moss: Book II | Quest | ✅ Works |  |
 | Munkr Funkr (The Legacy Days) | Quest | ✅ Works |  |
 | Nano | Quest | ✅ Works |  |
-| Neko Atsume Purrfect | Quest | ✅ Works |  |
 | NEX Player | Quest | ✅ Works |  |
 | NFL PRO ERA II | Quest | ✅ Works |  |
 | NOPE CHALLENGE | Quest | ✅ Works |  |
@@ -113,7 +108,6 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Riven | Quest | ✅ Works |  |
 | Robo Recall | Quest | ✅ Works |  |
 | RUINSMAGUS | Quest | ✅ Works |  |
-| Sclerosis | Quest | ✅ Works |  |
 | Shadow Point | Quest | ✅ Works |  |
 | Shoot The Zombirds VR | Quest | ✅ Works |  |
 | Shores of Loci | Quest | ✅ Works |  |
@@ -134,9 +128,7 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Tea For God | Quest | ✅ Works |  |
 | TetrisEffect | Quest | ✅ Works |  |
 | The Boys VR | Quest | ✅ Works |  |
-| The Climb | Quest | ✅ Works |  |
 | The Climb 2 | Quest | ✅ Works |  |
-| The Last Clockwinder | Quest | ✅ Works |  |
 | The Room VR | Quest | ✅ Works |  |
 | The Tale of Onogoro | Quest | ✅ Works |  |
 | Time Crisis II VR (Test) | Quest | ✅ Works |  |
@@ -151,7 +143,6 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Vader Immortal: Episode III | Quest | ✅ Works |  |
 | Vampire Survivors | Quest | ✅ Works |  |
 | Vendetta Forever | Quest | ✅ Works |  |
-| Vermillion | Quest | ✅ Works |  |
 | VR HOT Quest | Quest | ✅ Works |  |
 | VR4 | Quest | ✅ Works |  |
 | Walkabout Mini Golf | Quest | ✅ Works |  |
@@ -165,11 +156,10 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Does it Stack? | Quest | ⚠️ Works with issues | Mixed reality mode does not work (works on Demeo), everything else seems to be OK |
 | Dungeons of Eternity | Quest | ⚠️ Works with issues | It can not connect to servers |
 | End Space | Quest | ⚠️ Works with issues | Controls stop responding after the first mission loads. |
-| Exploding Kittens VR | Quest | ⚠️ Works with issues | Requires online for most modes. |
 | ExploreVR | Quest | ⚠️ Works with issues | The 3D world warps and shifts with head movement (wrong perspective). |
 | Fisherman | Quest | ⚠️ Works with issues | Loading screens have corruption, but everything works otherwise. |
+| Freedom | Quest | ⚠️ Works with issues | Volume can't be changed in the game. |
 | Homeworld: Vast Reaches | Quest | ⚠️ Works with issues | The game starts but after selecting to start a new game it seems to crash. |
-| Lawn Mowing Simulator VR | Quest | ⚠️ Works with issues | Left eye textures flicker only when mowing in specific areas. |
 | MacacoVR | Quest | ⚠️ Works with issues | 2d loading screens are glitchy, otherwise main gameplay is fine |
 | Majora's Mask VR | Quest | ⚠️ Works with issues | Audio on the file select screen sounds crunchy. |
 | Myst | Quest | ⚠️ Works with issues | Minor graphical glitches on some objects. |
@@ -178,14 +168,13 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | Plezy | Quest | ⚠️ Works with issues | Some videos play with strong artifacts and wrong colours; the cause is unknown, possibly hardware video decoding. |
 | Quantum Void | Quest | ⚠️ Works with issues | no hands |
 | Ragnarock | Quest | ⚠️ Works with issues |  |
-| Real VR Fishing | Quest | ⚠️ Works with issues | Seems to be almost 100% functional with meta permissions enabled. |
 | Silhouette | Quest | ⚠️ Works with issues | Hand-tracking game; the Frame synthesizes hands from controllers, so it is janky. |
-| SmartTube | Quest | ⚠️ Works with issues | Android's home screen shows for a few seconds while the app starts (normal for flat Android apps; longest on the first start after an install). |
 | Spunky Dungeon | Quest | ⚠️ Works with issues | Gear VR / Oculus Go game (32-bit only), runs through FramePort's 32-bit bridge (experimental). |
 | Swarm 2 | Quest | ⚠️ Works with issues | MSAA creates visible seams around edge geometry and also the skybox edge |
 | The Light Brigade | Quest | ⚠️ Works with issues | Judder in weapons |
 | The Thrill Of The Fight | Quest | ⚠️ Works with issues | Right eye doesn't draw the opponent or the referee. |
 | Time Stall | Quest | ⚠️ Works with issues | Both eyes distort during movement (unresolved). |
+| Vermillion | Quest | ⚠️ Works with issues | Runs. |
 | WiiCompiled VR | Quest | ⚠️ Works with issues | To add a game: in FramePort's Files tab, upload your .wcgame file to this game's storage, folder Android/data/org.wiicompiled.quest/files/WiiCompiledOpenXRVR… |
 | Deadly Delivery | Quest | ❌ Doesn't run | Quits after Meta's entitlement check fails: it needs Meta's online services. |
 | Espire 1: VR Operative (Quest Edition) | Quest | ❌ Doesn't run | Mesa GL driver crash during texture upload. |
@@ -167,7 +167,6 @@ FramePort downloads it, checks it, restarts and keeps your games and settings. *
 - Settings → **Updates** turns the check off or turns on **Install updates automatically**.
 - **Recipes** (the tested patches and settings for each game) update by themselves. A game whose recipe changed shows
  **Update on Frame**.
- **Moved your games?** Scan the new folder (or **Rescan folders**): games found there whose old files are gone keep their library entry, name, artwork, tags and settings, and only their location changes. **Settings → Library folders** lists the folders FramePort scans; remove the old one there (the games stay). See the [FAQ](FAQ.md#i-moved-my-games-to-another-folder-or-drive-how-do-i-update-the-library).
 - **A newer version of a game:** right-click it (or use **…** on its page) → **Update with a newer APK…** (Quest and
  Android games) or **Update with a newer version…** (Linux apps: the new AppImage, archive or folder; PC VR games:
  the new game folder). Its name, artwork, tags and your settings stay. Then click **Update on Frame** (or **on this
@@ -259,7 +258,6 @@ option. The main ones:
 | Command | What it does |
 |---|---|
 | `scan <folder>` / `list` / `show <game>` | add games, list the library, show a game's patches |
-| `folders [--add <folder>] [--remove <folder>]` / `rescan` | list the library folders, add or remove one (its games stay); scan them again for new and moved games |
 | `add-linux <path> [--exe <program>]` | add a Linux app (AppImage, folder or archive) |
 | `new-version <game> <path>` | point a game at its newer version (APK, Linux app file/folder, PC VR game folder) |
 | `recipe <game> --enable/--disable <patch>` | change a game's patches (`patches` lists them all) |
@@ -39,7 +39,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [Patch Oculus detection for Unity](#patch_oculus_unity) | `patch_oculus_unity` | Patches from OVRPort | default |
 | [Patch Oculus detection for Unreal](#patch_oculus_unreal) | `patch_oculus_unreal` | Patches from OVRPort | default |
 | [Remove localized app names](#patch_remove_localized_names) | `patch_remove_localized_names` | Patches from OVRPort | default |
-| [Remove Unreal's ForceQuit](#patch_remove_unreal_force_quit) | `patch_remove_unreal_force_quit` | Patches from OVRPort | 41 |
+| [Remove Unreal's ForceQuit](#patch_remove_unreal_force_quit) | `patch_remove_unreal_force_quit` | Patches from OVRPort | 38 |
 | [Remove uses-library](#patch_remove_uses_library) | `patch_remove_uses_library` | Patches from OVRPort | default |
 | [Remove VrApi library](#patch_remove_vrapi) | `patch_remove_vrapi` | Patches from OVRPort |  |
 | [Replace application label and icon](#patch_replace_icon_label) | `patch_replace_icon_label` | Patches from OVRPort | default |
@@ -47,7 +47,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [VrApi → OpenXR adapter (OVRPort)](#patch_vrapi_openxr) | `patch_vrapi_openxr` | Patches from OVRPort |  |
 | [32-bit ARM bridge (Gear VR / Go games)](#frame-a32_bridge) | `frame.a32_bridge` | Steam Frame patches | 6 |
 | [FrameBridge OpenXR adapter](#frame-adapter) | `frame.adapter` | Steam Frame patches | default |
-| [Content files from the game's data](#frame-asset_files) | `frame.asset_files` | Steam Frame patches | 2 |
+| [Content files from the game's data](#frame-asset_files) | `frame.asset_files` | Steam Frame patches | 1 |
 | [Asset-file service bypass](#frame-asset_files_stub) | `frame.asset_files_stub` | Steam Frame patches |  |
 | [Skip Meta avatars](#frame-avatar_stub) | `frame.avatar_stub` | Steam Frame patches | 1 |
 | [bHaptics: skip the Bluetooth permission request](#frame-bhaptics_permission) | `frame.bhaptics_permission` | Steam Frame patches | 5 |
@@ -56,22 +56,22 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [OpenGL ES: multiview shaders on flat panels (HUD, menus)](#frame-gl_multiview_fbo) | `frame.gl_multiview_fbo` | Steam Frame patches | 1 |
 | [GL shim (Mesa GLSL compatibility)](#frame-gl_shim) | `frame.gl_shim` | Steam Frame patches | 2 |
 | [Godot apps: start without a clipboard service](#frame-godot_clipboard) | `frame.godot_clipboard` | Steam Frame patches |  |
-| [Hardware video decoding (H.264, HEVC, VP9)](#frame-hw_video_decode) | `frame.hw_video_decode` | Steam Frame patches | 23 |
+| [Hardware video decoding (H.264, HEVC, VP9)](#frame-hw_video_decode) | `frame.hw_video_decode` | Steam Frame patches | 19 |
 | [Language packs from the game's files](#frame-langpacks) | `frame.langpacks` | Steam Frame patches |  |
 | [Launcher category (INFO → LAUNCHER)](#frame-launcher) | `frame.launcher` | Steam Frame patches | default |
 | [GL wrapper: OpenGL ES depth formats (Minecraft)](#frame-ltw_depth) | `frame.ltw_depth` | Steam Frame patches | default |
 | [Fix Lua startup crashes on Frame](#frame-luajit_pointers) | `frame.luajit_pointers` | Steam Frame patches |  |
-| [Declare Meta-only permissions](#frame-meta_permissions) | `frame.meta_permissions` | Steam Frame patches | 3 |
+| [Declare Meta-only permissions](#frame-meta_permissions) | `frame.meta_permissions` | Steam Frame patches | 2 |
 | [Meta XR Audio: skip Quest telemetry class](#frame-metaxr_telemetry) | `frame.metaxr_telemetry` | Steam Frame patches | default |
 | [Clear android:debuggable](#frame-nodebug) | `frame.nodebug` | Steam Frame patches | 3 |
-| [Oculus OS telemetry class stubs](#frame-oculusos) | `frame.oculusos` | Steam Frame patches | 17 |
+| [Oculus OS telemetry class stubs](#frame-oculusos) | `frame.oculusos` | Steam Frame patches | 15 |
 | [Fix crash when the game prepares the microphone](#frame-ovr_microphone) | `frame.ovr_microphone` | Steam Frame patches |  |
 | [Keep the same Meta user between starts](#frame-ovr_stable_user) | `frame.ovr_stable_user` | Steam Frame patches | default |
 | [Trace Meta platform requests (diagnostics)](#frame-ovr_trace) | `frame.ovr_trace` | Steam Frame patches |  |
 | [Platform compat (ovrMessageType_ToString)](#frame-ovrplatformcompat) | `frame.ovrplatformcompat` | Steam Frame patches | default |
 | [Stub missing Meta platform functions](#frame-ovrstubs) | `frame.ovrstubs` | Steam Frame patches | default |
 | [Unpaired pointer-authentication checks](#frame-pac_hints) | `frame.pac_hints` | Steam Frame patches | 1 |
-| [SDL apps: start without a clipboard service](#frame-sdl_clipboard) | `frame.sdl_clipboard` | Steam Frame patches | 5 |
+| [SDL apps: start without a clipboard service](#frame-sdl_clipboard) | `frame.sdl_clipboard` | Steam Frame patches | 4 |
 | [Stress Level Zero: let Unity start Vulkan itself](#frame-slz_vulkan_hooks) | `frame.slz_vulkan_hooks` | Steam Frame patches | 1 |
 | [Start straight in VR (skip the 2D launcher)](#frame-start_activity) | `frame.start_activity` | Steam Frame patches |  |
 | [Allow swapchains larger than 4096 px](#frame-swapchain_limit) | `frame.swapchain_limit` | Steam Frame patches | default |
@@ -82,7 +82,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [Unity: skip OVROverlay layers (fades, splash screens)](#frame-unity_no_overlay_copy) | `frame.unity_no_overlay_copy` | Steam Frame patches | 2 |
 | [Unity: start VR without Meta's system apps](#frame-unity_oculus_check) | `frame.unity_oculus_check` | Steam Frame patches | 12 |
 | [Unity: keep MSAA off at runtime (OVRManager)](#frame-unity_runtime_msaa_off) | `frame.unity_runtime_msaa_off` | Steam Frame patches | 28 |
-| [Make Unity text fields work](#frame-unity_text_input) | `frame.unity_text_input` | Steam Frame patches | 107 |
+| [Make Unity text fields work](#frame-unity_text_input) | `frame.unity_text_input` | Steam Frame patches | 102 |
 | [Unity: share thread keys (games that run out of them)](#frame-unity_tls_key_pool) | `frame.unity_tls_key_pool` | Steam Frame patches | 1 |
 | [Unity: headset always counts as worn](#frame-unity_user_presence) | `frame.unity_user_presence` | Steam Frame patches | 1 |
 | [GL shim for Unreal (no multisampled render-to-texture)](#frame-unreal_gl_shim) | `frame.unreal_gl_shim` | Steam Frame patches | 1 |
@@ -90,21 +90,21 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [Unreal: stand-ins for OVRPlugin functions OVRPort lacks](#frame-unreal_ovrp_entrypoints) | `frame.unreal_ovrp_entrypoints` | Steam Frame patches | 2 |
 | [Unreal: Quest controller bindings (RPOC key map)](#frame-unreal_quest_keymap) | `frame.unreal_quest_keymap` | Steam Frame patches | 3 |
 | [Unreal: don't wait for the Quest shader precompile](#frame-unreal_quest_precompile) | `frame.unreal_quest_precompile` | Steam Frame patches | 3 |
-| [Unreal: start without the OBB check](#frame-unreal_skip_obb_check) | `frame.unreal_skip_obb_check` | Steam Frame patches | 6 |
+| [Unreal: start without the OBB check](#frame-unreal_skip_obb_check) | `frame.unreal_skip_obb_check` | Steam Frame patches | 5 |
 | [Unreal: skip the OBB delivery check](#frame-unreal_skip_obb_delivery) | `frame.unreal_skip_obb_delivery` | Steam Frame patches | 1 |
 | [Unreal: bypass the stalled loading splash](#frame-unreal_splash_bypass) | `frame.unreal_splash_bypass` | Steam Frame patches | 1 |
 | [Unreal: thumb follows the capacitive touches](#frame-unreal_thumb_touch) | `frame.unreal_thumb_touch` | Steam Frame patches | 7 |
 | [Vermillion: paint canvases in the scene](#frame-vermillion_scene_canvas) | `frame.vermillion_scene_canvas` | Steam Frame patches | 1 |
-| [Vivox voice chat: skip Android 12 audio routing](#frame-vivox_audio_route) | `frame.vivox_audio_route` | Steam Frame patches | 2 |
+| [Vivox voice chat: skip Android 12 audio routing](#frame-vivox_audio_route) | `frame.vivox_audio_route` | Steam Frame patches | 1 |
 | [Vulkan: drop invalid render-pass pointers](#frame-vk_sanitize) | `frame.vk_sanitize` | Steam Frame patches | default · 1 |
-| [VrApi → OpenXR bridge](#frame-vrapi_bridge) | `frame.vrapi_bridge` | Steam Frame patches | 4 |
+| [VrApi → OpenXR bridge](#frame-vrapi_bridge) | `frame.vrapi_bridge` | Steam Frame patches | 3 |
 | [Quiet Meta's VrApi loader (OpenXR games)](#frame-vrapi_stub) | `frame.vrapi_stub` | Steam Frame patches | 2 |
 | [OpenGL ES: shader fixes (Vulkan layer under Zink)](#frame-zink_shader_fix) | `frame.zink_shader_fix` | Steam Frame patches | 1 |
 | [Pointer start](#adapter-aim_forward) | `adapter.aim_forward` | Game settings |  |
 | [Pointer angle](#adapter-aim_pitch) | `adapter.aim_pitch` | Game settings |  |
 | [Pointer turn](#adapter-aim_yaw) | `adapter.aim_yaw` | Game settings |  |
 | [Use controllers](#adapter-controller_fix) | `adapter.controller_fix` | Game settings | 1 |
-| [Show Steam Frame controllers](#adapter-controller_models) | `adapter.controller_models` | Game settings | 6 |
+| [Show Steam Frame controllers](#adapter-controller_models) | `adapter.controller_models` | Game settings | 4 |
 | [Stand in for cube layers](#adapter-cube_standin) | `adapter.cube_standin` | Game settings |  |
 | [Show curved menus and screens](#adapter-cylinder_strips) | `adapter.cylinder_strips` | Game settings |  |
 | [Show 360° backgrounds and videos](#adapter-equirect_emul) | `adapter.equirect_emul` | Game settings | 5 |
@@ -127,9 +127,9 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [GL shim: high-precision vertex shaders](#adapter-gl_highp_markers) | `adapter.gl_highp_markers` | Game settings | 1 |
 | [GL shim: integer vertex inputs](#adapter-gl_int_attribs) | `adapter.gl_int_attribs` | Game settings | 1 |
 | [Flat panel diagnostics (log)](#adapter-gl_mv_debug) | `adapter.gl_mv_debug` | Game settings |  |
-| [Fix freezes when controllers vibrate](#adapter-haptic_fix) | `adapter.haptic_fix` | Game settings | 88 |
+| [Fix freezes when controllers vibrate](#adapter-haptic_fix) | `adapter.haptic_fix` | Game settings | 81 |
 | [Vibration strength](#adapter-haptic_scale) | `adapter.haptic_scale` | Game settings |  |
-| [Turn off space warp](#adapter-hide_space_warp) | `adapter.hide_space_warp` | Game settings | 5 |
+| [Turn off space warp](#adapter-hide_space_warp) | `adapter.hide_space_warp` | Game settings | 4 |
 | [Controller input diagnostics (log)](#adapter-input_diag) | `adapter.input_diag` | Game settings |  |
 | [Extra diagnostics (log)](#adapter-layer_debug) | `adapter.layer_debug` | Game settings |  |
 | [Drop broken layers](#adapter-layer_fix) | `adapter.layer_fix` | Game settings |  |
@@ -137,7 +137,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [Unity frame loop: wait for skipped frames](#adapter-ovrp_begin_gate) | `adapter.ovrp_begin_gate` | Game settings | 1 |
 | [Steadier hands (older Unity)](#adapter-ovrp_hold_physics) | `adapter.ovrp_hold_physics` | Game settings | 1 |
 | [See your room](#adapter-passthrough_emul) | `adapter.passthrough_emul` | Game settings |  |
-| [Steadier head tracking](#adapter-pose_consistency) | `adapter.pose_consistency` | Game settings | 2 |
+| [Steadier head tracking](#adapter-pose_consistency) | `adapter.pose_consistency` | Game settings | 1 |
 | [Pose timing diagnostics (log)](#adapter-pose_debug) | `adapter.pose_debug` | Game settings |  |
 | [Fix hands lagging behind controllers](#adapter-pose_time_fix) | `adapter.pose_time_fix` | Game settings | 14 |
 | [Treat newer Quest controllers as Touch](#adapter-profile_remap) | `adapter.profile_remap` | Game settings |  |
@@ -148,7 +148,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [Re-create play space](#adapter-respace_kick) | `adapter.respace_kick` | Game settings |  |
 | [Sharpness](#adapter-scale) | `adapter.scale` | Game settings | 4 |
 | [Room depth](#adapter-scene_depth) | `adapter.scene_depth` | Game settings |  |
-| [Pretend room layout](#adapter-scene_emul) | `adapter.scene_emul` | Game settings | 11 |
+| [Pretend room layout](#adapter-scene_emul) | `adapter.scene_emul` | Game settings | 9 |
 | [Room height](#adapter-scene_height) | `adapter.scene_height` | Game settings |  |
 | [Room width](#adapter-scene_width) | `adapter.scene_width` | Game settings |  |
 | [Eye-image snapshots (diagnostics)](#adapter-snapshot) | `adapter.snapshot` | Game settings |  |
@@ -170,12 +170,12 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [OpenGL ES shader fixes](#adapter-zink_shader_fix) | `adapter.zink_shader_fix` | Game settings | 1 |
 | [Keep the game's saved resolution in step](#device-config_sync) | `device.config_sync` | Files and settings on the Frame | 1 |
 | [Show as VR or as a flat window](#device-display_mode) | `device.display_mode` | Files and settings on the Frame |  |
-| [Settings files for the game](#device-files) | `device.files` | Files and settings on the Frame | 3 |
+| [Settings files for the game](#device-files) | `device.files` | Files and settings on the Frame | 2 |
 | [Foveated rendering (Valve)](#device-foveation) | `device.foveation` | Files and settings on the Frame | 3 |
 | [Hide Android's navigation bar](#device-hide_navbar) | `device.hide_navbar` | Files and settings on the Frame |  |
 | [Extra Lepton settings](#device-lepton_env) | `device.lepton_env` | Files and settings on the Frame | 3 |
 | [Controllers as a gamepad (Steam Input)](#device-steam_gamepad) | `device.steam_gamepad` | Files and settings on the Frame |  |
-| [Show the app's Android window (for typing)](#device-text_input_window) | `device.text_input_window` | Files and settings on the Frame | 110 |
+| [Show the app's Android window (for typing)](#device-text_input_window) | `device.text_input_window` | Files and settings on the Frame | 105 |
 | [Launch options (SteamVR or OpenXR)](#pcvr-launch_args) | `pcvr.launch_args` | PC VR (Proton and Revive) | 2 |
 | [Provide the Oculus runtime from Revive (Frame)](#pcvr-libovr_redirect) | `pcvr.libovr_redirect` | PC VR (Proton and Revive) |  |
 | [No Unreal crash reporter](#pcvr-no_crash_reporter) | `pcvr.no_crash_reporter` | PC VR (Proton and Revive) |  |
@@ -420,7 +420,7 @@ Stops some Unreal games from closing themselves right after starting.
 - `patch_remove_unreal_force_quit`
 - **Changes:** Changes the APK (during the OVRPort conversion).
 - **Offered (off):** Built as the alternate APK for Unreal games (use it if the game quits itself).
- **Catalog games (41):** Asgard's Wrath 2, BARTENDER VR SIMULATOR, Breathedge VR, Carve Snowboarding, Creed, Dance Central, Espire 1: VR Operative (Quest Edition), Espire 2 and 33 more.
+- **Catalog games (38):** Asgard's Wrath 2, BARTENDER VR SIMULATOR, Carve Snowboarding, Creed, Dance Central, Espire 1: VR Operative (Quest Edition), Espire 2, ExploreVR and 30 more.
 - **Suggested by launch-test signatures:**
  - `force-quit` (error): The game quit itself right after starting.
 - **Source:** [patches/overport.py](../src/frameport/patches/overport.py)
@@ -526,7 +526,7 @@ Lets the game find extra content it keeps next to its data (for example Star War
 - `frame.asset_files`
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** The game asks Meta's platform for asset files and its data has … content file(s) (*.pak) that OVRPort's loader doesn't report.
- **Catalog games (2):** Attack on Titan VR: Unbreakable, Star Wars: Tales from the Galaxy's Edge.
+- **Catalog games (1):** Star Wars: Tales from the Galaxy's Edge.
 - **Source:** [patches/frame/langpack.py](../src/frameport/patches/frame/langpack.py)

 > Some games keep content in separate files next to their OBB (for example Star Wars: Tales from the Galaxy's Edge: its seasons and sound banks) and ask Meta's platform for them as asset files. OVRPort's platform loader doesn't know them, so the game waits for content that never arrives (black screen after loading). Lists the content files shipped with the game's data (*.pak) as installed and answers their download request at once with the file's path; nothing is copied or downloaded. Shares the language-pack library.
@@ -645,7 +645,7 @@ Plays the game's videos on the Frame's video hardware, so 4K and 8K video runs s
 - `frame.hw_video_decode` · also for 2D apps
 - **Changes:** Install only: written on the Frame when the game is installed; the APK isn't changed.
 - **Suggested (on):** The game plays video through Android's decoders (MediaCodec, ExoPlayer or VLC): decode it on the Frame's hardware.
- **Catalog games (23):** 4XVR Video Player, AugmentedEmpire, Batman: Arkham Shadow, Battlemarked, Breathedge VR, Dance Central, Exploding Kittens VR, Eye of the Temple and 15 more.
+- **Catalog games (19):** 4XVR Video Player, AugmentedEmpire, Batman: Arkham Shadow, Battlemarked, Dance Central, Eye of the Temple, Fruit Ninja, Ghost Town and 11 more.
 - **Source:** [patches/frame/hw_video_decode.py](../src/frameport/patches/frame/hw_video_decode.py)

 > Decodes the game's videos on the Frame's hardware video decoder instead of Android's software decoders, which stutter or fall behind with 4K/8K video (for example video players, Batman: Arkham Shadow's cutscenes). Adds FramePort's codec plugin (OMX.frameport.avc/hevc/vp9.decoder) to this game's container only; the APK isn't changed. When the hardware is busy (for example Steam's own hardware video decoding is on) the video is decoded in software as before.
@@ -706,7 +706,7 @@ Declares Meta's permissions some mixed-reality games ask for, so they don't stop
 - `frame.meta_permissions`
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** Mixed-reality game that needs the room model: its 'use spatial data' permission must be granted (for example Demeter).
- **Catalog games (3):** Arkio, Demeter, Real VR Fishing.
+- **Catalog games (2):** Arkio, Demeter.
 - **Source:** [patches/frame/manifest_fixes.py](../src/frameport/patches/frame/manifest_fixes.py)

 > Declares com.oculus.permission.* / horizonos.permission.* that the app uses, so Android grants them at install (for example the 'use spatial data' permission of mixed-reality games like Demeter).
@@ -749,7 +749,7 @@ Provides stand-ins for Quest system calls some games make at start.
 - **Suggested (on):** The Unreal build of Meta XR Audio looks up com.oculus.os.AnalyticsEvent and aborts without it (for example NOPE Challenge).
 - **Suggested (on):** Several Meta SDK libraries look up com.oculus.os.AnalyticsEvent (…); games like this abort without the stub (for example Nano).
 - **Offered (off):** … references com.oculus.os.AnalyticsEvent; usually harmless (for example Batman: Arkham Shadow and LEGO Bricktales run without it). Enable if the game aborts with ClassNotFoundException.
- **Catalog games (17):** AgeOfJoy, AllInOneSports, Caves, Deep Cuts, Does it Stack?, Nano, Neko Atsume Purrfect, NOPE CHALLENGE and 9 more.
+- **Catalog games (15):** AgeOfJoy, AllInOneSports, Caves, Deep Cuts, Does it Stack?, Nano, NOPE CHALLENGE, RC Pilot Trainer and 7 more.
 - **Suggested by launch-test signatures:**
  - `oculus-os-class` (fatal): The game looks up a Quest-only system class and aborts.
 - **Source:** [patches/frame/telemetry.py](../src/frameport/patches/frame/telemetry.py)
@@ -838,7 +838,7 @@ Lets SDL and LÖVE games start on the Frame (they'd crash looking for a clipboar
 - `frame.sdl_clipboard` · also for 2D apps
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** SDL app: it crashes at start in Lepton, which has no clipboard service.
- **Catalog games (5):** Crisis Zone VR, Majora's Mask VR, Time Crisis II VR (Test), Time Crisis VR (Experimental), WiiCompiled VR.
+- **Catalog games (4):** Majora's Mask VR, Time Crisis II VR (Test), Time Crisis VR (Experimental), WiiCompiled VR.
 - **Suggested by launch-test signatures:**
  - `sdl-no-clipboard` (fatal): The app crashed at start because the Frame's Android has no clipboard.
 - **Source:** [patches/frame/sdl_clipboard.py](../src/frameport/patches/frame/sdl_clipboard.py)
@@ -904,7 +904,7 @@ Stops a gray or frozen screen in Unity games that turn on anti-aliasing while ru
 - `frame.unity_gl_shim`
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** Unity GLES game that may switch to MSAA at runtime: hide multisampled render-to-texture, which crashes the Frame's GL driver (for example The Room VR).
- **Catalog games (23):** Audica, BattleSisters, Beat Saber, COMPOUND, Cosmodread, Down the Rabbit Hole, Drunkn Bar Fight, End Space and 15 more.
+- **Catalog games (23):** Audica, BattleSisters, Beat Saber, Clockwork, COMPOUND, Cosmodread, Down the Rabbit Hole, Drunkn Bar Fight and 15 more.
 - **Suggested by launch-test signatures:**
  - `unreal-msrtt-crash` (fatal): The game's graphics crashed a few seconds after start.
 - **Source:** [patches/frame/vrapi_bridge.py](../src/frameport/patches/frame/vrapi_bridge.py)
@@ -973,7 +973,7 @@ Keeps a smoothing setting off that the game turns on itself and that can freeze
 - `frame.unity_runtime_msaa_off` · revision 2
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** GLES Unity game whose OVRManager turns 4x MSAA on at runtime: multisampled render-to-texture can hang the Frame's GPU.
- **Catalog games (28):** Audica, BattleSisters, Beat Saber, COMPOUND, Cosmodread, Down the Rabbit Hole, Drunkn Bar Fight, End Space and 20 more.
+- **Catalog games (28):** Audica, BattleSisters, Beat Saber, Clockwork, COMPOUND, Cosmodread, Down the Rabbit Hole, Drunkn Bar Fight and 20 more.
 - **Suggested by launch-test signatures:**
  - `unity-render-crash` (fatal): The game's graphics crashed, so the picture freezes or stays gray.
  - `unity-runtime-msaa` (info): The game turns MSAA on at runtime, which can hang the Frame's GPU.
@@ -989,7 +989,7 @@ Lets you type into this app's text fields on the Frame (they'd close at once).
 - `frame.unity_text_input` · also for 2D apps
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** Unity app with text fields (…): they close at once on the Frame because it has no system keyboard.
- **Catalog games (107):** AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arcsmith, Arkio, Assassin's Creed Nexus, Attack on Titan VR: Unbreakable, Audica and 99 more.
+- **Catalog games (102):** AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arcsmith, Arkio, Assassin's Creed Nexus, Audica, AugmentedEmpire and 94 more.
 - **Source:** [patches/frame/unity_text_input.py](../src/frameport/patches/frame/unity_text_input.py)

 > Unity's TMP_InputField / InputField wait for Android's on-screen keyboard and close themselves a frame later when there is none (Lepton has no on-screen keyboard; Meta's system keyboard does this on a Quest), so a selected text field only flashes a caret. Rewrites TouchScreenKeyboardShouldBeUsed -&gt; false and isKeyboardUsingEvents (TMP) / InPlaceEditing (uGUI) -&gt; true in libil2cpp.so, found per game with Cpp2IL (downloaded on first use), so fields stay selected and take key presses: Steam's keyboard (with "Show the app window") or Type on Frame from the PC.
@@ -1092,7 +1092,7 @@ Starts Unreal games without re-checking their data file (they'd seem to hang on
 - `frame.unreal_skip_obb_check` · also for 2D apps
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** Unreal checks the OBB's contents before starting (bVerifyOBBOnStartUp); on the Frame a failed or slow check can't be seen and the game seems to hang.
- **Catalog games (6):** Dance Central, Kill It With Fire VR, Lost Recipes, MacacoVR, Maestro, Ragnarock.
+- **Catalog games (5):** Dance Central, Kill It With Fire VR, MacacoVR, Maestro, Ragnarock.
 - **Suggested by launch-test signatures:**
  - `unreal-obb-check-stuck` (fatal): The game stays on Unreal's OBB check screen (DownloaderActivity), which the Frame doesn't show, and never starts VR (for example Contractors, GitHub #159).
 - **Source:** [patches/frame/unreal_obb_check.py](../src/frameport/patches/frame/unreal_obb_check.py)
@@ -1158,7 +1158,7 @@ Lets games with Vivox voice chat start on the Frame (they'd crash on an Android
 - `frame.vivox_audio_route` · also for 2D apps
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** Vivox voice chat: it calls Android 12 audio methods, which Lepton (Android 11) lacks, and crashes.
- **Catalog games (2):** Dungeons of Eternity, Real VR Fishing.
+- **Catalog games (1):** Dungeons of Eternity.
 - **Suggested by launch-test signatures:**
  - `vivox-api31` (fatal): The game's Vivox voice-chat SDK calls Android 12 audio-routing methods (AudioManager communication devices) without checking the Android version; Lepton runs Android 11, so the app crashes (for example Green Hell VR).
 - **Source:** [patches/frame/vivox_audio_route.py](../src/frameport/patches/frame/vivox_audio_route.py)
@@ -1189,7 +1189,7 @@ Lets games built on Meta's oldest VR interface run on the Frame.
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** The engine calls libvrapi.so directly; OVRPort can't translate it.
 - **Conflicts with:** [`frame.vrapi_stub`](#frame-vrapi_stub)
- **Catalog games (4):** BlazeRush, Path of the Warrior, The Climb, The Climb 2.
+- **Catalog games (3):** BlazeRush, Path of the Warrior, The Climb 2.
 - **Suggested by launch-test signatures:**
  - `direct-vrapi` (warning): The game uses Meta's VrApi directly and needs the VrApi bridge.
  - `vrapi-frame-rejected` (fatal): The VrApi bridge rejected the game's frame options, so no picture reaches the headset even though frame pacing can appear in the log.
@@ -1295,7 +1295,7 @@ For games that show the headset's own controllers. Takes effect after a reinstal
 - **Options:**
  - Value: int, default `0`.
  - Game settings → Controllers → "Show Steam Frame controllers".
- **Catalog games (6):** Neko Atsume Purrfect, Ocean Rift, Real VR Fishing, SynthRiders, VR HOT Quest, Walkabout Mini Golf.
+- **Catalog games (4):** Ocean Rift, SynthRiders, VR HOT Quest, Walkabout Mini Golf.
 - **Suggested by launch-test signatures:**
  - `render-model-requested` (info): The game shows Quest controllers (or none) because the Frame doesn't provide controller models.
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)
@@ -1633,7 +1633,7 @@ For games that freeze the Frame when a controller vibrates (for example Lucky's
 - **Options:**
  - Value: int, default `0`.
  - Game settings → Controllers → "Fix freezes when controllers vibrate" (advanced).
- **Catalog games (88):** AgeOfJoy, Ancient_Dungeon, Attack on Titan VR: Unbreakable, Audica, AugmentedEmpire, Battlemarked, BattleSisters, Beat Saber and 80 more.
+- **Catalog games (81):** AgeOfJoy, Ancient_Dungeon, Audica, AugmentedEmpire, Battlemarked, BattleSisters, Beat Saber, Caves and 73 more.
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)

 > Routes OVRPlugin through FramePort's extension shim, which turns Meta's amplitude-envelope vibrations into plain ones: OVRPort's loader reads their nanosecond duration as seconds and allocates gigabytes, freezing the Frame when the game vibrates a controller (for example Lucky's Tale's save slots, GitHub #9). Needs a rebuild.
@@ -1662,7 +1662,7 @@ For games whose picture flickers or smears (for example Into The Radius 2).
 - **Options:**
  - Value: int, default `0`.
  - Game settings → Troubleshooting → "Turn off space warp" (advanced).
- **Catalog games (5):** Into The Radius 2, Lawn Mowing Simulator VR, Metro Awakening, Pinball FX VR, The Boys VR.
+- **Catalog games (4):** Into The Radius 2, Metro Awakening, Pinball FX VR, The Boys VR.
 - **Suggested by launch-test signatures:**
  - `space-warp-used` (info): The game uses Meta's space warp (it renders half of its frames plus motion vectors, and the runtime makes up the rest).
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)
@@ -1781,7 +1781,7 @@ For games that judder or shimmer while you hold your head still (for example I A
 - **Options:**
  - Value: int, default `0`.
  - Game settings → Picture → "Steadier head tracking" (advanced).
- **Catalog games (2):** I Am Cat, Lawn Mowing Simulator VR.
+- **Catalog games (1):** I Am Cat.
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)

 > Repeat xrLocateViews queries for the same display time get the first, fully tracked answer again. Games that ask several times per frame got slightly different poses and rendered parts of the frame with different heads: judder (for example I Am Cat; proposed by Klownicle, GitHub #8).
@@ -1941,7 +1941,7 @@ Mixed-reality games that build their level from your room get a simple room with
 - **Options:**
  - Value: int, default `0`.
  - Game settings → Mixed reality → "Pretend room layout".
- **Catalog games (11):** Arkio, AugmentedEmpire, Battlemarked, Demeo, Demeter, Ghostbusters: Rise of the Ghost Lord, Neko Atsume Purrfect, Ocean Rift and 3 more.
+- **Catalog games (9):** Arkio, AugmentedEmpire, Battlemarked, Demeo, Demeter, Ghostbusters: Rise of the Ghost Lord, Ocean Rift, Smash Drums and 1 more.
 - **Suggested by launch-test signatures:**
  - `scene-missing` (warning): The game wants Meta's room data (scene API), which the Frame lacks.
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)
@@ -2272,7 +2272,7 @@ Puts settings files next to the game on the Frame, for example to turn off an un
 - **Changes:** Install only: written on the Frame when the game is installed; the APK isn't changed.
 - **Suggested (on):** CryEngine: variable-rate shading isn't supported on the Frame, so user.cfg turns it off (… = 0; The Climb / The Climb 2).
 - **Options:** `files`: text, default none — path relative to files/ -&gt; content
- **Catalog games (3):** SUPERHOT VR, The Climb, The Climb 2.
+- **Catalog games (2):** SUPERHOT VR, The Climb 2.
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)

 > Writes config files into the game's Android/data/&lt;package&gt;/files/ on the Frame, to turn off engine features the Frame doesn't support (for example a CryEngine user.cfg with r_variable_rate_shading = 0, as The Climb 2 needs).
@@ -2335,7 +2335,7 @@ Lets typing reach this app from Steam's on-screen keyboard or your PC's keyboard
 - `device.text_input_window`
 - **Changes:** Install only: written on the Frame when the game is installed; the APK isn't changed.
 - **Suggested (on):** App with text fields: key presses only reach a shown Android window.
- **Catalog games (110):** AFFECTED: The Manor, AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arcsmith, Arkio, Assassin's Creed Nexus, Attack on Titan VR: Unbreakable and 102 more.
+- **Catalog games (105):** AFFECTED: The Manor, AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arcsmith, Arkio, Assassin's Creed Nexus, Audica and 97 more.
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)

 > Lepton runs VR apps headless: their Android window is never shown, so it never gets keyboard focus and no key press (Steam's on-screen keyboard, a USB/Bluetooth keyboard, Type on Frame) reaches the app's text fields. With Lepton's lepton-show-flatscreen marker the window is shown (behind the VR view, which keeps working) and Steam's keyboard opens for a selected text field. Steam lists the shown window as "Gamescope" (the Frame's compositor). Pairs with "Make Unity text fields work without a system keyboard".
@@ -63,8 +63,6 @@ version is `catalog/triage.yaml` (used by `frameport test` / the Job screen); ke
 | Un-cracked Oculus PC VR game: "Initializing OVR session" then exits / signature check on the runtime | Revive's hooks don't install on Proton-arm64; the Oculus shim rejects the unsigned Revive runtime | Not runnable on the Frame without the repack's crack extracted (not done by FramePort); use the PC version |
 | PC VR game: `Failed to initialize Oculus API (-3001)` / `Unable to load LibOVRRT DLL` | Revive's LoadLibrary hook doesn't work under Proton arm64 (ARM64EC kernelbase); the game's LibOVR shim finds no runtime DLL | Symlink `LibOVRRT64_1.dll` → Revive's DLL in the prefix's system32 (manual so far) → then -3021 (runtime signature check; open) |
 | Uploads to the Frame are slow | The link, storage or transfer backend can limit throughput | Check the job's "Transfer link"; try the Frame's hotspot or USB cable. Large install files prefer system OpenSSH SFTP, retaining paired-host checks and `.part` resume; unavailable or failed native uploads fall back to Paramiko. The log names the backend. Settings → Installing → Parallel uploads accepts 1–8 (default 3; saved preferences are preserved). More is not always faster. Measure the production path with `scripts/upload_bench.py --methods app-files-3 --check-resume` (three repetitions, checksum verification) |
-| Log: `OpenSSH SFTP failed (255): … Permission denied (publickey,password)`, then Paramiko | OpenSSH offered keys the Frame doesn't authorize (GitHub #242) | The log lists the keys OpenSSH offered (`Offering public key`) and its warnings. A connection that logged in with the PC's own keys/agent makes OpenSSH use them too (copies of `~/.ssh/id_*` + the agent); a refused FramePort key is retried that way once. A Frame that accepts only another key file: Settings → Installing → SSH keys (CLI `frameport frame ssh-keys --add <file>`); passphrase keys go through the SSH agent |
-| Log: `OpenSSH SFTP failed (1): stat C://…/[…: No such file or directory` | sftp got glob escapes inside its quotes (GitHub #324, fixed): `[` in a local folder name | Update FramePort; the native_upload `quote()` passes only `\\` and `\"` escapes, Windows paths with `/` |
 | PC VR game exits right away: `Unhandled Exception: 0xc06d007e` (after `FOnlineSubsystemOculus::InitWithWindowsPlatform`) | Delay-loaded `LibOVRPlatform64_1.dll` (Oculus Platform SDK, installed with the Oculus app) is missing | None on the Frame (entitlement check; FramePort doesn't replace it). PC mode with the Oculus app |
 | Unity PC VR game (Oculus + SteamVR build: `OVRPlugin.dll` and `openvr_api.dll` in `<Name>_Data/Plugins`) opens a window and quits after ~20 s; no VR Vulkan instance after the game's DXVK device in launch.log; Unity log (`unity log … Player.log`, agent v67): `OpenVR failed initialization` / `Initialization of device … failed` | Unity's built-in VR tries its SDKs in list order (Oculus first) unless `-vrmode` picks one; a catalog recipe verified with another build of the game (for example SUPERHOT VR's OpenXR build, GitHub #105) used to drop the build's own arguments | `pcvr.launch_args` = `-vrmode OpenVR` (detected for such builds; kept when the catalog's `xr` differs from the build's). A game's Electron launcher next to it (SHVR.exe) is ranked below the game |
 | Unreal PC VR game opens the crash reporter instead of closing | UE starts CrashReportClient.exe on a crash | `pcvr.no_crash_reporter` (default for Unreal Rift games): `-nocrashreports` + CrashReportClient.exe renamed `.disabled` in the Frame copy |
@@ -101,8 +101,6 @@ def main() -> int:
    ap.add_argument("--viewport", default="1280x820", help="browser size, e.g. 2560x1440")
    ap.add_argument("--update", action="store_true", help="pretend a new FramePort release exists (update UI: "
                    "changelog dialog, what's new bar + dialog, Settings changelog)")
-    ap.add_argument("--announcement", action="store_true", help="show the announcement pop-up (with a picture, "
-                    "then text only); nothing is fetched")
    ap.add_argument("--fake-frame", action="store_true", help="pretend a Steam Frame is connected (no device needed)")
    ap.add_argument("--hover", default=None, help="x,y: move the mouse there before the Library screenshot")
    ap.add_argument("--install-questions", nargs="+", metavar="PKG", default=None,
@@ -139,9 +137,7 @@ def main() -> int:
             ("monitor", lambda a: a.go("monitor")), ("monitor-details", open_monitor_details),
             ("tools", lambda a: a.go("settings")),
             # the index on the left: "This PC" scrolls the page there
-             ("settings-index", lambda a: a.page.run_task(a.settings_view.show_section, "pc")),
-             ("settings-folders", lambda a: a.page.run_task(a.settings_view.show_section, "folders")),
-             ("settings-installing", lambda a: a.page.run_task(a.settings_view.show_section, "installing"))]
+             ("settings-index", lambda a: a.page.run_task(a.settings_view.show_section, "pc"))]
    if game:
        steps.insert(1, ("game", lambda a: a.open_game(game)))
        steps.insert(2, ("game-customize", lambda a: a.open_game(game, advanced=True)))
@@ -424,26 +420,6 @@ def main() -> int:
            print(f"open dialogs: {len([d for d in a.page._dialogs.controls if d.open])}, queued: {queued}", flush=True)
        steps = [("library", lambda a: a.navigate(0)), ("questions", open_questions),
                 ("after-1st-double", double_click), ("after-2nd-double", double_click), ("end", report)]
-    if args.announcement:
-        import shutil
-
-        from frameport import announcements
-        from frameport.core.paths import user_data_dir
-
-        text = ("---\nid: smoke\ntitle: FramePort 1.3 brings the Monitor to every Frame\ndate: 2026-10-14T12:00:00Z\n"
-                "---\n"
-                "The **Monitor** tab now shows fps, battery and temperatures for any game the Frame runs, including "
-                "Steam's own. Open it from the sidebar's Frame card.\n\n"
-                "- Install links from FrameDrop buttons open in FramePort\n"
-                "- Uploads over the USB cable are about **3× faster**\n\n"
-                "Questions? Ask in [Discussions](https://example.invalid).")
-        news = announcements.parse(text)
-        pic = user_data_dir() / "announcements" / "smoke.png"
-        pic.parent.mkdir(parents=True, exist_ok=True)
-        shutil.copy(Path(__file__).resolve().parents[1] / "docs" / "images" / "library.png", pic)
-        steps = [("announcement-image", lambda a: (a.navigate(0), a.announcer.show(news, pic))),
-                 ("announcement-text", lambda a: (a.page.pop_dialog(), time.sleep(1.5), a.announcer.show(
-                     announcements.parse(text.replace("id: smoke", "id: smoke2")))))]
    if args.update:
        from frameport import __version__, updates

@@ -1,218 +0,0 @@
-"""Announcements: one short message from the maintainer, shown once as a pop-up in the app.
-
-Source of truth: `announcements/current.md` on GitHub `main` (front matter + Markdown, announcements/README.md), read
-through raw.githubusercontent like the catalog (cached, every 6 h), so a push reaches users without a release.
-
-Who sees it: only people who were already using FramePort before the announcement's `date` (a first start never
-shows one, and nor does one published before FramePort was installed). Closing it in any way (the X, a click outside,
-Escape, its button) dismisses that `id` for good; a new announcement = a new id. No Flet here.
-"""
-from __future__ import annotations
-
-import datetime as dt
-import hashlib
-import logging
-import os
-import re
-import time
-from dataclasses import dataclass
-from pathlib import Path
-
-import yaml
-
-from . import REPO_URL
-from .core import cache, library
-from .core.paths import user_data_dir
-
-_log = logging.getLogger("frameport.announcements")
-
-REPO = REPO_URL.removeprefix("https://github.com/").strip("/")
-PATH = "announcements/current.md"
-RAW = f"https://raw.githubusercontent.com/{REPO}/main/"
-URL = RAW + PATH
-CHECK_EVERY = 6 * 3600
-KEEP_DISMISSED = 50          # ids remembered (oldest dropped)
-IMAGE_MAX = 5 * 2**20
-ID_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._-]{0,79}$")
-# settings only an earlier GUI run writes: one of them when announcements first run = an existing user (not
-# recipes.app_version: library.load() writes that on the very first load)
-USED_BEFORE = ("update.last_seen_version", "update.last_check", "ui.welcome_done", "ui.window")
-
-
-@dataclass(frozen=True)
-class Announcement:
-    id: str
-    title: str
-    body: str                  # Markdown
-    date: float                # unix time it was published
-    image: str | None = None   # https URL (repo paths are resolved to raw GitHub)
-    image_alt: str = ""
-    button: str | None = None  # optional action: label + url
-    url: str | None = None
-    expires: float | None = None
-
-
-class AnnouncementError(ValueError):
-    pass
-
-
-def _when(value, end_of_day: bool = False) -> float:
-    """A front-matter date (YAML date/datetime or ISO text) as unix time; a bare date is UTC midnight (or the end of
-    that day for `expires`). Naive times are UTC."""
-    if isinstance(value, str):
-        text = value.strip().replace("Z", "+00:00")
-        try:
-            value = dt.datetime.fromisoformat(text) if "T" in text or " " in text else dt.date.fromisoformat(text)
-        except ValueError as exc:
-            raise AnnouncementError(f"not a date: {value!r}") from exc
-    if isinstance(value, dt.datetime):
-        return (value if value.tzinfo else value.replace(tzinfo=dt.timezone.utc)).timestamp()
-    if isinstance(value, dt.date):
-        day = dt.datetime(value.year, value.month, value.day, tzinfo=dt.timezone.utc)
-        return (day + dt.timedelta(days=1 if end_of_day else 0)).timestamp()
-    raise AnnouncementError(f"not a date: {value!r}")
-
-
-def _link(value) -> str | None:
-    """An image/button target: https URLs as they are, a repo path (announcements/x.png) → its raw GitHub URL."""
-    if value in (None, ""):
-        return None
-    text = str(value).strip()
-    if text.startswith("https://"):
-        return text
-    if "://" in text or text.startswith(("/", "..")) or ".." in text.split("/"):
-        raise AnnouncementError(f"use an https URL or a path in the repo: {text!r}")
-    return RAW + text
-
-
-def parse(text: str | None) -> Announcement | None:
-    """The file's announcement; None when there is none (empty file, `active: false`). Raises AnnouncementError for a
-    malformed one (the app then shows nothing; tests/test_announcements.py checks the committed file)."""
-    if not text or not text.strip():
-        return None
-    m = re.match(r"\A?---\s*\n(.*?)\n---\s*(?:\n|\Z)(.*)\Z", text, re.S)
-    if not m:
-        raise AnnouncementError("missing the --- front matter")
-    try:
-        meta = yaml.safe_load(m.group(1)) or {}
-    except yaml.YAMLError as exc:
-        raise AnnouncementError(f"front matter: {exc}") from exc
-    if not isinstance(meta, dict):
-        raise AnnouncementError("front matter must be key: value lines")
-    active = meta.get("active", True)
-    if active is False and not meta.get("id"):
-        return None
-    if not isinstance(active, bool):
-        raise AnnouncementError("active: true or false")
-    unknown = set(meta) - {"id", "title", "date", "image", "image_alt", "button", "url", "expires", "active"}
-    if unknown:
-        raise AnnouncementError(f"unknown fields: {', '.join(sorted(unknown))}")
-    ident, title = str(meta.get("id") or "").strip(), str(meta.get("title") or "").strip()
-    if not ID_RE.match(ident):
-        raise AnnouncementError("id: letters, digits, '.', '_' or '-' (change it to show a new announcement)")
-    if not title:
-        raise AnnouncementError("title is required")
-    if "date" not in meta:
-        raise AnnouncementError("date is required (only people using FramePort before it see the announcement)")
-    button, url = meta.get("button"), meta.get("url")
-    if bool(button) != bool(url):
-        raise AnnouncementError("button and url go together")
-    if not active:  # switched off, but still checked (tests catch mistakes before it's switched on)
-        _check_dates(meta)
-        return None
-    return Announcement(id=ident, title=title, body=m.group(2).strip(), date=_when(meta["date"]),
-                        image=_link(meta.get("image")), image_alt=str(meta.get("image_alt") or ""),
-                        button=str(button).strip() if button else None, url=_link(url),
-                        expires=_when(meta["expires"], end_of_day=True) if meta.get("expires") else None)
-
-
-def _check_dates(meta: dict) -> None:
-    _when(meta["date"])
-    if meta.get("expires"):
-        _when(meta["expires"], end_of_day=True)
-    _link(meta.get("image"))
-    _link(meta.get("url"))
-
-
-def disabled() -> bool:
-    return bool(os.environ.get("FRAMEPORT_NO_ANNOUNCEMENTS"))
-
-
-def fetch(force: bool = False) -> Announcement | None:
-    """The current announcement (cached 6 h; offline → the last copy; never raises)."""
-    try:
-        return parse(cache.cached_text("announcement.md", URL, max_age=0 if force else CHECK_EVERY, fallback=""))
-    except Exception as exc:  # noqa: BLE001
-        _log.warning("announcement skipped: %s", exc)
-        return None
-
-
-# ------------------------------------------------------------------------------------------ who sees it
-def since() -> float:
-    """When this user started using FramePort, as far as announcements are concerned (setting announce.since). Set
-    once, the first time it's asked: 0 for someone who used FramePort before announcements existed, else now (a first
-    start). Call it early at start, before anything records this start in the settings."""
-    value = library.setting("announce.since")
-    if isinstance(value, (int, float)):
-        return float(value)
-    value = 0.0 if any(library.setting(k) is not None for k in USED_BEFORE) or library.games() else time.time()
-    library.set_setting("announce.since", value)
-    return value
-
-
-def dismissed() -> list[str]:
-    value = library.setting("announce.dismissed")
-    return [v for v in value if isinstance(v, str)] if isinstance(value, list) else []
-
-
-def dismiss(ident: str) -> None:
-    """Never show this announcement again (any way of closing it)."""
-    library.update_setting("announce.dismissed",
-                           lambda cur: ([v for v in (cur or []) if v != ident] + [ident])[-KEEP_DISMISSED:], [])
-
-
-def due(a: Announcement | None, now: float | None = None, user_since: float | None = None) -> bool:
-    """Whether to show `a` now: published, not expired, not dismissed, and published after this
-    user started using FramePort."""
-    if a is None:
-        return False
-    now = time.time() if now is None else now
-    if a.expires is not None and now >= a.expires:
-        return False
-    if a.date > now:  # scheduled for later
-        return False
-    if a.id in dismissed():
-        return False
-    return a.date > (since() if user_since is None else user_since)
-
-
-def image_file(a: Announcement) -> Path | None:
-    """The announcement's image, downloaded once into <data>/announcements/ and checked (Pillow); None without one or
-    when it can't be loaded (the pop-up then shows no image). Shown by asset URL like artwork, never as bytes."""
-    if not a.image:
-        return None
-    folder = user_data_dir() / "announcements"
-    stem = hashlib.sha256(a.image.encode()).hexdigest()[:16]
-    for done in folder.glob(f"{stem}.*"):
-        if done.suffix != ".part":
-            return done
-    try:
-        from PIL import Image
-
-        tmp = folder / f"{stem}.part"
-        cache.download(a.image, tmp)
-        if tmp.stat().st_size > IMAGE_MAX:
-            raise AnnouncementError("image larger than 5 MiB")
-        with Image.open(tmp) as im:
-            im.verify()
-            fmt = (im.format or "").lower()
-        ext = {"jpeg": ".jpg", "png": ".png", "webp": ".webp", "gif": ".gif"}.get(fmt)
-        if not ext:
-            raise AnnouncementError(f"image format {fmt or '?'} (use PNG, JPEG, WebP or GIF)")
-        out = folder / f"{stem}{ext}"
-        tmp.replace(out)
-        return out
-    except Exception as exc:  # noqa: BLE001
-        _log.warning("announcement image skipped: %s", exc)
-        (folder / f"{stem}.part").unlink(missing_ok=True)
-        return None
@@ -227,78 +227,13 @@ def tools_import_keys(dirs: list[Path] = typer.Argument(..., help="folders with
 # ------------------------------------------------------------------------------------------ library
@app.command()
 def scan(path: Path = typer.Argument(..., help="a folder with game backups (APKs or PC VR game folders), or an APK")):
-    """Find games under PATH, analyze them and suggest patches. A folder is remembered for `frameport rescan`
-    (`frameport folders` lists them). Games of the library found here after a move get their new place."""
-    from .core import folders
-
-    if path.is_dir():
-        folders.remember(path)
-    _scan(path, only_new=False)
-
-
-def _scan(path: Path, only_new: bool) -> None:
+    """Find games under PATH, analyze them and suggest patches."""
    rep = printing_reporter(verbose=False)
-    report = pipeline.ScanReport()
-    for g in pipeline.add_path(path, rep, only_new=only_new, report=report):
+    for g in pipeline.add_path(path, rep):
        r = g["recipe"]
        typer.echo(f"{g['package']:40} {g.get('title', '')[:34]:34} {r['status']:11} {r['source']}")
        for warning in pipeline.analysis_warnings(g):
            typer.echo(f"  ! {warning}")
-    labels = {"moved": "moved here (location updated)", "updated": "another version here: now used",
-              "other_version": "another version here: left alone (frameport new-version <package> <path>)",
-              "other_copy": "another copy here: the library keeps its own"}
-    for kind, label in labels.items():
-        for item in getattr(report, kind):
-            typer.echo(f"{item['package']:40} {item['title'][:34]:34} {label}: {item['path']}")
-    if report.moved:
-        typer.echo(f"Updated the location of {len(report.moved)} game(s)")
-
-
-@app.command()
-def rescan():
-    """Scan the library folders again (`frameport folders`) for new games and for games that moved there."""
-    from .core import folders
-
-    roots = folders.rescan_roots()
-    if not roots:
-        typer.echo("no folders to rescan yet: frameport scan <folder> or frameport folders --add <folder>")
-        return
-    for root in roots:
-        typer.echo(f"== {root}")
-        _scan(Path(root), only_new=True)
-
-
-@app.command()
-def folders(add: list[Path] = typer.Option([], "--add", help="a folder to scan from now on (repeatable)"),
-            remove: list[Path] = typer.Option([], "--remove", help="stop scanning this folder; its games stay in "
-                                                                  "the library (repeatable)"),
-            as_json: bool = typer.Option(False, "--json", help=JSON_HELP)):
-    """The library folders `frameport rescan` (and the GUI's Rescan folders) look in: status, add, remove."""
-    import dataclasses
-    import json
-
-    from .core import folders as lib_folders
-
-    for p in add:
-        try:
-            lib_folders.add(p)
-        except ValueError as exc:
-            raise typer.BadParameter(str(exc)) from None
-        typer.echo(f"added {p}")
-    for p in remove:
-        if lib_folders.remove(p):
-            typer.echo(f"removed {p} (its games stay in the library)")
-        else:
-            typer.echo(f"{p} isn't a library folder", err=True)
-            raise typer.Exit(1)
-    status = lib_folders.status()
-    if as_json:
-        typer.echo(json.dumps([dataclasses.asdict(s) for s in status], indent=1))
-        return
-    if not status:
-        typer.echo("no library folders yet (frameport scan <folder> or frameport folders --add <folder>)")
-    for s in status:
-        typer.echo(f"{'ok' if s.exists else 'MISSING':8} {s.games:4} game(s)  {s.path}")


@app.command("catalog-update")
@@ -795,31 +730,6 @@ def frame_trust_key(frame: Optional[str] = typer.Option(None, help=FRAME_HELP)):
    typer.echo(f"connected: {info.get('hostname') or t.host} (new key saved)")


-@frame_app.command("ssh-keys")
-def frame_ssh_keys(add: list[str] = typer.Option([], "--add", help="a private key file to log in with too"),
-                   remove: list[str] = typer.Option([], "--remove", help="stop using this key file (it stays)")):
-    """Private SSH key files FramePort logs in with besides its own key (Settings → Installing → SSH keys): for a
-    Frame that accepts only your own key. The Frame connection and OpenSSH uploads both use them. Lists them."""
-    from .frame.connection import KeyFileError, add_extra_key, extra_key_status, remove_extra_key
-
-    failed = False
-    for path in remove:
-        typer.echo(f"removed {path}" if remove_extra_key(path) else f"not in the list: {path}")
-    for path in add:
-        try:
-            typer.echo(f"added {add_extra_key(path)}")
-        except KeyFileError as exc:
-            typer.echo(f"can't use {path}: {exc}", err=True)
-            failed = True
-    status = extra_key_status()
-    for path, problem in status:
-        typer.echo(f"{path}" + (f"  (not usable: {problem})" if problem else ""))
-    if not status:
-        typer.echo("no extra keys: FramePort's own key and your SSH agent's keys only")
-    if failed:
-        raise typer.Exit(1)
-
-
@frame_app.command("usb-check")
 def frame_usb_check(frame: Optional[str] = typer.Option(None, help=FRAME_HELP),
                    no_speed: bool = typer.Option(False, help="skip the upload speed test (2 × 128 MB)")):
@@ -1,120 +0,0 @@
-"""Library folders (GitHub discussion #351): the folders "Rescan folders" scans again (library setting `scan.roots`).
-
-Every "Scan a folder…" remembers its folder; Settings → Library folders and `frameport folders` list them with their
-status and let the user add or remove one. Removing a folder only stops it being scanned: the games already in the
-library stay. No Flet here (the CLI uses it too)."""
-from __future__ import annotations
-
-from dataclasses import dataclass
-from pathlib import Path
-
-from . import library
-
-SETTING = "scan.roots"
-
-
-@dataclass
-class FolderStatus:
-    path: str
-    exists: bool
-    games: int  # library games whose files (APK, data or game folder) are in it
-
-
-def roots() -> list[str]:
-    """The remembered folders, in the order they were added (missing ones too)."""
-    return [str(r) for r in (library.setting(SETTING) or [])]
-
-
-def _same(a: str, b: str) -> bool:
-    if a == b:
-        return True
-    try:
-        return Path(a).resolve() == Path(b).resolve()
-    except OSError:
-        return False
-
-
-def remember(path: str | Path) -> list[str]:
-    """Add a folder to the list (a scanned one): moved to the end if it's there already. Returns the new list."""
-    path = str(path)
-    return library.update_setting(SETTING, lambda cur: [r for r in (cur or []) if not _same(str(r), path)] + [path],
-                                  [])
-
-
-def add(path: str | Path) -> list[str]:
-    """Settings/CLI "Add folder…": like remember, but only an existing folder."""
-    p = Path(path).expanduser()
-    if not p.is_dir():
-        raise ValueError(f"{p} isn't a folder")
-    if any(_same(r, str(p)) for r in roots()):
-        return roots()
-    return remember(p)
-
-
-def remove(path: str | Path) -> bool:
-    """Stop scanning a folder (its games stay in the library). False if it wasn't in the list."""
-    path = str(path)
-    found = {"hit": False}
-
-    def drop(cur):
-        keep = [r for r in (cur or []) if not _same(str(r), path)]
-        found["hit"] = len(keep) != len(cur or [])
-        return keep
-    library.update_setting(SETTING, drop, [])
-    return found["hit"]
-
-
-def game_paths(entry: dict) -> list[Path]:
-    """Where a library game's files are (APK, data folder, game folder)."""
-    out = []
-    for key in ("apk", "data_dir", "game_dir"):
-        if entry.get(key):
-            out.append(Path(entry[key]))
-    return out
-
-
-def _inside(p: Path, folder: Path) -> bool:
-    try:
-        return p == folder or p.is_relative_to(folder)
-    except (OSError, ValueError):
-        return False
-
-
-def games_in(folder: str | Path, games: list[dict] | None = None) -> list[dict]:
-    """Library games whose files are in the folder (by path, no disk access)."""
-    folder = Path(folder)
-    games = library.games() if games is None else games
-    return [g for g in games if g.get("kind") != "linux" and any(_inside(p, folder) for p in game_paths(g))]
-
-
-def status() -> list[FolderStatus]:
-    """Each remembered folder: whether it's there now and how many library games come from it. Touches the disk
-    (exists): call it off the UI thread."""
-    games = library.games()
-    out = []
-    for r in roots():
-        try:
-            exists = Path(r).is_dir()
-        except OSError:
-            exists = False
-        out.append(FolderStatus(r, exists, len(games_in(r, games))))
-    return out
-
-
-def rescan_roots() -> list[str]:
-    """Folders "Rescan folders" scans: the remembered ones that exist now. Before anything was remembered (libraries
-    from older versions), the folders the library's games came from (one level up from each game folder). A folder
-    inside another one is scanned with it."""
-    saved = library.setting(SETTING)
-    if saved is not None:
-        found = [r for r in saved if Path(r).exists()]
-    else:
-        seen = set()
-        for g in library.games():
-            if g.get("kind") == "linux":  # added one by one (its origin may be e.g. Downloads)
-                continue
-            origin = g.get("origin") or (str(Path(g["apk"]).parent) if g.get("apk") else None)
-            if origin and Path(origin).parent.exists():
-                seen.add(str(Path(origin).parent))
-        found = sorted(seen)
-    return [r for r in found if not any(o != r and Path(r).is_relative_to(o) for o in found)]
@@ -1,8 +1,8 @@
 """SSH connection to a Steam Frame and the remote agent protocol.

 Authentication: FramePort's own keys first (<user data>/ssh/id_ed25519, installed by the bootstrap script, and
-id_rsa, registered through Valve's devkit pairing, which only takes RSA keys), then key files the user added in
-Settings (EXTRA_KEYS_SETTING), then the user's SSH agent/keys, then a password if given.
+id_rsa, registered through Valve's devkit pairing, which only takes RSA keys), then the user's SSH agent/keys, then a
+password if given.
 """
 from __future__ import annotations

@@ -163,96 +163,6 @@ def app_keys() -> list[paramiko.PKey]:
    return keys


-EXTRA_KEYS_SETTING = "ssh.extra_keys"  # library setting: private key files the user added (Settings → Installing)
-
-
-class KeyFileError(ValueError):
-    """A key file the user named can't be used (missing, not a private key, protected with a passphrase)."""
-
-
-def load_key_file(path) -> paramiko.PKey:
-    """A private key FramePort can log in with, or KeyFileError with a sentence saying why not."""
-    p = Path(path).expanduser()
-    if not p.is_file():
-        raise KeyFileError(f"{p}: file not found")
-    try:
-        return paramiko.PKey.from_path(p)
-    except (paramiko.SSHException, ValueError, OSError, UnicodeDecodeError, TypeError) as exc:
-        # paramiko says so with PasswordRequiredException (PEM) or a plain SSHException (OpenSSH format)
-        if isinstance(exc, paramiko.PasswordRequiredException) or "password" in str(exc).lower():
-            raise KeyFileError(f"{p.name} is protected with a passphrase, which FramePort can't ask for: add the "
-                               "key to your SSH agent instead (FramePort also logs in with the agent's keys)") from None
-        raise KeyFileError(f"{p.name} isn't a private SSH key FramePort can read "
-                           f"(OpenSSH or PEM format; a .pub file is the public half): {exc}") from None
-
-
-def extra_key_paths() -> list[Path]:
-    """The key files from Settings, as stored (each may be missing or unreadable by now: see extra_keys)."""
-    try:
-        from ..core import library
-
-        stored = library.peek_setting(EXTRA_KEYS_SETTING, [])
-    except Exception:  # noqa: BLE001 - no library yet
-        return []
-    if isinstance(stored, str):
-        stored = [stored]
-    paths: list[Path] = []
-    for value in stored if isinstance(stored, list) else []:
-        if isinstance(value, str) and value.strip():
-            p = Path(value.strip()).expanduser()
-            if p not in paths:
-                paths.append(p)
-    return paths
-
-
-def add_extra_key(path) -> Path:
-    """Check a key file (KeyFileError if FramePort can't use it) and add it to Settings. Returns the stored path."""
-    p = Path(path).expanduser()
-    if p.name.endswith(".pub") and p.with_name(p.name[:-4]).is_file():
-        raise KeyFileError(f"{p.name} is the public half: pick {p.name[:-4]} (the file without .pub) instead")
-    load_key_file(p)
-    p = p.resolve()
-    from ..core import library
-
-    library.update_setting(EXTRA_KEYS_SETTING, lambda old: [v for v in (old if isinstance(old, list) else [])
-                                                              if Path(v).expanduser() != p] + [str(p)], [])
-    return p
-
-
-def remove_extra_key(path) -> bool:
-    """Take a key file out of Settings (the file itself stays). False if it wasn't there."""
-    from ..core import library
-
-    p = Path(path).expanduser()
-    before = extra_key_paths()
-    library.update_setting(EXTRA_KEYS_SETTING, lambda old: [v for v in (old if isinstance(old, list) else [])
-                                                              if Path(v).expanduser() != p], [])
-    return p in before
-
-
-def extra_key_status() -> list[tuple[Path, str]]:
-    """Each key file from Settings with "" when usable, else why not (for Settings and the CLI)."""
-    status = []
-    for path in extra_key_paths():
-        try:
-            load_key_file(path)
-            status.append((path, ""))
-        except KeyFileError as exc:
-            status.append((path, str(exc)))
-    return status
-
-
-def extra_keys() -> list[tuple[Path, paramiko.PKey]]:
-    """The usable keys from Settings; unusable ones are logged and skipped (a login still tries the others)."""
-    keys = []
-    for path in extra_key_paths():
-        try:
-            keys.append((path, load_key_file(path)))
-        except KeyFileError as exc:
-            log.warning("SSH key from Settings skipped: %s", exc)
-    return keys
-
-
@dataclass
 class FrameTarget:
    host: str
@@ -358,15 +268,6 @@ def save_target(target: FrameTarget) -> None:
 FAST_LINKS = {"usb0": "USB cable", "wlanap": "the Frame's own Wi-Fi hotspot"}


-def install_key_command(pub: str) -> str:
-    """Shell command that adds `pub` to ~/.ssh/authorized_keys once. A file without a final newline would glue the key
-    onto its last line, where sshd never matches it (GitHub #242: OpenSSH uploads refused FramePort's key)."""
-    q, f = sh_quote(pub), "~/.ssh/authorized_keys"
-    return (f"mkdir -p ~/.ssh && chmod 700 ~/.ssh && touch {f} && "
-            f"{{ grep -qxF {q} {f} || {{ [ -n \"$(tail -c1 {f})\" ] && echo >> {f}; echo {q} >> {f}; }}; }}"
-            f" && chmod 600 {f}")
-
-
 def bundled_agent_version() -> int | None:
    """AGENT_VERSION of the agent this app ships (it's uploaded to the Frame whenever it differs)."""
    try:
@@ -508,10 +409,6 @@ class Frame:
    _video_codec_digest: str = ""  # "<manifest digest>:<on|off>" handled on this connection (incl. a failed install)
    _video_codec_lock: threading.Lock = field(default_factory=threading.Lock)
    home: str = ""
-    # how the last login worked: "app_key" (FramePort's own key), "user_key" (a key file from Settings),
-    # "agent" (this PC's SSH agent / ~/.ssh keys) or "password"; OpenSSH uploads follow it (native_upload)
-    auth: str = ""
-    openssh_relaxed: bool | None = None  # native_upload: True once OpenSSH needed this PC's own keys/agent

    # ------------------------------------------------------------------ connect
    def connect(self, timeout: float = 10) -> Frame:
@@ -562,8 +459,7 @@ class Frame:
        kwargs = dict(hostname=self.target.host, port=self.target.port, username=self.target.user, timeout=timeout,
                      banner_timeout=timeout, auth_timeout=timeout)
        errors = []
-        attempts = ([("app_key", k) for k in app_keys()] + [("user_key", k) for _, k in extra_keys()]
-                    + [("agent", None), ("password", None)])
+        attempts = [("app_key", k) for k in app_keys()] + [("agent", None), ("password", None)]
        for attempt, pkey in attempts:
            if attempt == "password" and not self.password:
                continue
@@ -571,7 +467,7 @@ class Frame:
            client.load_host_keys(str(known))
            client.set_missing_host_key_policy(paramiko.AutoAddPolicy())  # trust on first use (pairing)
            try:
-                if attempt in ("app_key", "user_key"):
+                if attempt == "app_key":
                    client.connect(pkey=pkey, allow_agent=False, look_for_keys=False, **kwargs)
                elif attempt == "agent":
                    client.connect(allow_agent=True, look_for_keys=True, **kwargs)
@@ -596,7 +492,6 @@ class Frame:
                raise
        else:
            raise FrameNotPaired(bool(self.password), errors)
-        self.auth = attempt
        client.save_host_keys(str(known))
        transport = client.get_transport()
        transport.set_keepalive(15)
@@ -684,7 +579,10 @@ class Frame:

    def install_key(self) -> None:
        """After a password login: add FramePort's public key to authorized_keys."""
-        self.run(install_key_command(app_public_key()))
+        pub = app_public_key()
+        self.run("mkdir -p ~/.ssh && chmod 700 ~/.ssh && touch ~/.ssh/authorized_keys && "
+                 f"grep -qxF {sh_quote(pub)} ~/.ssh/authorized_keys || echo {sh_quote(pub)} >> ~/.ssh/authorized_keys"
+                 " && chmod 600 ~/.ssh/authorized_keys")

    # ------------------------------------------------------------------ agent
    def ensure_agent(self) -> str:
@@ -2,9 +2,10 @@
 from __future__ import annotations

 import contextlib
+import csv
+import io
 import os
 import posixpath
-import re
 import shutil
 import signal
 import subprocess
@@ -12,30 +13,19 @@ import tarfile
 import tempfile
 import threading
 import time
-from pathlib import Path, PureWindowsPath
+from pathlib import Path

-from .connection import extra_keys, sh_quote, ssh_dir
+from .connection import sh_quote, ssh_dir


-def quote(value, windows=False) -> str:
-    """One sftp batch argument, taken literally.
-
-    Inside double quotes sftp escapes glob characters (* ? [) itself and undoes that for put's destination, so
-    they must NOT be escaped again: an extra backslash became part of the name (GitHub #324: "[ENG]" in a folder
-    name made every OpenSSH upload fail, on Linux too). Only backslash and the quote are escaped. ``windows``: a
-    local Windows path goes with forward slashes; Win32-OpenSSH's sftp turns every backslash of a local path into
-    '/', escapes included ("C:\\\\Users" → "C://Users").
-    """
+def quote(value) -> str:
    value = str(value)
    if any(c in value for c in "\r\n\x00"):
        raise ValueError("SFTP paths cannot contain newlines or NUL")
-    if windows:
-        value = PureWindowsPath(value).as_posix()
-    return '"' + value.replace("\\", "\\\\").replace('"', '\\"') + '"'
-
-
-def quote_local(path) -> str:
-    return quote(path, windows=os.name == "nt")
+    escaped = value.replace("\\", "\\\\").replace('"', '\\"')
+    for char in "*?[":
+        escaped = escaped.replace(char, "\\" + char)
+    return '"' + escaped + '"'


 def size_of(sftp, path):
@@ -45,74 +35,27 @@ def size_of(sftp, path):
        return 0


-def key_files(relaxed=False) -> list[Path]:
-    """The private keys OpenSSH offers: FramePort's own (<data>/ssh) and the usable key files from Settings;
-    ``relaxed`` also this PC's default keys (default_key_files)."""
-    keys = [ssh_dir() / name for name in ("id_ed25519", "id_rsa") if (ssh_dir() / name).exists()]
-    for path in [path for path, _ in extra_keys()] + (default_key_files() if relaxed else []):
-        if path not in keys:
-            keys.append(path)
-    return keys
-
-
-def default_key_files() -> list[Path]:
-    """This PC's own keys that Paramiko's "agent" login tries (look_for_keys: ~/.ssh/id_rsa, id_dsa, id_ecdsa,
-    id_ed25519; on Windows ~/ssh too), usable without a passphrase. OpenSSH needs them named: it skips its default
-    keys as soon as one -i is given, and Windows OpenSSH refuses a key file others can read (a private copy can't
-    be refused)."""
-    from .connection import KeyFileError, load_key_file
-
-    folders = [Path.home() / ".ssh"] + ([Path.home() / "ssh"] if os.name == "nt" else [])
-    found = []
-    for folder in folders:
-        for name in ("id_rsa", "id_dsa", "id_ecdsa", "id_ed25519"):
-            path = folder / name
-            if not path.is_file():
-                continue
-            try:
-                load_key_file(path)
-            except KeyFileError:
-                continue  # passphrase-protected or not a key: only the agent can use it
-            found.append(path)
-    return found
-
-
-def current_sid() -> str:
-    """This Windows account's SID. whoami prints in the console code page: read bytes, so a user name with
-    accents can't break decoding (only the ASCII SID is used)."""
-    out = subprocess.check_output(["whoami", "/user", "/fo", "csv", "/nh"], **hidden())
-    match = re.search(rb"S-1-[0-9]+(?:-[0-9]+)+", out)
-    if not match:
-        raise OSError("cannot find this Windows account's SID for the key copies' permissions")
-    return match.group().decode()
-
-
@contextlib.contextmanager
-def credentials(frame, port_flag="-P", relaxed=False):
-    """OpenSSH arguments that log in like the Frame connection and trust only the host key it pinned.
-
-    Keys are offered as private temporary copies (that avoids modifying pairing keys, including their Windows
-    ACLs; Windows OpenSSH refuses key files others can read). Strict (default): FramePort's keys and the key
-    files from Settings only (IdentitiesOnly). ``relaxed``: also this PC's default ~/.ssh keys and SSH agent, the
-    way Paramiko's "agent" login does (GitHub #242: a Frame that only authorizes the user's own key). Verbose
-    (-v), so a refused login can say which keys were offered (failure()).
-    """
-    key_paths = key_files(relaxed)
-    if not key_paths and not relaxed:
+def credentials(frame, port_flag="-P"):
+    """Private temporary copies avoid modifying pairing keys, including their Windows ACLs."""
+    key_paths = [ssh_dir() / name for name in ("id_ed25519", "id_rsa") if (ssh_dir() / name).exists()]
+    if not key_paths:
        raise OSError("no FramePort key available for OpenSSH")
    key = frame.client.get_transport().get_remote_server_key()
    with tempfile.TemporaryDirectory(prefix="frameport-upload-") as directory:
        directory = Path(directory)
        sid = None
        if os.name == "nt":
-            sid = current_sid()
+            row = next(csv.reader(io.StringIO(subprocess.check_output(
+                ["whoami", "/user", "/fo", "csv", "/nh"], text=True, **hidden()))))
+            sid = row[-1]
            subprocess.run(["icacls", str(directory), "/inheritance:r", "/grant:r", f"*{sid}:(OI)(CI)F"],
                           check=True, stdout=subprocess.DEVNULL, **hidden())
        else:
            directory.chmod(0o700)
        copies = []
-        for n, path in enumerate(key_paths):
-            copy = directory / f"key{n}"  # own names: a key from Settings may be called id_ed25519 too
+        for path in key_paths:
+            copy = directory / path.name
            shutil.copyfile(path, copy)
            if sid:
                subprocess.run(["icacls", str(copy), "/inheritance:r", "/remove:g", "*S-1-3-4",
@@ -123,72 +66,13 @@ def credentials(frame, port_flag="-P", relaxed=False):
        known = directory / "known_hosts"
        host = frame.target.host if frame.target.port == 22 else f"[{frame.target.host}]:{frame.target.port}"
        known.write_text(f"{host} {key.get_name()} {key.get_base64()}\n")
-        yield ["-F", os.devnull, "-v", *copies, "-o", "BatchMode=yes",
-               *([] if relaxed else ["-o", "IdentitiesOnly=yes"]),
+        yield ["-F", os.devnull, *copies, "-o", "BatchMode=yes", "-o", "IdentitiesOnly=yes",
               "-o", "StrictHostKeyChecking=yes", "-o", f'UserKnownHostsFile="{known.as_posix()}"',
               "-o", f"GlobalKnownHostsFile={os.devnull}", "-o", "ConnectTimeout=10",
               "-o", "ServerAliveInterval=10", "-o", "ServerAliveCountMax=3",
               port_flag, str(frame.target.port)]


-class OpenSSHAuthFailed(OSError):
-    """OpenSSH reached the Frame but the login was refused (the keys it offered aren't authorized there)."""
-
-
-AUTH_REFUSED = ("Permission denied (", "Too many authentication failures", "No more authentication methods")
-# debug lines (-v) worth keeping: which keys were found, offered, refused or unreadable
-AUTH_DEBUG = ("identity file", "Offering public key", "Server accepts key", "Will attempt key",
-              "Authentications that can continue", "Authenticated to", "Load key", "no such identity",
-              "Skipping", "agent", "Next authentication method")
-
-
-def failure(what: str, code, stderr: bytes) -> OSError:
-    """The error for a failed OpenSSH run: OpenSSH's own messages (all non-debug lines: warnings such as
-    "UNPROTECTED PRIVATE KEY FILE" included) plus the -v lines about keys; OpenSSHAuthFailed for a refused login."""
-    text = stderr.decode(errors="replace").replace("\r\n", "\n")
-    lines = [line for line in text.splitlines() if line.strip() and (
-        not line.startswith("debug") or any(k in line for k in AUTH_DEBUG))]
-    detail = "\n".join(lines)
-    if len(detail) > 4000:
-        detail = "…" + detail[-4000:]
-    refused = code == 255 and any(marker in text for marker in AUTH_REFUSED)
-    return (OpenSSHAuthFailed if refused else OSError)(f"{what} failed ({code}): {detail}")
-
-
-def login_modes(frame) -> list[bool]:
-    """How OpenSSH logs in, in order (False = FramePort's keys only, True = also this PC's keys and agent).
-
-    A Frame connection that logged in with this PC's own keys/agent (Paramiko's "agent" attempt) goes straight to
-    relaxed: FramePort's key isn't authorized there. Else strict first, relaxed once more after a refused login.
-    A mode that worked is kept for the rest of the connection. FramePort doesn't add its key to the Frame for
-    this: it only does that after a password login, where the user typed the Frame's password for it."""
-    known = getattr(frame, "openssh_relaxed", None)
-    if known is not None:
-        return [bool(known)]
-    if getattr(frame, "auth", "") == "agent":
-        return [True]
-    return [False, True]
-
-
-def with_login_modes(frame, reporter, run):
-    """run(relaxed) in each login mode until one isn't refused (see login_modes)."""
-    modes = login_modes(frame)
-    if modes == [True] and getattr(frame, "openssh_relaxed", None) is None:
-        reporter.log("the Frame connection logged in with this PC's own SSH keys or agent: OpenSSH uses them too")
-    for n, relaxed in enumerate(modes):
-        try:
-            result = run(relaxed)
-        except OpenSSHAuthFailed as exc:
-            if n == len(modes) - 1:
-                raise
-            reporter.log(f"OpenSSH login with FramePort's SSH keys was refused; trying this PC's own SSH keys and "
-                         f"agent too. {exc}")
-            continue
-        with contextlib.suppress(AttributeError):
-            frame.openssh_relaxed = relaxed
-        return result
-
-
 def hidden():
    return {"creationflags": subprocess.CREATE_NO_WINDOW} if os.name == "nt" else {}

@@ -215,11 +99,6 @@ def upload(frame, items, remote_root, reporter, total, sent, workers):
    Only successful batches are promoted, after every process has exited successfully. All control operations
    happen in the supervising thread, so Paramiko's SFTP client is never shared across threads.
    """
-    return with_login_modes(frame, reporter, lambda relaxed: _upload(
-        frame, items, remote_root, reporter, total, sent, workers, relaxed))
-
-
-def _upload(frame, items, remote_root, reporter, total, sent, workers, relaxed):
    executable = shutil.which("sftp")
    if not executable:
        raise OSError("system OpenSSH SFTP is unavailable")
@@ -232,7 +111,7 @@ def _upload(frame, items, remote_root, reporter, total, sent, workers, relaxed):
    sizes, offsets, progress = {}, {}, {}
    for path, rel, size in sorted(items, key=lambda item: item[2], reverse=True):
        remote = posixpath.join(remote_root, rel)
-        quote_local(path)
+        quote(path)
        quote(remote)
        offset = size_of(frame.sftp, remote + ".part")
        if offset > size:
@@ -248,7 +127,7 @@ def _upload(frame, items, remote_root, reporter, total, sent, workers, relaxed):
    speed = Speed(total - sent - sum(offsets.values()))
    reporter.log(f"uploading large files with OpenSSH SFTP ({len(groups)} workers)")
    setup_started = time.monotonic()
-    with credentials(frame, relaxed=relaxed) as args, contextlib.ExitStack() as stack:
+    with credentials(frame) as args, contextlib.ExitStack() as stack:
        monitor = stack.enter_context(frame.client.open_sftp())
        monitor.get_channel().settimeout(2)
        reporter.log(f"OpenSSH credentials and progress connection ready in {time.monotonic() - setup_started:.2f}s")
@@ -260,7 +139,7 @@ def _upload(frame, items, remote_root, reporter, total, sent, workers, relaxed):
                for path, rel, _ in group:
                    remote = posixpath.join(remote_root, rel) + ".part"
                    command = "reput" if offsets[rel] else "put"
-                    batch.write(f"{command} {quote_local(path)} {quote(remote)}\n".encode())
+                    batch.write(f"{command} {quote(path)} {quote(remote)}\n".encode())
                batch.seek(0)
                errors = stack.enter_context(tempfile.TemporaryFile())
                process = subprocess.Popen([executable, *args, "-b", "-",
@@ -273,7 +152,8 @@ def _upload(frame, items, remote_root, reporter, total, sent, workers, relaxed):
                for process, errors in processes:
                    if process.poll() not in (None, 0):
                        errors.seek(0)
-                        raise failure("OpenSSH SFTP", process.returncode, errors.read())
+                        detail = errors.read().decode(errors="replace")[-1500:]
+                        raise OSError(f"OpenSSH SFTP failed ({process.returncode}): {detail}")
                for rel, size in sizes.items():
                    reporter.check_cancel()
                    progress[rel] = max(progress[rel], min(size, size_of(
@@ -307,16 +187,11 @@ def _upload(frame, items, remote_root, reporter, total, sent, workers, relaxed):

 def put_tar(frame, files, remote_root, reporter, progress):
    """Stream a tar batch over paired OpenSSH; supervise writes so Cancel also stops a blocked pipe."""
-    return with_login_modes(frame, reporter,
-                            lambda relaxed: _put_tar(frame, files, remote_root, reporter, progress, relaxed))
-
-
-def _put_tar(frame, files, remote_root, reporter, progress, relaxed):
    executable = shutil.which("ssh")
    if not executable:
        raise OSError("system OpenSSH SSH is unavailable")
    reporter.check_cancel()
-    with credentials(frame, port_flag="-p", relaxed=relaxed) as args, tempfile.TemporaryFile() as errors:
+    with credentials(frame, port_flag="-p") as args, tempfile.TemporaryFile() as errors:
        command = f"mkdir -p {sh_quote(remote_root)} && tar -xf - -C {sh_quote(remote_root)}"
        process = subprocess.Popen([executable, *args, f"{frame.target.user}@{frame.target.host}", command],
                                   stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=errors,
@@ -347,14 +222,12 @@ def _put_tar(frame, files, remote_root, reporter, progress, relaxed):
                if not writer.is_alive() and process.poll() is None:
                    time.sleep(0.1)
            reporter.check_cancel()
-            if failures and process.poll() is None:  # a refused login shows as a broken pipe first
-                with contextlib.suppress(subprocess.TimeoutExpired):
-                    process.wait(timeout=2)
-            if process.poll() not in (None, 0):
-                errors.seek(0)
-                raise failure("OpenSSH tar", process.returncode, errors.read())
            if failures:
                raise failures[0]
+            if process.poll() != 0:
+                errors.seek(0)
+                raise OSError(f"OpenSSH tar failed ({process.returncode}): "
+                              + errors.read().decode(errors="replace")[-1500:])
        finally:
            stop_process(process)
            writer.join()
@@ -94,14 +94,12 @@
 "AC Nexus: no AppSW at 72 Hz": "",
 "AC Nexus: no AppSW at 90 Hz": "",
 "Activity": "",
- "Add a key file…": "",
 "Add a Linux app folder…": "",
 "Add a Linux app…": "",
 "Add a PC game folder…": "",
 "Add a tag": "",
 "Add a Windows program…": "",
 "Add an APK…": "",
- "Add folder…": "",
 "Add from a link…": "",
 "Add games": "",
 "Add this tag": "",
@@ -238,7 +236,6 @@
 "Check now": "",
 "Check program": "",
 "Check that the Frame and this PC are on the same network.": "",
- "Checking folders…": "",
 "Checking for updates": "",
 "Checking this PC…": "",
 "Checking tools…": "",
@@ -453,7 +450,6 @@
 "Every 5 s, logs per located space how far the requested times are from the frame's predicted display time, and the runtime clock's offset from the monotonic clock. No effect on the game.": "",
 "Every key goes through": "",
 "Every N seconds, saves the left-eye image the game submits (a quarter of its size) as fb_snap_0-7.ppm in the game's files folder on the Frame. Launch tests run without anyone wearing the headset, so the headset view stays black; this shows what the game itself draws. OpenGL ES games only.": "",
- "Every Scan a folder… adds its folder here. Rescan folders looks in them for new games, and for games you moved: a game whose files are gone from their old place is pointed at the same copy in its new place. Another version found there is only taken by Scan a folder…; Rescan leaves it for you to choose (Update with a newer version… on the game's page). Removing a folder only stops it being scanned: its games stay in the library.": "",
 "Every shot you take in the headset": "",
 "Every uploaded file is present with the right size.": "",
 "Every {n}": "",
@@ -561,7 +557,6 @@
 "Frame OpenXR compatibility layer": "",
 "FrameBridge OpenXR adapter": "",
 "FramePort": "",
- "FramePort also logs in with {name} from the next connection.": "",
 "FramePort can't update itself in {value} (no permission) — opening the release page to download it": "",
 "FramePort changelog": "",
 "FramePort checks GitHub for a new version every few hours. Update now downloads and checks it, then restarts FramePort; your games and settings stay.": "",
@@ -573,7 +568,6 @@
 "FramePort isn't sure which program starts this game. Open the game and use … → Change program… to pick it.": "",
 "FramePort keeps its own copies; nothing is installed system-wide": "",
 "FramePort live view": "",
- "FramePort logs in to the Frame with its own key. If your Frame accepts only one of your own keys, add that private key file here; fast uploads use it too. A key with a passphrase: add it to your SSH agent instead.": "",
 "FramePort looked at your last session of {n} game and has something to try.": [
  "",
  ""
@@ -854,7 +848,6 @@
 "Lets you type into this app's text fields on the Frame (they'd close at once).": "",
 "Letters, Enter, Backspace, arrows, Esc and shortcuts reach the headset.": "",
 "Library": "",
- "Library folders": "",
 "Link": "",
 "Linux": "",
 "Linux app": "",
@@ -961,7 +954,6 @@
 "No file at that path": "",
 "No folder at that path": "",
 "No folders to rescan yet — add games with Scan a folder…": "",
- "No folders yet. Add one here, or use Scan a folder… in the Library.": "",
 "No Frame connected: the game goes to your library now and installs when the Frame connects.": "",
 "No FramePort game is running. Start one, or switch the filter to see everything.": "",
 "No Frames found. New Frame? Use Start setup above. Otherwise turn on Developer Mode and keep the Frame on this network.": "",
@@ -969,7 +961,6 @@
 "No keyboard? Open {page} in Chromium on the Frame, copy the line and paste it into Konsole. This PC shows there as \"{words}\".": "",
 "No limit": "",
 "No matching files": "",
- "No new games in that folder": "",
 "No new games in {name}": "",
 "No other Frames remembered yet.": "",
 "No process matches.": "",
@@ -985,7 +976,6 @@
 "Not connected: {error}": "",
 "Not enough space on the Frame": "",
 "Not enough space on the Frame ({detail}). Uninstall games you don't play or free up space on the Steam Frame page.": "",
- "Not found (moved, deleted or on a drive that isn't connected)": "",
 "Not from a FramePort game": "",
 "Not installed": "",
 "Not installed yet (needs Developer Mode)": "",
@@ -1039,7 +1029,6 @@
 "On your Frame": "",
 "on: {names}": "",
 "One PC game folder": "",
- "Only FramePort's own key, and your SSH agent's keys.": "",
 "Only if 360° pictures show wrongly.": "",
 "Only if 360° pictures show wrongly: 1 = upside down, 2 = mirrored, 4 = turned around (add values to combine).": "",
 "Only install software from sites you trust. FramePort downloads it from {host} and installs it on your Frame.": "",
@@ -1152,7 +1141,6 @@
 "Pretty smooth": "",
 "Prevents a start-up crash in some Unreal games.": "",
 "Previous": "",
- "Private SSH key file (not the .pub file)": "",
 "Problems and feedback": "",
 "Processes": "",
 "Processor": "",
@@ -1219,7 +1207,6 @@
 "Remembered": "",
 "Remove": "",
 "Remove converted copies now": "",
- "Remove folder": "",
 "Remove from library…": "",
 "Remove localized app names": "",
 "Remove tag": "",
@@ -1268,12 +1255,7 @@
 "Report a problem…": "",
 "Reports Frame controllers as Oculus Touch and hides synthetic hand tracking. Set 0 for games that require hand tracking (for example Silhouette).": "",
 "Rescan folders": "",
- "Rescan folders in the Library looks in these folders for new games and for games that moved there.": "",
- "Rescan folders won't look in {path} any more. The {n} game from it stays in your library (nothing is deleted).": [
-  "",
-  ""
- ],
- "Rescanning {n} folder for new and moved games": [
+ "Rescanning {n} folder for new games": [
  "",
  ""
 ],
@@ -1335,7 +1317,7 @@
 "Scales every controller vibration the game asks for (0-1): plain vibrations, Meta's amplitude envelopes and PCM buffers. For games whose vibrations feel much stronger than on a Quest.": "",
 "Scan a folder…": "",
 "Scan {name}": "",
- "Scans your game folders again and adds new games. A game you moved into one of them gets its new place; games already in the library keep their name, recipe, tags and art. Settings → Library folders lists the folders.": "",
+ "Scans your game folders again and adds new games. Games already in the library keep their recipe, tags and art.": "",
 "Screenshot copied. Paste it anywhere.": "",
 "Screenshot taken": "",
 "Screenshots": "",
@@ -1434,7 +1416,6 @@
 "Sound on": "",
 "Source": "",
 "square, 256 × 256": "",
- "SSH keys": "",
 "Stable (default)": "",
 "Stand in for cube layers": "",
 "Standard for every game": "",
@@ -1485,9 +1466,6 @@
 "Stereo (3D) 360° layers: 0 = as the game sends them, 2 = flat (the left image to both eyes).": "",
 "Stop": "",
 "Stop objects popping in and out": "",
- "Stop scanning this folder": "",
- "Stop scanning this folder?": "",
- "Stop using this key (the file stays)": "",
 "Stopped: {why}": "",
 "Stops a black picture in Minecraft launchers (for example QuestCraft).": "",
 "Stops a crash a few seconds after start in some Unreal games with anti-aliasing (for example Star Wars Pinball VR).": "",
@@ -1539,7 +1517,6 @@
 "Test Proton on the Frame": "",
 "Text and layout size": "",
 "That APK is a different app, not {title}.": "",
- "That key can't be used: {error}": "",
 "That theme file can't be used: {error}": "",
 "That's me!": "",
 "The APK file is damaged or incomplete. Get the game again and rescan the folder.": "",
@@ -1739,10 +1716,6 @@
 "Update tools": "",
 "Update with a newer APK…": "",
 "Update with a newer version…": "",
- "Updated the location of {n} game": [
-  "",
-  ""
- ],
 "Updates": "",
 "Updates every game marked \"Update ready\", one after another.": "",
 "Updates the game, frame rate and battery every 5 seconds. Turn off to save the Frame's power.": "",
@@ -1938,22 +1911,6 @@
  "",
  ""
 ],
- "{n} game has another version there (left alone: Update with a newer version… on its page)": [
-  "",
-  ""
- ],
- "{n} game in the library": [
-  "",
-  ""
- ],
- "{n} game is already in the library from another folder": [
-  "",
-  ""
- ],
- "{n} game now uses the other version found there": [
-  "",
-  ""
- ],
 "{n} game ran into a problem": [
  "",
  ""
@@ -28,115 +28,15 @@ from .sources import quest_dump, rift_dump
 from .targets.base import PC_LABEL, Target


-@dataclasses.dataclass
-class ScanReport:
-    """What a scan did with games already in the library that it found at another place (GitHub discussion #351).
-    Each item: {"package", "title", "path": the copy found, "old": where the library had it}.
-    moved: the library's copy is gone and the found one is the same build: the entry now points at it (title, tags,
-    art, recipe, builds and installs stay). updated: the library's copy is gone and the found one is another version:
-    taken like "Update with a newer APK…" (only by Scan a folder…, which the user pointed at that folder).
-    other_version: the same on Rescan folders: left alone, the user decides. other_copy: the library's copy is still
-    there: it stays."""
-    moved: list[dict] = dataclasses.field(default_factory=list)
-    updated: list[dict] = dataclasses.field(default_factory=list)
-    other_version: list[dict] = dataclasses.field(default_factory=list)
-    other_copy: list[dict] = dataclasses.field(default_factory=list)
-
-    def handled(self) -> set[str]:
-        return {i["package"] for i in self.moved + self.updated + self.other_version + self.other_copy}
-
-    def note(self, kind: str, entry: dict, path, reporter: Reporter | None = None) -> None:
-        item = {"package": entry["package"], "title": entry.get("title") or entry["package"], "path": str(path),
-                "old": entry.get("apk") or entry.get("game_dir")}
-        getattr(self, kind).append(item)
-        if reporter:
-            reporter.log({
-                "moved": "{title}: moved, now uses {path}",
-                "updated": "{title}: another version found at {path}; the library now uses it (title, tags, art and "
-                           "your own recipe stay)",
-                "other_version": "{title}: another version found at {path}; left alone (to switch to it: \"Update "
-                                 "with a newer APK…\" or \"…version…\" on the game's page, or Scan a folder… on "
-                                 "that folder)",
-                "other_copy": "{title}: another copy at {path} is left out (the library keeps {old})",
-            }[kind].format(**item))
-
-
-def _same_path(a, b) -> bool:
-    try:
-        return Path(a).resolve() == Path(b).resolve()
-    except OSError:
-        return str(a) == str(b)
-
-
-def source_present(entry: dict) -> bool:
-    """The game's own files are where the library says (Quest/Android: APK + data; PC VR: the game folder)."""
-    try:
-        if is_rift(entry) or is_linux(entry):
-            return bool(entry.get("game_dir")) and Path(entry["game_dir"]).is_dir()
-        check_source(entry)
-        return True
-    except Exception:  # noqa: BLE001 - missing, or on a drive that isn't connected
-        return False
-
-
-def _missing_note(entry: dict, reporter: Reporter | None) -> None:
-    if reporter:
-        reporter.log(f"{entry.get('title') or entry['package']}: its files aren't at "
-                     f"{entry.get('apk') or entry.get('game_dir')} any more (moved, deleted, or on a drive that "
-                     "isn't connected)")
-
-
-def same_quest_build(entry: dict, apk: Path) -> bool:
-    """The APK is the build the library entry was made from: the same SHA-256 (recorded when it was added), else the
-    same versionName."""
-    if entry.get("source_sha256"):
-        try:
-            return builder.sha256(Path(apk)) == entry["source_sha256"]
-        except OSError:
-            return False
-    ver = (entry.get("analysis") or {}).get("version")
-    return bool(ver) and quest_dump.version_name(Path(apk)) == ver
-
-
-def relink_quest(package: str, src: SourceGame) -> dict | None:
-    """Point a Quest/Android entry at the same build in another place: only where its files are changes."""
-    from .core.models import data_manifest
-
-    manifest = data_manifest(src.data_dir, src.data_files)
-    fields = dict(name=src.name, apk=str(src.apk), data_dir=str(src.data_dir) if src.data_dir else None,
-                  data_files=src.data_files, data_bytes=sum(manifest.values()), data_manifest=manifest,
-                  origin=str(src.origin) if src.origin else None)
-    return library.update_game(package, lambda g: g.update(fields))
-
-
-def _known_quest(src: SourceGame, old: dict, reporter: Reporter | None, allow_update: bool,
-                 report: ScanReport) -> None:
-    """A Quest/Android game of the library found at another place than the library's copy (see ScanReport)."""
-    if source_present(old):
-        report.note("other_copy", old, src.apk, reporter)
-        return
-    _missing_note(old, reporter)
-    if same_quest_build(old, src.apk):
-        relink_quest(old["package"], src)
-        report.note("moved", old, src.apk, reporter)
-    elif allow_update:
-        replace_apk(old["package"], src.apk, reporter, found=src)
-        report.note("updated", old, src.apk, reporter)
-    else:
-        report.note("other_version", old, src.apk, reporter)
-
-
 def add_path(path: Path, reporter: Reporter | None = None, on_added=None, force_rift: bool = False,
-             art: bool = False, only_new: bool = False, report: ScanReport | None = None) -> list[dict]:
+             art: bool = False, only_new: bool = False) -> list[dict]:
    """Scan a file/folder (recursively), analyze every game found (Quest APKs and Rift game folders) and store it with
    a suggested recipe. on_added(entry) is called as each game lands in the library (the GUI streams cards in).
    force_rift: `path` is one Rift game folder (added even if no VR runtime is detected). art: fetch artwork too.
    only_new: skip Quest APKs already in the library (a rescan for games added since; Rift folders already skip
-    unchanged games). A game of the library found at another place (moved, a second copy, another version) is put in
-    `report` (ScanReport), not in the returned list."""
+    unchanged games)."""
    path = Path(path)
    added = []
-    report = report if report is not None else ScanReport()
    known_apks = {str(Path(g["apk"]).resolve()) for g in library.games() if g.get("apk")} if only_new else set()
    # entries made from AXRB's PC-patched copies (no OBBs; older FramePort scanned them) get the original download
    known_packages = {g["package"] for g in library.games()
@@ -145,8 +45,6 @@ def add_path(path: Path, reporter: Reporter | None = None, on_added=None, force_
    def done(entry):
        if only_new and entry["package"] in known_packages:  # already in the library (e.g. an unchanged Rift folder)
            return
-        if entry["package"] in report.handled():  # moved, another copy or version: reported, not "added"
-            return
        added.append(entry)
        if on_added:
            on_added(entry)
@@ -156,21 +54,12 @@ def add_path(path: Path, reporter: Reporter | None = None, on_added=None, force_
                reporter.check_cancel()
            if only_new and str(Path(src.apk).resolve()) in known_apks:
                continue
-            try:
-                pkg = quest_dump._package_of(src.apk)
-            except Exception:  # noqa: BLE001
-                pkg = None
-            old = library.game(pkg) if pkg else None
-            if old and old.get("apk") and not is_rift(old) and not is_linux(old) \
-                    and not _same_path(old["apk"], src.apk) and not quest_dump._axrb_patched(Path(old["apk"])):
+            if only_new:  # another copy of a game already in the library (e.g. a patched build): leave it alone
                try:
-                    _known_quest(src, old, reporter, not only_new, report)
-                except Exception as exc:  # noqa: BLE001 - keep scanning
-                    if reporter:
-                        reporter.log(f"skipped {src.apk.name}: {exc}")
-                continue
-            if only_new and pkg in known_packages:  # (e.g. an entry without an APK)
-                continue
+                    if quest_dump._package_of(src.apk) in known_packages:
+                        continue
+                except Exception:  # noqa: BLE001
+                    pass
            try:
                entry = add_game(src, reporter)
                if art:
@@ -198,8 +87,7 @@ def add_path(path: Path, reporter: Reporter | None = None, on_added=None, force_
                reporter.check_cancel()
                reporter.progress(i / max(len(folders), 1), f"{i + 1} / {len(folders)} · {folder.name}")
            try:
-                entry = add_rift_game(folder, reporter, tree=trees.get(folder), force=force_rift, art=art,
-                                      report=report, allow_update=not only_new)
+                entry = add_rift_game(folder, reporter, tree=trees.get(folder), force=force_rift, art=art)
                if entry and art and not entry.get("details"):
                    fetch_details(entry["package"], reporter)
                    entry = library.game(entry["package"])
@@ -208,8 +96,6 @@ def add_path(path: Path, reporter: Reporter | None = None, on_added=None, force_
            except Exception as exc:
                if reporter:
                    reporter.log(f"skipped {folder.name}: {exc}")
-    if reporter and report.moved:
-        reporter.log(f"Updated the location of {len(report.moved)} game(s)")
    return added


@@ -250,70 +136,12 @@ def _existing_rift(folder: Path) -> dict | None:
    return None


-def _rift_program(entry: dict) -> tuple[str, int] | None:
-    """(program path in the game folder, its size) from a PC VR entry's fingerprint."""
-    fp = (((entry.get("analysis") or {}).get("extra") or {}).get("fingerprint")) or ""
-    parts = fp.rsplit(":", 3)
-    if len(parts) == 4 and parts[0] and parts[1].isdigit():
-        return parts[0], int(parts[1])
-    return None
-
-
-def _file_size(path: Path) -> int | None:
-    try:
-        return path.stat().st_size if path.is_file() else None
-    except OSError:
-        return None
-
-
-def _same_rift_build(entry: dict, folder: Path) -> bool:
-    """The folder holds the build the entry was made from: its program at the same place with the same size."""
-    prog = _rift_program(entry)
-    if prog:
-        return _file_size(folder / prog[0]) == prog[1]
-    return bool(entry.get("exe")) and _file_size(folder / entry["exe"]) is not None
-
-
-def _moved_rift(folder: Path, tree) -> dict | None:
-    """The library's PC VR entry this folder is another copy of (it was found elsewhere before): the same game id,
-    else an entry whose folder is gone and whose program (path and size) is in this folder."""
-    from .analysis import rift
-
-    rifts = [g for g in library.games() if g.get("kind") == "rift" and g.get("game_dir")
-             and not _same_path(g["game_dir"], folder)]
-    same = library.game(rift.game_id(folder, getattr(tree, "manifest", None)))
-    if same is not None and any(g["package"] == same["package"] for g in rifts):
-        return same
-    gone = [g for g in rifts if (p := _rift_program(g)) and _file_size(folder / p[0]) == p[1]
-            and not source_present(g)]
-    return gone[0] if len(gone) == 1 else None
-
-
-def _relink_rift(entry: dict, folder: Path) -> dict | None:
-    """Point a PC VR entry at the same build in another folder: only where its files are changes."""
-    from .analysis import rift
-
-    new_fp = rift.fingerprint(folder, entry.get("exe") or "")
-
-    def change(g: dict) -> None:
-        g.update(game_dir=str(folder), origin=str(folder.parent), name=folder.name)
-        extra = (g.get("analysis") or {}).setdefault("extra", {}) if isinstance(g.get("analysis"), dict) else {}
-        extra["folder"] = str(folder)
-        old_fp = extra.get("fingerprint") or ""
-        # (copies may get a new date; a fingerprint of an older analysis stays so the next scan analyzes it again)
-        if new_fp and old_fp.rsplit(":", 1)[-1] == new_fp.rsplit(":", 1)[-1]:
-            extra["fingerprint"] = new_fp
-    return library.update_game(entry["package"], change)
-
-
 def add_rift_game(folder: Path, reporter: Reporter | None = None, tree=None, exe: str | None = None,
-                  force: bool = False, art: bool = False, replace: dict | None = None,
-                  report: ScanReport | None = None, allow_update: bool = True) -> dict | None:
+                  force: bool = False, art: bool = False, replace: dict | None = None) -> dict | None:
    """Analyze one Rift game folder and store it. Unchanged folders (same program, size, date) are not analyzed again;
    the user's exe choice, recipe and tags survive rescans. Returns None for folders without a VR runtime (unless
    force). replace: the library entry this folder is a newer version of (replace_rift_game): it keeps its package and
-    name. A game of the library whose folder moved here gets this folder (report: ScanReport; allow_update: another
-    version of it may replace it, see ScanReport)."""
+    name."""
    from .analysis import rift
    from .recommend import catalog

@@ -324,27 +152,6 @@ def add_rift_game(folder: Path, reporter: Reporter | None = None, tree=None, exe
            reporter.log(f"skipped {folder.name}: an older version of a game that was updated from another folder")
        return None
    old = replace or _existing_rift(folder)
-    if old is None and exe is None:  # (set_exe passes the entry's own folder)
-        tree = tree or rift.walk(folder)
-        other = _moved_rift(folder, tree)
-        if other is not None:
-            report = report if report is not None else ScanReport()
-            if source_present(other):
-                report.note("other_copy", other, folder, reporter)
-                return None
-            _missing_note(other, reporter)
-            if not _same_rift_build(other, folder):
-                if not allow_update:
-                    report.note("other_version", other, folder, reporter)
-                    return None
-                replace_rift_game(other["package"], folder, reporter)
-                report.note("updated", other, folder, reporter)
-                return library.game(other["package"])
-            _relink_rift(other, folder)
-            report.note("moved", other, folder, reporter)
-            if art and not _has_art(other["package"]):
-                _rift_art(library.game(other["package"]), reporter)
-            return library.game(other["package"])
    old_extra = ((old or {}).get("analysis") or {}).get("extra") or {}
    forced = exe is not None or replace is not None  # set_exe / a newer version: always analyze
    if replace is None:
@@ -831,16 +638,13 @@ def add_game(src: SourceGame, reporter: Reporter | None = None) -> dict:
    old = library.game(a.package) or {}
    # a name the user chose (Rename…, an install link) stays when the game is scanned again
    names = {"auto_title": recipe.title or a.label} if old.get("title_locked") else {"title": recipe.title or a.label}
-    # a recipe the user edited stays when the game is scanned again (only the suggestion is refreshed, like Analyze
-    # again); a derived one follows the new analysis
-    own = {} if (old.get("recipe") or {}).get("source") == "user" else \
-        {"recipe": library.recipe_to_dict(recipe), "status": recipe.status}
    return library.upsert_game(
        a.package, **names, name=src.name, apk=str(src.apk),
        data_dir=str(src.data_dir) if src.data_dir else None, data_files=src.data_files,
        data_bytes=sum(manifest.values()), data_manifest=manifest, source_sha256=builder.sha256(src.apk),
        origin=str(src.origin),
-        analysis=a.to_dict(), suggested=library.recipe_to_dict(recipe), **own,
+        analysis=a.to_dict(), recipe=library.recipe_to_dict(recipe), suggested=library.recipe_to_dict(recipe),
+        status=recipe.status,
    )


@@ -857,17 +661,16 @@ class WrongPackage(ValueError):
    """The picked APK is another app than the game it should update."""


-def replace_apk(package: str, apk: Path, reporter: Reporter | None = None, found: SourceGame | None = None) -> dict:
+def replace_apk(package: str, apk: Path, reporter: Reporter | None = None) -> dict:
    """A newer APK for a Quest/Android game already in the library (GitHub #161): the entry points at it from now on.
    Its title, art, tags and the user's own recipe stay (a suggested recipe follows the new analysis, like Analyze
-    again). The game data stays where it was unless the new APK's folder brings its own. found: the game as a scan
-    found it (its data folder). Returns {"entry", "older": the new versionCode is lower than the old one's,
-    "old_version", "new_version"}."""
+    again). The game data stays where it was unless the new APK's folder brings its own. Returns {"entry", "older":
+    the new versionCode is lower than the old one's, "old_version", "new_version"}."""
    entry = library.game(package)
    if entry is None or is_rift(entry) or is_linux(entry):
        raise ValueError("only Quest/Android games can get a newer APK")
    apk = Path(apk)
-    src = found or quest_dump.from_path(apk)
+    src = quest_dump.from_path(apk)
    new_pkg, new_vc = quest_dump._apk_ids(apk)
    if src is None or new_pkg is None:
        raise ValueError(f"{apk.name} isn't a readable APK")
@@ -882,14 +685,8 @@ def replace_apk(package: str, apk: Path, reporter: Reporter | None = None, found
    a = analyze(apk, data_bytes=src.data_bytes())
    a.extra["lang_packs"] = langpacks.find_tags(_data_folder(src))
    a.extra["asset_files"] = langpacks.find_content_files(_data_folder(src))
-    fields = dict(apk=str(apk), data_dir=str(src.data_dir) if src.data_dir else None, data_files=src.data_files,
-                  data_bytes=src.data_bytes(), source_sha256=builder.sha256(apk))
-    if found is not None:  # found by a scan: where it was found
-        from .core.models import data_manifest
-
-        fields.update(name=src.name, origin=str(src.origin) if src.origin else entry.get("origin"),
-                      data_manifest=data_manifest(src.data_dir, src.data_files))
-    library.upsert_game(package, **fields)
+    library.upsert_game(package, apk=str(apk), data_dir=str(src.data_dir) if src.data_dir else None,
+                        data_files=src.data_files, data_bytes=src.data_bytes())
    stored = _store_analysis(package, a)
    return {"entry": stored, "older": bool(old_vc and new_vc and new_vc < old_vc), "old_version": old_vc,
            "new_version": new_vc}
@@ -45,16 +45,6 @@ def _apk_ids(apk: Path) -> tuple[str | None, int | None]:
    return a.package, vc


-def version_name(apk: Path) -> str | None:
-    """The APK's versionName (None if it can't be read)."""
-    try:
-        from pyaxmlparser import APK
-
-        return APK(str(apk)).version_name or None
-    except Exception:
-        return None
-
-
 def _package_of(apk: Path) -> str | None:
    return _apk_ids(apk)[0]

@@ -1,160 +0,0 @@
-"""The announcement pop-up (frameport.announcements does the fetching and the who-sees-it rules): checked in the
-background a little after start and every 6 h, shown once when no other dialog is open and the welcome screen is done.
-Any way of closing it (the X, a click outside, Escape, its button) dismisses that announcement for good."""
-from __future__ import annotations
-
-import threading
-import time
-from typing import TYPE_CHECKING
-
-import flet as ft
-
-from .. import announcements
-from ..core import applog
-from ..i18n import tr
-from . import components as C
-from . import theme as T
-
-if TYPE_CHECKING:
-    from ..announcements import Announcement
-    from .app import FramePortApp
-
-FIRST_DELAY = 20   # seconds after start: after the start-up work and the update check
-BUSY_RETRY = 15    # another dialog is open / the welcome screen is shown: look again
-LONG_BODY = 900    # characters: longer bodies scroll inside the pop-up
-
-
-class Announcer:
-    def __init__(self, app: FramePortApp):
-        self.app = app
-        self.shown: str | None = None  # id on screen (a check while it's open doesn't show it twice)
-        try:
-            announcements.since()  # first start → only announcements published after it (before anything is saved)
-        except Exception:  # noqa: BLE001
-            applog.log.exception("announcements: recording the first start failed")
-
-    def start(self) -> None:
-        if not announcements.disabled():
-            threading.Thread(target=self._loop, daemon=True).start()
-
-    def _loop(self) -> None:
-        time.sleep(FIRST_DELAY)
-        while True:
-            try:
-                a = announcements.fetch()
-                if announcements.due(a):
-                    self._offer(a)
-            except Exception:  # noqa: BLE001
-                applog.log.exception("announcement check failed")
-            time.sleep(announcements.CHECK_EVERY)
-
-    def _offer(self, a: Announcement) -> None:
-        """Wait for a quiet moment (no dialog, not the welcome screen), then show it (background thread)."""
-        image = announcements.image_file(a)
-        while self.app.route[0] == "welcome" or C.dialog_open(self.app.page):
-            time.sleep(BUSY_RETRY)
-        if announcements.due(a) and self.shown != a.id:
-            self.show(a, image)
-
-    # ---------------------------------------------------------------- the pop-up
-    def show(self, a: Announcement, image=None) -> None:
-        page = self.app.page
-        closed = []
-
-        def dismiss(e=None) -> None:
-            if closed:
-                return
-            closed.append(True)
-            self.shown = None
-            try:
-                announcements.dismiss(a.id)
-            except Exception:  # noqa: BLE001
-                applog.log.exception("announcement: saving the dismissal failed")
-
-        def close(e=None) -> None:
-            dismiss()
-            page.pop_dialog()
-
-        def act(e=None) -> None:
-            close()
-            self.app.open_url(a.url)
-
-        self.shown = a.id
-        page.show_dialog(C.dialog(None, announcement_card(page, a, image, close, act if a.button else None),
-                                  content_padding=0, actions_padding=0, inset_padding=self._insets(),
-                                  clip_behavior=ft.ClipBehavior.ANTI_ALIAS,
-                                  on_dismiss=dismiss, width=T.DIALOG_M))
-
-
-    def _insets(self) -> ft.Padding:
-        """Centred over the content area (right of the sidebar, left of an open activity panel), not the whole
-        window; where that area is narrower than the pop-up, the panel and then the sidebar are left out."""
-        gap = T.S5
-        try:
-            left, right = self.app.content_insets()
-            width = float(self.app.page.width or 0)
-        except Exception:  # noqa: BLE001
-            return ft.Padding.all(gap)
-        need = T.DIALOG_M + 2 * gap
-        if width and width - left - right < need:
-            right = 0
-        if width and width - left - right < need:
-            left = 0
-        return ft.Padding(left + gap, gap, right + gap, gap)
-
-
-def announcement_card(page: ft.Page, a: Announcement, image, on_close, on_action=None) -> ft.Control:
-    """The pop-up's content: the portal edge, the picture (if any) with the close button over it, title, date, the
-    Markdown body and the optional action."""
-    from ..artwork.thumbs import asset_url
-    from .updater import _notes_style, _open_url
-
-    width = T.DIALOG_M
-    close_tip = tr("Dismiss")
-    title = ft.Text(a.title, size=T.px(20), weight=ft.FontWeight.W_700, color=T.TEXT, selectable=True)
-    date = C.meta(time.strftime("%Y-%m-%d", time.localtime(a.date)))
-    body = ft.Markdown(a.body, selectable=True, extension_set=ft.MarkdownExtensionSet.GITHUB_WEB,
-                       md_style_sheet=_notes_style(),
-                       on_tap_link=lambda e: _open_url(page, e.data))
-    if len(a.body) > LONG_BODY:
-        body = ft.Column([body], scroll=ft.ScrollMode.AUTO, height=T.px(320))
-
-    head: list[ft.Control] = [ft.Container(height=T.px(3), gradient=C.portal_gradient())]
-    if image is not None:
-        head.append(ft.Stack([
-            ft.Image(src=asset_url(image), width=width, height=_image_height(image, width), fit=ft.BoxFit.COVER,
-                     semantics_label=a.image_alt or None),
-            ft.Container(
-                ft.Icon(ft.Icons.CLOSE_ROUNDED, size=T.px(18), color=T.TEXT),
-                width=T.px(34), height=T.px(34), border_radius=T.px(17), alignment=ft.Alignment.CENTER,
-                bgcolor=ft.Colors.with_opacity(0.62, T.BG), border=ft.Border.all(1, T.soft(T.TEXT, 0.18)),
-                tooltip=close_tip, ink=True, on_click=on_close, right=T.S3, top=T.S3),
-        ], width=width))
-        title_row: ft.Control = title
-    else:
-        title_row = ft.Row([ft.Container(title, expand=True, padding=ft.Padding(0, T.px(6), 0, 0)),
-                            C.icon_btn(ft.Icons.CLOSE_ROUNDED, close_tip, on_click=on_close)],
-                           vertical_alignment=ft.CrossAxisAlignment.START, spacing=T.S2)
-
-    text = [ft.Column([title_row, date], spacing=T.px(2), tight=True)]
-    if a.body:
-        text.append(body)
-    if on_action is not None:
-        text.append(ft.Row([C.primary(a.button, icon=ft.Icons.OPEN_IN_NEW_ROUNDED, on_click=on_action)],
-                           alignment=ft.MainAxisAlignment.END))
-    pad = ft.Padding(T.S5, T.S4 if image is None else T.S5, T.S4 if image is None else T.S5, T.S5)
-    return ft.Container(
-        ft.Column([*head, ft.Container(ft.Column(text, spacing=T.S4, tight=True), padding=pad)], spacing=0, tight=True),
-        width=width)
-
-
-def _image_height(path, width: float) -> float:
-    """The picture's height at the pop-up's width, kept between a banner and a third of a 16:9 screen."""
-    try:
-        from PIL import Image
-
-        with Image.open(path) as im:
-            ratio = im.height / im.width
-    except Exception:  # noqa: BLE001
-        ratio = 9 / 21
-    return max(T.px(140), min(width * ratio, T.px(320)))
@@ -96,27 +96,6 @@ def reduce_motion_setting() -> bool:
    return bool(library.setting(REDUCE_MOTION, False))


-def scan_report_lines(report: pipeline.ScanReport) -> list[str]:
-    """A scan's summary of games already in the library that it found elsewhere (pipeline.ScanReport)."""
-    out = []
-    if report.moved:
-        out.append(tr_n("Updated the location of {n} game", "Updated the location of {n} games", len(report.moved)))
-    if report.updated:
-        out.append(tr_n("{n} game now uses the other version found there",
-                        "{n} games now use the other versions found there", len(report.updated)))
-    if report.other_version:
-        out.append(tr_n("{n} game has another version there (left alone: Update with a newer version… on its page)",
-                        "{n} games have another version there (left alone: Update with a newer version… on their "
-                        "pages)", len(report.other_version)))
-    if report.other_copy:
-        out.append(tr_n("{n} game is already in the library from another folder",
-                        "{n} games are already in the library from other folders", len(report.other_copy)))
-    return out
-
-
-SIDEBAR_WIDTH = 236  # logical px before the UI scale (content_insets)
-
-
 class FramePortApp:
    def __init__(self, page: ft.Page):
        from .views.library import load_filters
@@ -166,12 +145,9 @@ class FramePortApp:
                                   self.stop_live(),  # and stop a live view (it would keep the Frame encoding)
                                   self.stop_keyboard(), self.stop_monitor(), self.monitor_hub.close(),
                                   _link_state.update(owner=None) if _link_state["owner"] is self else None)
-        from .announcer import Announcer
        from .updater import Updater

        self.updater = Updater(self)  # new FramePort releases (sidebar card, Library bar, one-click update)
-        # maintainer announcements (pop-up once, not on a first start); before updater.start() saves this start
-        self.announcer = Announcer(self)

        page.title = tr("FramePort")
        for problem in T.load_user_themes(themes_dir()):  # installed theme files (Settings → Appearance)
@@ -206,7 +182,6 @@ class FramePortApp:
        self._start_auto_pair()
        threading.Thread(target=self._backfill_covers, daemon=True).start()
        self.updater.start()
-        self.announcer.start()
        self.run_bg(self._refresh_catalog)  # confirmed game configs from GitHub main (no release needed)
        _link_state["owner"] = self
        if _link_state["thread"] is None:
@@ -261,18 +236,13 @@ class FramePortApp:
            self.activity_card,
            self.conn_card,
            self.power_row,  # under the Frame card (owner's choice)
-        ], spacing=T.S2), width=T.px(SIDEBAR_WIDTH), bgcolor=T.SIDEBAR, padding=T.S4,
+        ], spacing=T.S2), width=T.px(236), bgcolor=T.SIDEBAR, padding=T.S4,
            border=None if T.DUAL else ft.Border(right=ft.BorderSide(1, T.BORDER)))
        # dual themes: the sidebar's edge is the portal, blue at the top into orange at the bottom
        edge = [ft.Container(width=2, gradient=C.portal_gradient(vertical=True, opacity=0.7))] if T.DUAL else []
        self.page.controls = [ft.Row([sidebar, *edge, self.body, self.activity.root], expand=True, spacing=0,
                                     vertical_alignment=ft.CrossAxisAlignment.STRETCH)]

-    def content_insets(self) -> tuple[float, float]:
-        """How much of the window's left (the sidebar + its edge) and right (the activity panel, when open) isn't the
-        content area: pop-ups about the content (announcements) centre over what's between."""
-        return T.px(SIDEBAR_WIDTH) + (2 if T.DUAL else 0), float(self.activity.root.width or 0)
-
    def restyle(self, theme: str) -> None:
        """Switch the colour theme while running (Settings → Appearance): new tokens, the window rebuilt, the views
        FramePort keeps between visits recreated (the files/screenshots views start at their first location again;
@@ -2253,29 +2223,36 @@ class FramePortApp:
        return self.submit(tr("Add {name}").format(name=name), run, None, "task")

    def scan_roots(self) -> list[str]:
-        """Folders "Rescan folders" scans (core/folders.py; Settings → Library folders lists and edits them)."""
-        from ..core import folders
-
-        return folders.rescan_roots()
+        """Folders to rescan: the ones scanned before (remembered from now on), else the folders the library's games
+        came from (one level up from each game folder)."""
+        roots = [r for r in library.setting("scan.roots", []) if Path(r).exists()]
+        if not roots:
+            found = set()
+            for g in library.load().get("games", {}).values():
+                if g.get("kind") == "linux":  # added one by one (its origin may be e.g. Downloads)
+                    continue
+                origin = g.get("origin") or (str(Path(g["apk"]).parent) if g.get("apk") else None)
+                if origin and Path(origin).parent.exists():
+                    found.add(str(Path(origin).parent))
+            roots = sorted(found)
+        # a folder inside another one is scanned with it (scanning it again would only repeat work)
+        return [r for r in roots if not any(o != r and Path(r).is_relative_to(o) for o in roots)]

    def rescan(self, e=None) -> None:
-        """Scan the library's folders again for games added since (unchanged games aren't analyzed again) and for games
-        whose files moved there (their entries are pointed at the new place)."""
+        """Scan the library's folders again for games added since (unchanged games aren't analyzed again)."""
        roots = self.scan_roots()
        if not roots:
            self.toast(tr("No folders to rescan yet — add games with Scan a folder…"))
            return
        for r in roots:
            self.scan(r, only_new=True)
-        self.toast(tr_n("Rescanning {n} folder for new and moved games",
-                        "Rescanning {n} folders for new and moved games", len(roots)))
+        self.toast(tr_n("Rescanning {n} folder for new games", "Rescanning {n} folders for new games", len(roots)))

    def scan(self, path: str, single: bool = False, only_new: bool = False) -> Job:
        last = {"t": 0.0}
-        if not single and Path(path).is_dir():  # remembered for "Rescan folders" (Settings → Library folders)
-            from ..core import folders
-
-            folders.remember(path)
+        if not single:  # remembered for "Rescan folders"
+            roots = [r for r in library.setting("scan.roots", []) if r != str(path)]
+            library.set_setting("scan.roots", roots + [str(path)])

        def added_one(entry: dict):
            from ..artwork import thumbs
@@ -2293,23 +2270,17 @@ class FramePortApp:
        def run(job: Job):
            rep = job.reporter
            rep.stage(tr("Looking for games"))
-            report = pipeline.ScanReport()
            added = pipeline.add_path(Path(path), rep, on_added=added_one, force_rift=single, art=True,
-                                      only_new=only_new, report=report)
+                                      only_new=only_new)
            if self.route[0] == "welcome" and added:
                library.set_setting("ui.welcome_done", True)
                self.route = ("library",)
            n = len(added)
-            if report.handled():
-                self.refresh_view()  # moved games: their pages show the new place
            if only_new:
-                text = tr_n("{n} new game in {name}", "{n} new games in {name}", n,
+                return tr_n("{n} new game in {name}", "{n} new games in {name}", n,
                            name=Path(path).name) if added else \
                    tr("No new games in {name}").format(name=Path(path).name)
-            else:
-                text = tr_n("Added {n} game", "Added {n} games", n) if added else \
-                    (tr("No new games in that folder") if report.handled() else tr("No games found in that folder"))
-            return " · ".join([text] + scan_report_lines(report))
+            return tr_n("Added {n} game", "Added {n} games", n) if added else tr("No games found in that folder")
        return self.submit(tr("Scan {name}").format(name=Path(path).name), run, None, "scan")

    # ------------------------------------------------------------------ executable choice / artwork
@@ -62,9 +62,6 @@ HELP: dict[str, str] = _Translated({
    "hw_video_decode": "Games with the Hardware video decoding patch play their videos on the Frame's video hardware. "
                       "Turn it off if videos misbehave; games pick it up at their next start. For one game only, put "
                       "FRAMEPORT_NO_HW_VIDEO=1 before %command% in its Steam launch options.",
-    "ssh_keys": "FramePort logs in to the Frame with its own key. If your Frame accepts only one of your own keys, "
-                "add that private key file here; fast uploads use it too. A key with a passphrase: add it to your SSH "
-                "agent instead.",
    "launch_test": "Starts the game on the Frame while nobody wears the headset and reads the log: did it start and "
                   "draw frames. It can't check the picture.",
    "last_session": "After you play a game on the Frame, FramePort reads that session's log: crashes, frame rate and "
@@ -111,14 +108,8 @@ HELP: dict[str, str] = _Translated({
    "app_updates": "FramePort checks GitHub for a new version every few hours. Update now downloads and checks it, "
                   "then restarts FramePort; your games and settings stay.",
    "update_all": "Updates every game marked \"Update ready\", one after another.",
-    "rescan": "Scans your game folders again and adds new games. A game you moved into one of them gets its new "
-              "place; games already in the library keep their name, recipe, tags and art. Settings → Library "
-              "folders lists the folders.",
-    "library_folders": "Every Scan a folder… adds its folder here. Rescan folders looks in them for new games, and "
-                       "for games you moved: a game whose files are gone from their old place is pointed at the same "
-                       "copy in its new place. Another version found there is only taken by Scan a folder…; Rescan "
-                       "leaves it for you to choose (Update with a newer version… on the game's page). Removing a "
-                       "folder only stops it being scanned: its games stay in the library.",
+    "rescan": "Scans your game folders again and adds new games. Games already in the library keep their recipe, "
+              "tags and art.",
    "files": "Upload, download, rename and delete files on the Frame. Videos, Downloads and Documents are shared by "
             "every Quest game; each game also has its own storage.",
    "live_view": "Shows the headset's view with sound, whatever is running. It plays here where possible, else in "
@@ -23,14 +23,12 @@ TOOL_WHY = {"java": tr("Runs OVRPort and apksigner"), "overport": tr("Converts Q
            "apksigner": tr("Signs rebuilt games"), "revive": tr("Runs Oculus PC games on SteamVR")}
 # the page's sections in order (the index on the left lists them): Appearance near the top (it's the most used),
 # "Uninstall FramePort" last
-SECTIONS = ("appearance", "updates", "links", "folders", "installing", "tools", "pc", "data", "feedback", "about",
-            "remove")
+SECTIONS = ("appearance", "updates", "links", "installing", "tools", "pc", "data", "feedback", "about", "remove")


 def section_titles() -> dict[str, str]:
    """Index labels of SECTIONS (the sections' own headings may be longer)."""
    return {"appearance": tr("Appearance"), "updates": tr("Updates"), "links": tr("Install links"),
-            "folders": tr("Library folders"),
            "installing": tr("Installing"), "tools": tr("Tools"), "pc": tr("This PC"), "data": tr("Data"),
            "feedback": tr("Problems and feedback"), "about": tr("About"), "remove": tr("Uninstall FramePort")}

@@ -133,121 +131,9 @@ class SettingsView:
                          C.meta(tr("Large files upload together using OpenSSH when available. "
                                    "Default: 3. Lower this on a busy network.")),
                          C.ghost(tr("Remove converted copies now"), ft.Icons.CLEANING_SERVICES_OUTLINED, clean,
-                                  tooltip=tr("Your own game files aren't touched.")),
-                          ft.Container(height=T.S2), self.ssh_keys()],
+                                  tooltip=tr("Your own game files aren't touched."))],
                         spacing=T.S2, horizontal_alignment=ft.CrossAxisAlignment.START)

-    def library_folders(self) -> ft.Control:
-        """Settings → Library folders: the folders "Rescan folders" scans (core/folders.py, GitHub discussion #351).
-        Status (is it there, how many games come from it) is read off the UI thread."""
-        from ...core import folders
-
-        app = self.app
-        rows = ft.Column(spacing=T.S2)
-
-        def row(st: folders.FolderStatus) -> ft.Control:
-            games = tr_n("{n} game in the library", "{n} games in the library", st.games)
-            if st.exists:
-                icon, color, state = ft.Icons.FOLDER_OUTLINED, T.TEXT_2, games
-            else:
-                icon, color = ft.Icons.FOLDER_OFF_OUTLINED, T.WARN
-                state = tr("Not found (moved, deleted or on a drive that isn't connected)") + " · " + games
-            return ft.Row([
-                C.as_icon(icon, T.px(18), color),
-                ft.Column([C.body(Path(st.path).name or st.path, T.TEXT, max_lines=1,
-                                  overflow=ft.TextOverflow.ELLIPSIS),
-                           C.meta(st.path, max_lines=2, overflow=ft.TextOverflow.ELLIPSIS, tooltip=st.path),
-                           C.meta(state, T.WARN if not st.exists else None)],
-                          spacing=0, expand=True),
-                C.icon_btn(ft.Icons.DELETE_OUTLINE_ROUNDED, tr("Stop scanning this folder"),
-                           on_click=lambda e, s=st: remove(s)),
-            ], spacing=T.S2, vertical_alignment=ft.CrossAxisAlignment.CENTER)
-
-        def fill():  # (run_bg: a folder on a sleeping network drive can take a while to answer)
-            items = folders.status()
-            rows.controls = [row(s) for s in items] or \
-                [C.meta(tr("No folders yet. Add one here, or use Scan a folder… in the Library."))]
-            C.update(rows)
-
-        def remove(st: folders.FolderStatus):
-            def ok():
-                folders.remove(st.path)
-                app.run_bg(fill)
-            C.confirm(app.page, tr("Stop scanning this folder?"),
-                      tr_n("Rescan folders won't look in {path} any more. The {n} game from it stays in your library "
-                           "(nothing is deleted).",
-                           "Rescan folders won't look in {path} any more. The {n} games from it stay in your library "
-                           "(nothing is deleted).", st.games, path=st.path),
-                      tr("Remove folder"), ok)
-
-        async def add(e):
-            path = await C.pick_dir(app.page, dialog_title=tr("Folder with games (APKs or PC VR games)"))
-            if not path:
-                return
-            try:
-                folders.add(path)
-            except ValueError as exc:
-                app.toast(str(exc), error=True)
-                return
-            app.run_bg(fill)
-            app.scan(path, only_new=True)  # its games (new ones, and ones that moved there) come in now
-
-        rows.controls = [C.meta(tr("Checking folders…"))]
-        app.run_bg(fill)
-        return ft.Column([
-            C.meta(tr("Rescan folders in the Library looks in these folders for new games and for games that "
-                      "moved there.")),
-            rows,
-            ft.Row([C.secondary(tr("Add folder…"), ft.Icons.CREATE_NEW_FOLDER_OUTLINED, add),
-                    C.ghost(tr("Rescan folders"), ft.Icons.REFRESH_ROUNDED, app.rescan)],
-                   spacing=T.S2, run_spacing=T.S2, wrap=True),
-        ], spacing=T.S3, horizontal_alignment=ft.CrossAxisAlignment.START)
-
-    def ssh_keys(self) -> ft.Control:
-        """Settings → Installing: private key files FramePort logs in with besides its own (frame.connection
-        EXTRA_KEYS_SETTING; the Frame connection and OpenSSH uploads both use them, GitHub #242)."""
-        from ...frame import connection
-
-        app = self.app
-        rows = ft.Column(spacing=T.S1)
-
-        def fill():
-            items = []
-            for path, problem in connection.extra_key_status():
-                items.append(ft.Row([
-                    C.as_icon(ft.Icons.KEY_ROUNDED if not problem else ft.Icons.WARNING_AMBER_ROUNDED, T.px(18),
-                              T.TEXT_2 if not problem else T.WARN),
-                    ft.Column([C.body(path.name, T.TEXT), C.meta(problem or str(path), selectable=True)],
-                              spacing=0, expand=True),
-                    C.icon_btn(ft.Icons.DELETE_OUTLINE_ROUNDED, tr("Stop using this key (the file stays)"),
-                               on_click=lambda e, p=path: remove(p)),
-                ], spacing=T.S2, vertical_alignment=ft.CrossAxisAlignment.CENTER))
-            rows.controls = items or [C.meta(tr("Only FramePort's own key, and your SSH agent's keys."))]
-            C.update(rows)
-
-        def remove(path):
-            connection.remove_extra_key(path)
-            fill()
-
-        async def add(e):
-            for path in await C.pick_files(app.page, dialog_title=tr("Private SSH key file (not the .pub file)"),
-                                           multiple=True):
-                try:
-                    stored = connection.add_extra_key(path)
-                except connection.KeyFileError as exc:
-                    app.toast(tr("That key can't be used: {error}").format(error=exc), error=True)
-                    continue
-                app.toast(tr("FramePort also logs in with {name} from the next connection.").format(name=stored.name))
-            fill()
-
-        fill()
-        return ft.Column([
-            ft.Row([C.body(tr("SSH keys"), T.TEXT, weight=ft.FontWeight.W_500), C.help_icon("ssh_keys")],
-                   spacing=T.px(4), vertical_alignment=ft.CrossAxisAlignment.CENTER),
-            rows,
-            C.secondary(tr("Add a key file…"), ft.Icons.VPN_KEY_ROUNDED, add),
-        ], spacing=T.S2, horizontal_alignment=ft.CrossAxisAlignment.START)
-
    def updates_card(self) -> ft.Control:
        """Settings → Updates: FramePort's own updates (ui/updater.py, frameport/updates.py)."""
        import time
@@ -564,8 +450,6 @@ class SettingsView:
            "appearance": C.section(tr("Appearance"), C.card(self.appearance(), padding=T.S4), help="ui_scale"),
            "updates": C.section(tr("Updates"), C.card(self.updates_card(), padding=T.S4), help="app_updates"),
            "links": C.section(tr("Install links"), C.card(self.links_card(), padding=T.S4), help="install_links"),
-            "folders": C.section(tr("Library folders"), C.card(self.library_folders(), padding=T.S4),
-                                 help="library_folders"),
            "installing": C.section(tr("Installing"), C.card(self.installing(), padding=T.S4), help="launch_test"),
            "tools": C.section(tr("Tools"), C.card(self.tools, padding=ft.Padding(T.S4, T.S2, T.S4, T.S2)),
                               subtitle=tr("FramePort keeps its own copies; nothing is installed system-wide"),
@@ -1,140 +0,0 @@
-"""Announcements: the committed file parses, who sees one (never on a first start), and dismissing is for good."""
-from pathlib import Path
-
-import pytest
-
-from frameport import announcements as A
-from frameport.core import library
-
-ROOT = Path(__file__).resolve().parents[1]
-
-DOC = """---
-id: one
-title: Hello
-date: 2026-10-10T12:00:00Z
---
-Some **news**.
-"""
-
-
-def ann(text=DOC):
-    a = A.parse(text)
-    assert a is not None
-    return a
-
-
-def test_committed_announcement_is_valid():
-    """announcements/current.md must parse (an inactive one is checked too): a typo fails here, not on users."""
-    A.parse((ROOT / A.PATH).read_text(encoding="utf-8"))
-
-
-def test_parse_fields():
-    a = A.parse("""---
-id: frameport-1.3
-title: "FramePort 1.3: the Monitor"
-date: 2026-11-02
-image: announcements/x.png
-image_alt: A picture
-button: Read more
-url: https://frameport.app/changelog/
-expires: 2026-11-30
---
-Body *here*.""")
-    assert a.id == "frameport-1.3" and a.title == "FramePort 1.3: the Monitor" and a.body == "Body *here*."
-    assert a.image == A.RAW + "announcements/x.png" and a.image_alt == "A picture"
-    assert a.button == "Read more" and a.url == "https://frameport.app/changelog/"
-    assert a.date == 1793577600.0  # 2026-11-02 00:00 UTC
-    assert a.expires == 1795996800.0 + 86400  # end of 2026-11-30 (inclusive)
-
-
-@pytest.mark.parametrize("text", ["", "   \n", "---\nactive: false\n---\n"])
-def test_nothing_to_show(text):
-    assert A.parse(text) is None
-
-
-@pytest.mark.parametrize("front, error", [
-    ("title: x\ndate: 2026-10-10", "id"),
-    ("id: bad id\ntitle: x\ndate: 2026-10-10", "id"),
-    ("id: a\ndate: 2026-10-10", "title"),
-    ("id: a\ntitle: x", "date"),
-    ("id: a\ntitle: x\ndate: soon", "date"),
-    ("id: a\ntitle: x\ndate: 2026-10-10\nbutton: Go", "button and url"),
-    ("id: a\ntitle: x\ndate: 2026-10-10\nimage: http://example.com/x.png", "https"),
-    ("id: a\ntitle: x\ndate: 2026-10-10\nimage: ../secret.png", "https"),
-    ("id: a\ntitle: x\ndate: 2026-10-10\nwhere: app", "unknown"),  # the site pop-up was dropped
-    ("id: a\ntitle: x\ndate: 2026-10-10\ncolour: red", "unknown"),
-    ("active: false\nid: a\ntitle: x\ndate: tomorrow", "date"),  # switched off, still checked
-])
-def test_parse_errors(front, error):
-    with pytest.raises(A.AnnouncementError, match=error):
-        A.parse(f"---\n{front}\n---\nbody")
-
-
-def test_fetch_never_raises_on_a_broken_file(monkeypatch):
-    monkeypatch.setattr(A.cache, "cached_text", lambda *a, **k: "no front matter")
-    assert A.fetch() is None
-
-
-def test_first_start_sees_no_older_announcement():
-    """A new install: `since` = now, so an announcement published before it never shows."""
-    assert A.since() > 1.9e9 - 2e8  # roughly now
-    assert not A.due(ann())
-
-
-def test_existing_user_sees_it_once():
-    library.set_setting("update.last_seen_version", "1.2.0")  # FramePort ran before announcements existed
-    assert A.since() == 0
-    a = ann()
-    assert A.due(a)
-    A.dismiss(a.id)
-    assert not A.due(a)
-    assert not A.due(a)  # for good, also at the next check
-    # a typo fixed under the same id stays dismissed; a new id shows again
-    assert not A.due(ann(DOC.replace("Hello", "Hallo")))
-    assert A.due(ann(DOC.replace("id: one", "id: two")))
-
-
-def test_since_is_recorded_once():
-    first = A.since()
-    library.set_setting("update.last_seen_version", "1.2.0")  # written later by this same start
-    assert A.since() == first
-
-
-def test_new_user_sees_later_announcements():
-    start = 1_800_000_000.0
-    later = ann(DOC.replace("2026-10-10T12:00:00Z", "2027-01-20T00:00:00Z"))  # after `start`
-    assert A.due(later, now=later.date + 60, user_since=start)
-    assert not A.due(ann(), now=later.date + 60, user_since=start)  # published before the install
-
-
-def test_schedule_and_expiry():
-    a = ann(DOC.replace("---\nSome", "expires: 2026-10-12\n---\nSome"))
-    assert not A.due(a, now=a.date - 60, user_since=0)        # not published yet
-    assert A.due(a, now=a.date + 60, user_since=0)
-    assert not A.due(a, now=a.expires + 1, user_since=0)      # expired
-
-
-def test_dismissed_list_is_bounded():
-    for i in range(A.KEEP_DISMISSED + 5):
-        A.dismiss(f"id{i}")
-    kept = A.dismissed()
-    assert len(kept) == A.KEEP_DISMISSED and kept[-1] == f"id{A.KEEP_DISMISSED + 4}"
-    A.dismiss("id10")  # again: moves to the end, no duplicate
-    assert A.dismissed().count("id10") == 1 and A.dismissed()[-1] == "id10"
-
-
-def test_image_file_checks_the_picture(monkeypatch, tmp_path):
-    from PIL import Image
-
-    src = tmp_path / "pic.png"
-    Image.new("RGB", (40, 20), "orange").save(src)
-
-    def fake_download(url, dest, **kw):
-        dest.parent.mkdir(parents=True, exist_ok=True)
-        dest.write_bytes(src.read_bytes() if url.endswith(".png") else b"not an image")
-        return dest
-    monkeypatch.setattr(A.cache, "download", fake_download)
-    good = A.image_file(ann(DOC.replace("---\nSome", "image: announcements/a.png\n---\nSome")))
-    assert good is not None and good.suffix == ".png" and good.exists()
-    assert A.image_file(ann(DOC.replace("---\nSome", "image: https://example.com/a.jpg\n---\nSome"))) is None
-    assert not list(good.parent.glob("*.part"))
@@ -1,59 +0,0 @@
-"""Adding FramePort's key to ~/.ssh/authorized_keys never glues it onto a last line without a newline (GitHub #242):
-sshd ignores such a line, so OpenSSH uploads were refused while Paramiko got in with the user's own key."""
-import re
-import shutil
-import subprocess
-
-import pytest
-
-from frameport.core.paths import bootstrap_dir
-from frameport.frame.connection import install_key_command
-
-KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFramePortTestKey frameport"
-OTHER = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQUserKey user@pc"
-pytestmark = pytest.mark.skipif(shutil.which("bash") is None, reason="needs bash")
-
-
-def bootstrap_key_block() -> str:
-    script = (bootstrap_dir() / "bootstrap.sh").read_text()
-    start = script.index("mkdir -p ~/.ssh")
-    return script[start:script.index("\n\n", start)]
-
-
-def run(tmp_path, command, before, key=KEY):
-    ssh = tmp_path / ".ssh"
-    if before is not None:
-        ssh.mkdir(mode=0o700)
-        (ssh / "authorized_keys").write_text(before)
-    subprocess.run(["bash", "-c", command], env={"HOME": str(tmp_path), "PATH": "/usr/bin:/bin", "key": key},
-                   check=True)
-    return (ssh / "authorized_keys").read_text()
-
-
-def commands():
-    return [("install_key", install_key_command(KEY)), ("bootstrap", bootstrap_key_block())]
-
-
-@pytest.mark.parametrize("name,command", commands())
-@pytest.mark.parametrize("before,after", [
-    (None, KEY + "\n"),                                      # no file yet
-    ("", KEY + "\n"),                                        # empty file
-    (OTHER + "\n", OTHER + "\n" + KEY + "\n"),               # normal file
-    (OTHER, OTHER + "\n" + KEY + "\n"),                      # last line without a newline: the #242 case
-    (OTHER + "\n" + KEY + "\n", OTHER + "\n" + KEY + "\n"),  # already there: unchanged
-])
-def test_key_is_added_on_its_own_line(tmp_path, name, command, before, after):
-    assert run(tmp_path, command, before) == after
-
-
-@pytest.mark.parametrize("name,command", commands())
-def test_glued_key_gets_a_working_line(tmp_path, name, command):
-    # an earlier install glued the key onto another line: sshd can't use it, so a clean line is added
-    text = run(tmp_path, command, OTHER + KEY + "\n")
-    assert KEY in text.splitlines()
-
-
-def test_file_mode(tmp_path):
-    run(tmp_path, install_key_command(KEY), OTHER)
-    assert oct((tmp_path / ".ssh" / "authorized_keys").stat().st_mode & 0o777) == "0o600"
-    assert re.fullmatch(r"0o7\d\d", oct((tmp_path / ".ssh").stat().st_mode & 0o777))
@@ -1,261 +0,0 @@
-"""GitHub discussion #351: the library folders list (Settings → Library folders, `frameport folders`) and scans that
-find games of the library at a new place (moved: relinked in place; another version; another copy)."""
-import shutil
-import zipfile
-
-from typer.testing import CliRunner
-
-from frameport import cli, pipeline
-from frameport.artwork import fetch as artwork
-from frameport.core import folders, library
-from frameport.core.events import Reporter
-from frameport.patches import base
-from frameport.sources import quest_dump
-
-PKG = "com.example.questgame"
-
-
-# ------------------------------------------------------------------------------------------ the folder list
-def test_folder_list_add_remove_status(tmp_path):
-    a, b = tmp_path / "A", tmp_path / "B"
-    a.mkdir()
-    b.mkdir()
-    folders.remember(a)
-    folders.remember(b)
-    folders.remember(a)  # scanned again: once, moved to the end
-    assert folders.roots() == [str(b), str(a)]
-    assert folders.add(b) == [str(b), str(a)]  # already there: unchanged
-    library.upsert_game("g1", apk=str(a / "x" / "g.apk"))
-    library.upsert_game("g2", kind="rift", game_dir=str(a / "Game"))
-    library.upsert_game("g3", apk=str(tmp_path / "elsewhere.apk"))
-    shutil.rmtree(b)
-    st = {s.path: s for s in folders.status()}
-    assert (st[str(a)].exists, st[str(a)].games) == (True, 2)
-    assert (st[str(b)].exists, st[str(b)].games) == (False, 0)
-    assert folders.rescan_roots() == [str(a)]  # a missing folder isn't scanned
-    assert folders.remove(str(a)) is True and folders.remove(str(a)) is False
-    assert library.game("g1") and library.game("g2")  # its games stay
-    try:
-        folders.add(tmp_path / "nope")
-        raise AssertionError("a missing folder can't be added")
-    except ValueError:
-        pass
-
-
-def test_rescan_roots_fallback_only_before_anything_was_remembered(tmp_path):
-    games = tmp_path / "Games"
-    (games / "One").mkdir(parents=True)
-    library.upsert_game("g1", apk=str(games / "One" / "g.apk"), origin=str(games / "One"))
-    assert folders.rescan_roots() == [str(games)]  # an older library: where its games came from
-    folders.remember(games)
-    folders.remember(games / "One")  # inside another one: scanned with it
-    assert folders.rescan_roots() == [str(games)]
-    folders.remove(games)
-    folders.remove(games / "One")
-    assert folders.rescan_roots() == []  # the user removed them all: no guessing them back
-
-
-def test_cli_folders(tmp_path):
-    d = tmp_path / "Games"
-    d.mkdir()
-    runner = CliRunner()
-    res = runner.invoke(cli.app, ["folders", "--add", str(d)])
-    assert res.exit_code == 0 and str(d) in res.output and "ok" in res.output
-    assert folders.roots() == [str(d)]
-    res = runner.invoke(cli.app, ["folders", "--json"])
-    assert '"exists": true' in res.output
-    res = runner.invoke(cli.app, ["folders", "--remove", str(d)])
-    assert res.exit_code == 0 and folders.roots() == []
-    assert runner.invoke(cli.app, ["folders", "--remove", str(d)]).exit_code == 1
-    assert runner.invoke(cli.app, ["folders", "--add", str(tmp_path / "missing")]).exit_code != 0
-    assert "no folders to rescan" in runner.invoke(cli.app, ["rescan"]).output
-
-
-# ------------------------------------------------------------------------------------------ Quest games that moved
-def _apk(path, manifest, extra=b""):
-    path.parent.mkdir(parents=True, exist_ok=True)
-    with zipfile.ZipFile(path, "w") as z:
-        z.writestr("AndroidManifest.xml", manifest)
-        z.writestr("classes.dex", b"dex\n035\0" + extra)
-    return path
-
-
-def _game(root, manifest, extra=b""):
-    apk = _apk(root / "Quest Game" / "game.apk", manifest, extra)
-    obb = root / "Quest Game" / PKG
-    obb.mkdir()
-    (obb / f"main.1.{PKG}.obb").write_bytes(b"o" * 10)
-    return apk
-
-
-def _setup(tmp_path, monkeypatch, manifest):
-    base.load_all()
-    monkeypatch.setattr(quest_dump, "_apk_ids", lambda p: (PKG, 1))
-    monkeypatch.setattr(pipeline.rift_dump, "scan", lambda *a, **k: [])
-    _game(tmp_path / "Old", manifest)
-    [g] = pipeline.add_path(tmp_path / "Old")
-    r = library.recipe_from_dict(g["recipe"])
-    r.source, r.status = "user", "works"
-    r.patches["adapter.scale"] = {"value": 1.2}
-    library.upsert_game(PKG, title="My Game", title_locked=True, tags=["mine"], recipe=library.recipe_to_dict(r),
-                        status="works", build={"ok": True, "sha256": "b"}, installs={"Frame": {"time": 1}})
-    art = artwork.artwork_dir(PKG)
-    (art / artwork.PICKED).write_text("custom")
-    return g
-
-
-def _logs():
-    logs = []
-    rep = Reporter([lambda e: logs.append(e.message) if e.kind == "log" else None])
-    return rep, logs
-
-
-def _kept_user_fields(g):
-    assert (g["title"], g["title_locked"], g["tags"]) == ("My Game", True, ["mine"])
-    assert g["recipe"]["source"] == "user" and g["recipe"]["patches"]["adapter.scale"] == {"value": 1.2}
-    assert g["status"] == "works" and g["build"] == {"ok": True, "sha256": "b"} and g["installs"]
-    assert (artwork.artwork_dir(PKG) / artwork.PICKED).is_file()
-
-
-def test_rescan_relinks_a_moved_quest_game(tmp_path, monkeypatch, quest_manifest):
-    _setup(tmp_path, monkeypatch, quest_manifest)
-    shutil.move(tmp_path / "Old", tmp_path / "New")  # e.g. another drive
-    rep, logs = _logs()
-    report = pipeline.ScanReport()
-    assert pipeline.add_path(tmp_path / "New", rep, only_new=True, report=report) == []
-    g = library.game(PKG)
-    assert [i["package"] for i in report.moved] == [PKG]
-    new = tmp_path / "New" / "Quest Game"
-    assert g["apk"] == str(new / "game.apk") and g["data_dir"] == str(new / PKG) and g["origin"] == str(new)
-    assert g["data_manifest"] == {f"main.1.{PKG}.obb": 10}
-    _kept_user_fields(g)
-    assert any("aren't at" in m and "drive" in m for m in logs)  # the old place is gone (maybe unplugged)
-    assert any("Updated the location of 1 game" in m for m in logs)
-    pipeline.check_source(g)  # buildable again
-
-
-def test_full_scan_keeps_a_user_recipe_and_refreshes_a_derived_one(tmp_path, monkeypatch, quest_manifest):
-    g0 = _setup(tmp_path, monkeypatch, quest_manifest)
-    [g] = pipeline.add_path(tmp_path / "Old")  # scanned again, same place
-    _kept_user_fields(g)
-    assert g["suggested"] == g0["suggested"]
-    stale = dict(g0["recipe"], patches={}, source="heuristics")
-    library.upsert_game(PKG, recipe=stale)
-    [g] = pipeline.add_path(tmp_path / "Old")
-    assert g["recipe"] == g["suggested"]  # not the user's: follows the analysis
-
-
-def test_another_version_isnt_swapped_silently(tmp_path, monkeypatch, quest_manifest):
-    _setup(tmp_path, monkeypatch, quest_manifest)
-    shutil.rmtree(tmp_path / "Old")
-    newer = _game(tmp_path / "New", quest_manifest, extra=b"v2")  # other bytes: another build
-    report = pipeline.ScanReport()
-    pipeline.add_path(tmp_path / "New", only_new=True, report=report)  # Rescan folders: the user decides
-    assert [i["package"] for i in report.other_version] == [PKG] and not report.moved
-    assert library.game(PKG)["apk"] == str(tmp_path / "Old" / "Quest Game" / "game.apk")
-    report = pipeline.ScanReport()
-    assert pipeline.add_path(tmp_path / "New", report=report) == []  # Scan a folder…: like Update with a newer APK…
-    g = library.game(PKG)
-    assert [i["package"] for i in report.updated] == [PKG]
-    assert g["apk"] == str(newer) and g["source_sha256"] == pipeline.builder.sha256(newer)
-    assert (g["title"], g["tags"], g["recipe"]["source"]) == ("My Game", ["mine"], "user")
-
-
-def test_a_second_copy_leaves_the_existing_one(tmp_path, monkeypatch, quest_manifest):
-    _setup(tmp_path, monkeypatch, quest_manifest)
-    _game(tmp_path / "Copy", quest_manifest)
-    for only_new in (True, False):
-        report = pipeline.ScanReport()
-        assert pipeline.add_path(tmp_path / "Copy", only_new=only_new, report=report) == []
-        assert [i["package"] for i in report.other_copy] == [PKG]
-        g = library.game(PKG)
-        assert g["apk"] == str(tmp_path / "Old" / "Quest Game" / "game.apk")
-        _kept_user_fields(g)
-
-
-def test_same_build_without_a_checksum_uses_the_version_name(tmp_path, monkeypatch):
-    apk = tmp_path / "x.apk"
-    apk.write_bytes(b"x")
-    monkeypatch.setattr(quest_dump, "version_name", lambda p: "1.2")
-    assert pipeline.same_quest_build({"analysis": {"version": "1.2"}}, apk)
-    assert not pipeline.same_quest_build({"analysis": {"version": "1.1"}}, apk)
-    assert not pipeline.same_quest_build({"source_sha256": "0" * 64, "analysis": {"version": "1.2"}}, apk)
-
-
-def test_scan_summary_lines():
-    from frameport.ui.app import scan_report_lines
-
-    report = pipeline.ScanReport()
-    assert scan_report_lines(report) == []
-    report.note("moved", {"package": "a", "title": "A"}, "/x")
-    report.note("moved", {"package": "b", "title": "B"}, "/y")
-    report.note("other_version", {"package": "c"}, "/z")
-    lines = scan_report_lines(report)
-    assert lines[0] == "Updated the location of 2 games" and "another version" in lines[1]
-
-
-# ------------------------------------------------------------------------------------------ PC VR games that moved
-def _rift(tmp_path):
-    from test_rift import unity_game
-
-    unity_game(tmp_path / "Old")
-    [g] = pipeline.add_path(tmp_path / "Old")
-    pkg = g["package"]
-    r = library.recipe_from_dict(g["recipe"])
-    r.source = "user"
-    r.patches["pcvr.no_crash_reporter"] = {}
-    pipeline.set_recipe(pkg, r)
-    library.upsert_game(pkg, title="My Space", title_locked=True, tags=["mine"], exe_confirmed=True)
-    return pkg
-
-
-def _rift_kept(g):
-    assert (g["title"], g["tags"], g["exe"]) == ("My Space", ["mine"], "Space Game.exe")
-    assert g["recipe"]["source"] == "user" and "pcvr.no_crash_reporter" in g["recipe"]["patches"]
-
-
-def test_rescan_relinks_a_moved_rift_game(tmp_path):
-    pkg = _rift(tmp_path)
-    (tmp_path / "New").mkdir()
-    shutil.move(tmp_path / "Old" / "Space Game", tmp_path / "New" / "Space Game")
-    report = pipeline.ScanReport()
-    assert pipeline.add_path(tmp_path / "New", only_new=True, report=report) == []
-    g = library.game(pkg)
-    new = tmp_path / "New" / "Space Game"
-    assert [i["package"] for i in report.moved] == [pkg]
-    assert g["game_dir"] == str(new) and g["analysis"]["extra"]["folder"] == str(new)
-    _rift_kept(g)
-    assert len([x for x in library.games() if x.get("kind") == "rift"]) == 1  # no second entry
-
-
-def test_a_renamed_rift_folder_is_found_by_its_program(tmp_path):
-    pkg = _rift(tmp_path)
-    (tmp_path / "New").mkdir()
-    shutil.move(tmp_path / "Old" / "Space Game", tmp_path / "New" / "Space Game (repack)")
-    report = pipeline.ScanReport()
-    pipeline.add_path(tmp_path / "New", only_new=True, report=report)
-    assert [i["package"] for i in report.moved] == [pkg]
-    assert library.game(pkg)["game_dir"] == str(tmp_path / "New" / "Space Game (repack)")
-    assert len([x for x in library.games() if x.get("kind") == "rift"]) == 1
-
-
-def test_rift_copy_and_version(tmp_path):
-    pkg = _rift(tmp_path)
-    shutil.copytree(tmp_path / "Old" / "Space Game", tmp_path / "Copy" / "Space Game")
-    report = pipeline.ScanReport()
-    pipeline.add_path(tmp_path / "Copy", report=report)  # the library's folder is still there: it stays
-    assert [i["package"] for i in report.other_copy] == [pkg]
-    assert library.game(pkg)["game_dir"] == str(tmp_path / "Old" / "Space Game")
-    shutil.rmtree(tmp_path / "Old")
-    exe = tmp_path / "Copy" / "Space Game" / "Space Game.exe"
-    exe.write_bytes(exe.read_bytes() + b"\0" * 512)  # another build
-    report = pipeline.ScanReport()
-    pipeline.add_path(tmp_path / "Copy", only_new=True, report=report)
-    assert [i["package"] for i in report.other_version] == [pkg]
-    assert library.game(pkg)["game_dir"] == str(tmp_path / "Old" / "Space Game")
-    report = pipeline.ScanReport()
-    pipeline.add_path(tmp_path / "Copy", report=report)
-    g = library.game(pkg)
-    assert [i["package"] for i in report.updated] == [pkg] and g["source_id"]
-    assert g["game_dir"] == str(tmp_path / "Copy" / "Space Game")
-    _rift_kept(g)
@@ -38,36 +38,8 @@ def test_quote_refuses_batch_injection(value):
        native.quote(value)


-def test_quote_leaves_globs_to_sftp():
-    """Inside double quotes sftp escapes * ? [ itself: an extra backslash became part of the name (GitHub #324)."""
-    assert native.quote('a *?["b') == '"a *?[\\"b"'
-    assert native.quote("/x/te*s?t [ENG] \\b+(1).apk") == '"/x/te*s?t [ENG] \\\\b+(1).apk"'
-
-
-def test_quote_windows_local_path_uses_forward_slashes():
-    """Win32-OpenSSH turns a local path's backslashes into '/', escapes included ("C://Users", "/[ENG]")."""
-    path = r"C:\Users\user_name\AppData\Local\FramePort\output\All-In-One - Sports VR [ENG] v100+1.9.0 (x)\a.apk"
-    assert native.quote(path, windows=True) == (
-        '"C:/Users/user_name/AppData/Local/FramePort/output/All-In-One - Sports VR [ENG] v100+1.9.0 (x)/a.apk"')
-    assert native.quote(r"\\server\share\*?[a].apk", windows=True) == '"//server/share/*?[a].apk"'
-    assert native.quote('C:\\odd "name"\\a.apk', windows=True) == '"C:/odd \\"name\\"/a.apk"'
-
-
-@pytest.mark.parametrize("os_name,expected", [("nt", '"C:/games/[ENG] a/x.apk"'),
-                                              ("posix", '"C:\\\\games\\\\[ENG] a\\\\x.apk"')])
-def test_quote_local_follows_the_platform(monkeypatch, os_name, expected):
-    monkeypatch.setattr(native.os, "name", os_name)
-    assert native.quote_local(r"C:\games\[ENG] a\x.apk") == expected
-
-
-def test_batch_line_for_bracketed_folder(tmp_path, monkeypatch):
-    folder = tmp_path / "All-In-One - Sports VR [ENG] v100+1.9.0"
-    folder.mkdir()
-    frame, items, files, commands, processes = setup_batch(folder, monkeypatch)
-    monkeypatch.setattr(native.os, "name", "posix")
-    native.upload(frame, items, "/incoming", Reporter(), 20, 0, 1)
-    assert sorted(commands[0].splitlines()) == [f'put "{folder}/patch.obb" "/incoming/patch.obb.part"',
-                                                f'reput "{folder}/main.obb" "/incoming/main.obb.part"']
+def test_quote_protects_spaces_quotes_globs():
+    assert native.quote('a *?["b') == '"a \\*\\?\\[\\"b"'


 def test_size_lookup_does_not_hide_connection_errors():
@@ -93,11 +65,10 @@ def setup_batch(tmp_path, monkeypatch, code=0):
    monitor.stat.side_effect = stat
    monitor.remove.side_effect = lambda path: files.pop(path)
    frame = SimpleNamespace(sftp=monitor, client=SimpleNamespace(open_sftp=lambda: monitor),
-                            target=FrameTarget("paired"), run=Mock(return_value=(0, "", "")), modes_seen=[])
+                            target=FrameTarget("paired"), run=Mock(return_value=(0, "", "")))
    monkeypatch.setattr(native.shutil, "which", lambda _: "sftp")
    @contextlib.contextmanager
-    def creds(frame, relaxed=False):
-        frame.modes_seen.append(relaxed)
+    def creds(frame):
        yield ["-o", "StrictHostKeyChecking=yes"]
    monkeypatch.setattr(native, "credentials", creds)
    commands, processes = [], []
@@ -239,7 +210,7 @@ def setup_tar(tmp_path, monkeypatch, code=0):

    path = tmp_path / "small.bin"
    path.write_bytes(b"payload")
-    frame = SimpleNamespace(target=FrameTarget("paired.example", port=2222), modes_seen=[])
+    frame = SimpleNamespace(target=FrameTarget("paired.example", port=2222))
    pipe = io.BytesIO()
    pipe.close = lambda: None
    process = Mock(stdin=pipe, returncode=code)
@@ -248,9 +219,8 @@ def setup_tar(tmp_path, monkeypatch, code=0):
    monkeypatch.setattr(native.subprocess, "Popen", popen)
    monkeypatch.setattr(native.shutil, "which", lambda _: "ssh")
    @contextlib.contextmanager
-    def creds(frame, port_flag, relaxed=False):
+    def creds(frame, port_flag):
        assert port_flag == "-p"
-        frame.modes_seen.append(relaxed)
        yield ["-o", "StrictHostKeyChecking=yes", port_flag, "2222"]
    monkeypatch.setattr(native, "credentials", creds)
    return frame, [(path, "nested/small.bin")], process, popen, pipe
@@ -1,340 +0,0 @@
-"""SSH keys beyond FramePort's own (GitHub #242): key files from Settings, the login a connection used, and OpenSSH
-uploads that fall back to this PC's own keys/agent when the Frame refuses FramePort's key."""
-import contextlib
-from pathlib import Path
-from types import SimpleNamespace
-from unittest.mock import Mock
-
-import paramiko
-import pytest
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric import ed25519
-
-from frameport.core import library
-from frameport.core.events import Reporter
-from frameport.frame import connection as C
-from frameport.frame import native_upload as native
-
-REFUSED = (b"debug1: Reading configuration data nul\r\n"
-           b"debug1: identity file C:/Temp/frameport-upload-x/key0 type 3\r\n"
-           b"debug1: Connecting to 10.0.0.2 [10.0.0.2] port 22.\r\n"
-           b"@         WARNING: UNPROTECTED PRIVATE KEY FILE!          @\r\n"
-           b"debug1: Offering public key: C:/Temp/frameport-upload-x/key0 ED25519 SHA256:abc explicit\r\n"
-           b"debug1: Authentications that can continue: publickey,password\r\n"
-           b"debug1: kex: algorithm: curve25519-sha256\r\n"
-           b"steamos@10.0.0.2: Permission denied (publickey,password).\r\n")
-
-
-@pytest.fixture(autouse=True)
-def no_real_home_keys(tmp_path, monkeypatch):
-    """Never read the real ~/.ssh (relaxed mode looks there)."""
-    empty = tmp_path / "empty-home"
-    empty.mkdir()
-    monkeypatch.setattr(native.Path, "home", lambda: empty)
-
-
-def write_key(path: Path, password: bytes | None = None) -> Path:
-    enc = serialization.BestAvailableEncryption(password) if password else serialization.NoEncryption()
-    key = ed25519.Ed25519PrivateKey.generate()
-    path.write_bytes(key.private_bytes(serialization.Encoding.PEM, serialization.PrivateFormat.OpenSSH, enc))
-    path.with_name(path.name + ".pub").write_bytes(key.public_key().public_bytes(
-        serialization.Encoding.OpenSSH, serialization.PublicFormat.OpenSSH))
-    return path
-
-
-# ------------------------------------------------------------------------------------------- key files
-def test_key_file_validation(tmp_path):
-    good = write_key(tmp_path / "id_ed25519")
-    assert isinstance(C.load_key_file(good), paramiko.PKey)
-    with pytest.raises(C.KeyFileError, match="passphrase"):
-        C.load_key_file(write_key(tmp_path / "locked", b"secret"))
-    with pytest.raises(C.KeyFileError, match="public half"):
-        C.load_key_file(tmp_path / "id_ed25519.pub")
-    with pytest.raises(C.KeyFileError, match="not found"):
-        C.load_key_file(tmp_path / "missing")
-    (tmp_path / "notes.txt").write_text("hello")
-    with pytest.raises(C.KeyFileError, match="isn't a private SSH key"):
-        C.load_key_file(tmp_path / "notes.txt")
-
-
-def test_extra_keys_come_from_settings_and_skip_unusable_ones(tmp_path):
-    good = write_key(tmp_path / "mine")
-    locked = write_key(tmp_path / "locked", b"secret")
-    library.set_setting(C.EXTRA_KEYS_SETTING, [str(good), str(good), str(locked), str(tmp_path / "gone"), "", 3])
-    assert C.extra_key_paths() == [good, locked, tmp_path / "gone"]
-    assert [path for path, _ in C.extra_keys()] == [good]
-    library.set_setting(C.EXTRA_KEYS_SETTING, str(good))  # a single path, e.g. edited by hand
-    assert C.extra_key_paths() == [good]
-
-
-class _Client:
-    """paramiko.SSHClient stand-in: accepts the key `accepted` (or the agent when accepted == "agent")."""
-    accepted = None
-    tried: list = []
-
-    def load_host_keys(self, path):
-        pass
-
-    def set_missing_host_key_policy(self, policy):
-        pass
-
-    def close(self):
-        pass
-
-    def save_host_keys(self, path):
-        pass
-
-    def get_transport(self):
-        return Mock()
-
-    def connect(self, pkey=None, password=None, allow_agent=False, look_for_keys=False, **kw):
-        kind = "password" if password else "agent" if allow_agent else pkey
-        _Client.tried.append(kind)
-        if kind != _Client.accepted:
-            raise paramiko.AuthenticationException("Authentication failed.")
-
-
-@pytest.mark.parametrize("accepted,auth", [("app", "app_key"), ("user", "user_key"), ("agent", "agent")])
-def test_connection_records_the_login_that_worked(monkeypatch, accepted, auth):
-    monkeypatch.setattr(C.paramiko, "SSHClient", _Client)
-    monkeypatch.setattr(C, "app_keys", lambda: ["app"])
-    monkeypatch.setattr(C, "extra_keys", lambda: [(Path("/k"), "user")])
-    monkeypatch.setattr(C.Frame, "run", lambda self, cmd: (0, "/home/steamos", ""))
-    _Client.accepted, _Client.tried = accepted, []
-    frame = C.Frame(C.FrameTarget("10.0.0.2")).connect()
-    assert frame.auth == auth
-    assert _Client.tried == ["app", "user", "agent"][:["app", "user", "agent"].index(accepted) + 1]
-
-
-# ------------------------------------------------------------------------------------------- OpenSSH arguments
-def frame_with_key():
-    key = SimpleNamespace(get_name=lambda: "ssh-ed25519", get_base64=lambda: "PAIRED_KEY")
-    client = SimpleNamespace(get_transport=lambda: SimpleNamespace(get_remote_server_key=lambda: key))
-    return C.Frame(C.FrameTarget("paired.example"), client=client)
-
-
-def test_credentials_offer_own_and_settings_keys_strict_or_relaxed(tmp_path, monkeypatch):
-    own = tmp_path / "ssh"
-    own.mkdir()
-    write_key(own / "id_ed25519")
-    mine = write_key(tmp_path / "id_ed25519")  # same file name as FramePort's: copies get their own names
-    monkeypatch.setattr(native, "ssh_dir", lambda: own)
-    library.set_setting(C.EXTRA_KEYS_SETTING, [str(mine)])
-    with native.credentials(frame_with_key()) as args:
-        copies = [Path(args[i + 1]) for i, a in enumerate(args) if a == "-i"]
-        assert [c.read_bytes() for c in copies] == [(own / "id_ed25519").read_bytes(), mine.read_bytes()]
-        assert "IdentitiesOnly=yes" in args and "BatchMode=yes" in args and "-v" in args
-        assert all(oct(c.stat().st_mode & 0o777) == "0o600" for c in copies)
-    assert not any(c.exists() for c in copies)
-    with native.credentials(frame_with_key(), relaxed=True) as args:
-        assert "IdentitiesOnly=yes" not in args and args.count("-i") == 2
-        assert "StrictHostKeyChecking=yes" in args  # host key still pinned
-
-
-def test_relaxed_credentials_work_without_any_key_file(tmp_path, monkeypatch):
-    monkeypatch.setattr(native, "ssh_dir", lambda: tmp_path)
-    with pytest.raises(OSError, match="no FramePort key"):
-        with native.credentials(frame_with_key()):
-            pass
-    with native.credentials(frame_with_key(), relaxed=True) as args:
-        assert "-i" not in args
-
-
-def test_windows_sid_survives_a_non_ascii_user_name(monkeypatch):
-    out = '"desktop-1\\josé müller","S-1-5-21-1004336348-1177238915-682003330-1001"\r\n'.encode("cp850")
-    monkeypatch.setattr(native.subprocess, "check_output", lambda *a, **k: out)
-    assert native.current_sid() == "S-1-5-21-1004336348-1177238915-682003330-1001"
-    monkeypatch.setattr(native.subprocess, "check_output", lambda *a, **k: b"nothing")
-    with pytest.raises(OSError):
-        native.current_sid()
-
-
-# ------------------------------------------------------------------------------------------- failures and modes
-def test_failure_keeps_openssh_messages_and_key_lines():
-    exc = native.failure("OpenSSH SFTP", 255, REFUSED)
-    assert isinstance(exc, native.OpenSSHAuthFailed)
-    text = str(exc)
-    assert "UNPROTECTED PRIVATE KEY FILE" in text and "Offering public key" in text
-    assert "identity file" in text and "Permission denied (publickey,password)" in text
-    assert "kex: algorithm" not in text and "Reading configuration" not in text
-    other = native.failure("OpenSSH SFTP", 1, b"stat x: No such file or directory\n")
-    assert type(other) is OSError and "No such file" in str(other)
-    assert type(native.failure("OpenSSH tar", 255, b"ssh: connect to host x port 22: Connection timed out")) is OSError
-
-
-@pytest.mark.parametrize("auth,known,modes", [("app_key", None, [False, True]), ("user_key", None, [False, True]),
-                                              ("password", None, [False, True]), ("agent", None, [True]),
-                                              ("app_key", True, [True]), ("agent", False, [False])])
-def test_login_modes(auth, known, modes):
-    assert native.login_modes(SimpleNamespace(auth=auth, openssh_relaxed=known)) == modes
-    assert native.login_modes(SimpleNamespace()) == [False, True]  # stand-ins without the fields
-
-
-def sftp_setup(tmp_path, monkeypatch, refuse_strict=True, refuse_relaxed=False, auth="app_key"):
-    """Two .part-less files; strict/relaxed logins refused as asked; returns the frame and the Popen calls."""
-    paths = [tmp_path / "main.obb", tmp_path / "patch.obb"]
-    for path in paths:
-        path.write_bytes(b"0123456789")
-    items = [(path, path.name, 10) for path in paths]
-    files = {}
-    monitor = Mock()
-    monitor.__enter__ = Mock(return_value=monitor)
-    monitor.__exit__ = Mock(return_value=False)
-
-    def stat(path):
-        if path not in files:
-            raise FileNotFoundError(path)
-        return SimpleNamespace(st_size=files[path])
-    monitor.stat.side_effect = stat
-    frame = SimpleNamespace(sftp=monitor, client=SimpleNamespace(open_sftp=lambda: monitor), auth=auth,
-                            openssh_relaxed=None, target=C.FrameTarget("paired"), run=Mock(return_value=(0, "", "")))
-    monkeypatch.setattr(native.shutil, "which", lambda _: "sftp")
-    mode = {}
-
-    @contextlib.contextmanager
-    def creds(frame, port_flag="-P", relaxed=False):
-        mode["relaxed"] = relaxed
-        yield ["relaxed" if relaxed else "strict"]
-    monkeypatch.setattr(native, "credentials", creds)
-    calls = []
-
-    def popen(args, **kwargs):
-        relaxed = mode["relaxed"]
-        calls.append(relaxed)
-        refused = refuse_relaxed if relaxed else refuse_strict
-        if refused:
-            kwargs["stderr"].write(REFUSED)
-            code = 255
-        else:
-            for _, rel, size in items:
-                files["/incoming/" + rel + ".part"] = size
-            code = 0
-        process = Mock(returncode=code)
-        process.poll.return_value = code
-        return process
-    monkeypatch.setattr(native.subprocess, "Popen", popen)
-    return frame, items, calls
-
-
-def test_refused_strict_login_retries_with_this_pcs_keys(tmp_path, monkeypatch):
-    frame, items, calls = sftp_setup(tmp_path, monkeypatch)
-    logs = []
-    reporter = Reporter()
-    reporter.log = lambda message, **k: logs.append(message)
-    assert native.upload(frame, items, "/incoming", reporter, 20, 0, 2) == 20
-    assert calls == [False, False, True, True]  # both strict workers are refused, then both run relaxed
-    assert frame.openssh_relaxed is True
-    assert any("trying this PC's own SSH keys" in m and "UNPROTECTED" in m for m in logs)
-    assert native.login_modes(frame) == [True]  # the next upload starts in the mode that worked
-
-
-def test_agent_login_goes_straight_to_relaxed(tmp_path, monkeypatch):
-    frame, items, calls = sftp_setup(tmp_path, monkeypatch, auth="agent")
-    assert native.upload(frame, items, "/incoming", Reporter(), 20, 0, 1) == 20
-    assert calls == [True]
-
-
-def test_refused_in_both_modes_raises_the_auth_failure(tmp_path, monkeypatch):
-    frame, items, calls = sftp_setup(tmp_path, monkeypatch, refuse_relaxed=True)
-    with pytest.raises(native.OpenSSHAuthFailed, match="Permission denied"):
-        native.upload(frame, items, "/incoming", Reporter(), 20, 0, 1)
-    assert calls == [False, True] and frame.openssh_relaxed is None
-    assert not frame.run.called  # nothing promoted
-
-
-def test_tar_retries_a_refused_login(tmp_path, monkeypatch):
-    path = tmp_path / "small.bin"
-    path.write_bytes(b"abc")
-    frame = SimpleNamespace(target=C.FrameTarget("paired"), auth="app_key", openssh_relaxed=None)
-    monkeypatch.setattr(native.shutil, "which", lambda _: "ssh")
-    mode = {}
-
-    @contextlib.contextmanager
-    def creds(frame, port_flag="-P", relaxed=False):
-        mode["relaxed"] = relaxed
-        yield []
-    monkeypatch.setattr(native, "credentials", creds)
-
-    class Pipe:
-        def write(self, data):
-            if not mode["relaxed"]:
-                raise BrokenPipeError(32, "Broken pipe")  # ssh already exited
-            return len(data)
-
-        def flush(self):
-            pass
-
-        def close(self):
-            pass
-    calls = []
-
-    def popen(args, **kwargs):
-        calls.append(mode["relaxed"])
-        code = 0 if mode["relaxed"] else 255
-        if code:
-            kwargs["stderr"].write(REFUSED)
-        process = Mock(stdin=Pipe(), returncode=code)
-        process.poll.return_value = code
-        return process
-    monkeypatch.setattr(native.subprocess, "Popen", popen)
-    native.put_tar(frame, [(path, "small.bin")], "/incoming", Reporter(), Mock())
-    assert calls == [False, True] and frame.openssh_relaxed is True
-
-
-def test_azure_ad_sid(monkeypatch):
-    out = b'"azuread\\jmueller","S-1-12-1-1234567890-1234567890-1234567890-1234567890"\r\n'
-    monkeypatch.setattr(native.subprocess, "check_output", lambda *a, **k: out)
-    assert native.current_sid() == "S-1-12-1-1234567890-1234567890-1234567890-1234567890"
-
-
-def test_relaxed_mode_names_this_pcs_default_keys(tmp_path, monkeypatch):
-    """OpenSSH skips its default keys once any -i is given, so relaxed mode names the ones Paramiko tries."""
-    home = tmp_path / "home"
-    (home / ".ssh").mkdir(parents=True)
-    rsa = home / ".ssh" / "id_rsa"
-    from cryptography.hazmat.primitives.asymmetric import rsa as rsa_keys
-
-    rsa.write_bytes(rsa_keys.generate_private_key(65537, 2048).private_bytes(
-        serialization.Encoding.PEM, serialization.PrivateFormat.OpenSSH, serialization.NoEncryption()))
-    write_key(home / ".ssh" / "id_ecdsa", b"secret")  # passphrase: only usable through the agent
-    (home / ".ssh" / "id_ed25519").write_text("garbage")
-    monkeypatch.setattr(native.Path, "home", lambda: home)
-    own = tmp_path / "own"
-    own.mkdir()
-    write_key(own / "id_ed25519")
-    monkeypatch.setattr(native, "ssh_dir", lambda: own)
-    assert native.default_key_files() == [rsa]
-    assert native.key_files() == [own / "id_ed25519"]
-    assert native.key_files(relaxed=True) == [own / "id_ed25519", rsa]
-    library.set_setting(C.EXTRA_KEYS_SETTING, [str(rsa)])  # a default key also named in Settings: offered once
-    assert native.key_files(relaxed=True) == [own / "id_ed25519", rsa]
-
-
-def test_add_remove_and_status_of_settings_keys(tmp_path):
-    good = write_key(tmp_path / "frame key")
-    with pytest.raises(C.KeyFileError, match="public half"):
-        C.add_extra_key(tmp_path / "frame key.pub")
-    with pytest.raises(C.KeyFileError, match="passphrase"):
-        C.add_extra_key(write_key(tmp_path / "locked", b"pw"))
-    assert C.add_extra_key(good) == good.resolve()
-    C.add_extra_key(good)  # once only
-    assert C.extra_key_paths() == [good.resolve()]
-    good.unlink()
-    [(path, problem)] = C.extra_key_status()
-    assert path == good.resolve() and "not found" in problem
-    assert C.remove_extra_key(good) is True and C.remove_extra_key(good) is False
-    assert C.extra_key_paths() == []
-
-
-def test_cli_ssh_keys(tmp_path):
-    from typer.testing import CliRunner
-
-    from frameport.cli import app
-
-    good = write_key(tmp_path / "mine")
-    run = CliRunner().invoke(app, ["frame", "ssh-keys", "--add", str(good)])
-    assert run.exit_code == 0 and f"added {good.resolve()}" in run.output
-    run = CliRunner().invoke(app, ["frame", "ssh-keys", "--add", str(tmp_path / "nope")])
-    assert run.exit_code == 1 and str(good.resolve()) in run.output
-    run = CliRunner().invoke(app, ["frame", "ssh-keys", "--remove", str(good.resolve())])
-    assert run.exit_code == 0 and "no extra keys" in run.output