OpenSSH uploads log in like the Frame connection; SSH key files in Settings (#242 )

A Frame that only authorizes the user's own key refused OpenSSH, which offered FramePort's keys alone (IdentitiesOnly), so every upload fell back to Paramiko. The connection now records which login worked (Frame.auth): after a login with this PC's own keys/agent OpenSSH also offers private copies of ~/.ssh/id_* (OpenSSH skips its defaults once -i is given) and the agent; a refused strict login is retried that way once. FramePort doesn't add its key to the Frame for this. New: Settings > Installing > SSH keys (library ssh.extra_keys, CLI frameport frame ssh-keys): extra private key files for the connection and OpenSSH, checked with Paramiko (passphrase keys: use the agent). OpenSSH runs with -v and a refused login's error lists the keys offered and its warnings. whoami's SID is read from bytes (non-ASCII user names). Checked with Windows ssh.exe/sftp.exe against the Frame.
OpenSSH uploads: don't escape glob characters inside sftp's quotes (#324 )
2026-10-16 07:02:17 +02:00 · 2026-10-15 19:54:09 -04:00 · 2026-10-15 19:36:48 -04:00 · 2026-10-15 19:07:48 -04:00 · 2026-10-15 19:07:47 -04:00 · 2026-10-15 19:07:46 -04:00
42 changed files with 2085 additions and 108 deletions
@@ -19,6 +19,8 @@ CLAUDE.local.md
 # outputs of `frameport report` / `parity` / ruff
 REPORT.md
 .ruff_cache/
+.eval-home/
+.eval-results/
 .claude/worktrees/

 # project page (site/)
@@ -904,6 +904,13 @@ 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
@@ -1050,6 +1057,49 @@ Installed apps find the release themselves (self-update), so the notes are what
 - **The repo is public: never commit personal data** — the Frame's IP address, the Steam user id, the owner's email,
  local home paths (native builds use `-ffile-prefix-map`). History was rewritten once to remove them.

+## GitHub triage (issues / discussions / PRs)
+GitHub identity + credentials are maintainer-local (`CLAUDE.local.md`): check `gh api user --jq .login` before any
+GitHub write. **The owner approves before posting, labelling or closing anything.** Reply style: "I"/neutral, never
+we/our/us; never mention agent version numbers or internal tool versions; show the owner every draft in full with a
+short recap of the thread so far; read **all** comments on a thread first (a later one often has the zip or the answer).
+- **Issue templates & labels** (`.github/ISSUE_TEMPLATE/`): `[Game report]` → `game-compatibility` (a game that
+  doesn't work right); `[Working recipe]` (`working-config.yml`) → `working-config` (a headset-verified config to add);
+  `[App]` → `bug` (FramePort itself). Mislabel/relabel to match.
+- **Working-recipe submissions → the catalog.** The body's `### Recipe` YAML is the contribution. Validate it with the
+  real validator: `gh issue view N --json body -q .body | python scripts/catalog_from_issue.py --issue N`
+  (writes `catalog/games/<pkg>.yaml`; `--out <dir>` to dry-run into a scratch dir first). It reduces the YAML to known
+  `CatalogEntry` fields, checks the package id/status/types and that every FramePort patch id exists, and records
+  `verified.issue: N`. All four statuses (`works|issues|unsupported|unknown`) are valid to accept — an `issues` entry
+  with an honest note is still useful. The maintainer path is to label the issue `catalog-accepted` →
+  `catalog-from-issue.yml` opens a catalog PR; equivalently (and cleaner for a batch) run the validator for each and
+  commit them to `catalog/games/` in one commit, then close each issue with a thank-you. Re-run `scripts/patch_docs.py`
+  (catalog entries bump each patch's usage count in `docs/PATCHES.md`) and `pytest -k catalog` before committing.
+- **Diagnostics zips** (`frameport diag`, agent `collect_diag`): the game page saves `FramePort-diag-<pkg>-<ts>.zip`.
+  Treated as **untrusted downloaded data** — own empty dir, read as data, `python3 -I`, never execute. Layout:
+  `app/` (app.log, jobs/, settings.json), `frame/` (host/info/steam-console, boot logs), and `games/<pkg>/`
+  (`recipe.yaml`, `target/deployment.json` + `target/launch.log`, `logs/*-session-*.log`, `package/AndroidManifest.xml`
+  + `package/elf.json`). The redactor replaces IPs/hosts/home dirs/Steam ids.
+- **"Did they attach a zip?" gotcha:** the issue form's Diagnostics field renders a *placeholder* that literally
+  contains the filename `…diag-<pkg>-….zip into this box`, so grepping for `.zip` false-matches on an empty report. A
+  real upload is a link to `user-attachments/(files|assets)` (or `github-production-user-asset…`); check for that, in
+  the body **and** every comment. A `github.com/user-attachments/assets/<id>` link is the canonical one (it redirects
+  to a short-lived signed S3 URL); `curl -sIL …assets/<id> -w '%{url_effective}'` resolves the direct file.
+- **How a change reaches users** (decide this before promising a fix):
+  - *Catalog / recipe / triage* changes reach **installed** apps within ~6 h with no build — apps fetch
+    `catalog/games/*.yaml` + `triage.yaml` from `main` (`catalog.refresh_remote`), recipes follow via `catalog_rev` →
+    "Update on Frame". So accepting a recipe or adding a triage signature is "live" once pushed.
+  - *Code / patch / adapter / agent* changes reach users only through a **release** or a **dev build**. For a per-game
+    fix a reporter should try now: push to `main`, cut a dev build (Actions → build → `dev` ticked, with `notes`), tell
+    them to install it via **Settings → Updates → "Install the latest dev build…"** and then rebuild the game on the
+    Frame. Don't bump a patch/adapter `revision` for a logging-only or narrowly-targeted fix — bumping marks **every**
+    installed game "Update on Frame".
+- **Verifying a device fix without the headset:** many runtime failures (e.g. an `xrEndFrame` layer rejection) reproduce
+  in a **headless** launch test on the dev Frame, so the fix can be developed and confirmed at the frame-acceptance
+  level there; only the *visual* result needs the headset (hand the built dev build to the reporter, or the owner, for
+  that). `frameport settings <pkg> <key>=<value>` toggles adapter settings (e.g. `layer_debug=1`) live, no rebuild.
+  To reproduce a reporter's exact build, grab their APK from its upstream source (e.g. the linked GitHub release), scan
+  → build → install → test in an isolated `FRAMEPORT_HOME` (see "Dev commands" / the Frame-busy rules).
+
 ## Heuristics (games not in the catalog)
 Each patch's `detect()` suggests itself from the Analysis; `applies()` says whether it can matter at all (the UI/CLI
 hide non-applicable patches; enabled ones are always shown). Rules learned from the 34 games:
@@ -1057,9 +1107,15 @@ MR-only (PASSTHROUGH required + BOUNDARYLESS_APP) → force_passthrough, + USE_S
 hand tracking required → controller_fix=0; OVRPlugin + ≥20 GiB → disable_space_warp; Unreal ≤4.21 or Unreal Meta XR
 Audio → nodebug; Oculus-OS class referenced by the Unreal audio build or ≥2 Meta libs → oculusos; legacy-VrApi Unity
 GLES with MSAA → unity_no_msaa; CryEngine → user.cfg r_variable_rate_shading=0; direct VrApi → bridge (+GL shim for
-GLAD/GLES); Unreal → alternate no-ForceQuit build. Score changes with
-`python scripts/eval_heuristics.py "<dumps>"` (catalog off vs verified recipes; currently 33/34 exact — Phantom's
-"use the no-ForceQuit build" is only detectable at runtime via triage). Add a rule → re-run the eval + `pytest -m games`.
+GLAD/GLES); Unreal → alternate no-ForceQuit build. Scoring (docs/HEURISTICS_EVAL.md, 2026-10-15): analyse the dumps
+once (`scripts/heuristics_snapshot.py <out.json> "<VR CyberDeck Portable>" "<PATCHED>"`, ~30 min, keep out of git),
+then `scripts/eval_heuristics.py --snapshot <out.json> --split dev|holdout|all [--fit-report]` (catalog-only truth,
+per-patch precision/recall, a fixed 20% holdout to catch rules fitted to one game). Read the **dated** score: an
+"extra" on an entry verified before the patch existed is a catalog gap, and adapter/device picks are inherited by
+catalog recipes anyway. 2026-10-15: strict 5/65 exact, F1 73.8%; dated 39/65, F1 88.6%; remaining misses are
+one-game runtime fixes. Don't key a rule on one game's code fingerprint (an Unreal splash/depth "detect" matching
+only Star Wars Tales + FNAF HW was rejected: it would also have bumped ANALYSIS_VERSION for every user). Add a rule →
+re-run dev + holdout + `pytest -m games`.

 ## Frame operations
 - Find/connect: `frameport frame discover` / `frame info` (the remembered Frame is in `<user data>/frames.json`).
@@ -7,8 +7,14 @@ xr: OpenXR
 status: works
 notes: Uses Meta XR Audio via FMOD (not covered by patch_meta_xr_audio); if audio is missing, that is the likely
  cause.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 63fff470777f2753d55ad50f8355573ced8fa48bcaee0f5e6a0c10369f951a38
+updated: '2026-10-15'
@@ -6,9 +6,15 @@ engine: Unity
 xr: VrApi
 status: issues
 notes: Right eye distorts during movement (unresolved; swap, tracking, Valve layers, depth and pacing ruled out).
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: Legacy VrApi via OVRPlugin; overport swaps in an OpenXR OVRPlugin. Do not remove VrApi.
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 192ff250f5fbec38b9c4e898f0b8408edc25901f46bb4b227f7ca60bbd9f0bba
+updated: '2026-10-15'
@@ -6,9 +6,15 @@ engine: Unity
 xr: OpenXR
 status: works
 notes: Needed the GLES/sRGB swapchain fallback.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: Also available as a native PC SteamVR title.
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 158f7c4f5e8558029dc8cc5e8dcb4e67e846b261bf34e3e448fee7f657c74597
+updated: '2026-10-15'
@@ -6,8 +6,14 @@ engine: Unity
 xr: OpenXR
 status: works
 notes: Recommended pilot title.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 2300f628ce04c1da60b52fed18335d6a31b88cc88313fd6d2c0e1a8e7785126f
+updated: '2026-10-15'
@@ -5,9 +5,14 @@ source_hint: 'Sniper Elite VR- Winter Warrior'
 engine: Unity
 xr: OpenXR
 status: works
-notes: ''
+notes: frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 6b8170da5826b9a35326a20967a0e5a242d46fb569a0a3c669e1cbd368102dd3
+updated: '2026-10-15'
@@ -6,11 +6,14 @@ engine: Unity
 xr: OpenXR
 status: works
 notes: Passthrough + Meta scene/room emulated from the Steam guardian (scene_emul=1).
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: Mixed-reality-only; builds its level from the room model, which the adapter emulates from the Steam guardian.
 overport_extra:
 - patch_force_passthrough
 adapter:
  scene_emul: 1
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
@@ -18,3 +21,5 @@ verified:
  known_good_sha256: 9f900fc86fbb2663abe83c82ab79cc72bbf1f93fea54f7583fd274dd07e3d09c
 frame:
 - frame.meta_permissions
+- frame.unity_text_input
+updated: '2026-10-15'
@@ -6,12 +6,18 @@ engine: Unity
 xr: OpenXR
 status: issues
 notes: Hand-tracking game; the Frame synthesizes hands from controllers, so it is janky.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: Hand-tracking-only game; Steam Frame has no optical hand tracking. Built with controller_fix=0 so hand
  data passes through if the runtime ever provides it.
 adapter:
  controller_fix: 0
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: a19b80db0c300d422cbba35a4924ab59211b39bcb6485e200d310e3e1372ddb7
+updated: '2026-10-15'
@@ -7,10 +7,15 @@ xr: OpenXR
 status: works
 notes: FrameBridge turns its upside-down UI panels upright (flip emulation, in place since FramePort 1.2.0). Ubisoft
  login may not work.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: Ubisoft online login may not work. Data folder holds raw assets (start0..2, .climb, bundles), not .obb
  files; install to obb as-is.
 overport_extra:
 - patch_ac_nexus_no_appsw_90
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
@@ -18,5 +23,5 @@ verified:
  known_good_sha256: 89644a12bf8df956fa3d3a9a40540ba9e1fb62f63494714a05c9f05984383ac8
  no_appsw_90: '2026-10-02, OVRPort 1.2.5 (owner: 90 Hz felt better than 72 Hz; same known issues)'
  flip_in_place: '2026-10-14, owner in the headset: launch warnings and tutorial pop-ups upright (GitHub #138)'
-updated: '2026-10-14'
+updated: '2026-10-15'
 min_app: 1.2.0
@@ -2,6 +2,7 @@ package: com.camouflaj.manta
 title: 'Batman: Arkham Shadow'
 status: works
 notes: Large data set (~27 GiB) incl. all language packs.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: 'Uses Meta XR Audio (Wwise), handled by patch_meta_xr_audio. Cutscenes are 8K HEVC panoramas: frame.hw_video_decode
  decodes them on the Frame''s hardware, adapter.surface_native shows them in stereo (PRs #96, #128). Includes all
  language packs (~28 GB). sync_guard (to test, GitHub #102) - a reporter''s game quit to Steam''s waiting screen
@@ -13,15 +14,18 @@ overport_extra:
 - patch_disable_space_warp
 frame:
 - frame.hw_video_decode
+- frame.unity_text_input
 adapter:
  sync_guard: 1
  surface_native: 1
  fade_quad: 1
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 796d1cab08f614d72c50d9702974c719c0908f5de91183cfe02d1fd5eb09551a
-updated: '2026-10-13'
+updated: '2026-10-15'
 min_app: 1.1.0
 source_hint: Batman- Arkham Shadow
@@ -6,9 +6,15 @@ engine: Unity
 xr: OpenXR
 status: works
 notes: Co-op unavailable.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: 'Release notes: for DLC use an older version. Co-op likely unavailable.'
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 06428a6328a49b3ca769e070dd0d2bb55c2122c8fba5d07a69b1b206a532c212
+updated: '2026-10-15'
@@ -6,11 +6,17 @@ engine: Unity
 xr: OpenXR
 status: works
 notes: Passthrough emulated with the Frame cameras (greyscale).
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: Mixed-reality-only title; relies on passthrough (emulated).
 overport_extra:
 - patch_force_passthrough
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 65ca3a8f46cc9acfd268949418f9adeecb0cf9f59d11591ba95fe2ba9ea966d8
+updated: '2026-10-15'
@@ -2,10 +2,17 @@ package: com.nexxr.nexplayer
 title: NEX Player
 status: works
 notes: 'Confirmed in the headset by the owner (2026-10-01): 72 fps, local 2D/360/3D videos play (it browses /sdcard/Movies
-  itself). USB-drive browsing can''t work in Lepton.'
+  itself). USB-drive browsing can''t work in Lepton. Typing (frame.unity_text_input + device.text_input_window,
+  owner in the headset 2026-10-15): SteamVR''s keyboard button works and typed text reaches the fields; the keyboard
+  doesn''t open by itself when a field is selected.'
 tested_version: 1.3.1.0
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 engine: Unity
 xr: OpenXR
 verified:
  date: '2026-10-01'
 source_hint: NEX - NEXt-Gen Video Player
+updated: '2026-10-15'
@@ -6,8 +6,14 @@ engine: Unity
 xr: OpenXR
 status: works
 notes: Layers with failed swapchains are dropped by the adapter.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: c3f8cba1c22762231b6a6fbd881668db859d83224884ebeae0c1a3ba716f298c
+updated: '2026-10-15'
@@ -6,9 +6,15 @@ engine: Unity
 xr: OpenXR
 status: works
 notes: Use VR mode.
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
 details: Has VR and MR modes; use VR mode (passthrough not forced).
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: 5ba09a2bc0046c8cb587272ab81e8d32739334fef523b10ab26531a733d54f12
+updated: '2026-10-15'
@@ -5,9 +5,14 @@ source_hint: Toy Master
 engine: Unity
 xr: OpenXR
 status: works
-notes: ''
+notes: frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: e951595c67b6e448f3fb4afd07e6b83e98e589094bb3b73374cfb28aa01e96ee
+updated: '2026-10-15'
@@ -7,6 +7,9 @@ xr: OpenXR
 status: works
 notes: Needs Oculus OS telemetry class stubs and the no-ForceQuit build (the normal build quits right after
  starting).
+  frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
+device:
+- device.text_input_window
 verified:
  date: '2026-10-02'  # owner-confirmed with the no-ForceQuit build
  overport_cli: 1.2.3
@@ -14,6 +17,8 @@ verified:
  known_good_sha256: 31469d50b8ee292597291db7cc3bc3eca8e851f533cd92bba0d64214893580cc
 frame:
 - frame.oculusos
+- frame.unity_text_input
 alt_overport:
 - patch_remove_unreal_force_quit
 use_alt: true
+updated: '2026-10-15'
@@ -5,9 +5,14 @@ source_hint: H.U.N.T
 engine: Unity
 xr: OpenXR
 status: works
-notes: ''
+notes: frame.unity_text_input and device.text_input_window added from detection (not headset-verified).
+frame:
+- frame.unity_text_input
+device:
+- device.text_input_window
 verified:
  date: '2026-09-28'
  overport_cli: 1.2.3
  overport_runtime: 3.4.3-23204ea
  known_good_sha256: c35373d0f7c870ade148e3259abcc74098b6bc89fe2c2f3a2e55168df642e391
+updated: '2026-10-15'
@@ -0,0 +1,83 @@
+# Evaluating patch heuristics
+
+`scripts/eval_heuristics.py` compares `engine.suggest(analysis, use_catalog=False)` with the bundled
+`catalog/games/*.yaml` entries. It does not merge personal or remote catalog recipes into the benchmark.
+It supports the original dumps command, or a precomputed `scripts/heuristics_snapshot.py` snapshot:
+
+```sh
+.venv/bin/python scripts/eval_heuristics.py '<dumps folder>' --verbose
+.venv/bin/python scripts/eval_heuristics.py --snapshot analyses.json --split all --json baseline.json
+.venv/bin/python scripts/eval_heuristics.py --snapshot analyses.json --fit-report --out fit-report.md
+```
+
+Use a scratch `FRAMEPORT_HOME`, `FRAMEPORT_NO_CATALOG_UPDATE=1`, and an empty `FRAMEPORT_WINDOWS_DATA` for offline
+measurement. Snapshot mode reads no APKs or game data. Each snapshot read copies the source to a temporary file,
+then parses the copy, retrying incomplete JSON. To compare multiple splits against an actively growing snapshot,
+freeze one valid copy first and use that file for every run.
+
+The default split is `dev`. `split_packages({package: analysis_engine})` sorts packages by SHA-256 within Unity,
+Unreal, and Other strata, then holds out the nearest 20% (half rounded up). Pass only packages with both an analysis
+and a catalog entry. The same input set always yields the same split regardless of iteration order; adding packages
+can move the cutoff. Very small strata can have no holdout. Unsupported entries participate in splitting.
+
+## What is scored
+
+Ground truth contains catalog choices and patch registry defaults, with no inherited heuristic adapter settings.
+Default expectations are determined per analysis, using each default patch's own detection in the same way as the
+engine's initial heuristic pass. Thus a conditional default that is not detected (e.g. LTW on a game without LTW)
+is not expected. Explicit catalog `overport_remove` and `frame_remove` entries remove expected defaults. An absent
+expected default is represented as `remove:<patch id>`; enabled defaults do not inflate patch scores.
+
+Opt-in overport/frame/device/PC VR IDs, default removals, adapter values, device-file names, foveation parameters,
+and alternate-build patch IDs are compared. Alternate-build identities use `alt:<patch id>` so choosing one in a
+fallback is distinct from choosing it in the primary build. Device-file content is not compared. Adapter values
+must match: a wrong value contributes both an FP and an FN for `adapter.<key>`. Patch precision, recall and F1 are
+micro-averaged across games; an empty denominator is reported as zero. Exact-game accuracy also compares the
+unsupported status flag. Fields report matching games, including empty-field matches.
+
+`RUNTIME_ONLY` lists choices excluded from the headline: `use_alt`, selected runtime adapter settings, Lepton
+environment variables, and config-sync settings. They have their own exact, field and patch metrics. Catalog
+entries with status `unsupported` are excluded from both headline and runtime supported-game metrics, and have
+separate metrics and per-game diffs. Converted analyses are included and marked. JSON contains all metrics per
+engine, all game signatures, split assignments, and missing/extra decisions.
+
+## Dated score: catalog gaps vs. detection errors
+
+The strict score treats the catalog as complete, but older entries were verified before many patches existed, and
+a catalog recipe inherits every heuristic adapter setting and device patch (except `device.text_input_window`)
+without listing them (`engine.suggest`), so the verified build had those. The dated score (`headline_dated`, printed
+under "Dated") sets aside, on both sides:
+
+- patches first committed after the entry's `verified.date` (the verifier couldn't have chosen them), and
+- inherited adapter/device picks (`inherited_decisions`).
+
+What remains are real disagreements: an extra on an entry verified after the patch existed, or a catalog choice
+the heuristics don't make. Gaps are counted per patch ("Catalog gaps by patch"). The dated score needs the intro
+date cache that `--fit-report` writes; without it only inherited picks are set aside.
+
+Before tuning a rule to remove an "extra", check which kind it is: a gap on an old entry is a candidate for the
+catalog (fit report), not a detection error. Before adding a patch to a working entry, weigh its benefit (does it
+fix something the game hits?) against a rebuild prompt for everyone who installed it; adapter settings never need
+adding (inherited). Results 2026-10-15: strict 5/65 exact, F1 73.8%; dated 39/65, F1 88.6% (dev 90.5%, holdout
+79.5%). Remaining misses are one-game fixes found at runtime (e.g. Vader's gl_error_clear, BlazeRush's GL settings).
+
+An evaluation writes JSON even when its headline has differences, then exits 1 for compatibility with the original
+script. It exits 0 when exact, or after producing a fit report.
+
+## New patch fit
+
+The fit report covers all catalog entries, independently of `--split`. Candidates come from the final heuristic
+recipe, preserving platform, flat-app, dependency, and 32-bit normalization rules. A candidate must also be opt-in,
+applicable and recommended by its own `detect()`. Entries already listing or explicitly removing the patch are
+excluded; a listed adapter key is excluded regardless of its value. This report proposes additions, not value edits.
+
+Each candidate includes its reason, experimental/strict flags, first local git introduction date, catalog entry
+date (`verified.date`; `updated` only without one, since it also moves for unrelated edits), and whether the
+patch is newer. Unknown dates are marked unknown. Warnings
+come from the full catalog recipe plus that one candidate; they may include pre-existing conflicts. Missing-analysis
+entries appear as metadata-only rows. Intro dates, including unknown results, are cached in
+`patch-intro-dates.json` beside the snapshot (or dumps folder); subsequent runs only query uncached patch IDs.
+
+`tests/test_eval_heuristics.py` uses synthetic data. The opt-in real-dump test in `tests/test_games.py` ratchets the
+supported all-split exact ratio and patch F1 against measured, rounded-down baseline constants. Machine-local
+`.eval-home/` and `.eval-results/` scratch outputs are ignored by git.
@@ -82,7 +82,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [Unity: skip OVROverlay layers (fades, splash screens)](#frame-unity_no_overlay_copy) | `frame.unity_no_overlay_copy` | Steam Frame patches | 2 |
 | [Unity: start VR without Meta's system apps](#frame-unity_oculus_check) | `frame.unity_oculus_check` | Steam Frame patches | 12 |
 | [Unity: keep MSAA off at runtime (OVRManager)](#frame-unity_runtime_msaa_off) | `frame.unity_runtime_msaa_off` | Steam Frame patches | 28 |
-| [Make Unity text fields work](#frame-unity_text_input) | `frame.unity_text_input` | Steam Frame patches | 85 |
+| [Make Unity text fields work](#frame-unity_text_input) | `frame.unity_text_input` | Steam Frame patches | 102 |
 | [Unity: share thread keys (games that run out of them)](#frame-unity_tls_key_pool) | `frame.unity_tls_key_pool` | Steam Frame patches | 1 |
 | [Unity: headset always counts as worn](#frame-unity_user_presence) | `frame.unity_user_presence` | Steam Frame patches | 1 |
 | [GL shim for Unreal (no multisampled render-to-texture)](#frame-unreal_gl_shim) | `frame.unreal_gl_shim` | Steam Frame patches | 1 |
@@ -175,7 +175,7 @@ Link to an entry with its id, dots replaced by dashes: `PATCHES.md#frame-unity_t
 | [Hide Android's navigation bar](#device-hide_navbar) | `device.hide_navbar` | Files and settings on the Frame |  |
 | [Extra Lepton settings](#device-lepton_env) | `device.lepton_env` | Files and settings on the Frame | 3 |
 | [Controllers as a gamepad (Steam Input)](#device-steam_gamepad) | `device.steam_gamepad` | Files and settings on the Frame |  |
-| [Show the app's Android window (for typing)](#device-text_input_window) | `device.text_input_window` | Files and settings on the Frame | 88 |
+| [Show the app's Android window (for typing)](#device-text_input_window) | `device.text_input_window` | Files and settings on the Frame | 105 |
 | [Launch options (SteamVR or OpenXR)](#pcvr-launch_args) | `pcvr.launch_args` | PC VR (Proton and Revive) | 2 |
 | [Provide the Oculus runtime from Revive (Frame)](#pcvr-libovr_redirect) | `pcvr.libovr_redirect` | PC VR (Proton and Revive) |  |
 | [No Unreal crash reporter](#pcvr-no_crash_reporter) | `pcvr.no_crash_reporter` | PC VR (Proton and Revive) |  |
@@ -989,7 +989,7 @@ Lets you type into this app's text fields on the Frame (they'd close at once).
 - `frame.unity_text_input` · also for 2D apps
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
 - **Suggested (on):** Unity app with text fields (…): they close at once on the Frame because it has no system keyboard.
- **Catalog games (85):** AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arkio, Audica, AugmentedEmpire, Battlemarked, BattleSisters and 77 more.
+- **Catalog games (102):** AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arcsmith, Arkio, Assassin's Creed Nexus, Audica, AugmentedEmpire and 94 more.
 - **Source:** [patches/frame/unity_text_input.py](../src/frameport/patches/frame/unity_text_input.py)

 > Unity's TMP_InputField / InputField wait for Android's on-screen keyboard and close themselves a frame later when there is none (Lepton has no on-screen keyboard; Meta's system keyboard does this on a Quest), so a selected text field only flashes a caret. Rewrites TouchScreenKeyboardShouldBeUsed -&gt; false and isKeyboardUsingEvents (TMP) / InPlaceEditing (uGUI) -&gt; true in libil2cpp.so, found per game with Cpp2IL (downloaded on first use), so fields stay selected and take key presses: Steam's keyboard (with "Show the app window") or Type on Frame from the PC.
@@ -1000,6 +1000,7 @@ Lets Unity 6 games with many native libraries start when they run out of thread

 - `frame.unity_tls_key_pool` · also for 2D apps
 - **Changes:** Changes the APK (a rebuild and reinstall apply it).
+- **Suggested (on):** Unity 6 with Firebase Firestore and Gecko: these native runtimes can exhaust Android's 128 thread keys alongside the Frame's graphics and XR libraries. Pool Unity's keys to leave room for them.
 - **Offered (off):** Unity 6 with …: turn on if the game aborts at start with "cannot create thread specific key" (for example Wander).
 - **Catalog games (1):** Wander.
 - **Suggested by launch-test signatures:**
@@ -2334,7 +2335,7 @@ Lets typing reach this app from Steam's on-screen keyboard or your PC's keyboard
 - `device.text_input_window`
 - **Changes:** Install only: written on the Frame when the game is installed; the APK isn't changed.
 - **Suggested (on):** App with text fields: key presses only reach a shown Android window.
- **Catalog games (88):** AFFECTED: The Manor, AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arkio, Audica, AugmentedEmpire, Battlemarked and 80 more.
+- **Catalog games (105):** AFFECTED: The Manor, AgeOfJoy, AllInOneSports, Ancient_Dungeon, Arcsmith, Arkio, Assassin's Creed Nexus, Audica and 97 more.
 - **Source:** [patches/settings.py](../src/frameport/patches/settings.py)

 > Lepton runs VR apps headless: their Android window is never shown, so it never gets keyboard focus and no key press (Steam's on-screen keyboard, a USB/Bluetooth keyboard, Type on Frame) reaches the app's text fields. With Lepton's lepton-show-flatscreen marker the window is shown (behind the VR view, which keeps working) and Steam's keyboard opens for a selected text field. Steam lists the shown window as "Gamescope" (the Frame's compositor). Pairs with "Make Unity text fields work without a system keyboard".
@@ -62,6 +62,8 @@ 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 |
@@ -1,69 +1,508 @@
 #!/usr/bin/env python3
-"""Score the patch heuristics against the verified catalog: for every game dump that has a catalog recipe, suggest a
-recipe with the catalog switched off and compare the recipe-relevant choices.
+"""Evaluate static patch suggestions against catalog-only ground truth (no catalog-assisted suggestions).

-    python scripts/eval_heuristics.py "<folder with game dumps>" [--verbose]
+    eval_heuristics.py <dumps folder> [--verbose]
+    eval_heuristics.py --snapshot analyses.json --split all --json baseline.json
+    eval_heuristics.py --snapshot analyses.json --fit-report --out fit-report.md
+
+Snapshots can be in progress: each read copies to a temporary file and retries incomplete JSON. The split is
+stratified by analysis engine and stable for a fixed set of packages. Converted inputs are included and labelled.
+Patch scores are micro-averaged across games, excluding enabled automatic defaults. Expected defaults are detected
+per analysis before applying explicit catalog removals; inapplicable defaults create no removal decisions. A wrong
+adapter value is both an FP and an FN. Removal decisions and alternate-build patches have their own identities
+("remove:<id>", "alt:<id>").
+Unsupported catalog entries and runtime-only choices are reported separately from the headline.
 """
 from __future__ import annotations

 import argparse
+import copy
+import hashlib
+import json
+import shutil
+import subprocess
 import sys
+import tempfile
+import time
+from collections import Counter, defaultdict
 from pathlib import Path

 sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))

 from frameport.analysis.detect import analyze  # noqa: E402
+from frameport.core.library import analysis_from_dict  # noqa: E402
+from frameport.core.models import Recipe  # noqa: E402
 from frameport.patches import base  # noqa: E402
 from frameport.recommend import catalog, engine  # noqa: E402
 from frameport.sources import quest_dump  # noqa: E402

+RUNTIME_ONLY = [
+    "use_alt", "adapter.vk_shader_fix", "adapter.focus_hold", "adapter.focus_hold_ms", "adapter.sync_guard",
+    "adapter.scale", "adapter.layer_debug", "adapter.refresh_rate", "adapter.pose_consistency",
+    "lepton_env", "config_sync",
+]
+REPO = Path(__file__).resolve().parents[1]
+DEVICE_FIELDS = {"device.files", "device.lepton_env", "device.config_sync", "device.foveation"}

-def signature(recipe) -> dict:
-    """The parts of a recipe that differ between games (defaults/automatic fixes are excluded)."""
+
+def expected_defaults(analysis) -> set[str]:
+    """Defaults recommended by their own detection, before recipe normalization/removals.
+
+    As in suggest's initial pass, default_on patches bypass the opt-in applies gate; their own detect() decides.
+    This masks e.g. LTW defaults in games without LTW, without importing any heuristic opt-in/adapter choices.
+    """
+    return {p.id for p in base.all_patches() if p.default_on and base.for_game(p, analysis)
+            and (s := p.detect(analysis)) and s.recommended}
+
+
+def signature(recipe: Recipe, defaults: set[str] | None = None) -> dict:
+    """Recipe decisions, excluding enabled defaults but retaining explicit removal of defaults."""
    pats = recipe.patches
-    return {
-        "overport": sorted(p for p in pats if base.get(p).category == "overport" and not base.get(p).default_on),
-        "overport_removed": sorted(p for p in (x.id for x in base.all_patches()
-                                               if x.category == "overport" and x.default_on)
-                                   if p not in pats),
-        "frame": sorted(p for p in pats if base.get(p).category == "frame" and not base.get(p).default_on),
+    rift = recipe.package.startswith("rift.")
+    patches = [p for p in base.all_patches() if (p.category == "pcvr") == rift]
+    out = {}
+    for category in ("overport", "frame", "pcvr"):
+        out[category] = sorted(p.id for p in patches if p.category == category and not p.default_on and p.id in pats)
+        out[category + "_removed"] = sorted(p.id for p in patches
+                                            if p.category == category and p.default_on and p.id not in pats
+                                            and (defaults is None or p.id in defaults))
+    out.update({
        "adapter": {p.split(".", 1)[1]: v.get("value") for p, v in sorted(pats.items()) if p.startswith("adapter.")},
+        "device": sorted(p for p in pats if p.startswith("device.") and p not in DEVICE_FIELDS
+                         and not base.get(p).default_on),
        "device_files": sorted((pats.get("device.files") or {}).get("files", {})),
+        "foveation": dict(pats.get("device.foveation") or {}),
+        "lepton_env": dict((pats.get("device.lepton_env") or {}).get("env", {})),
+        "config_sync": dict((pats.get("device.config_sync") or {}).get("files", {})),
        "alt": sorted(recipe.alt_patches),
        "use_alt": recipe.use_alt,
        "status_unsupported": recipe.status == "unsupported",
-    }
+    })
+    return out
+
+
+def catalog_recipe(entry: catalog.CatalogEntry, defaults: set[str] | None = None, analysis=None) -> Recipe:
+    """Materialize catalog choices plus expected defaults; never import heuristic opt-in choices. With the game's
+    analysis, the engine's structural transforms apply as in suggest(): a 32-bit game goes through the bridge (its
+    entry relies on that instead of listing what the bridge replaces), a 2D app keeps only its non-VR patches."""
+    r = Recipe(entry.package, status=entry.status, as_is=entry.as_is,
+               alt_patches=list(entry.alt_overport), use_alt=entry.use_alt)
+    rift = entry.kind == "rift" or entry.package.startswith("rift.")
+    r.patches = {p.id: {} for p in base.all_patches() if p.default_on and (p.category == "pcvr") == rift
+                 and (defaults is None or p.id in defaults)}
+    for pid in (*entry.overport_extra, *entry.frame, *entry.device, *entry.pcvr):
+        r.patches[pid] = {}
+    for pid in (*entry.overport_remove, *entry.frame_remove, *entry.pcvr_remove):
+        r.patches.pop(pid, None)
+    for key, value in entry.adapter.items():
+        r.patches[f"adapter.{key}"] = {"value": value}
+    for pid, param, values in (("device.files", "files", entry.device_files),
+                               ("device.lepton_env", "env", entry.lepton_env),
+                               ("device.config_sync", "files", entry.config_sync)):
+        if values:
+            r.patches[pid] = {param: copy.deepcopy(values)}
+    if entry.foveation:
+        r.patches["device.foveation"] = {"mode": entry.foveation}
+        if entry.foveation_radius:
+            r.patches["device.foveation"]["radius"] = entry.foveation_radius
+        if entry.foveation_test:
+            r.patches["device.foveation"]["test"] = True
+    if analysis is not None:
+        if analysis.only_32bit and "frame.a32_bridge" not in entry.frame_remove:
+            r.patches.setdefault("frame.a32_bridge", {})
+            engine.a32_recipe(analysis, r, newly=False)
+        elif analysis.vr_kind == "none":
+            needed = {pid for pid in r.patches if not base.get(pid).needs_vr and pid != "frame.launcher"}
+            needed |= {"frame.launcher"} if analysis.has_info_category else set()
+            r.patches = {pid: v for pid, v in r.patches.items() if pid in needed}
+            r.alt_patches = []
+    return r
+
+
+def catalog_signature(entry: catalog.CatalogEntry, defaults: set[str] | None = None, analysis=None) -> dict:
+    return signature(catalog_recipe(entry, defaults, analysis), defaults)
+
+
+def engine_group(name: str) -> str:
+    return name if name in ("Unity", "Unreal") else "Other"
+
+
+def split_packages(engines: dict[str, str]) -> dict[str, str]:
+    """package -> dev/holdout; nearest 20% per engine (half rounded up), lowest sha256 first.
+
+    Only pass the intersection of catalog and analyses. This is stable under input reordering; adding packages can
+    change membership at a stratum's cutoff. Tiny strata may have no holdout. Unsupported entries participate too.
+    """
+    groups = defaultdict(list)
+    for pkg, name in engines.items():
+        groups[engine_group(name)].append(pkg)
+    result = {}
+    for packages in groups.values():
+        ordered = sorted(packages, key=lambda p: (hashlib.sha256(p.encode()).digest(), p))
+        n = (len(ordered) + 2) // 5
+        result.update((p, "holdout" if i < n else "dev") for i, p in enumerate(ordered))
+    return dict(sorted(result.items()))
+
+
+def _parts(sig: dict) -> tuple[dict, dict]:
+    headline, runtime = {}, {}
+    for key, value in sig.items():
+        if key == "adapter":
+            headline[key] = {k: v for k, v in value.items() if f"adapter.{k}" not in RUNTIME_ONLY}
+            runtime[key] = {k: v for k, v in value.items() if f"adapter.{k}" in RUNTIME_ONLY}
+        else:
+            (runtime if key in RUNTIME_ONLY else headline)[key] = value
+    return headline, runtime
+
+
+def _decisions(sig: dict) -> dict:
+    """Patch/action identities -> values. Status is a field metric, not a patch."""
+    out = {}
+    for field, value in sig.items():
+        if field == "status_unsupported":
+            continue
+        if field in ("adapter", "lepton_env", "config_sync"):
+            prefix = "adapter" if field == "adapter" else f"device.{field}"
+            out.update((f"{prefix}.{k}", v) for k, v in value.items())
+        elif field == "foveation":
+            if value:
+                out["device.foveation"] = value
+        elif field == "use_alt":
+            if value:
+                out["use_alt"] = value
+        else:
+            prefix = ("remove:" if field.endswith("_removed") else "alt:" if field == "alt"
+                      else "device.files:" if field == "device_files" else "")
+            out.update((prefix + p, True) for p in value)
+    return out
+
+
+def _rates(tp: int, fp: int, fn: int) -> dict:
+    # No positive decisions yields 0, rather than inflating scores for empty recipes/strata.
+    return {"tp": tp, "fp": fp, "fn": fn, "precision": tp / (tp + fp) if tp + fp else 0.0,
+            "recall": tp / (tp + fn) if tp + fn else 0.0,
+            "f1": 2 * tp / (2 * tp + fp + fn) if 2 * tp + fp + fn else 0.0}
+
+
+def score_signatures(want: dict, got: dict, gaps: frozenset | set = frozenset()) -> dict:
+    """Compare one pair of signatures; value mismatches count as both missing and extra. `gaps` = decisions the
+    catalog entry couldn't have made (the patch didn't exist when it was verified): left out of both sides."""
+    result = {}
+    for scope, w, g in zip(("headline", "runtime"), _parts(want), _parts(got), strict=True):
+        wanted, actual = _decisions(w), _decisions(g)
+        gap = {k: actual.pop(k) for k in list(actual) if k in gaps and k not in wanted}
+        missing = {k: v for k, v in wanted.items() if k not in actual or actual[k] != v}
+        extra = {k: v for k, v in actual.items() if k not in wanted or wanted[k] != v}
+        per_patch = {k: _rates(int(k in wanted and k in actual and wanted[k] == actual[k]),
+                               int(k in extra), int(k in missing)) for k in sorted(wanted.keys() | actual.keys())}
+        fields = {k: w.get(k) == g.get(k) for k in sorted(w.keys() | g.keys())}
+        exact = all(fields.values()) if not gap else not missing and not extra
+        result[scope] = {"exact": exact, "fields": fields, "missing": missing, "extra": extra,
+                         "per_patch": per_patch, "gap": gap}
+    return result
+
+
+def _aggregate(rows: list[dict], scope: str, score_key: str = "score") -> dict:
+    fields = defaultdict(lambda: {"matched": 0, "total": 0})
+    counts = defaultdict(Counter)
+    gaps = Counter()
+    for row in rows:
+        s = row[score_key][scope]
+        gaps.update(s.get("gap") or {})
+        for key, match in s["fields"].items():
+            fields[key]["matched"] += int(match)
+            fields[key]["total"] += 1
+        for key, stats in s["per_patch"].items():
+            counts[key].update({k: stats[k] for k in ("tp", "fp", "fn")})
+    per_patch = {k: _rates(**v) for k, v in sorted(counts.items())}
+    total = Counter()
+    for stats in counts.values():
+        total.update(stats)
+    exact = sum(row[score_key][scope]["exact"] for row in rows)
+    return {"games": len(rows), "exact": exact, "exact_ratio": exact / len(rows) if rows else 0.0,
+            "fields": dict(sorted(fields.items())), "per_patch": per_patch, "gaps": dict(sorted(gaps.items())),
+            "patches": _rates(*(total[k] for k in ("tp", "fp", "fn")))}
+
+
+def score_records(records: list[dict]) -> dict:
+    """Score {package, engine, status, converted, want, got, ...} records; no filesystem needed."""
+    rows = [{**r, "score": score_signatures(r["want"], r["got"]),
+             "score_dated": score_signatures(r["want"], r["got"], set(r.get("gaps") or ()))}
+            for r in sorted(records, key=lambda r: r["package"])]
+
+    def metrics(group):
+        supported = [r for r in group if r["status"] != "unsupported"]
+        unsupported = [r for r in group if r["status"] == "unsupported"]
+        return {"total_games": len(group), "converted_games": sum(bool(r.get("converted")) for r in group),
+                "excluded_unsupported": len(unsupported),
+                "headline": _aggregate(supported, "headline"), "runtime": _aggregate(supported, "runtime"),
+                "headline_dated": _aggregate(supported, "headline", "score_dated"),
+                "unsupported": {scope: _aggregate(unsupported, scope) for scope in ("headline", "runtime")}}
+
+    return {**metrics(rows), "by_engine": {name: metrics([r for r in rows if engine_group(r["engine"]) == name])
+                                           for name in ("Unity", "Unreal", "Other")}, "games": rows}
+
+
+def read_snapshot(path: Path, attempts: int = 8) -> dict:
+    """Copy before parsing, even on retries; never write to the source or read APK/data paths in it."""
+    with tempfile.TemporaryDirectory(prefix="frameport-eval-") as tmp:
+        dest = Path(tmp) / "snapshot.json"
+        for attempt in range(attempts):
+            shutil.copyfile(path, dest)
+            try:
+                return json.loads(dest.read_text(encoding="utf-8"))
+            except json.JSONDecodeError:
+                if attempt == attempts - 1:
+                    raise
+                time.sleep(0.25 * (attempt + 1))
+    raise AssertionError("unreachable")
+
+
+def read_dumps(path: Path) -> dict:
+    records = {}
+    for g in quest_dump.scan(path):
+        a = analyze(g.apk, data_bytes=g.data_bytes())
+        row = {"analysis": a.to_dict(), "converted": a.is_overport_output, "name": g.name}
+        if a.package not in records or records[a.package]["converted"] and not row["converted"]:
+            records[a.package] = row
+    return records
+
+
+def gap_decisions(entry, intro_dates: dict | None) -> set[str]:
+    """Decision keys for patches introduced after the entry was verified: the catalog can't be wrong about them."""
+    verified = str((entry.verified or {}).get("date") or "")
+    if not intro_dates or not verified:
+        return set()
+    return {(f"alt:{pid}" if pid.startswith("patch_remove_unreal") else pid)
+            for pid, date in intro_dates.items() if date and date > verified}
+
+
+def inherited_decisions() -> set[str]:
+    """Heuristic picks a catalog recipe keeps even when the entry doesn't name them (engine.suggest: adapter
+    settings and device patches other than catalog.TOGGLED_DEVICE): the verified build had them, so an "extra" one
+    isn't a detection error. A catalog value that differs still counts (the key is in both sides then)."""
+    return {p.id for p in base.all_patches()
+            if p.category == "adapter" or (p.category == "device" and p.id not in catalog.TOGGLED_DEVICE)}
+
+
+def evaluate(snapshot: dict, entries: dict, split: str = "dev", intro_dates: dict | None = None) -> dict:
+    analyses = {pkg: analysis_from_dict(v["analysis"]) for pkg, v in snapshot.items() if pkg in entries}
+    assignments = split_packages({pkg: a.engine for pkg, a in analyses.items()})
+    records = []
+    for pkg, a in sorted(analyses.items()):
+        if split != "all" and assignments[pkg] != split:
+            continue
+        entry = entries[pkg]
+        defaults = expected_defaults(a)
+        records.append({"package": pkg, "title": entry.title, "engine": a.engine, "status": entry.status,
+                        "converted": bool(snapshot[pkg].get("converted", a.is_overport_output)),
+                        "analysis_version": snapshot[pkg].get("analysis_version"), "split": assignments[pkg],
+                        "want": catalog_signature(entry, defaults, a),
+                        "got": signature(engine.suggest(a, use_catalog=False), defaults),
+                        "gaps": sorted(gap_decisions(entry, intro_dates) | inherited_decisions())})
+    return {"schema_version": 1, "split": split, "runtime_only": RUNTIME_ONLY, "snapshot_packages": len(snapshot),
+            "default_policy": "per-analysis default detection, then explicit catalog removals",
+            "catalog_packages": len(entries), "matched_packages": len(analyses),
+            "split_assignments": assignments, **score_records(records)}
+
+
+def fit_candidates(analysis, entry: catalog.CatalogEntry) -> list[dict]:
+    """Use suggest's final heuristic pass, including platform filtering, non-VR and a32 normalization.
+
+    Requiring a recommended detect() as well excludes dependencies and synthetic recipe additions. No engine
+    refactor is needed: suggest() remains untouched, and catalog data is used only for the candidate exclusion and
+    the hypothetical warning recipe.
+    """
+    suggested = engine.suggest(analysis, use_catalog=False)
+    chosen = catalog_recipe(entry, expected_defaults(analysis), analysis)
+    listed = set(chosen.patches) | set(entry.alt_overport)
+    removed = set(entry.overport_remove) | set(entry.frame_remove) | set(entry.pcvr_remove)
+    result = []
+    for pid, params in sorted(suggested.patches.items()):
+        p = base.get(pid)
+        if (p.default_on or pid in listed or pid in removed or not base.for_game(p, analysis)
+                or not p.applies(analysis)):
+            continue
+        s = p.detect(analysis)
+        if not s or not s.recommended:
+            continue
+        trial = copy.deepcopy(chosen)
+        trial.patches[pid] = dict(params)
+        result.append({"patch": pid, "category": p.category, "experimental": p.experimental,
+                       "strict": bool(getattr(p, "strict", False)), "reason": s.reason,
+                       "warnings": engine.warnings(trial, analysis)})
+    return result
+
+
+def patch_intro_dates(cache_path: Path) -> dict:
+    """One local git pickaxe per uncached patch (including missing-history results); never use the network."""
+    try:
+        cached = json.loads(cache_path.read_text(encoding="utf-8"))
+    except (OSError, ValueError):
+        cached = {}
+    changed = False
+    for p in base.all_patches():
+        if p.id in cached:
+            continue
+        needle = p.id.split(".", 1)[1] if p.category == "adapter" else p.id
+        paths = ["src/frameport/patches/settings.py"] if p.category == "adapter" else ["src/frameport"]
+        log = subprocess.run(["git", "log", f'-S"{needle}"', "--reverse", "--format=%ad", "--date=short", "--",
+                              *paths], cwd=REPO, text=True, capture_output=True, check=True)
+        dates = log.stdout.splitlines()
+        cached[p.id] = dates[0] if dates else None
+        changed = True
+    if changed:
+        cache_path.write_text(json.dumps(cached, indent=2, sort_keys=True) + "\n", encoding="utf-8")
+    return cached
+
+
+def entry_date(entry) -> str:
+    """When the recipe was verified; `updated` only when there is no verified date (it also moves for unrelated
+    edits, e.g. a note, so it says nothing about which patches the verifier could pick)."""
+    return str(entry.verified.get("date") or "") or str(entry.updated or "")
+
+
+def fit_report(snapshot: dict, entries: dict, intro_dates: dict) -> dict:
+    games, metadata = [], []
+    totals = Counter()
+    for pkg, entry in sorted(entries.items()):
+        common = {"package": pkg, "title": entry.title, "engine": entry.engine, "xr": entry.xr,
+                  "status": entry.status, "verified_date": str(entry.verified.get("date") or ""),
+                  "updated": str(entry.updated or ""), "entry_date": entry_date(entry)}
+        if pkg not in snapshot:
+            metadata.append(common)
+            continue
+        candidates = fit_candidates(analysis_from_dict(snapshot[pkg]["analysis"]), entry)
+        for c in candidates:
+            intro = intro_dates.get(c["patch"])
+            c.update(intro_date=intro,
+                     newer_patch=bool(intro and common["entry_date"] and intro > common["entry_date"]))
+            totals[c["patch"]] += 1
+        games.append({**common, "converted": bool(snapshot[pkg].get("converted")), "candidates": candidates})
+    return {"games": games, "metadata_only": metadata, "totals_by_patch": dict(sorted(totals.items())),
+            "candidate_count": sum(totals.values()), "games_with_candidates": sum(bool(g["candidates"]) for g in games)}
+
+
+def _md(value) -> str:
+    return str(value if value is not None else "unknown").replace("|", "\\|").replace("\n", " ")
+
+
+def render_fit_report(report: dict) -> str:
+    lines = ["# New patch fit", "", f"{len(report['games'])} catalog games with analyses; "
+             f"{report['games_with_candidates']} with candidates; {report['candidate_count']} candidate additions. "
+             f"{len(report['metadata_only'])} metadata-only entries.", "",
+             "Candidates are opt-in recommended patches absent from the entry, after the heuristic engine's platform "
+             "and a32 rules. A listed adapter key is excluded even if its value differs. Warnings are for the full "
+             "catalog recipe plus that one patch; they can include pre-existing conflicts. Unknown history/date "
+             "does not imply a newer patch. Default-on patches are not candidates. All splits and statuses included.",
+             "", "## Totals by patch", "", "| Patch | Games |", "| --- | ---: |"]
+    lines.extend(f"| {pid} | {n} |" for pid, n in
+                 sorted(report["totals_by_patch"].items(), key=lambda kv: (-kv[1], kv[0])))
+    for game in report["games"]:
+        lines += ["", f"## {_md(game['title'])} (`{game['package']}`)", "",
+                  f"{game['engine']} / {game['xr']}; status: {game['status']}; "
+                  f"entry date: {game['entry_date'] or 'unknown'}; converted: {game['converted']}.", ""]
+        if not game["candidates"]:
+            lines += ["No candidates."]
+            continue
+        lines += ["| Patch | Category | Experimental | Strict | Reason | Introduced | Newer patch | Warnings |",
+                  "| --- | --- | --- | --- | --- | --- | --- | --- |"]
+        for c in game["candidates"]:
+            cells = [c["patch"], c["category"], c["experimental"], c["strict"], c["reason"], c["intro_date"],
+                     c["newer_patch"], "; ".join(c["warnings"]) or "none"]
+            lines.append("| " + " | ".join(_md(v) for v in cells) + " |")
+    lines += ["", "## Catalog entries without analyses (metadata only)", "",
+              "| Package | Title | Engine | XR | Status | Verified | Updated | Entry date |",
+              "| --- | --- | --- | --- | --- | --- | --- | --- |"]
+    for g in report["metadata_only"]:
+        lines.append("| " + " | ".join(_md(g[k]) for k in
+                     ("package", "title", "engine", "xr", "status", "verified_date", "updated", "entry_date")) + " |")
+    return "\n".join(lines) + "\n"
+
+
+def print_metrics(report: dict, verbose: bool = False) -> None:
+    print(f"Split: {report['split']}; catalog/analysis intersection: {report['matched_packages']}; "
+          f"converted: {report['converted_games']}; unsupported excluded: {report['excluded_unsupported']}")
+    print(f"{'Engine':10} {'Games':>5} {'Exact':>9} {'Fields':>11} {'Prec':>7} {'Recall':>7} {'F1':>7} {'Runtime':>9}")
+    for name, metrics in [("All", report), *report["by_engine"].items()]:
+        h, r = metrics["headline"], metrics["runtime"]
+        fields = h["fields"].values()
+        f = f"{sum(x['matched'] for x in fields)}/{sum(x['total'] for x in h['fields'].values())}"
+        p = h["patches"]
+        print(f"{name:10} {h['games']:5} {h['exact']:4}/{h['games']:<4} {f:>11} "
+              f"{p['precision']:7.1%} {p['recall']:7.1%} {p['f1']:7.1%} {r['exact']:4}/{r['games']:<4}")
+    print("\nDated (extras the entry couldn't have listed - patch newer than its verified date - or that catalog "
+          "recipes inherit anyway - adapter/device picks - are not errors):")
+    for name, metrics in [("All", report), *report["by_engine"].items()]:
+        d = metrics["headline_dated"]
+        p = d["patches"]
+        print(f"{name:10} {d['games']:5} {d['exact']:4}/{d['games']:<4} {'':>11} "
+              f"{p['precision']:7.1%} {p['recall']:7.1%} {p['f1']:7.1%}")
+    gaps = report["headline_dated"]["gaps"]
+    if gaps:
+        print("Catalog gaps by patch: " + ", ".join(f"{k}={v}" for k, v in sorted(gaps.items(), key=lambda kv: -kv[1])))
+    for name, metrics in [("All", report), *report["by_engine"].items()]:
+        print(f"\n{name}: field matches (headline / runtime)")
+        for scope in ("headline", "runtime"):
+            matches = metrics[scope]["fields"].items()
+            print(scope + ": " + ", ".join(f"{k}={v['matched']}/{v['total']}" for k, v in matches))
+        print(f"{'Scope / patch':55} {'TP':>5} {'FP':>5} {'FN':>5} {'Prec':>7} {'Recall':>7} {'F1':>7}")
+        for scope in ("headline", "runtime"):
+            for pid, p in metrics[scope]["per_patch"].items():
+                print(f"{scope + ' / ' + pid:55} {p['tp']:5} {p['fp']:5} {p['fn']:5} "
+                      f"{p['precision']:7.1%} {p['recall']:7.1%} {p['f1']:7.1%}")
+    u = report["unsupported"]["headline"]
+    print(f"\nUnsupported (excluded): {u['exact']}/{u['games']} exact; patch F1={u['patches']['f1']:.1%}")
+    for game in report["games"]:
+        s = game["score"]
+        if verbose or not s["headline"]["exact"] or not s["runtime"]["exact"] or game["status"] == "unsupported":
+            print(f"\n{game['package']} [{game['engine']}, {game['status']}, {game['split']}"
+                  + (", converted" if game["converted"] else "") + "]")
+            for scope in ("headline", "runtime"):
+                for diff in ("missing", "extra"):
+                    if s[scope][diff]:
+                        print(f"  {scope} {diff}: {json.dumps(s[scope][diff], sort_keys=True)}")
+                if not s[scope]["fields"].get("status_unsupported", True):
+                    print(f"  {scope} status_unsupported: catalog={game['want']['status_unsupported']} "
+                          f"heuristics={game['got']['status_unsupported']}")


 def main() -> int:
-    ap = argparse.ArgumentParser()
-    ap.add_argument("dumps", type=Path)
+    ap = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    ap.add_argument("dumps", type=Path, nargs="?")
+    ap.add_argument("--snapshot", type=Path)
+    ap.add_argument("--split", choices=("dev", "holdout", "all"), default="dev")
+    ap.add_argument("--json", type=Path, dest="json_out")
    ap.add_argument("--verbose", action="store_true")
+    ap.add_argument("--fit-report", action="store_true")
+    ap.add_argument("--out", type=Path, help="Markdown destination for --fit-report (otherwise stdout)")
    args = ap.parse_args()
-    games = quest_dump.scan(args.dumps)
-    total = matched_fields = games_ok = 0
-    misses = []
-    for g in games:
-        a = analyze(g.apk, data_bytes=g.data_bytes())
-        if not catalog.lookup(a.package):
-            continue
-        want = signature(engine.suggest(a, use_catalog=True))
-        want["status_unsupported"] = (catalog.lookup(a.package).status == "unsupported"
-                                      and "32-bit" in catalog.lookup(a.package).notes)
-        got = signature(engine.suggest(a, use_catalog=False))
-        diffs = {k: (want[k], got[k]) for k in want if want[k] != got[k]}
-        total += len(want)
-        matched_fields += len(want) - len(diffs)
-        games_ok += not diffs
-        if diffs:
-            misses.append((a.package, diffs))
-        if args.verbose or diffs:
-            print(f"{'OK  ' if not diffs else 'DIFF'} {a.package}")
-            for k, (w, h) in diffs.items():
-                print(f"       {k}: catalog={w}  heuristics={h}")
-    n = games_ok + len(misses)
-    print(f"\n{games_ok}/{n} games reproduced exactly; {matched_fields}/{total} recipe fields match")
-    return 0 if not misses else 1
+    if not args.snapshot and not args.dumps:
+        ap.error("provide a dumps folder or --snapshot")
+    if args.out and not args.fit_report:
+        ap.error("--out requires --fit-report")
+    snapshot = read_snapshot(args.snapshot) if args.snapshot else read_dumps(args.dumps)
+    # Explicitly bundled entries: remote caches and personal recipes must not affect this benchmark.
+    entries = catalog._load_dir(REPO / "catalog/games", "bundled")
+    if args.fit_report:
+        cache = (args.snapshot.parent if args.snapshot else args.dumps) / "patch-intro-dates.json"
+        report = fit_report(snapshot, entries, patch_intro_dates(cache))
+        markdown = render_fit_report(report)
+        if args.out:
+            args.out.write_text(markdown, encoding="utf-8")
+            print(f"{report['candidate_count']} candidates in {report['games_with_candidates']} games -> {args.out}")
+        else:
+            print(markdown, end="")
+    else:
+        cache = (args.snapshot.parent if args.snapshot else args.dumps) / "patch-intro-dates.json"
+        # dated scoring reads the cache --fit-report writes; a plain run never shells out for dates
+        dates = json.loads(cache.read_text(encoding="utf-8")) if cache.is_file() else None
+        report = evaluate(snapshot, entries, args.split, dates)
+        print_metrics(report, args.verbose)
+    if args.json_out:
+        args.json_out.write_text(json.dumps(report, indent=2, sort_keys=True, default=str) + "\n", encoding="utf-8")
+    # Retain the legacy evaluator's nonzero exit for recipe differences; JSON is still written.
+    return 0 if args.fit_report or report["headline"]["games"] == report["headline"]["exact"] else 1


 if __name__ == "__main__":
@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+"""Analyse every Quest dump below the given folders once and save the analyses as JSON, so heuristics evaluations
+(`eval_heuristics.py --snapshot`) don't re-read gigabytes of APKs each run.
+
+    python scripts/heuristics_snapshot.py <out.json> <dumps folder> [<dumps folder> ...]
+
+An original APK beats an already converted one (OVRPort output, e.g. PATCHED/ copies): converted inputs change what
+the heuristics suggest, so they are only kept when no original exists and are marked `converted`. The output holds
+local paths: keep it out of git.
+"""
+from __future__ import annotations
+
+import argparse
+import dataclasses
+import json
+import sys
+import time
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
+
+from frameport.analysis.detect import ANALYSIS_VERSION, analyze  # noqa: E402
+from frameport.sources import quest_dump  # noqa: E402
+
+
+def _skip(game, roots: list[Path]) -> bool:
+    """Folders starting with "_" (known-good backups, test builds, keys) are not dumps."""
+    for root in roots:
+        try:
+            rel = game.apk.relative_to(root)
+        except ValueError:
+            continue
+        return any(part.startswith("_") for part in rel.parts[:-1])
+    return False
+
+
+def main() -> int:
+    ap = argparse.ArgumentParser()
+    ap.add_argument("out", type=Path)
+    ap.add_argument("roots", type=Path, nargs="+")
+    args = ap.parse_args()
+    roots = [r.resolve() for r in args.roots]
+    old = json.loads(args.out.read_text()) if args.out.is_file() else {}
+    snap: dict[str, dict] = {}
+    for root in roots:
+        for g in quest_dump.scan(root):
+            if _skip(g, roots):
+                continue
+            key = str(g.apk)
+            cached = next((v for v in old.values() if v.get("apk") == key
+                           and v.get("analysis_version") == ANALYSIS_VERSION
+                           and v.get("apk_size") == g.apk.stat().st_size), None)
+            t = time.time()
+            if cached:
+                entry = cached
+            else:
+                try:
+                    data_bytes = g.data_bytes()
+                    a = analyze(g.apk, data_bytes=data_bytes)
+                except Exception as e:  # noqa: BLE001 - one unreadable dump mustn't stop the snapshot
+                    print(f"FAIL {g.apk}: {e}", file=sys.stderr, flush=True)
+                    continue
+                entry = {"analysis": dataclasses.asdict(a), "data_bytes": data_bytes, "apk": key,
+                         "apk_size": g.apk.stat().st_size, "name": g.name, "root": str(root),
+                         "converted": bool(a.is_overport_output), "analysis_version": ANALYSIS_VERSION}
+            pkg = entry["analysis"]["package"]
+            have = snap.get(pkg)
+            # originals beat converted copies; otherwise the first root given wins
+            if have is None or (have["converted"] and not entry["converted"]):
+                snap[pkg] = entry
+            print(f"{'cache' if cached else f'{time.time() - t:5.1f}s'} {pkg}"
+                  f"{' (converted)' if entry['converted'] else ''}", flush=True)
+            args.out.write_text(json.dumps(snap, indent=1, default=str))  # partial results survive a crash
+    print(f"{len(snap)} packages ({sum(v['converted'] for v in snap.values())} converted only) -> {args.out}")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
@@ -137,7 +137,8 @@ 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-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"))]
    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)))
@@ -706,6 +706,31 @@ 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 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 key files the user added in
+Settings (EXTRA_KEYS_SETTING), then the user's SSH agent/keys, then a password if given.
 """
 from __future__ import annotations

@@ -163,6 +163,96 @@ 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
@@ -409,6 +499,10 @@ 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:
@@ -459,7 +553,8 @@ 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()] + [("agent", None), ("password", None)]
+        attempts = ([("app_key", k) for k in app_keys()] + [("user_key", k) for _, k in extra_keys()]
+                    + [("agent", None), ("password", None)])
        for attempt, pkey in attempts:
            if attempt == "password" and not self.password:
                continue
@@ -467,7 +562,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 == "app_key":
+                if attempt in ("app_key", "user_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)
@@ -492,6 +587,7 @@ 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,10 +2,9 @@
 from __future__ import annotations

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

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


-def quote(value) -> str:
+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").
+    """
    value = str(value)
    if any(c in value for c in "\r\n\x00"):
        raise ValueError("SFTP paths cannot contain newlines or NUL")
-    escaped = value.replace("\\", "\\\\").replace('"', '\\"')
-    for char in "*?[":
-        escaped = escaped.replace(char, "\\" + char)
-    return '"' + escaped + '"'
+    if windows:
+        value = PureWindowsPath(value).as_posix()
+    return '"' + value.replace("\\", "\\\\").replace('"', '\\"') + '"'
+
+
+def quote_local(path) -> str:
+    return quote(path, windows=os.name == "nt")


 def size_of(sftp, path):
@@ -35,27 +45,74 @@ 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"):
-    """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:
+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:
        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":
-            row = next(csv.reader(io.StringIO(subprocess.check_output(
-                ["whoami", "/user", "/fo", "csv", "/nh"], text=True, **hidden()))))
-            sid = row[-1]
+            sid = current_sid()
            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 path in key_paths:
-            copy = directory / path.name
+        for n, path in enumerate(key_paths):
+            copy = directory / f"key{n}"  # own names: a key from Settings may be called id_ed25519 too
            shutil.copyfile(path, copy)
            if sid:
                subprocess.run(["icacls", str(copy), "/inheritance:r", "/remove:g", "*S-1-3-4",
@@ -66,13 +123,72 @@ def credentials(frame, port_flag="-P"):
        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, *copies, "-o", "BatchMode=yes", "-o", "IdentitiesOnly=yes",
+        yield ["-F", os.devnull, "-v", *copies, "-o", "BatchMode=yes",
+               *([] if relaxed else ["-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 {}

@@ -99,6 +215,11 @@ 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")
@@ -111,7 +232,7 @@ def upload(frame, items, remote_root, reporter, total, sent, workers):
    sizes, offsets, progress = {}, {}, {}
    for path, rel, size in sorted(items, key=lambda item: item[2], reverse=True):
        remote = posixpath.join(remote_root, rel)
-        quote(path)
+        quote_local(path)
        quote(remote)
        offset = size_of(frame.sftp, remote + ".part")
        if offset > size:
@@ -127,7 +248,7 @@ def upload(frame, items, remote_root, reporter, total, sent, workers):
    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) as args, contextlib.ExitStack() as stack:
+    with credentials(frame, relaxed=relaxed) 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")
@@ -139,7 +260,7 @@ def upload(frame, items, remote_root, reporter, total, sent, workers):
                for path, rel, _ in group:
                    remote = posixpath.join(remote_root, rel) + ".part"
                    command = "reput" if offsets[rel] else "put"
-                    batch.write(f"{command} {quote(path)} {quote(remote)}\n".encode())
+                    batch.write(f"{command} {quote_local(path)} {quote(remote)}\n".encode())
                batch.seek(0)
                errors = stack.enter_context(tempfile.TemporaryFile())
                process = subprocess.Popen([executable, *args, "-b", "-",
@@ -152,8 +273,7 @@ def upload(frame, items, remote_root, reporter, total, sent, workers):
                for process, errors in processes:
                    if process.poll() not in (None, 0):
                        errors.seek(0)
-                        detail = errors.read().decode(errors="replace")[-1500:]
-                        raise OSError(f"OpenSSH SFTP failed ({process.returncode}): {detail}")
+                        raise failure("OpenSSH SFTP", process.returncode, errors.read())
                for rel, size in sizes.items():
                    reporter.check_cancel()
                    progress[rel] = max(progress[rel], min(size, size_of(
@@ -187,11 +307,16 @@ def upload(frame, items, remote_root, reporter, total, sent, workers):

 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") as args, tempfile.TemporaryFile() as errors:
+    with credentials(frame, port_flag="-p", relaxed=relaxed) 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,
@@ -222,12 +347,14 @@ def put_tar(frame, files, remote_root, reporter, progress):
                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,6 +94,7 @@
 "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…": "",
@@ -557,6 +558,7 @@
 "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.": "",
@@ -568,6 +570,7 @@
 "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.": [
  "",
  ""
@@ -1026,6 +1029,7 @@
 "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.": "",
@@ -1138,6 +1142,7 @@
 "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": "",
@@ -1412,6 +1417,7 @@
 "Sound on": "",
 "Source": "",
 "square, 256 × 256": "",
+ "SSH keys": "",
 "Stable (default)": "",
 "Stand in for cube layers": "",
 "Standard for every game": "",
@@ -1462,6 +1468,7 @@
 "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).": "",
@@ -1513,6 +1520,7 @@
 "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.": "",
@@ -112,6 +112,7 @@ class UnityOculusCheck(Patch):
        return a.engine == "Unity" and "libOVRPlugin.so" in a.libs and bool((a.extra or {}).get("unity_oculus_check"))

    def detect(self, a):
+        # not narrowed by libOculusXRPlugin.so: a verified game ships it and still needs this fix
        if self.applies(a):
            return Suggestion(True, "Unity with built-in Oculus support: it checks for Meta's system apps before "
                                    "starting VR, else it runs as a 2D app (for example Accounting+, BattleSisters).")
@@ -12,7 +12,7 @@ frame.unity_text_input).
 from __future__ import annotations

 from ..base import Suggestion, register
-from .unity_text_input import RET_FALSE, Il2cppReturnPatch
+from .unity_text_input import RET_FALSE, Il2cppReturnPatch, can_rewrite_il2cpp

 RET_ZERO = RET_FALSE  # mov w0, #0 ; ret

@@ -40,7 +40,8 @@ class UnityRuntimeMsaa(Il2cppReturnPatch):
        return a.engine == "Unity" and "libil2cpp.so" in a.libs and not a.only_32bit

    def detect(self, a):
-        if self.applies(a) and (a.extra or {}).get("ovr_runtime_msaa") and "GLES" in a.graphics:
+        if (self.applies(a) and can_rewrite_il2cpp(a)
+                and (a.extra or {}).get("ovr_runtime_msaa") and "GLES" in a.graphics):
            return Suggestion(True, "GLES Unity game whose OVRManager turns 4x MSAA on at runtime: multisampled "
                                    "render-to-texture can hang the Frame's GPU.")
        return None
@@ -85,6 +85,19 @@ def patch_field_loads(lib: bytes, method: tuple[int, int], field_offset: int, va
 ALL_TARGETS: dict[str, list[str]] = {}  # every IL2CPP patch's methods: one Cpp2IL run (and cache entry) serves all


+def can_rewrite_il2cpp(a) -> bool:
+    """Automatic return patches need AArch64 code and metadata Cpp2IL can read.
+
+    Unity 2017's metadata is unreadable by our Cpp2IL workflow (AGENTS.md, Accounting+). Unknown versions keep the
+    existing fallback: apply() reads the version from the APK. This does not restrict manually selected patches.
+    """
+    try:
+        major = int(str((a.extra or {}).get("unity_version") or "0").split(".")[0])
+    except ValueError:
+        major = 0
+    return "arm64-v8a" in a.abis and not 0 < major < 2018
+
+
 class Il2cppReturnPatch(Patch):
    """Make IL2CPP methods return a constant (targets), found per game with Cpp2IL (analysis/il2cpp.py)."""
    targets: dict[str, dict[str, bytes]] = {}
@@ -164,7 +177,7 @@ class UnityTextInput(Il2cppReturnPatch):
        return a.engine == "Unity" and "libil2cpp.so" in a.libs and bool((a.extra or {}).get("text_fields"))

    def detect(self, a):
-        if self.applies(a):
+        if self.applies(a) and can_rewrite_il2cpp(a):
            kinds = " and ".join((a.extra or {}).get("text_fields"))
            return Suggestion(True, f"Unity app with text fields ({kinds}): they close at once on the Frame because "
                                    "it has no system keyboard.")
@@ -40,6 +40,13 @@ class UnityTlsKeyPool(Patch):
    def detect(self, a):
        heavy = heavy_native_libs(a)
        if self.applies(a) and _unity_major(a) >= 6000 and heavy:
+            # Firebase's Firestore and Gecko both consume keys alongside Unity 6 and the Frame's graphics/XR
+            # runtime. This is the documented exhaustion case (AGENTS.md, #198), rather than just any Firebase
+            # library: keep a lone SDK as an optional diagnostic fix below.
+            if "libFirebaseCppFirestore.so" in heavy and "libxul.so" in heavy:
+                return Suggestion(True, "Unity 6 with Firebase Firestore and Gecko: these native runtimes can "
+                                        "exhaust Android's 128 thread keys alongside the Frame's graphics and XR "
+                                        "libraries. Pool Unity's keys to leave room for them.")
            return Suggestion(False, f"Unity 6 with {', '.join(heavy)}: turn on if the game aborts at start with "
                                     "\"cannot create thread specific key\" (for example Wander).")
        return None
@@ -486,6 +486,11 @@ class AdapterSetting(Patch):
                                    "Tale, BattleSisters): vibrations are converted before they reach it.",
                              {"value": 1})
        if (self.key == "pose_time_fix" and a.engine == "Unity" and "libOVRPlugin.so" in a.libs
+                # Absence of the Oculus XR Plugin isn't proof of Unity's built-in VR: Unity OpenXR games can
+                # bundle OVRPlugin too. The system-app check in libunity is positive evidence of built-in Oculus
+                # (analysis/detect.py, frame/unity_oculus_check.py). Older analyses lack this signal; converted
+                # inputs may have had the check rewritten to "android", so keep the legacy fallback for those.
+                and (a.extra.get("unity_oculus_check", True) or a.is_overport_output)
                and not a.extra.get("oculus_xr_plugin") and "libOculusXRPlugin.so" not in a.libs):
            return Suggestion(True, "Unity's built-in Oculus support reads controller poses through OVRPlugin at its "
                                    "monotonic \"now\", seconds in the past on the Frame: they are located at the "
@@ -62,6 +62,9 @@ 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,9 +131,55 @@ 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."))],
+                                  tooltip=tr("Your own game files aren't touched.")),
+                          ft.Container(height=T.S2), self.ssh_keys()],
                         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
@@ -0,0 +1,326 @@
+"""Synthetic evaluator tests: no APKs, snapshots, git history, or network needed."""
+import importlib.util
+import json
+from pathlib import Path
+
+import pytest
+
+from frameport.core.library import analysis_from_dict
+from frameport.patches import base
+from frameport.recommend import catalog, engine
+
+script = Path(__file__).parents[1] / "scripts/eval_heuristics.py"
+spec = importlib.util.spec_from_file_location("eval_heuristics", script)
+ev = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(ev)
+
+
+def _analysis(**kwargs):
+    fields = dict(package="com.example.game", engine="Unity", xr="OpenXR", abis=["arm64-v8a"],
+                  libs=[], extra={}, graphics="Vulkan")
+    fields.update(kwargs)
+    return analysis_from_dict(fields)
+
+
+def _entry(**kwargs):
+    return catalog.CatalogEntry(**(dict(package="com.example.game", title="Example", status="works") | kwargs))
+
+
+def _patch(monkeypatch, pid, *, category="frame", default=False, applies=True, recommended=True,
+           a32=None, requires=(), conflicts=()):
+    base.load_all()
+    p = base.Patch()
+    p.id, p.title, p.category, p.default_on = pid, pid, category, default
+    p.a32, p.requires, p.conflicts = a32, requires, conflicts
+    p.experimental, p.strict = True, True
+    p.applies = lambda _: applies
+    params = {"value": 3} if category == "adapter" else {}
+    p.detect = lambda _: base.Suggestion(recommended, f"reason for {pid}", params)
+    monkeypatch.setitem(base.REGISTRY, pid, p)
+    return p
+
+
+def test_catalog_signature_is_catalog_only(monkeypatch):
+    def forbidden(*args, **kwargs):
+        pytest.fail("catalog signature must not call suggest")
+
+    monkeypatch.setattr(engine, "suggest", forbidden)
+    a = _analysis()
+    defaults = ev.expected_defaults(a)
+    entry = _entry(overport_extra=["patch_remove_unreal_force_quit"], overport_remove=["patch_copy_libraries"],
+                   frame=["frame.unity_text_input"], frame_remove=["frame.adapter"],
+                   adapter={"scene_emul": 0, "scale": 1.5}, device=["device.text_input_window"],
+                   device_files={"user.cfg": "r_vsync=0"}, alt_overport=["patch_fix_ue4_crash"], use_alt=True,
+                   foveation="fixed", foveation_radius=0.5, foveation_test=True,
+                   lepton_env={"X": "1"}, config_sync={"user.cfg": {"width": "w"}})
+    want = ev.catalog_signature(entry, defaults)
+    assert want["overport"] == ["patch_remove_unreal_force_quit"]
+    assert want["overport_removed"] == ["patch_copy_libraries"]
+    assert want["frame"] == ["frame.unity_text_input"]
+    assert want["frame_removed"] == ["frame.adapter"]
+    assert want["adapter"] == {"scene_emul": 0, "scale": 1.5}
+    assert want["device"] == ["device.text_input_window"]
+    assert want["device_files"] == ["user.cfg"]
+    assert want["alt"] == ["patch_fix_ue4_crash"]
+    assert want["use_alt"] is True
+    assert want["lepton_env"] == {"X": "1"}
+    assert want["config_sync"] == {"user.cfg": {"width": "w"}}
+    assert want["foveation"] == {"mode": "fixed", "radius": 0.5, "test": True}
+    assert not want["status_unsupported"]
+
+
+def test_mask_conditional_defaults_and_score_explicit_removals():
+    a = _analysis()
+    defaults = ev.expected_defaults(a)
+    assert "frame.ltw_depth" not in defaults
+    assert "frame.vk_sanitize" not in defaults
+    assert "frame.adapter" in defaults
+    r = ev.catalog_recipe(_entry(), defaults)
+    assert ev.signature(r, defaults)["frame_removed"] == []
+    removed = ev.catalog_signature(_entry(frame_remove=["frame.adapter", "frame.ltw_depth"]), defaults)
+    assert removed["frame_removed"] == ["frame.adapter"]
+    scored = ev.score_signatures(removed, ev.signature(r, defaults))["headline"]
+    assert scored["missing"] == {"remove:frame.adapter": True}
+    assert not scored["exact"]
+    r.patches.pop("frame.adapter")
+    dropped = ev.score_signatures(ev.catalog_signature(_entry(), defaults), ev.signature(r, defaults))["headline"]
+    assert dropped["extra"] == {"remove:frame.adapter": True}
+
+
+def test_catalog_adapter_does_not_inherit_heuristics():
+    a = _analysis(libs=["libOVRPlugin.so"])
+    got = engine.suggest(a, use_catalog=False)
+    assert "adapter.haptic_fix" in got.patches
+    assert ev.catalog_signature(_entry(), ev.expected_defaults(a))["adapter"] == {}
+
+
+def test_scorer_values_counts_and_exact():
+    want = ev.catalog_signature(_entry(frame=["frame.unity_text_input"], adapter={"scene_emul": 1}))
+    got = ev.catalog_signature(_entry(frame=["frame.unity_text_input", "frame.hw_video_decode"],
+                                      adapter={"scene_emul": 2}))
+    score = ev.score_signatures(want, got)["headline"]
+    assert not score["exact"]
+    assert score["per_patch"]["frame.unity_text_input"] == ev._rates(1, 0, 0)
+    assert score["per_patch"]["frame.hw_video_decode"] == ev._rates(0, 1, 0)
+    assert score["per_patch"]["adapter.scene_emul"] == ev._rates(0, 1, 1)
+    assert score["missing"] == {"adapter.scene_emul": 1}
+    assert score["extra"] == {"adapter.scene_emul": 2, "frame.hw_video_decode": True}
+    same = ev.score_signatures(want, want)
+    assert same["headline"]["exact"] and same["runtime"]["exact"]
+    assert same["headline"]["per_patch"]["adapter.scene_emul"] == ev._rates(1, 0, 0)
+
+
+def test_runtime_separate_from_headline():
+    want = ev.catalog_signature(_entry(adapter={"scale": 1.5, "sync_guard": 1}, use_alt=True,
+                                       lepton_env={"X": "Y"}, config_sync={"foo": {"w": "w"}}))
+    got = ev.catalog_signature(_entry())
+    score = ev.score_signatures(want, got)
+    assert score["headline"]["exact"]
+    assert not score["headline"]["missing"]
+    assert not score["runtime"]["exact"]
+    assert score["runtime"]["per_patch"]["adapter.scale"] == ev._rates(0, 0, 1)
+    assert score["runtime"]["missing"]["use_alt"]
+
+
+def test_aggregate_excludes_unsupported_and_breaks_down_engines():
+    want = ev.catalog_signature(_entry(frame=["frame.unity_text_input"]))
+    empty = ev.catalog_signature(_entry())
+    rows = [dict(package="com.a", status="works", engine="Unity", converted=True, want=want, got=want),
+            dict(package="com.b", status="issues", engine="Unreal", want=want, got=empty),
+            dict(package="com.c", status="unsupported", engine="Other", want=want, got=empty)]
+    result = ev.score_records(rows)
+    assert result["headline"]["games"] == 2
+    assert result["headline"]["exact"] == 1
+    assert result["headline"]["exact_ratio"] == 0.5
+    assert result["headline"]["patches"] == ev._rates(1, 0, 1)
+    assert result["headline"]["fields"]["frame"] == {"matched": 1, "total": 2}
+    assert result["runtime"]["exact"] == 2
+    assert result["excluded_unsupported"] == 1
+    assert result["unsupported"]["headline"]["patches"] == ev._rates(0, 0, 1)
+    assert result["by_engine"]["Unreal"]["headline"]["patches"] == ev._rates(0, 0, 1)
+    assert result["converted_games"] == 1
+    assert len(result["games"]) == 3
+
+
+def test_split_deterministic_stratified_and_disjoint():
+    engines = {f"com.example.{name}{i}": name for name in ("Unity", "Unreal", "Other") for i in range(10)}
+    assignments = ev.split_packages(engines)
+    assert assignments == ev.split_packages(dict(reversed(list(engines.items()))))
+    for name in ("Unity", "Unreal", "Other"):
+        mine = [pkg for pkg in engines if engines[pkg] == name]
+        ranked = sorted(mine, key=lambda p: ev.hashlib.sha256(p.encode()).digest())
+        assert {p for p in mine if assignments[p] == "holdout"} == set(ranked[:2])
+    dev = {p for p, s in assignments.items() if s == "dev"}
+    holdout = {p for p, s in assignments.items() if s == "holdout"}
+    assert not dev & holdout
+    assert dev | holdout == engines.keys()
+    assert ev.split_packages({}) == {}
+    assert ev.split_packages({"com.one": "CryEngine"}) == {"com.one": "dev"}
+
+
+def test_fit_selects_only_recommended_opt_ins_not_listed_or_removed(monkeypatch):
+    _patch(monkeypatch, "frame.eval_candidate", conflicts=("frame.adapter",), requires=("frame.eval_unrecommended",))
+    _patch(monkeypatch, "frame.eval_default", default=True)
+    _patch(monkeypatch, "frame.eval_unrecommended", recommended=False)
+    _patch(monkeypatch, "frame.eval_inapplicable", applies=False)
+    _patch(monkeypatch, "frame.eval_listed")
+    _patch(monkeypatch, "frame.eval_removed")
+    _patch(monkeypatch, "frame.eval_alternate")
+    _patch(monkeypatch, "adapter.eval_setting", category="adapter")
+    _patch(monkeypatch, "pcvr.eval_wrong_platform", category="pcvr")
+    entry = _entry(frame=["frame.eval_listed"], frame_remove=["frame.eval_removed"],
+                   alt_overport=["frame.eval_alternate"], adapter={"eval_setting": 9})
+    candidates = {r["patch"]: r for r in ev.fit_candidates(_analysis(), entry)}
+    assert "frame.eval_candidate" in candidates
+    assert not set(candidates) & {"frame.eval_default", "frame.eval_unrecommended", "frame.eval_inapplicable",
+                                  "frame.eval_listed", "frame.eval_removed", "frame.eval_alternate",
+                                  "adapter.eval_setting", "pcvr.eval_wrong_platform"}
+    c = candidates["frame.eval_candidate"]
+    assert c["reason"] == "reason for frame.eval_candidate"
+    assert c["category"] == "frame" and c["experimental"] and c["strict"]
+    assert any("conflicts" in w for w in c["warnings"])
+
+
+def test_fit_uses_a32_and_flat_rules(monkeypatch):
+    _patch(monkeypatch, "frame.eval_64_only", a32=False)
+    _patch(monkeypatch, "frame.eval_32_ok", a32=True)
+    candidates = {r["patch"] for r in ev.fit_candidates(_analysis(abis=["armeabi-v7a"]), _entry())}
+    assert "frame.eval_32_ok" in candidates
+    assert "frame.eval_64_only" not in candidates
+    assert "frame.a32_bridge" not in candidates  # implied for 32-bit entries, as engine._a32_predates_bridge does
+    flat = {r["patch"] for r in ev.fit_candidates(_analysis(extra={"vr_kind": "none"}), _entry())}
+    assert "frame.eval_32_ok" not in flat  # needs_vr defaults True, removed by engine._non_quest
+
+
+def test_fit_metadata_dates_and_converted(monkeypatch):
+    monkeypatch.setattr(ev, "fit_candidates", lambda a, e: [dict(patch="frame.new", category="frame",
+                                                               reason="x", experimental=False, strict=False,
+                                                               warnings=[])])
+    entries = {"com.a": _entry(package="com.a", verified={"date": "2026-01-01"}, updated="2026-02-01"),
+               "com.b": _entry(package="com.b", status="unsupported", engine="Other", xr="VrApi")}
+    report = ev.fit_report({"com.a": {"analysis": _analysis(package="com.a").to_dict(), "converted": True}}, entries,
+                           {"frame.new": "2026-03-01"})
+    assert report["games"][0]["candidates"][0]["newer_patch"] is True
+    assert report["games"][0]["entry_date"] == "2026-01-01"  # verified, not updated
+    assert report["games"][0]["converted"]
+    assert report["metadata_only"][0]["package"] == "com.b"
+    assert report["metadata_only"][0]["xr"] == "VrApi"
+    assert report["totals_by_patch"] == {"frame.new": 1}
+    md = ev.render_fit_report(report)
+    assert "metadata only" in md and "com.b" in md and "frame.new" in md
+
+
+def test_snapshot_copied_before_read_and_retried(tmp_path, monkeypatch):
+    source = tmp_path / "snapshot.json"
+    source.write_text('{"complete": true}')
+    calls = []
+    real_copy = ev.shutil.copyfile
+
+    def copying(src, dest):
+        calls.append((src, dest))
+        real_copy(src, dest)
+        if len(calls) == 1:
+            dest.write_text('{"partial":')
+
+    monkeypatch.setattr(ev.shutil, "copyfile", copying)
+    monkeypatch.setattr(ev.time, "sleep", lambda _: None)
+    assert ev.read_snapshot(source) == {"complete": True}
+    assert len(calls) == 2
+    assert all(src == source and dest != source for src, dest in calls)
+    assert json.loads(source.read_text()) == {"complete": True}
+
+
+def test_intro_dates_cached_and_adapter_searches_bare_key(tmp_path, monkeypatch):
+    calls = []
+    patch = base.get("adapter.scene_emul")
+    monkeypatch.setattr(base, "all_patches", lambda: [patch])
+
+    def log(args, **kwargs):
+        calls.append(args)
+        return type("Result", (), {"stdout": "2026-01-02\n2026-02-03\n"})()
+
+    monkeypatch.setattr(ev.subprocess, "run", log)
+    cache = tmp_path / "patch-intro-dates.json"
+    assert ev.patch_intro_dates(cache) == {"adapter.scene_emul": "2026-01-02"}
+    assert '-S"scene_emul"' in calls[0]
+    assert calls[0][-1] == "src/frameport/patches/settings.py"
+    assert ev.patch_intro_dates(cache) == {"adapter.scene_emul": "2026-01-02"}
+    assert len(calls) == 1
+
+
+def test_legacy_dumps_cli_remains_available(tmp_path, monkeypatch, capsys):
+    a = _analysis()
+    snapshot = {a.package: {"analysis": a.to_dict()}}
+    entry = _entry()
+    calls = []
+    monkeypatch.setattr(ev, "read_dumps", lambda p: calls.append(p) or snapshot)
+    monkeypatch.setattr(catalog, "_load_dir", lambda *args: {a.package: entry})
+    monkeypatch.setattr(ev.sys, "argv", ["eval_heuristics.py", str(tmp_path), "--verbose"])
+    assert ev.main() in (0, 1)  # a difference exit is compatible with the original CLI
+    assert calls == [tmp_path]
+    output = capsys.readouterr().out
+    assert "Split: dev" in output and a.package in output
+
+
+def test_snapshot_fit_cli_writes_markdown_and_json(tmp_path, monkeypatch):
+    a = _analysis()
+    snapshot = tmp_path / "synthetic.json"
+    snapshot.write_text(json.dumps({a.package: {"analysis": a.to_dict(), "converted": True}}))
+    md, js = tmp_path / "fit.md", tmp_path / "fit.json"
+    monkeypatch.setattr(catalog, "_load_dir", lambda *args: {a.package: _entry()})
+    monkeypatch.setattr(ev, "patch_intro_dates", lambda p: {})
+    monkeypatch.setattr(ev.quest_dump, "scan", lambda *a: pytest.fail("must not scan with --snapshot"))
+    monkeypatch.setattr(ev.sys, "argv", ["eval_heuristics.py", "--snapshot", str(snapshot), "--fit-report",
+                                        "--out", str(md), "--json", str(js)])
+    assert ev.main() == 0
+    assert "# New patch fit" in md.read_text()
+    assert json.loads(js.read_text())["games"][0]["converted"]
+
+
+def test_evaluate_split_coverage_and_no_snapshot_analysis_mutation():
+    snapshot = {f"com.game.n{i}": {"analysis": _analysis(package=f"com.game.n{i}").to_dict(), "converted": i == 0}
+                for i in range(10)}
+    entries = {p: _entry(package=p) for p in snapshot}
+    before = json.dumps(snapshot, sort_keys=True)
+    reports = {s: ev.evaluate(snapshot, entries, s) for s in ("all", "dev", "holdout")}
+    assert reports["dev"]["total_games"] == 8
+    assert reports["holdout"]["total_games"] == 2
+    assert reports["all"]["total_games"] == 10
+    assert json.dumps(snapshot, sort_keys=True) == before
+    assert reports["all"]["converted_games"] == 1
+
+
+def test_catalog_truth_applies_the_a32_bridge_transform():
+    """A 32-bit game's entry relies on the bridge switching OVRPort and the 64-bit fixes off; the heuristics do the
+    same, so neither side may count those as removals."""
+    a = _analysis(abis=["armeabi-v7a"], engine="Unreal", graphics="GLES")
+    defaults = ev.expected_defaults(a)
+    want = ev.catalog_signature(_entry(), defaults, a)
+    got = ev.signature(engine.suggest(a, use_catalog=False), defaults)
+    assert want["overport_removed"] == got["overport_removed"]
+    assert want["frame_removed"] == got["frame_removed"]
+
+
+def test_dated_score_sets_aside_patches_newer_than_the_entry():
+    want = ev.catalog_signature(_entry(frame=["frame.unity_text_input"]))
+    got = ev.catalog_signature(_entry(frame=["frame.unity_text_input", "frame.hw_video_decode"]))
+    strict = ev.score_signatures(want, got)["headline"]
+    dated = ev.score_signatures(want, got, {"frame.hw_video_decode"})["headline"]
+    assert strict["extra"] and not strict["exact"]
+    assert dated["exact"] and dated["gap"] == {"frame.hw_video_decode": True}
+    assert "frame.hw_video_decode" not in dated["per_patch"]
+
+
+def test_inherited_picks_are_adapter_and_untoggled_device_patches():
+    inherited = ev.inherited_decisions()
+    assert "adapter.haptic_fix" in inherited
+    assert "device.text_input_window" not in inherited  # catalog.TOGGLED_DEVICE: dropped unless the entry names it
+    assert not any(pid.startswith("frame.") for pid in inherited)
+
+
+def test_gap_decisions_use_the_verified_date_not_updated():
+    e = _entry(verified={"date": "2026-09-28"}, updated="2026-10-14")
+    gaps = ev.gap_decisions(e, {"frame.unity_text_input": "2026-10-03", "frame.adapter": "2026-09-28",
+                                "patch_remove_unreal_force_quit": "2026-10-01"})
+    assert gaps == {"frame.unity_text_input", "alt:patch_remove_unreal_force_quit"}
+    assert ev.entry_date(e) == "2026-09-28"
@@ -8,6 +8,12 @@ from frameport.sources import quest_dump

 pytestmark = pytest.mark.games

+# 2026-10-15 full snapshot (80 dumps, 65 supported catalog games), strict score: 5/65 exact, patch F1 73.8%;
+# rounded down. The dated score (--fit-report's date cache) was 39/65, F1 88.6%. See docs/HEURISTICS_EVAL.md;
+# runtime-only choices and unsupported catalog entries are excluded.
+MIN_HEURISTICS_EXACT_RATIO = 0.07
+MIN_HEURISTICS_PATCH_F1 = 0.73
+

@pytest.fixture(scope="module")
 def dumps():
@@ -36,8 +42,7 @@ def test_every_catalog_game_found_and_detected(dumps):


 def test_heuristics_reproduce_catalog(dumps):
-    """Without the catalog, heuristics must reproduce the verified recipes (Phantom's use-the-no-ForceQuit-build is a
-    runtime finding the triage makes, not a static one)."""
+    """Ratchet catalog-only static accuracy without requiring runtime findings to be detectable from APKs."""
    import importlib.util
    from pathlib import Path

@@ -45,16 +50,15 @@ def test_heuristics_reproduce_catalog(dumps):
    spec = importlib.util.spec_from_file_location("ev", script)
    ev = importlib.util.module_from_spec(spec)
    spec.loader.exec_module(ev)
-    exact = total = 0
+    snapshot = {}
    for g in dumps:
        a = analyze(g.apk, data_bytes=g.data_bytes())
-        entry = catalog.lookup(a.package)
-        if not entry:
-            continue
-        from frameport.recommend import engine
-
-        want, got = ev.signature(engine.suggest(a)), ev.signature(engine.suggest(a, use_catalog=False))
-        want["status_unsupported"] = got["status_unsupported"] = False
-        total += 1
-        exact += want == got
-    assert exact >= total - 1, f"only {exact}/{total} catalog recipes reproduced by heuristics"
+        row = {"analysis": a.to_dict(), "converted": a.is_overport_output}
+        if a.package not in snapshot or snapshot[a.package]["converted"] and not row["converted"]:
+            snapshot[a.package] = row
+    entries = catalog._load_dir(script.parents[1] / "catalog/games", "bundled")
+    result = ev.evaluate(snapshot, entries, split="all")["headline"]
+    assert result["games"], "no supported catalog games found in the dumps"
+    assert result["exact_ratio"] >= MIN_HEURISTICS_EXACT_RATIO, (
+        f"only {result['exact']}/{result['games']} static catalog recipes reproduced exactly")
+    assert result["patches"]["f1"] >= MIN_HEURISTICS_PATCH_F1, result["patches"]
@@ -0,0 +1,51 @@
+"""Adapter recommendations use the detected runtime path, without a catalog."""
+import pytest
+from test_patches import _analysis
+
+from frameport.patches import base
+from frameport.recommend.engine import suggest
+
+
+@pytest.mark.parametrize(("extra", "other_libs", "converted", "expected"), [
+    # Built-in Oculus has the system-app check; modern Unity OpenXR can still ship OVRPlugin.
+    ({"unity_oculus_check": True}, [], False, True),
+    ({"unity_oculus_check": False}, ["libUnityOpenXR.so"], False, False),
+    ({"unity_oculus_check": False}, [], False, False),
+    # Neither the version nor the graphics API is the reason to select this fix.
+    ({"unity_oculus_check": False, "unity_version": "2019.4.20f1"}, [], False, False),
+    ({"unity_oculus_check": True, "unity_version": "2019.4.20f1"}, [], False, True),
+    # The built-in check can coexist with XR Plugin Management: retain both exclusions.
+    ({"unity_oculus_check": True, "oculus_xr_plugin": True}, [], False, False),
+    ({"unity_oculus_check": True}, ["libOculusXRPlugin.so"], False, False),
+    # Old analyses have no check signal. Converted builds may have the check patched out.
+    ({}, [], False, True),
+    ({"unity_oculus_check": False}, [], True, True),
+    ({"unity_oculus_check": False}, ["libOculusXRPlugin.so"], True, False),
+])
+def test_pose_time_fix_uses_builtin_oculus_evidence(extra, other_libs, converted, expected):
+    a = _analysis(libs=["libunity.so", "libOVRPlugin.so", *other_libs],
+                  extra=extra, is_overport_output=converted)
+    patch = base.get("adapter.pose_time_fix")
+    detected = patch.detect(a)
+    assert patch.applies(a)  # still available for manual investigation in any OVRPlugin game
+    assert bool(detected and detected.recommended) is expected
+    recipe = suggest(a, use_catalog=False)
+    assert (patch.id in recipe.patches) is expected
+    if expected:
+        assert recipe.patches[patch.id] == {"value": 1}
+    # The new evidence is specific to pose timing: OVRPlugin's haptic bug affects both paths.
+    assert recipe.patches["adapter.haptic_fix"] == {"value": 1}
+
+
+def test_pose_time_fix_still_requires_ovrplugin():
+    a = _analysis(libs=["libunity.so"], extra={"unity_oculus_check": True}, is_overport_output=False)
+    patch = base.get("adapter.pose_time_fix")
+    assert not patch.applies(a)
+    assert patch.detect(a) is None
+    assert patch.id not in suggest(a, use_catalog=False).patches
+
+
+def test_unreal_pose_evidence_is_independent_of_unity():
+    a = _analysis(engine="Unreal", libs=["libUE4.so", "libOVRPlugin.so"], is_overport_output=False,
+                  extra={"unity_oculus_check": False, "unreal_thumb_touch": True})
+    assert suggest(a, use_catalog=False).patches["adapter.pose_time_fix"] == {"value": 1}
@@ -0,0 +1,136 @@
+"""Unity heuristics from executable paths and tool support, without catalog/package matching."""
+import pytest
+from test_patches import _analysis
+
+from frameport.patches import base
+from frameport.recommend.engine import suggest
+
+IL2CPP_FIXES = ("frame.unity_text_input", "frame.unity_runtime_msaa_off")
+
+
+def _il2cpp(**changes):
+    values = dict(libs=["libunity.so", "libil2cpp.so", "libOVRPlugin.so"], graphics="GLES",
+                  extra={"unity_version": "2019.4.10f1", "text_fields": ["TMP_InputField"],
+                         "ovr_runtime_msaa": True})
+    values.update(changes)
+    return _analysis(**values)
+
+
+@pytest.mark.parametrize("pid", IL2CPP_FIXES)
+@pytest.mark.parametrize("version", ["2017.4.23f1", "2017.1.0f1", "5.6.7f1"])
+def test_unreadable_old_metadata_does_not_recommend_il2cpp_rewrites(pid, version):
+    a = _il2cpp(extra={"unity_version": version, "text_fields": ["TMP_InputField"], "ovr_runtime_msaa": True})
+    p = base.get(pid)
+    assert p.detect(a) is None
+    assert pid not in suggest(a, use_catalog=False).patches
+    assert p.applies(a)  # still available for an explicit recipe; only automatic detection changes
+
+
+@pytest.mark.parametrize("pid", IL2CPP_FIXES)
+@pytest.mark.parametrize("version", ["2018.4.0f1", "2019.4.1f1", "2022.3.1f1", "6000.5.6f1", None, "unknown"])
+def test_supported_or_unknown_metadata_keeps_il2cpp_recommendations(pid, version):
+    a = _il2cpp(extra={"unity_version": version, "text_fields": ["InputField"], "ovr_runtime_msaa": True})
+    assert base.get(pid).detect(a).recommended
+    assert pid in suggest(a, use_catalog=False).patches
+
+
+@pytest.mark.parametrize("pid", IL2CPP_FIXES)
+@pytest.mark.parametrize("abis", [["armeabi-v7a"], ["x86_64"], []])
+def test_aarch64_return_instructions_are_not_recommended_for_other_abis(pid, abis):
+    assert base.get(pid).detect(_il2cpp(abis=abis)) is None
+
+
+@pytest.mark.parametrize("pid", IL2CPP_FIXES)
+def test_il2cpp_rewrites_still_need_unity_and_il2cpp(pid):
+    assert base.get(pid).detect(_il2cpp(engine="Unreal")) is None
+    assert base.get(pid).detect(_il2cpp(libs=["libunity.so", "libmonobdwgc-2.0.so"])) is None
+
+
+def test_text_classes_remain_a_signal_for_both_unity_field_implementations():
+    p = base.get("frame.unity_text_input")
+    for fields in (["TMP_InputField"], ["InputField"], ["TMP_InputField", "InputField"]):
+        a = _il2cpp(extra={"text_fields": fields})
+        assert p.detect(a).recommended
+        assert base.get("device.text_input_window").detect(a).recommended
+    assert p.detect(_il2cpp(extra={"text_fields": []})) is None
+
+
+@pytest.mark.parametrize("graphics", ["Vulkan (declared in manifest)", "Vulkan (Unity boot.config)"])
+def test_runtime_msaa_does_not_guess_gles_from_a_vulkan_label(graphics):
+    assert base.get("frame.unity_runtime_msaa_off").detect(_il2cpp(graphics=graphics)) is None
+
+
+def test_runtime_msaa_needs_the_runtime_msaa_signal():
+    assert base.get("frame.unity_runtime_msaa_off").detect(_il2cpp(extra={}, unity_msaa_levels=4)) is None
+
+
+@pytest.mark.parametrize("version", ["2017.4.23f1", "2019.4.20f1", None])
+def test_built_in_oculus_path_still_needs_system_app_bypass(version):
+    a = _il2cpp(extra={"unity_version": version, "unity_oculus_check": True})
+    p = base.get("frame.unity_oculus_check")
+    assert p.detect(a).recommended
+    assert p.id in suggest(a, use_catalog=False).patches
+
+
+def test_oculus_xr_plugin_still_gets_the_builtin_startup_check():
+    """A verified game (com.coatsink.alone) ships libOculusXRPlugin.so and still needs the bypass."""
+    a = _il2cpp(libs=["libunity.so", "libil2cpp.so", "libOVRPlugin.so", "libOculusXRPlugin.so"],
+                extra={"unity_version": "2019.4.35f1", "unity_oculus_check": True})
+    assert base.get("frame.unity_oculus_check").detect(a).recommended
+
+
+def test_oculus_metadata_field_alone_does_not_prove_a_native_plugin_path():
+    a = _il2cpp(extra={"unity_oculus_check": True, "oculus_xr_plugin": True})
+    assert base.get("frame.unity_oculus_check").detect(a).recommended
+
+
+def test_oculus_bypass_needs_both_the_check_and_ovrplugin():
+    p = base.get("frame.unity_oculus_check")
+    assert p.detect(_il2cpp(extra={})) is None
+    assert p.detect(_il2cpp(libs=["libunity.so"], extra={"unity_oculus_check": True})) is None
+    assert p.detect(_il2cpp(engine="Other", extra={"unity_oculus_check": True})) is None
+
+
+FIRESTORE = "libFirebaseCppFirestore.so"
+GECKO = "libxul.so"
+
+
+def _tls(version="6000.5.6f1", heavy=(FIRESTORE, GECKO), **changes):
+    return _analysis(libs=["libunity.so", *heavy], extra={"unity_version": version}, **changes)
+
+
+@pytest.mark.parametrize("version", ["6000.0.1f1", "6000.5.6f1"])
+def test_unity6_firestore_and_gecko_recommend_thread_key_pool(version):
+    a = _tls(version)
+    p = base.get("frame.unity_tls_key_pool")
+    assert p.detect(a).recommended
+    assert p.id in suggest(a, use_catalog=False).patches
+
+
+@pytest.mark.parametrize("heavy", [(FIRESTORE,), (GECKO,), ("libFirebaseCppApp-9_6_0.so", GECKO)])
+def test_less_thread_key_pressure_remains_an_optional_diagnostic(heavy):
+    a = _tls(heavy=heavy)
+    p = base.get("frame.unity_tls_key_pool")
+    assert not p.detect(a).recommended
+    assert p.id not in suggest(a, use_catalog=False).patches
+
+
+@pytest.mark.parametrize("version", ["2019.4.1f1", "2022.3.1f1", None, "unknown"])
+def test_thread_key_pressure_rule_requires_unity6(version):
+    assert base.get("frame.unity_tls_key_pool").detect(_tls(version)) is None
+
+
+def test_thread_key_pool_requires_native_unity_for_arm64():
+    p = base.get("frame.unity_tls_key_pool")
+    assert p.detect(_tls(engine="Unreal")) is None
+    assert p.detect(_tls(abis=["armeabi-v7a"])) is None
+    assert p.detect(_analysis(libs=[FIRESTORE, GECKO], extra={"unity_version": "6000.5.6f1"})) is None
+
+
+def test_rendering_tradeoffs_stay_opt_in_without_the_runtime_symptom():
+    a = _il2cpp(libs=["libunity.so", "libil2cpp.so", "libOculusXRPlugin.so"], unity_msaa_levels=4,
+                extra={"oculus_xr_plugin": True, "ovr_runtime_msaa": True})
+    for pid in ("frame.unity_multipass", "frame.unity_no_overlay_copy"):
+        p = base.get(pid)
+        assert p.applies(a) and p.detect(a) is None
+        assert pid not in suggest(a, use_catalog=False).patches
@@ -38,8 +38,36 @@ def test_quote_refuses_batch_injection(value):
        native.quote(value)


-def test_quote_protects_spaces_quotes_globs():
-    assert native.quote('a *?["b') == '"a \\*\\?\\[\\"b"'
+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_size_lookup_does_not_hide_connection_errors():
@@ -65,10 +93,11 @@ 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, "", "")))
+                            target=FrameTarget("paired"), run=Mock(return_value=(0, "", "")), modes_seen=[])
    monkeypatch.setattr(native.shutil, "which", lambda _: "sftp")
    @contextlib.contextmanager
-    def creds(frame):
+    def creds(frame, relaxed=False):
+        frame.modes_seen.append(relaxed)
        yield ["-o", "StrictHostKeyChecking=yes"]
    monkeypatch.setattr(native, "credentials", creds)
    commands, processes = [], []
@@ -210,7 +239,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))
+    frame = SimpleNamespace(target=FrameTarget("paired.example", port=2222), modes_seen=[])
    pipe = io.BytesIO()
    pipe.close = lambda: None
    process = Mock(stdin=pipe, returncode=code)
@@ -219,8 +248,9 @@ 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):
+    def creds(frame, port_flag, relaxed=False):
        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
@@ -0,0 +1,340 @@
+"""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
Author	SHA1	Message	Date
spoopyghosty0	f3c9605694	OpenSSH uploads log in like the Frame connection; SSH key files in Settings (#242 ) A Frame that only authorizes the user's own key refused OpenSSH, which offered FramePort's keys alone (IdentitiesOnly), so every upload fell back to Paramiko. The connection now records which login worked (Frame.auth): after a login with this PC's own keys/agent OpenSSH also offers private copies of ~/.ssh/id_* (OpenSSH skips its defaults once -i is given) and the agent; a refused strict login is retried that way once. FramePort doesn't add its key to the Frame for this. New: Settings > Installing > SSH keys (library ssh.extra_keys, CLI frameport frame ssh-keys): extra private key files for the connection and OpenSSH, checked with Paramiko (passphrase keys: use the agent). OpenSSH runs with -v and a refused login's error lists the keys offered and its warnings. whoami's SID is read from bytes (non-ASCII user names). Checked with Windows ssh.exe/sftp.exe against the Frame.	2026-10-15 19:54:09 -04:00
spoopyghosty0	3557469242	OpenSSH uploads: don't escape glob characters inside sftp's quotes (#324 ) sftp escapes * ? [ inside double quotes itself, so FramePort's extra backslash became part of the path: a folder named "... [ENG] ..." failed every OpenSSH upload (on Linux too) and fell back to Paramiko. On Windows the local path now goes with forward slashes: Win32-OpenSSH turned every backslash, escapes included, into '/' ("C://Users", "/[ENG]"). Checked with Windows sftp.exe and Linux sftp against the Frame (put and reput, sha256 match).	2026-10-15 19:36:48 -04:00
spoopyghosty0	f2f92cce70	Catalog: NEX Player typing verified in the headset (keyboard opened by hand)	2026-10-15 19:07:48 -04:00
spoopyghosty0	dd74c17212	Heuristics eval: docs for the dated score, CLAUDE.md notes, ratchet floors from the final run	2026-10-15 19:07:47 -04:00
spoopyghosty0	5647e266bd	Catalog: Unity text-input fix for 17 recipes verified before it existed (from detection, not headset-verified)	2026-10-15 19:07:46 -04:00
spoopyghosty0	a5a86e591d	eval_heuristics: adapter/device picks a catalog recipe inherits aren't errors in the dated score	2026-10-15 19:07:45 -04:00
spoopyghosty0	7cd78cfa26	eval_heuristics: date-aware score (patches newer than the entry's verified date are catalog gaps, not errors); fit report dates by verified date	2026-10-15 19:07:44 -04:00
spoopyghosty0	e04edf3600	unity_oculus_check: keep suggesting it with the Oculus XR Plugin (holdout game com.coatsink.alone needs it)	2026-10-15 19:07:43 -04:00
spoopyghosty0	c98aad5056	Use built-in Oculus evidence for adapter pose timing suggestions	2026-10-15 19:07:41 -04:00
spoopyghosty0	ae228ea4ea	Refine Unity heuristics for IL2CPP support, XR routing and thread keys	2026-10-15 19:07:40 -04:00
spoopyghosty0	0599e55831	eval_heuristics: catalog truth goes through the 32-bit bridge / 2D-app transforms like suggest(); floors from the full snapshot	2026-10-15 19:07:39 -04:00
spoopyghosty0	2e83970ad5	Add catalog-only heuristics scoring and new patch fit reports	2026-10-15 19:07:38 -04:00
spoopyghosty0	33a778c195	scripts: heuristics_snapshot.py saves dump analyses as JSON for heuristics evals	2026-10-15 19:07:37 -04:00
spoopyghosty0	b9a1fe67bc	CLAUDE.md: document the GitHub triage workflow Consolidates the reusable mechanics: issue templates/labels, the working-recipe -> catalog path (scripts/catalog_from_issue.py), handling diagnostics zips (and the attachment-vs-placeholder gotcha), how a change reaches users (catalog ~6 h vs code needing a release/dev build, and not bumping a shared revision for a narrow fix), and verifying a device fix headless. Identity/credentials stay in CLAUDE.local.md.	2026-10-15 17:34:39 -04:00