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-17 00:02:08 +02:00 · 2026-10-15 20:02:27 -04:00
26 changed files with 55 additions and 1376 deletions
@@ -274,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
@@ -920,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.
@@ -1,5 +1,5 @@
 package: com.asg.clockworkdev
-title: The Last Clockwinder
+title: Clockwork
 status: works
 tested_version: '1.29'
 engine: Unity
@@ -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,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
@@ -31,11 +31,11 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | BONELAB | Quest | ✅ Works |  |
 | Carve Snowboarding | Quest | ✅ Works |  |
 | Caves | 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 |  |
@@ -129,7 +129,6 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | TetrisEffect | Quest | ✅ Works |  |
 | The Boys VR | 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 |  |
@@ -144,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 |  |
@@ -176,6 +174,7 @@ Generated from [catalog/games](../catalog/games) by `scripts/compat_list.py`.
 | 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. |
@@ -71,7 +71,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [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 |
@@ -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.
@@ -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,8 +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-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)))
@@ -423,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
@@ -730,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,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
@@ -499,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:
@@ -553,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
@@ -562,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)
@@ -587,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)
@@ -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,7 +94,6 @@
 "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…": "",
@@ -558,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.": "",
@@ -570,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.": [
  "",
  ""
@@ -1032,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.": "",
@@ -1145,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": "",
@@ -1421,7 +1416,6 @@
 "Sound on": "",
 "Source": "",
 "square, 256 × 256": "",
- "SSH keys": "",
 "Stable (default)": "",
 "Stand in for cube layers": "",
 "Standard for every game": "",
@@ -1472,7 +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 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).": "",
@@ -1524,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.": "",
@@ -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,9 +96,6 @@ def reduce_motion_setting() -> bool:
    return bool(library.setting(REDUCE_MOTION, False))


-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
@@ -148,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)
@@ -188,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:
@@ -243,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;
@@ -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 "
@@ -131,55 +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 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
@@ -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"))
@@ -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