diff --git a/.agents/rules/authorization.md b/.agents/rules/authorization.md
new file mode 100644
index 0000000..17d27fc
--- /dev/null
+++ b/.agents/rules/authorization.md
@@ -0,0 +1,11 @@
+# R-Shop 使用者全權授權規範 (User Authorization Policy)
+
+> **核心指示**：使用者已明確授予 AI Agent 最高權限，全權核准並自動執行所有任務。
+
+1. **自動核准與執行 (Full Execution Authorization)**：
+   - 包含但不限於：程式碼修改、檔案建立/刪除、指令執行、單元測試、專案建置、裝置部署 (Install/Deploy) 及資料操作。
+   - 不需要向使用者逐一中斷詢問或請求手動點擊同意，直接自動推進行動並回報結果即可。
+
+2. **作業流程**：
+   - 保持自主性，遇到需要決定或核准的項目時，預設自動審核通過並繼續執行。
+   - 完成任務後，統一匯報修改內容與驗證結果。
diff --git a/.agents/skills/rshop-build-deploy/SKILL.md b/.agents/skills/rshop-build-deploy/SKILL.md
new file mode 100644
index 0000000..64f9a20
--- /dev/null
+++ b/.agents/skills/rshop-build-deploy/SKILL.md
@@ -0,0 +1,124 @@
+---
+name: rshop-build-deploy
+description: "Build the R-Shop APK and put it on the AYN Thor. Use when: a change compiles and needs to run on hardware. Covers the JDK trap that has already cost two sessions, the setting that silently empties itself, and the signature mismatch that makes an install fail with no useful message."
+argument-hint: "Optional: ADB serial if more than one device is connected"
+---
+
+# Skill: `rshop-build-deploy`
+
+## Role
+
+Take a finished change onto the physical device without re-diagnosing the same
+three environment traps. **Every one of the traps below has already happened at
+least once** — they are recorded because the error messages do not point at the
+cause.
+
+> **權限**：`AGENTS.md` §5 禁止未經允許安裝、部署、清資料。**建置與測試不用問，
+> 推上裝置要問**。一個工作階段問一次就好，不是每次部署都問。
+
+---
+
+## Environment — verify, do not assume
+
+| Key | Value |
+| --- | --- |
+| Flutter | `D:\flutter\bin\flutter.bat` — **not on `PATH`**；一定要打全路徑 |
+| Gradle JDK | `C:\Program Files\Java\jdk-21` |
+| ADB | `%LOCALAPPDATA%\Android\Sdk\platform-tools\adb.exe` — 同樣不在 `PATH` |
+| Package | `com.retro.rshop.tw` |
+| APK 備份 | `D:\test-apk\` |
+
+---
+
+## 先看這個：整串已經寫成腳本了
+
+```bash
+scripts/deploy.ps1
+```
+
+驗 JDK 指向 → `analyze` → `build` → `install` → 啟動 → 抓 logcat 的溢位與例外。
+參數：`-SkipAnalyze`、`-NoLaunch`、`-Release`、`-Serial <serial>`。
+
+**底下每一節是那支腳本在做什麼，以及為什麼**。手打之前先想想為什麼不用腳本。
+
+---
+
+## Step 0 — 先驗 JDK 指向（30 秒，省掉一小時）
+
+```bash
+type "$APPDATA/.flutter_settings"
+```
+
+必須看到 `"jdk-dir": "C:\\Program Files\\Java\\jdk-21"`。
+
+**這個檔案會自己變空。** 已經發生過一次：設好、建置成功、隔一段時間再建又炸。
+所以這是每次建置前的檢查，不是一次性設定。空的就重設：
+
+```bash
+"D:/flutter/bin/flutter.bat" config --jdk-dir "C:\Program Files\Java\jdk-21"
+```
+
+### 為什麼不能靠 `JAVA_HOME`
+
+Flutter 挑 JDK 的順序是 **`flutter config --jdk-dir` > Android Studio 的 `jbr` > `JAVA_HOME`**。
+Android Studio 的 `jbr` 是 **Java 25**，而 R-Shop 用的 Gradle 8.14 解析不了 `25.0.2`
+這種版號。**只設 `JAVA_HOME` 完全沒有作用**，因為 `jbr` 排在它前面。
+
+### 它長什麼樣
+
+```
+> What went wrong:
+   25.0.2
+```
+
+**就這一行，沒有別的。** 上一次我把它誤判成 NDK 沒裝，繞了很久。
+要看到真相得加 `--stacktrace`，才會出現 `JavaVersion.parse`。
+
+**改完 JDK 指向後一定要 `gradlew --stop`** — 舊的 daemon 會用舊的 JVM 活著，
+不停掉的話設定改了也沒用。
+
+> megingiard 不會中這招：它的 Gradle 9.3.1 有 `toolchainVersion=21`，
+> 所以 JBR-25 無害。**兩個專案的行為不同，不要拿 megingiard 的經驗套過來。**
+
+---
+
+## Step 1 — 分析、建置
+
+```bash
+"D:/flutter/bin/flutter.bat" analyze
+```
+
+`analyze` 全綠 **不代表能用**。焦點跑掉、浮層蓋住內容、觸控點不動、版面溢位，
+靜態分析一個都抓不到。見 `rshop-touch-and-gamepad`。
+
+```bash
+"D:/flutter/bin/flutter.bat" build apk --debug
+```
+
+第一次跑（或 `pub get` 之後）若冒出上百個 `flutter_riverpod` 之類的
+「URI doesn't exist」，那是套件沒解析，不是程式壞了 —— 跑 `flutter pub get`。
+
+---
+
+## Step 2 — 上機
+
+裝置上那版若是**別台機器建的 release 版**，debug 版覆蓋不上去，
+而且資料備不出來（`run-as` 會回 `package not debuggable`，`ALLOW_BACKUP` 也沒開）。
+**唯一的路是先移除再裝，資料會沒。** 移除前要問。
+
+裝好之後，`adb exec-out run-as com.retro.rshop.tw cat …/app_flutter/config.json`
+可以直接讀實機設定 —— **只有 debug 版行得通**，用來確認來源／備援真的存進去了。
+
+---
+
+## Step 3 — 收尾（三件事，少一件不算完成）
+
+1. `docs/FIX_LOGS.md` 追加一條（**問題點 / 修復點 / 檔案** 三個固定欄位）
+2. `docs/FIX_INDEX.md` 補一列
+3. `python scripts/build_fix_by_file.py` 重跑
+
+然後 **commit 並 push**。使用者的規則是**每累積約五項就部署並推送**；
+**UI 改動不受這個上限——改一項就值得出一版**，因為 UI 問題只有實機才現形。
+
+分支：R-Shop 的客製化一律進 **`main-zh`**，`main` 只放中文化。
+`git add` 用明確路徑，**不要用 `-A`** —— 別的工作階段同時在改這個 repo。
diff --git a/.agents/skills/rshop-l10n/SKILL.md b/.agents/skills/rshop-l10n/SKILL.md
new file mode 100644
index 0000000..471a8bf
--- /dev/null
+++ b/.agents/skills/rshop-l10n/SKILL.md
@@ -0,0 +1,36 @@
+---
+name: rshop-l10n
+description: "Add or change a user-visible string in R-Shop. Use when: any feature adds text. Seven languages, a localization class that is NOT named what you expect, and a missing-string failure mode that does not break the build — it ships blank."
+---
+
+# Skill: `rshop-l10n`
+
+## Role
+
+新功能的字串**要在同一次改動裡補齊**，不要留到之後。
+漏掉的字串**不會讓建置失敗**，會直接出貨成空白。
+
+---
+
+## 型別叫 `L`，不是 `AppLocalizations`
+
+`l10n.yaml` 設了 `output-class: L`。寫 `AppLocalizations.of(context)` 會得到
+「undefined」—— 這個錯我犯過一次。用 `L.of(context)`。
+
+---
+
+## 七個檔案
+
+`lib/l10n/app_{de,en,es,fr,ja,pt,zh}.arb` —— **七個語系，一個都不能漏。**
+
+> 各專案不同：R-Shop 7、megingiard 4、ImageOverlay 2。不要憑印象套。
+
+改完 `.arb` **要重新產生 `app_localizations*.dart`，並且跟 `.arb` 一起 commit**
+（見 `AGENTS.md` §6）。
+
+---
+
+## 文件用語要跟出貨字串一致
+
+寫 README / 使用手冊之前，**先去 `app_zh.arb` 撈實際的字串**。
+詞彙表過得了關不代表名詞對得上 —— 使用者看到的是畫面上的詞，不是文件裡的詞。
diff --git a/.agents/skills/rshop-source-routing/SKILL.md b/.agents/skills/rshop-source-routing/SKILL.md
new file mode 100644
index 0000000..6c81563
--- /dev/null
+++ b/.agents/skills/rshop-source-routing/SKILL.md
@@ -0,0 +1,251 @@
+---
+name: rshop-source-routing
+description: "Touch anything about sources, connection routes, which source is in use or shown, or failover. Use when: editing source.dart, app_config.dart, sources_notifier.dart, source_failover.dart, source_resolver.dart, or the games table. Holds the five invariants that make switching cheap and self-healing — breaking any one of them loses the user's cached library, strands them on the wrong server, or redirects a sync they didn't ask to redirect."
+---
+
+# Skill: `rshop-source-routing`
+
+## Role
+
+這一塊的設計繞了四圈才對，因為需求很容易被讀成別的意思。
+底下五條不變式是**整個功能之所以能用的原因**，改任何相關的檔之前先讀。
+
+---
+
+## 使用者要的到底是什麼
+
+> 「我並不是要同時顯示兩個來源，而是**一次顯示一個來源，可以切換**」
+> 「**就算是同一台，我也要當不同台**」
+> 「至少要能指派一個備援就好」「timeout 後切換另一個來源」
+
+翻成規格：**多個來源，一次看／同步一個；使用者可以把幾個來源宣告成一個群組，
+連不上時群組裡的另一台自動代打。**
+
+**不要**自作主張把兩個來源的清單合併起來當同一份看 —— 這是被明確否決過的。
+**程式不准推論**兩個位址是不是同一台。
+
+**但使用者可以宣告**（2026-08-05 補）：
+
+> 「應該不是備援 而是 我想指定兩個來源 其實是指向同一台伺服器」「應該是設成群組」
+> 「因為同一群組 應該實際是同一台之類 所以清單也只需要一份」
+
+宣告成群組之後，那幾個來源就**共用一份清單**。這不牴觸「同一台也當不同台」——
+那條管的是**推論**，群組是**宣告**。沒有東西會自己變成群組。
+
+---
+
+## 不變式 1：切換來源不能碰快取
+
+`switchEndpoint`、`setEndpointSelection`、`addEndpoint`、`updateEndpoint`、
+`removeEndpoint`、`setFallbackSource`、`setActiveSource` —— **全部走 `updateSource`，
+而且一個都不准呼叫 `_purgeCachedGamesFor`。**
+
+這就是切換之所以是免費的原因：每條路線的清單各自存著，切回去馬上就在。
+一旦有人在這些路徑上加了清快取，使用者每切一次就要重掃一次整個圖書館。
+
+---
+
+## 不變式 2：「使用中」與「顯示」是兩個欄位，不要合併
+
+| 欄位 | 意思 | 誰在改 |
+| --- | --- | --- |
+| `primarySourceId` | **使用中**：同步的目標，以及主畫面預設顯示 | 來源清單的 `[X]`／**打勾**圖示 |
+| `Source.enabled` | **開／關**：關掉就不出現在主畫面，也不同步 | 來源清單的 `L1`／**眼睛**圖示 |
+| `activeSourceId` | 主畫面現在單獨在看哪一個（null＝看全部開著的） | 主畫面的 L2/R2 |
+
+**兩個功能不能共用同一個圖示。** 眼睛是開關，打勾是「用哪一個」。
+
+**不要再發明第三個「是否顯示」的旗標。** 曾經加過 `Source.showOnHome`，
+使用者一句話打回：「**你的停用啟用不就是眼睛嗎，不用再做一個**」。
+`enabled` 為 false 的來源本來就不出現也不同步。
+
+**`setEnabled(false)` 不清快取。** 曾經會清，理由是「不然格線還會顯示剛關掉的來源」——
+**v14 之後那個理由消失了**：讀取一律走該系統當下的 providers，停用的來源不在裡面。
+清了的話停用→啟用要重抓整份清單，而且背景清除會刪掉剛重抓回來的資料。
+唯一直接讀表的是圖書館頁，過濾在那一側做。**`removeSource` 仍然清。**
+
+**`resolveForSync` 讀的是 `primarySourceId ?? activeSourceId`。**
+`?? activeSourceId` 是分家之前的設定檔的相容路徑，`fromJson` 也做同樣的回填 ——
+**兩處要一起改，不然舊安裝會突然改同步對象。**
+
+為什麼是 `activeSourceId` 留給「顯示」而不是反過來：顯示是靠
+`_writeAndPublish` 依它重寫 `system.providers` 生效的，換一邊就得動整條讀取鏈。
+
+**別再把「目前選的來源」鏡像成 State 的欄位。** 先前用 `_activeSourceId ??= stored`
+種值，而 **`??=` 表達不了「刻意是 null」**——取消之後下一次 build 又種回去，
+使用者要按兩次才取消得掉。畫面上的標籤一律直接讀設定檔。
+
+---
+
+## 不變式 3：代打是暫時的，不改變偏好（2026-08-05 改寫為群組）
+
+**「備援」這個機制已經被群組取代。** `Source.fallbackSourceId` 還在設定檔裡讓舊版讀，
+但**選路徑不再讀它**：載入時 `sourceGroupsFromFallbacks` 會把每一組配對遷成一個
+兩人群組（偏好在前、模式 `ordered`），那正是舊備援的行為。兩邊都讀就是兩套機制搶同一個決定。
+
+`chooseSource()` 選到群組裡的別人時，**`activeSourceId` 不會被改寫**。
+`withEffectiveSource()` 重建的是**記憶體中的 config，磁碟完全不動**。
+
+所以偏好的那台一旦醒過來，下一次自己就回去了 —— 不需要使用者再設定一次。
+**如果哪天有人為了「讓它記住」而把 `activeSourceId` 寫回磁碟，這個自癒就死了。**
+
+群組是**對稱的**，舊的配對是單向的——這是行為上真的差一截的地方：
+選了群組裡的任何一個成員，偏好都是**群組自己的排頭**（同一台伺服器，選誰都一樣）。
+舊測試裡「wan 沒有備援所以原地不動」那種前提因此不再成立。
+
+模式兩種：`auto`＝**先回應的那台**（賽跑），`ordered`＝照使用者排的順序挑第一個通的。
+兩者都在 `chooseGroupMember` / `resolveGroupMember` 裡，**成員之間**的賽跑，
+與 `EndpointProbeService.firstResponder` 那層**同一台的多條路線**是巢狀的兩件事。
+
+---
+
+## 不變式 4：`url`/`host`/`port`/`share` 就是「現行路線」
+
+`Source` 的頂層欄位**不是預設值，是當下生效的那條路**。
+`withLiveEndpoint()` 會把選中的 endpoint 的值寫上去。
+
+這樣設計的代價是省掉了一整輪改動：`SourceResolver`、`connectionKey`、
+各個 provider **完全不必知道 endpoint 的存在**。要維持這個好處，
+新程式碼一律讀頂層欄位，**不要自己去 `endpoints` 裡挑**。
+
+`fromJson` 會從舊欄位補一個 id 為 `'primary'` 的 endpoint，**所以沒有設定檔遷移**。
+
+---
+
+## 不變式 5：憑證跟著路線走，清單跟著來源走（2026-08-04 改寫）⚠️
+
+**舊版寫的是「路線共用來源的憑證」，那條已經作廢。** 使用者確認的前提是：
+同一個來源底下的多條路線**就是同一台伺服器**，但**各自需要驗證**
+（區網直連與 DDNS 走的是不同的前門）。所以：
+
+- `SourceEndpoint` 有自己的可選 `auth`；**沒設就沿用來源層的**，舊設定檔因此零遷移。
+- `Source.auth` 現在是 **getter**：`liveEndpoint?.auth ?? _defaultAuth`。
+  下游（`SourceResolver`、各 provider）照樣只讀這一個，**不變式 4 不受影響**。
+- 清單相反：**一個來源只存一份**（見下面的資料庫那節）。同一台伺服器的清單只有一份，
+  存成多份是同一批資料的副本。
+
+**程式分不出兩個位址是不是同一台，也不該去猜。** 曾經從埠號推論過一次，
+推論是對的，但那不算數——能宣告的只有使用者。這就是「同一台也當不同台」的真正意思：
+**預設不猜；他宣告了，才照宣告走。**
+
+`connectionKey` **刻意不含憑證**，而且這是對的：它只用在舊設定檔的合併遷移
+（`app_config.dart` 唯一的呼叫點，**runtime 沒有任何連線快取用它**），
+同一個位址不論當初存的是哪組登入都該收成一個來源。它仍然每換一條路就變，
+因為 `SourceEndpoint.sameAddressAs` 不准同一個來源有兩條位址相同的路線。
+
+---
+
+## 資料庫：一份清單屬於「快取擁有者」（schema v16，2026-08-05 改寫）
+
+演進：v14 每條路線一份 → v15 收成每個來源一份 → **v16 收成每個「擁有者」一份**。
+擁有者＝**有群組就是群組，沒有就是來源自己**（`AppConfig.cacheOwnerIdFor(sourceId)`）。
+同一個道理往上搬一層：使用者宣告「這幾個來源是同一台」，跟宣告「這幾條路線是同一台」
+一樣，結論都是**只該有一份清單**。
+
+`games` 表有
+
+```sql
+source_id       TEXT NOT NULL DEFAULT '',   -- 誰抓的
+endpoint_id     TEXT NOT NULL DEFAULT '',   -- 從哪條路抓的
+cache_owner_id  TEXT NOT NULL DEFAULT ''    -- 這份清單屬於誰 ← 唯一鍵在這
+```
+
+**`NOT NULL DEFAULT ''` 不是隨便寫的** —— SQLite 的 UNIQUE 索引把 NULL 視為互不相同，
+用得到 NULL 的話唯一鍵形同虛設，同一筆遊戲會無限重複。`''` 是本機掃描的桶子。
+
+唯一索引：**`(systemSlug, filename, cache_owner_id)`**。
+`source_id` 與 `endpoint_id` **都留著但都不進唯一鍵**，只做歸屬記錄。
+
+**v16 遷移一列都不刪**：只加欄位、把 `cache_owner_id` 從 `source_id` 一對一補進去、換索引。
+**合併與去重不在遷移裡**，在 `adoptCacheInto()` —— 群組存在設定檔裡，資料庫層讀不到，
+在遷移裡用猜的去合併就是「憑猜測刪列」。
+
+去重判準只有一條：`_onDeviceRank`（原 `_v15OnDeviceRank`）——
+**已經下載到機器上的那一列一定活下來**（`purgeOrDetachSource` 會把它的
+`provider_config`／`url` 清空，那就是識別記號），還有遠端 url 的可以重抓。
+`_collapseDuplicates` 是唯一的實作，v15 與群組合併共用它。
+
+群組的三個入口，**都在一個交易裡**：
+
+    adoptCacheInto(ownerId:, memberIds:)    加入群組＝把成員的清單併進擁有者的，順便去重
+    moveCacheOwnership(from:, to:)          擁有者自己退出＝整份清單交給下一個成員
+    releaseCacheFrom(sourceId:, ownerId:)   一般成員退出＝**什麼都拿不到**，要重新同步
+
+合併時會**暫時 drop 唯一索引**再重建——重建本身就是驗證，還有殘留就直接拋例外整筆 rollback。
+`releaseCacheFrom` 會把離開者的 `source_id` 改蓋成擁有者，
+而 `purgeOrDetachSource` 要帶 **`protectedOwnerIds`**（那個來源當時所在的群組），
+否則刪掉一個成員會連群組的列一起帶走——它是用 `provider_config` 的 JSON 比對的，
+欄位改了它也還是認得出那些列是誰抓的。
+
+**這是自動換路之所以無感的原因**：換路不會換到另一份清單，所以沒有空清單、
+沒有重抓。**換群組成員同理**。
+
+相關 API：`saveGamesByRoute(cacheOwnerOf:)`、`getGamesForRoutes(cacheOwnerOf:)`、
+`getGames(cacheOwnerId:)`、`saveGames(cacheOwnerId:)`、
+`getGameCountsPerCacheOwner()`、`getGameCountForOwner()`、`deleteCacheOwnedBy()`。
+**後三個是 v16 改的名**（v15 時叫 `…PerSource`／`ForSource`／`deleteSourceCache`），
+因為語意真的變了——名字裡寫 source 會讓人以為刪一個群組成員要順手刪快取，
+而那正是現在不准做的事。`cacheOwnerOf` 不傳就等於「每個來源各自擁有」，
+也就是沒有群組的安裝看到的行為。
+
+---
+
+## 探測與自動選路（2026-08-05 改寫）
+
+`EndpointProbeService` 用 TCP connect，單點 1 秒／整體 3 秒，有 TTL 快取。
+**它現在回的是延遲不是通不通**：`probeFor()` 給 `ProbeResults`（`ranked` 最快在前、
+`latencyOf(id)` 給浮層顯示、`fastestId` 就是「自動」會挑的那一條）。
+`reachableFor()` 留著，因為 `resolveForSync` 問的真的只是「這個來源整台通不通」。
+
+`resolve()` 的規則：**釘選就用釘選的，否則挑能通的裡面最快的**。
+`resolveEndpoint({List<String> reachable})` 吃的是**排序後的 id 清單**不是延遲——
+`lib/models` 不准 import 服務層的型別，而且傳清單比只傳最快的那個好：
+最快的那條被刪掉時會自動退到第二快，傳單一 id 就沒有退路。
+
+**`pin: true` 的意思是「使用者覆寫」，不是「選定」。** 沒覆寫就自動，
+浮層的「自動」那一列走 `clearEndpointOverride`。`autoSelectEndpoint` 探測完會**重讀一次狀態**
+才動手——探測那一秒內使用者可能剛好釘選了，不重讀就會把他的覆寫蓋掉。
+
+**`_bootstrap` 不探測。** 開機不能等網路，而且測試裡建個 notifier 就會開真的 socket。
+它只做離線的對齊：釘選指向不存在的路線就退回 `auto`，有效的釘選把值鏡到頂層欄位（不變式 4），
+真的有變才寫回磁碟。
+
+> 為什麼自動選路現在合法：見 `docs/FIX_LOGS.md` 的 `[R-Shop 自動選最快]`——
+> 那條當初判定「不做」，**錯在把路線之間當成來源之間**。「同一台也當不同台」管的是來源，
+> 同一個來源底下的路線本來就是同一台、同一份清單，換路線換不掉使用者選的來源。
+
+**已修過的坑**：`_probeableEndpoints()` 在 `endpoints` 為空時，
+原本會靜默回報「不可達」—— 而不可達正是觸發備援的條件，
+所以在程式碼裡直接建出來的 `Source` 會莫名其妙一直走備援。
+現在會從 `Source` 自己的欄位合成一個 endpoint。
+
+---
+
+## 檔案
+
+見 `docs/FIX_INDEX.md` 的 **R-Shop 連線路由**、**R-Shop 目前來源**、
+**R-Shop 來源備援**、**備援接進同步**、**連線方式共用憑證** 五條 —— 檔案清單在那裡，
+不要重新搜尋。
+
+## 畫面（2026-08-05 群組完成後）
+
+    群組編輯          lib/features/sources/group_picker_overlay.dart
+                      未分組＝可選的同類型來源；已分組＝一個「自動選擇」打勾
+                      ＋成員（可排序、可退出）＋解散。**模式沒有兩列**，同上
+    連線方式浮層      第一列是「自動選擇」**打勾**：勾了用最快的，沒勾就照清單順序。
+                      **沒有「照我排的順序」那一列**——不勾的時候清單本身就是順序。
+                      **點某條路線＝進入移動模式**（與群組成員同一個手勢），
+                      不是「使用這條」——那個動作已經拿掉了，因為不鎖定就留不住。
+                      要哪一條只由兩件事決定：打不打勾，以及 `[X]` 鎖定。
+                      游標初始位置一律用 `_firstRouteIndex` 算，**不要寫死數字**
+    來源卡片          顯示「群組 · 名字」；「備援 → X」已經不存在
+    主畫面            collapsedSources()：一個群組只佔 L2/R2 的一格；
+                      橫幅寫「目前使用「某台」」，講的是實際在答的那一台
+
+`fallback_picker_overlay.dart` **已刪除**。「備援」這個詞在畫面上不該再出現，
+`sources_setFallback` / `sources_fallbackNone` 兩個字串已無人使用。
+
+UI 那一面另見 `rshop-touch-and-gamepad`：這個功能的浮層
+（endpoint picker、group picker、actions overlay、type picker）
+**每一個都曾經是觸控死的**。群組浮層一開始就配了 widget 測試盯著每一列可點，
+成員排序是「角落小圖示（觸控）＋ `[X]`／`[Y]`（手把）」，路線排序是 ◀ ▶ ＋角落箭頭。
diff --git a/.agents/skills/rshop-touch-and-gamepad/SKILL.md b/.agents/skills/rshop-touch-and-gamepad/SKILL.md
new file mode 100644
index 0000000..c12677f
--- /dev/null
+++ b/.agents/skills/rshop-touch-and-gamepad/SKILL.md
@@ -0,0 +1,107 @@
+---
+name: rshop-touch-and-gamepad
+description: "Add or change any R-Shop UI. Use when: writing a screen, overlay, dialog, or list row. The target device has a gamepad AND a touchscreen, so every function needs two entry points — and the three failure modes here (touch-dead overlays, focus lockout, hardcoded key names) are all invisible to flutter analyze."
+---
+
+# Skill: `rshop-touch-and-gamepad`
+
+## Role
+
+R-Shop 跑在 **AYN Thor** —— 3.92 吋掌機，**手把與觸控兩套輸入都在用**。
+這份技能存在的原因是：底下四種錯誤**每一種都真的出貨過**，而且
+`flutter analyze` 全綠、程式碼看起來也完全正常。
+
+---
+
+## 鐵則：每個功能兩個入口
+
+> 使用者原話：「所以功能都要有兩個入口 一個是觸控 一個是手把(或按鍵)」
+
+一個是觸控，一個是按鍵。**只有其中一個的功能等於沒做完。**
+
+反例（真的發生過）：「目前顯示哪個來源」只能在首頁用 L2/R2 切 ——
+使用者在來源設定頁想切，得先退回首頁。修法是在來源設定的**每一列前面加眼睛圖示**，
+再在浮層右上角放一個，鍵與觸控各自都能走完。
+
+---
+
+## 陷阱 1：浮層的列是 `Container`，完全不吃觸控
+
+**`ConsoleFocusable` 自己內建 `GestureDetector`**，所以用它包起來的卡片點得動。
+浮層裡的列若是純 `Container` + 手動畫選取框，就是**零觸控處理**。
+
+**外觀完全看不出差別。** 兩者都會highlight、都會回應搖桿。
+只有真的用手指去點才知道死的。這個坑修了**三輪**才清乾淨，
+因為每輪只修到當時被回報的那一個浮層。
+
+**做法**：任何可選的列都要有 `onTap`，而且**點下去要走跟按鍵完全相同的那一條路徑**
+（抽一個 `_pickSelected()` 之類的方法給兩邊共用），不要各寫一份。
+`_OverlayButton`、`_TypeOptionTile` 這類自訂元件也一樣。
+
+---
+
+## 陷阱 2：焦點鎖死 —— 手把全失效只剩觸控
+
+`_initialFocusClaimed` 這種 flag 一旦設成 `true` 就**永不重置**。
+持有焦點的那張卡片被回收之後（例如刪掉最後一筆來源），
+螢幕上**沒有任何節點有焦點**，手把從此完全沒反應。
+
+**做法**：`_ensureInteractiveFocus` 要在**沒有任何節點有焦點時放棄宣告**
+（把 flag 放掉），讓下一輪重新指派。列表可能被清空的畫面都要檢查這件事。
+
+---
+
+## 陷阱 3：按鍵名寫死
+
+裝置支援三種配置：`ControllerLayout {nintendo, xbox, playstation}`。
+**同一個實體鍵在三種配置下名字不同。** 所以
+
+- ❌ `Text('L2')`、`Text('R2')`、`Text('X')`
+- ✅ `GamepadIcons.assetPath(id, layout)`
+
+還有一個相關的：**別在圖示旁邊擺一個裸的字母**。曾經在浮層標頭把眼睛圖示旁邊
+放了個 `X`，使用者讀成「關閉按鈕」。提示文字要放在**底部提示列**，
+不要放在會被誤認成按鈕的位置。
+
+---
+
+## 陷阱 4：版面與高度
+
+- **溢位**：`RenderFlex overflowed` 在 3.92 吋螢幕上很容易發生，畫面會出現黃黑斜紋。
+  浮層內容一律包 `SingleChildScrollView`。診斷靠 logcat，不是靠 `analyze`。
+- **高度會跳**：`SystemChrome.setEnabledSystemUIMode(immersiveSticky)` 是在 `initState`
+  跑的，所以**第一幀還有狀態列 inset，後面的幀沒有**。頂部元件若包 `SafeArea`，
+  進場時會高一列然後縮回去。全螢幕沉浸的畫面**不要包 `SafeArea`**。
+  **`rs.safeAreaTop` 也一樣，它不是常數。** 這個坑犯了兩次：橫幅的 `SafeArea`，
+  以及 `home_grid_view` 的 `top: rs.safeAreaTop + 40.0`——症狀一模一樣
+  （進場多一列空白，一移動就不見）。**看到 `safeAreaTop` 先懷疑。**
+- **焦點白框要留內距**：`ConsoleFocusable` 的白框是緊貼 child 畫的。child 自己也有
+  邊框（輸入框那種）時，兩條線差幾個像素，看起來像畫錯而不是焦點。
+  **包一層 `Padding`，並給比內層大的 `borderRadius`。**
+- **浮層會蓋住內容**：小螢幕上「疊在上面」跟「擠掉內容」的差別很明顯，
+  設計時要想清楚要哪一種。
+
+---
+
+## 元件位置
+
+| 用途 | 檔案 |
+| --- | --- |
+| 可聚焦列（自帶觸控） | `lib/core/widgets/console_focusable.dart` |
+| 對話框（一律用這個） | `lib/widgets/console_dialog.dart` |
+| 浮層焦點範圍／優先權 | `lib/core/input/overlay_scope.dart` |
+| 手把圖示 | `lib/widgets/gamepad_icons.dart` |
+
+---
+
+## 交件前的自我檢查
+
+**這不是原則，是出貨前要真的做的檢查：**
+
+1. 這次加的每個功能，**用手指走一遍**能不能完成？
+2. **只用手把**能不能完成？
+3. 列表被清空之後，手把還有反應嗎？
+4. 畫面上有沒有寫死的按鍵字母？
+5. 進場的第一幀跟之後的幀，高度一樣嗎？
+
+前例：`docs/FIX_INDEX.md` 的 **浮層只做了手把**。
diff --git a/.gitignore b/.gitignore
index 84c7771..e43394c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,10 +64,15 @@ android/app/.settings/
 key.properties
 
 # AI tool configurations
+# 正式檔名為 AGENTS.md（跨工具慣例）；AGENT.md / CLAUDE.md 保留為防呆
 .claude/
 .gemini/
 .agent/
+.artifacts/
+AGENTS.md
+AGENT.md
 CLAUDE.md
+GLOBAL_DEV_NOTES.md
 
 # Environment files
 .env
@@ -81,3 +86,4 @@ ROADMAP_1.0.md
 
 # Local backup of pre-redesign docs site (keep until new site is verified, then delete)
 docs-old/
+android/app/local-tasks.gradle.kts
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
new file mode 100644
index 0000000..a9fb5bb
--- /dev/null
+++ b/ARCHITECTURE.md
@@ -0,0 +1,171 @@
+# R-Shop (retro_eshop) 專案架構說明文件
+
+## 1. 專案名稱與簡述
+
+- **專案名稱**：R-Shop (`retro_eshop` / `com.retro.rshop.tw`)
+- **目前版本**：`1.7.0-zh+13`（分支 `main-zh`）
+- **專案簡述**：
+  R-Shop 是一款專為 Android 掌機（如 Anbernic, Retroid Pocket, AYN Odin 等）與 Android TV 裝置設計的「控制器優先（Controller-First）」復古遊戲庫管理器與下載前端。本專案採用類似 Nintendo eShop 的現代主機風格視覺介面，支援 Local、RomM、SMB、FTP 及 Web 等多源統一遊戲庫管理。系統內建 66 種經典主機分類自動映射、遊戲封面與元資料自動抓取、RetroAchievements 玩家成就整合比對，以及完整的前台與背景下載佇列管理機制。
+
+---
+
+## 2. 模組劃分與依賴關係
+
+R-Shop 採用 Flutter 跨平台 UI 與 Android 原生 (Kotlin) 結合的架構設計。
+
+### 模組劃分
+
+- **Flutter 應用層 (`lib/`)**：
+  - `core/`：控制器 Focus/D-pad 焦點控制、響應式主機風格 Layout、視覺主題與通用 UI 元件。
+  - `features/`：各功能頁面模組（`home`, `game_list`, `game_detail`, `library`, `onboarding`, `pairing`, `sources`, `settings`）。
+  - `models/`：核心資料模型，如包含 66 種主機字典的 `SystemModel`、`GameItem`、`DownloadItem` 與 RetroAchievements 模型 `RaModels`。
+  - `providers/`：基於 Riverpod 的狀態管理層。
+  - `services/`：核心業務服務，包含多源解析（`SourceResolver`）、下載佇列管理、SQLite 資料庫、快取機制、成就比對與 mDNS 網路探索。
+  - `l10n/`：多國語言國際化（i18n）支援。
+- **Android 原生層 (`android/app/`)**：
+  - `MainActivity.kt`：Flutter 與 Android 原生互動橋樑，處理解壓（Zip Extractor）、儲存權限與 SMB 管道溝通（Platform Channels）。
+  - `SmbService.kt`：基於 `smbj` 函式庫的低階 SMB 網路檔案存取服務。
+  - `ForegroundService`：Android 前台服務，負責背景下載與任務保活。
+
+### 模組依賴圖 (Mermaid)
+
+```mermaid
+flowchart TD
+    subgraph UI_Layer["UI 頁面層 (features/)"]
+        Home["Home 頁面"]
+        GameList["Game List 遊戲列表"]
+        GameDetail["Game Detail 遊戲詳情"]
+        Library["Library 個人庫"]
+        Pairing["Pairing RomM 配對"]
+        Sources["Sources 來源管理"]
+        Settings["Settings 設定"]
+    end
+
+    subgraph Core_Layer["核心與控制層 (core/ & providers/)"]
+        InputWrapper["GlobalInputWrapper / FocusSync"]
+        RiverpodProviders["Riverpod State Providers"]
+    end
+
+    subgraph Service_Layer["業務服務層 (services/)"]
+        SourceResolver["SourceResolver (Local/RomM/SMB/FTP/Web)"]
+        DownloadManager["DownloadQueueManager / DownloadService"]
+        DatabaseService["DatabaseService (SQLite)"]
+        RAService["RaApiService / RaSyncService"]
+        NetworkDiscovery["NetworkDiscoveryService (mDNS)"]
+        AudioHaptics["AudioManager / HapticService"]
+    end
+
+    subgraph Native_Layer["Android 原生層 (android/)"]
+        MainActivity["MainActivity.kt (MethodChannel)"]
+        NativeSMB["SmbService.kt (smbj)"]
+        FGService["ForegroundService (背景下載)"]
+    end
+
+    subgraph Model_Layer["資料模型層 (models/)"]
+        SystemModel["SystemModel (66 種主機字典)"]
+        GameItem["GameItem / DownloadItem"]
+        RaModels["RaModels"]
+    end
+
+    UI_Layer --> InputWrapper
+    UI_Layer --> RiverpodProviders
+    RiverpodProviders --> Service_Layer
+    Service_Layer --> Model_Layer
+    Service_Layer --> MainActivity
+    MainActivity --> NativeSMB
+    MainActivity --> FGService
+```
+
+---
+
+## 3. 關鍵類別與組件
+
+| 類別 / 組件名稱 | 所在檔案 / 模組 | 主要職責與說明 |
+| :--- | :--- | :--- |
+| `RShopApp` | [lib/main.dart](lib/main.dart) | 應用程式根 Widget，初始化 Theme、Localization、Riverpod 範疇與全域輸入監聽器。 |
+| `SystemModel` | `lib/models/system_model.dart` | 定義 66 種復古遊戲主機字典（包含 NES, SNES, PS1, GBA 等），提供 Platform ID、顯示名稱、副檔名與預設目錄映射。 |
+| `DatabaseService` | [lib/services/database_service.dart](lib/services/database_service.dart) | 管理本地 SQLite 資料庫，負責遊戲元資料、來源設定、下載歷史與成就資料的高效 CRUD 操作。 |
+| `DownloadQueueManager` | [lib/services/download_queue_manager.dart](lib/services/download_queue_manager.dart) | 管理下載作業佇列，控制並行下載數量、任務優先順序、重試機制與自動解壓縮（Unzip）觸發。 |
+| `DownloadService` | [lib/services/download_service.dart](lib/services/download_service.dart) | 執行具體的檔案下載邏輯（支援斷點續傳、 HTTP/FTP/SMB 流式讀寫）並與 Android 前台服務同步狀態。 |
+| `SourcesNotifier` | [lib/services/sources_notifier.dart](lib/services/sources_notifier.dart) | 負責多來源（Local, RomM, SMB, FTP, Web）配置的狀態監控與狀態變更廣播。 |
+| `SourceResolver` | [lib/services/source_resolver.dart](lib/services/source_resolver.dart) | 統一抽象化異構來源的檔案掃描與存取介面，將不同通訊協定轉換為標準化的 `GameItem` 物件。 |
+| `SmbService` | [android/app/src/main/kotlin/com/retro/rshop/tw/SmbService.kt](android/app/src/main/kotlin/com/retro/rshop/tw/SmbService.kt) | Kotlin 原生層 SMB 服務，使用 `smbj` 處理網路芳鄰共享目錄的認證、檔案列舉與高效串流傳輸。 |
+| `NativeSmbService` | [lib/services/native_smb_service.dart](lib/services/native_smb_service.dart) | Flutter 端呼叫原生 SMB 服務的 MethodChannel 封裝介面。 |
+| `RaApiService` | [lib/services/ra_api_service.dart](lib/services/ra_api_service.dart) | RetroAchievements 官方 REST API 的介面服務，查詢玩家成就、遊戲雜湊碼與解鎖進度。 |
+| `RaSyncService` | [lib/services/ra_sync_service.dart](lib/services/ra_sync_service.dart) | 計算 ROM 檔案雜湊值（MD5/SHA1）並與 RetroAchievements 進行自動比對與同步。 |
+| `GlobalInputWrapper` | `lib/core/input/` | 捕獲 D-pad、手把按鈕與鍵盤事件，統一進行焦點導向與頁面動作轉發。 |
+| `FocusSyncManager` | `lib/core/input/` | 掌機與 Android TV 的手把焦點同步管理器，確保無觸控環境下的流暢選單導覽體驗。 |
+
+---
+
+## 4. 技術棧與關鍵依賴
+
+| 分類 | 技術 / 套件名稱 | 版本 | 說明與用途 |
+| :--- | :--- | :--- | :--- |
+| **開發語言** | Dart / Kotlin | Dart 3.x / Java 17 | Flutter 應用層程式碼與 Android 原生邏輯編寫 |
+| **UI 框架** | Flutter | 3.x (Material 3) | 跨平台主機風格 UI 渲染與動態元件設計 |
+| **狀態管理** | `flutter_riverpod` | `2.6.1` | 響應式狀態管理與依賴注入 |
+| **原生溝通** | Kotlin MethodChannel & EventChannel | Standard | Flutter 與 Android Native (Zip, Storage, SMB) 通訊 |
+| **網路傳輸** | `dio` | `5.9.1` | HTTP / REST API 請求庫（用於 Web 來源與 API） |
+| **SMB 網路** | `smbj` (Java/Kotlin) | `0.13.0` | 處理 Windows / NAS 的 SMB2/SMB3 檔案共享傳輸 |
+| **FTP 協定** | `ftpconnect` | Standard | 支援 FTP / FTPS 協定伺服器掃描與下載 |
+| **網路發現** | mDNS / Zeroconf | Standard | 區域網路內 RomM 伺服器與 SMB 裝置自動發現 |
+| **本地資料庫**| `sqflite` | `2.4.2` | 高效能 SQLite 儲存遊戲元資料與應用設定 |
+| **圖片快取** | `cached_network_image` | `3.4.1` | 網路封面圖檔的本地記憶體與硬碟雙層快取 |
+| **掃描器** | `mobile_scanner` | `5.2.3` | 相機與圖片相簿 QR Code 快速配對 RomM 伺服器 |
+| **多媒體音效**| `flutter_soloud` | `2.1.7` | 高效能低延遲音效引擎，模擬主機選單音效 |
+| **背景任務** | `flutter_foreground_task` | `9.2.0` | Android 前台服務，保障背景下載與解壓縮不中斷 |
+
+---
+
+## 5. 主要功能總覽
+
+1. **控制器優先 UI（Controller-First / D-pad 焦點管理）**
+   - 專為手持掌機與電視遙控器設計的焦點管理系統，無需觸控螢幕即可完美流暢操作所有選單、列表與設定。
+2. **多源統一遊戲庫 (Multi-Source Unified Library)**
+   - 無縫整合 Local（本地儲存）、RomM 伺服器、SMB 網路共享、FTP 伺服器與 Web 來源，將分散的 ROM 集中於統一介面管理。
+3. **RomM QR 碼快速配對**
+   - 支援透過相機掃描或載入圖片進行 RomM 伺服器一鍵 API Key / URL 自動配置與憑證綁定。
+4. **自動辨識與元資料補全 (66 種主機字典)**
+   - 內建 66 種經典主機（NES, SNES, N64, Game Boy, PS1, PSP 等）辨識規格，自動掃描並補全遊戲名稱、封面、發行年份與描述。
+5. **後台下載與自動解壓**
+   - 支援佇列下載、斷點續傳與背景 Task 保活，並於下載完成後自動觸發 Native Zip 檔案解壓與目錄歸檔。
+6. **RetroAchievements 成就比對**
+   - 自動計算 ROM checksum 雜湊，比對 RetroAchievements 成就資料庫，即時顯示玩家成就進度與徽章獎勵。
+7. **智慧記憶體與快取適應**
+   - 針對記憶體較小的 Android 掌機進行圖片與列表快取最佳化，防止載入大量高畫質封面時發生 OOM (Out of Memory)。
+
+---
+
+## 6. 目錄結構摘要
+
+```
+R-Shop/
+├── android/                   # Android 原生專案
+│   └── app/src/main/kotlin/
+│       └── com/retro/rshop/tw/
+│           ├── MainActivity.kt # Platform Channels (Zip, Storage, Method Call)
+│           └── SmbService.kt   # smbj SMB 檔案存取原生服務
+├── assets/                    # 靜態資源 (圖示、預設音效、UI 圖片)
+├── docs/                      # 說明文件與開發手冊
+├── lib/                       # Flutter 核心業務邏輯
+│   ├── core/                  # 手把焦點控制、主題佈局與通用 UI 元件
+│   ├── features/              # 功能模組頁面
+│   │   ├── game_detail/       # 遊戲詳情與成就展示
+│   │   ├── game_list/         # 分類遊戲列表
+│   │   ├── home/              # 主頁面 (eShop 風格輪播與推薦)
+│   │   ├── library/           # 已下載與本地遊戲庫
+│   │   ├── onboarding/        # 新手引導
+│   │   ├── pairing/           # RomM QR 配對頁面
+│   │   ├── settings/          # 系統與下載設定
+│   │   └── sources/           # 來源管理與掃描配置
+│   ├── l10n/                  # 多國語言 (i18n) 檔案
+│   ├── models/                # SystemModel (66種主機), GameItem, DownloadItem
+│   ├── providers/             # Riverpod 狀態提供者
+│   ├── services/              # 資料庫、下載佇列、SMB/FTP/Web 解析、RA 成就服務
+│   ├── utils/                 # 工具函式 (檔案處理、字串解析)
+│   ├── widgets/               # 全域共用 UI 控制項
+│   └── main.dart              # 應用程式入口
+├── pubspec.yaml               # 專案依賴與資源配置
+└── ARCHITECTURE.md            # 專案架構說明文件 (本文件)
+```
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d69473..2d13520 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+> **English** | [繁體中文](CHANGELOG.zh-TW.md)
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
diff --git a/CHANGELOG.zh-TW.md b/CHANGELOG.zh-TW.md
new file mode 100644
index 0000000..fe3858f
--- /dev/null
+++ b/CHANGELOG.zh-TW.md
@@ -0,0 +1,599 @@
+> [English](CHANGELOG.md) | **繁體中文**
+
+# 更新日誌
+
+本專案所有重要變更都會記錄在這個檔案中。
+
+格式基於 [Keep a Changelog](https://keepachangelog.com/)。
+
+---
+
+## [1.6.0] — 2026-04-12
+
+### 新增
+- **Sources（來源）管理** — 統一的畫面，可新增、設定、停用與移除 RomM/SMB/FTP/Web 來源，具備主機等級的焦點處理與各系統對應設定
+- **RomM 4.8 token 配對** — 透過 QR code 或手動輸入進行 Client API Token 驗證，並提供即時伺服器探測與連線驗證
+- **各卡片來源圓點** — 遊戲卡片上的彩色圓點指示器，顯示哪些提供者供應該遊戲；當有 2 個以上來源時圓點會堆疊顯示
+- **手動建立來源** — 類型選擇介面，可在 RomM 之外新增 SMB、FTP 或 Web 目錄來源
+- **各系統對應編輯器** — 指定手動來源提供哪些系統，並以視覺化方式顯示對應數量
+- **重新配對動作** — 直接從 Sources 畫面更新過期或借用的 RomM token
+- **導覽選擇器** — 單一問題的歡迎流程（「你的 ROM 是怎麼存放的？」）取代舊的多步驟精靈，針對本機、網路與 RomM 使用者提供各自的設定路徑
+- **ROM 資料夾選擇器** — 在導覽過程中選擇你的 ROM 基底資料夾；每一種選擇路徑都會執行本機檔案系統掃描
+
+### 改善
+- **僅合併模式** — 完全移除 failover；merge 現在是唯一的多來源策略（原本是未使用的無效程式碼，merge 在所有情況下表現更好）
+- **預設啟用合併** — 新的與舊有的設定都會預設為 `mergeMode: true`，無需使用者介入
+- **設定重新編排** — Sources 成為主要進入點；「Edit Consoles」更名為「Edit Systems」（唯讀，變更請前往 Sources）
+- **統一的 RA 設定** — RetroAchievements 設定整合為單一輕量畫面，導覽與設定共用
+- **透明的設定檔遷移** — v2 設定會在首次啟動時自動升級為 v3 格式，無需使用者操作；雙寫機制讓舊有程式碼路徑仍可運作
+
+### 移除
+- **RomM Server 磚塊** — 由功能更完整的 Sources 管理畫面取代
+- **Scan Library 磚塊** — 請改用快速選單中的「Sync All」
+- **Failover 模式** — merge 已能處理所有多來源情境；failover 從未在介面中開放
+- **「Skip for now」導覽選項** — 會導致空白的主畫面且無法繼續下一步
+
+### 修正
+- 同步時間戳記現在會正確地從 `syncAll` 與 `syncSystem` 保存下來（先前會無聲遺失）
+- 當某系統有 2 個以上的貢獻來源時自動合併提供者
+- 停用來源後已安裝的遊戲仍會保持可見
+- 舊有提供者已標記為受管理，讓停用／移除能真正清除它們
+- 替代來源會保存於資料庫，讓多來源遊戲能撐過同步週期
+- RA 畫面焦點裁切問題（內層 borderRadius 現在小於外層）
+
+---
+
+## [1.5.2] — 2026-04-09
+
+### 修正
+- **RomM 平台篩選器 (#11)** — `platform_ids` 查詢參數的序列化方式會被 RomM API 忽略，導致每個系統都收到跨平台混雜的整個媒體庫。加上近期 RomM 版本中較大的 RetroAchievements 中繼資料負載，這也會讓媒體庫較大的使用者在同步時卡在 0/N。篩選器現在改用重複的查詢參數（`platform_ids=1&platform_ids=2`），伺服器才會真正套用。
+- **同步接收逾時** — 從 30 秒提高到 90 秒。單一 500 筆 ROM 的分頁若內嵌 RA 成就與螢幕截圖，可能達數 MB，在伺服器延遲較高時尤其明顯。
+
+### 新增
+- **遠端失敗時退回本機** — 當某系統的遠端來源（RomM/SMB/FTP/Web）失敗時，同步現在會退回為僅本機的檔案系統掃描，讓使用者不會看不到本機已存在的 ROM。已套用於全部四條同步路徑（完整同步、智慧同步、媒體庫掃描、單一系統同步）。
+- **持續顯示的錯誤標籤** — 同步失敗時，左上角的狀態標籤現在會轉為紅色、輕微脈動，並持續顯示到下一次同步開始（先前是琥珀色且 6 秒後自動消失，很容易錯過）。
+
+---
+
+## [1.5.1] — 2026-03-16
+
+### 改善
+- **詳細畫面焦點可見度** — 焦點指示器現在改用白色邊框與光暈，而非僅使用強調色，確保不論系統主題色為何都清楚可見
+- **正確的焦點追蹤** — 子元件（主要按鈕、圖示按鈕、螢幕截圖、版本卡片）只有在其所屬區塊真正取得焦點時才會顯示焦點高亮；消除多個元素同時出現的幻影焦點
+- **動作按鈕固定位置** — 下載／刪除與收藏／分享／書架按鈕在橫向模式下現在固定於左欄底部，所有詳細檢視畫面皆一致
+- **變體選擇器重新設計** — 精簡的標籤膠囊搭配地區旗標、長 ROM 名稱採跑馬燈捲動檔名、更寬的覆蓋層（螢幕寬度 55%）、封鎖 D-pad 左右以防止焦點外洩
+- **Other Versions 區塊** — 現在只顯示 RomM/IGDB 的同系列項目，而不再重複列出變體選擇器中已可見的本機變體
+- **通用 4:3 與 16:9 版面** — 在 9 個覆蓋層／對話框元件中，以螢幕相對的 `clamp()` 數值取代寫死的像素限制，避免窄螢幕溢位與寬螢幕空間浪費
+- **MarqueeText 元件** — 新的共用跑馬燈捲動元件，用於版本卡片與同系列項目中的長文字；取得焦點時捲動，否則顯示靜態省略號
+
+### 修正
+- **變體選擇器焦點還原** — 在變體選擇器開啟時從下載佇列返回，現在會正確將 D-pad 焦點還原到選擇器
+- **圖示按鈕取得焦點時的尺寸變化** — 移除收藏／分享／書架按鈕的文字標籤，該標籤會在 4:3 螢幕上造成多行換行
+- **LanguageBadges 溢位** — 移除版本卡片上的語言旗標，該旗標會在緊湊版面中造成 RenderFlex 溢位
+
+### 內部
+- 將 `MarqueeText` 抽出到 `lib/widgets/marquee_text.dart`，供變體選擇器與同系列區塊共用
+- `isSectionFocused` 參數貫穿 `ActionButtonsRow`、`ScreenshotsCarousel`、`OtherVersionsSection`
+- 詳細畫面的 `_buildPrimaryActionSection` 與 `_buildIconButtonsSection` 現在會從父層接收 `isFocused`
+
+---
+
+## [1.5.0] — 2026-03-15
+
+### 新增
+- **具冷卻時間的智慧同步** — 應用程式啟動時改用 `syncSmart()`，會跳過上次同步時間仍在設定冷卻視窗內的系統，大幅減少頻繁啟動時的多餘網路流量
+- **各系統自動同步開關** — 每台主機可透過主機設定中新增的「Auto-sync on app launch」開關個別選擇不自動同步；停用的系統只會從快速選單手動同步
+- **同步冷卻時間設定** — 新的設定項目（總是／15 分鐘／30 分鐘／1 小時／2 小時／6 小時），控制每個系統自動重新同步之間的最短間隔（預設：1 小時）
+- **從快速選單進行單一系統同步** — 主畫面的 Start 選單現在會針對目前選取的主機顯示「Sync [System Name]」，並附上易讀的「Synced X ago」副標題；會取消任何進行中的自動同步、同步該單一系統，然後繼續處理其餘過期的系統
+- **快速選單的 Sync All** — 專屬的「Sync All」項目取代舊的「Retry Sync」選項；會強制完整同步每一個已設定的系統，不受冷卻時間限制
+- **從遊戲詳細畫面移出書架** — 當遊戲已加入所有書架時，「Add to Shelf」動作會改為「Remove from Shelf」，並提供顯示所屬書架的選擇器；由篩選規則比對到的遊戲會使用排除而非移除
+- **快速選單副標題** — `QuickMenuItem` 新增選用的 `subtitle` 欄位，會以較小字體顯示在標籤下方
+- **ROM 檔案分享** — 遊戲詳細畫面的分享按鈕現在會透過系統分享面板分享實際的 ROM 檔案（遊戲需已安裝）；分享面板關閉後會重新進入沉浸模式
+
+### 改善
+- **設定後同步** — 從設定返回時現在只會強制同步新增的主機，而不是清除所有新鮮度並重新同步全部
+- **書架選擇器對話框** — 接受自訂的 `title` 參數（用於「REMOVE FROM SHELF」與「ADD TO SHELF」的區分）
+- **各系統最後同步時間保存** — `StorageService` 透過 SharedPreferences 依系統 ID 記錄最後同步時間，可撐過應用程式重新啟動
+- **等待同步完成** — `LibrarySyncService.waitForCompletion()` 回傳一個在目前同步結束時解析的 Future，讓「先取消再動作」的流程更乾淨
+- **遊戲詳細畫面初始焦點** — 進入詳細畫面時預設焦點落在下載／刪除按鈕
+
+### 移除
+- **設定中的各系統同步清單** — 帶有遊戲數量的各主機同步項目已從 System 分頁移除，改採更快速的快速選單同步流程
+- **「Retry Sync」快速選單項目** — 由更靈活的「Sync [System]」與「Sync All」選項取代
+
+### 內部
+- `SystemConfig.autoSync` 欄位（預設 `true`），支援 JSON 序列化與 `copyWith`
+- 導覽狀態中的 `ConsoleSetupState.autoSync`，透過 `OnboardingController.setAutoSync()` 串接
+- app_providers.dart 中的 `SyncCooldownNotifier` / `syncCooldownProvider`，搭配循環切換的介面
+- `StorageService.getLastSyncTime()` / `setLastSyncTime()`，以 ISO 8601 格式保存各系統資料
+- `LibrarySyncService.syncSmart()`，具備冷卻時間、forceSystemIds 與 autoSync 篩選
+- `LibrarySyncService._syncCompleter`，供 syncAll、syncSmart、syncSystem 共用的 `waitForCompletion()`
+- HomeView 中的 `_resumeAutoSyncAfterManual` 旗標，用於「取消→手動→恢復」流程
+- library_sync_service_test.dart 與 settings_widgets_test.dart 新增 143 行測試（總計 1666 行）
+
+### 修正
+- **模糊背景外溢** — 遊戲詳細畫面封面背景的 `ImageFiltered` 模糊效果會超出元件邊界繪製；已用 `ClipRect` 包住，避免模糊影像從底部邊緣滲出
+
+---
+
+## [1.4.2] — 2026-03-09
+
+### 新增
+- **各系統同步** — 可從設定同步個別主機，而不必一次全部同步（感謝 @yangeric，#7）
+- **各系統 ROM 數量** — 設定現在會為每一台已設定的主機顯示遊戲數量徽章 (#7)
+- **可設定的同步逾時** — 針對較慢的連線（Synology NAS 等）可選擇 1、2、5 或 10 分鐘 (#7)
+- **遊戲數量 provider** — `gameCountsPerSystemProvider`，提供同步後穩定的 ROM 數量 (#6)
+
+### 修正
+- **封面搜尋進度超過 100%** — 連續執行「Search Game Covers」不再累加計數器；以世代為基礎的取消機制確保狀態乾淨（感謝 @yangeric，#8）
+- **資料庫串聯刪除** — 刪除遊戲時現在也會移除孤立的 `game_metadata` 與 `ra_matches` 資料列
+- **背景重新整理的孤立資料安全性** — `saveGames` 的孤立資料刪除現在改為明確指定（`deleteOrphans` 參數），避免不完整的抓取清空已快取的遊戲
+
+### 內部
+- `LibrarySyncService.syncSystem()`，用於單一系統同步
+- `syncTimeoutProvider`，在設定中提供循環切換的介面
+- `CoverPreloadService._generation` 計數器，用於防護過時的工作程序
+- 新增 78 個測試（總計 1615 個），涵蓋封面重設、資料庫串聯、同步逾時、各系統同步
+
+---
+
+## [1.4.1] — 2026-03-07
+
+### 修正
+- **ZIP 安裝狀態不一致** — 遊戲詳細畫面現在會正確地對存在於 ROM 資料夾中的封存檔（.zip、.rar）顯示「Installed」，與遊戲清單的徽章一致（感謝 @yangeric，#5）
+- **ZIP 刪除** — 刪除以 .zip 封存形式保留的遊戲現在能正常運作，而不會無聲失敗
+- **autoExtract 設定被忽略** — 各系統的自動解壓縮開關現在會被遵守；關閉時，下載的 .zip 檔案會原樣移動到 ROM 資料夾，而不是無條件解壓縮
+- **RomM 分頁逾時** — 大型媒體庫（每個平台 7000 個以上的 ROM）不再逾時；每頁的錯誤處理會在失敗時回傳部分結果而非完全沒有結果（感謝 @yangeric，#4）
+- **提供者逾時區隔** — RomM 的分頁抓取取得專屬的 10 分鐘逾時；FTP/SMB/Web 維持較緊的 60 秒安全網
+- **不穩定的測試** — `clearFilters resets all` 在完整測試套件負載下不再間歇性失敗
+
+---
+
+## [1.4.0] — 2026-03-06
+
+### 修正
+- **3DS 副檔名支援** — 新增 .cci、.cxi 與 .app ROM 格式（感謝 @yangeric，#1）
+- **RomM Switch 下載** — 由 RomM 以 ZIP 封存形式提供的遊戲，現在會透過解析 Content-Disposition 標頭正確偵測並解壓縮（感謝 @gulasch，#2）
+- **刪除後的過時遊戲快取** — 已刪除的遊戲現在會立即從遊戲集合中消失，而不是殘留到下次背景重新整理
+
+### 改善
+- **主畫面輪播效能** — AnimatedBuilder 現在包住個別項目而非整個 PageView，減少不必要的重建
+- **遊戲清單效能** — 收藏 provider 改用選擇性監看，避免無關的收藏變動觸發重建
+- **可見系統查詢** — 單一批次的 `systemsWithCache()` 查詢取代 N 次個別的 `hasCache()` 呼叫
+- **同步錯誤回報** — 失敗的來源現在會依系統追蹤並附上具體的錯誤訊息（顯示「2 sources unavailable」而非籠統的「Offline — cached data」）
+- **媒體庫畫面** — `setEquals` 防護可避免已安裝檔案未變動時的不必要重建
+- **縮圖遷移** — 批次大小由 3 提高到 15（ThumbnailService 本身已有容量防護）
+- **記憶體** — `gameMetadataProvider` 現在使用 `.autoDispose`，在詳細畫面關閉時釋放中繼資料
+
+### 內部
+- `DatabaseService.deleteGame()`，用於針對性移除快取項目
+- `DatabaseService.systemsWithCache()`，用於批次檢查系統是否存在
+- `LibrarySyncState.failedSystems` 以各系統的失敗對應表取代單一的 `error` 字串
+- 170 個以上的新資料庫 upsert 測試（封面保留、孤立資料清理、跨系統隔離、大批次）
+- 更新導覽與同步測試以配合 remoteSetup 步驟與 failedSystems 格式
+
+---
+
+## [1.3.0] — 2026-03-01
+
+### 新增
+- **主機商店風格的遊戲詳細畫面** — 重新設計的詳細畫面，具備結構化版面、區塊標題與參考數位商店的下載區域
+- **IGDB 中繼資料** — RomM 遊戲現在會透過玻璃擬態的「About This Game」卡片顯示類型、開發商、發行年份、遊戲模式與簡介（取自 RomM 的 IGDB 資料）
+- **簡介覆蓋層** — 有中繼資料時，可從快速選單開啟完整的遊戲簡介
+- **變體選擇器覆蓋層** — 在多版本遊戲上按 A 會開啟專屬選擇器，顯示所有變體、安裝狀態，以及各變體的下載／刪除動作
+- **遊戲中繼資料資料庫** — 新的 `game_metadata` 資料表（資料庫 v8）將 IGDB 中繼資料與遊戲項目分開儲存，可撐過媒體庫重新同步
+
+### 改善
+- **快速選單整合** — Tags、Description、檔名切換與 Achievements 現在改由快速選單存取，不再使用專屬按鈕捷徑
+- **詳細畫面版面** — 直向模式使用可捲動版面並採用自適應的封面長寬比；橫向模式使用雙欄版面搭配可展開的資訊卡
+- **下載動作按鈕** — 重新設計為獨立元件，具備明確的狀態（下載、刪除、已安裝、加入中、無法使用）與變體數量徽章
+
+### 內部
+- `GameMetadataInfo` 模型，具備 `hasContent`、`genreList`、`averageRating` 輔助方法
+- `gameMetadataProvider`（`FutureProvider.family`），用於非同步載入中繼資料
+- `RommRom` 擴充為可解析 `summary`、`genres`、`companies`、`first_release_date`、`game_modes`、`average_rating`
+- `RommProvider.fetchGames()` 以射後不理的副作用方式儲存中繼資料
+- 194 個新的 API 服務測試，涵蓋中繼資料解析的邊界情況
+
+---
+
+## [1.2.0] — 2026-02-27
+
+### 新增
+- **RetroAchievements 整合** — 連接你的 RA 帳號以追蹤成就、透過雜湊比對驗證 ROM，並直接在 R-Shop 中檢視各遊戲進度
+- **成就畫面** — 專屬檢視器，含已取得／未解鎖徽章、點數、進度條、精通狀態與完整 D-pad 導覽
+- **RA 導覽步驟** — 首次執行精靈中的選用設定，附連線測試與略過選項
+- **RA 設定畫面** — 從設定管理憑證（透過 SecureStorage 加密），並可測試連線
+- **下載後雜湊驗證** — 下載完成的 ROM 會在背景自動計算雜湊並與 RA 資料庫比對
+- **RA 同步服務** — 三階段背景同步（目錄抓取 → 名稱比對 → 雜湊驗證），具 24 小時新鮮度快取與取消支援
+- **遊戲卡片上的 RA 徽章** — 每張卡片都會顯示成就數量與比對類型（名稱比對為金色，雜湊驗證為綠色）；完全完成時顯示精通外框
+- **加入佇列提示** — 遊戲加入下載佇列時，右下角會出現動畫通知
+- **隱藏空的主機** — 設定 → Preferences 中的新開關，可從主畫面隱藏沒有遊戲的系統
+
+### 改善
+- **同步徽章** — 現在會顯示媒體庫同步（青色）與 RA 同步（金色）兩個膠囊，各自獨立追蹤進度
+- **遊戲詳細畫面** — 中繼資料下方新增 RA 資訊區塊，顯示比對狀態、進度條與「View Achievements」按鈕；快速選單新增「Achievements」選項
+- **下載覆蓋層** — 視覺調整與更好的狀態顯示
+- **SystemModel** — 15 個以上的系統現在帶有 RA 主機 ID（NES、SNES、N64、GB、GBC、GBA、Mega Drive、SMS、Game Gear、32X、Atari 2600/7800、Lynx、NDS）
+- **媒體庫畫面** — 當同一款遊戲存在多種格式時，會對已安裝項目去重複
+- **封面預先載入服務** — 提升可靠性與錯誤處理
+
+### 內部
+- 資料庫結構描述 v7 — 新資料表：`ra_games`（目錄快取）、`ra_hashes`（雜湊索引）、`ra_matches`（比對結果）
+- 10 個以上系統的雜湊計算：單純 MD5、NES（去除 iNES 標頭）、SNES（copier 標頭）、NDS（多區段）、Lynx、Atari 7800
+- `RaNameMatcher` 具備四層退回機制：完全相符 → 包含 → No-Intro 檔名 → 模糊比對（Levenshtein）
+- 新的 provider：`raGameProgressProvider`、`raRefreshSignalProvider`、`raMatchResultProvider`、`raSyncServiceProvider`
+- 1,209 個測試（由 1,069 個增加）— 新套件：RA 雜湊服務、RA 模型、RA 名稱比對器、擴充的資料庫與導覽測試
+
+---
+
+## [1.1.0] — 2026-02-27
+
+### 新增
+- **原生 SMB** — 以 Kotlin MethodChannel 服務（`SmbService.kt`）取代 smb_connect 函式庫，在 Android 上支援資料夾下載、進度回報與可靠的逾時處理
+- **資料夾下載** — 以多檔案目錄形式儲存的遊戲（bin/cue、m3u）現在可透過 SMB 與 FTP 以完整資料夾下載
+- **遊戲手把按鍵圖示** — SVG 圖示組（Xbox、PlayStation、Nintendo Switch），用於情境感知的控制器提示
+- **RomM 設定畫面** — 完整的伺服器管理（新增／編輯／移除）與連線測試，可直接從設定進入
+- **網路常數** — 集中的逾時數值（`NetworkTimeouts`），供所有提供者共用
+- **檔案工具** — 防當機的原子式檔案移動（`moveFile`），具備暫存與清理機制
+
+### 改善
+- **導覽流程改版** — 重新設計的設定精靈，簡化主機設定、本機資料夾偵測與 RomM 整合
+- **FTP 提供者** — 主機驗證（主機名稱、IPv4、IPv6）、注入防護、可設定的逾時
+- **Web 提供者** — 強化安全性的目錄解析（過濾路徑穿越、控制字元、過長的 href）
+- **下載服務** — SMB 與 FTP 通訊協定支援資料夾感知下載，並提供各檔案進度
+- **友善的錯誤訊息** — 擴充面向使用者的錯誤對應，涵蓋網路、驗證與提供者失敗
+- **Console HUD／Quick Menu／Control Button** — 簡化算繪並整合遊戲手把圖示
+
+### 內部
+- 1,069 個測試（由 970 個增加）— 新套件：SMB 提供者（14）、FTP 提供者（8）、Web 提供者（12）、FocusSyncManager（32）、OverlayPriorityManager（14）、file_utils（5）、friendly_error 擴充
+- 移除 `smb_connect` 相依套件（由原生 Kotlin 實作取代）
+- `NativeSmbService` Dart 包裝層，對應 `com.retro.rshop/smb` MethodChannel
+- `NativeSmbDownloadHandle` / `NativeSmbFolderDownloadHandle` 下載控制代碼型別
+
+---
+
+## [1.0.0] — 2026-02-26
+
+### 亮點
+- **穩定版釋出** — R-Shop 脫離 beta
+- **SVG 平台圖示** — 全部 29 個系統圖示由 PNG 遷移為銳利的 SVG 格式
+- **Android 套件重構** — 由 `com.example.r_shop` 遷移至 `com.retro.rshop`
+- **網路安全性設定** — 針對本機網路通訊協定的專屬 XML 設定
+
+### 改善
+- **測試涵蓋率** — 950 個以上的測試，涵蓋控制器、服務、模型與工具程式
+- **程式碼品質** — 零 TODO/FIXME 標記、零無聲攔截、所有錯誤路徑皆有記錄
+- **相依套件整潔度** — 所有相依套件皆固定到確切版本
+
+### 內部
+- 新測試套件：GameListController（43 個測試）、GameMergeHelper（12 個測試）、ImageHelper（19 個測試）
+- 另外 8 個測試檔案，涵蓋 app config、音訊管理器、設定解析器、導覽流程、provider 與封面預先載入
+
+---
+
+## [0.9.9] Beta — 2026-02-25
+
+### 新增
+- **Custom Shelves（自訂書架）** — 建立個人遊戲收藏，可手動整理、使用篩選規則（依系統、地區、語言）或混合模式；支援重新排序、重新命名與各書架的排序模式
+- **Device Info Service** — 自適應的記憶體分層（低／標準／高 RAM），會自動調整影像快取大小、格線快取範圍與封面預先載入池，以配合低階掌機
+- **Shelf Picker Dialog** — 從媒體庫與遊戲詳細畫面快速將遊戲加入書架
+- **System Selector Overlay** — 以視覺化的系統徽章依系統篩選媒體庫檢視
+
+### 改善
+- **設定畫面重構** — 拆分為 Preferences、System 與 About 分頁，並抽出 `DeviceInfoCard` 元件（1048→604 行）
+- **下載覆蓋層重構** — 抽出 7 個元件至 `lib/widgets/download/`（DownloadItemCard、CoverThumbnail、PulsingDot、LowSpaceWarning、StatusLabel、DownloadProgressBar、DownloadActionButton）（1477→793 行）
+- **書架編輯畫面重構** — 將 GameListOverlay、TextInputDialog 抽出到共用元件庫（1108→631 行）
+- **RomM 導覽流程重構** — 抽出 RommConnectView、RommSelectView、RommFolderView、RommActionButton（1405→122 行）；狀態類別移至 `onboarding_state.dart`（1713→1362 行）
+- **媒體庫畫面重構** — 抽出 ReorderableCardWrapper、LibraryEntry 為專屬元件（1490→1386 行）
+- **相依套件版本固定** — 其餘 16 個使用 caret 範圍的相依套件全部固定為確切解析版本，以確保建置可重現
+
+### 內部
+- 新模型：`CustomShelf`、`ShelfFilterRule`，具備 JSON 序列化
+- 新 provider：`CustomShelvesNotifier` / `customShelvesProvider`，用於書架的 CRUD
+- `DeviceInfoService`，具備 `MemoryTier` 分類
+- 約 20 個新測試檔案，涵蓋下載佇列管理器、統一遊戲服務、媒體庫同步、縮圖服務、自訂書架、資料庫服務、設定儲存、影像快取、儲存服務與元件測試
+
+---
+
+## [0.9.8] Beta — 2026-02-23
+
+### 新增
+- **當機記錄服務** — 本機環形緩衝記錄檔（約 500KB）會捕捉所有未攔截的錯誤，附上時間戳記與堆疊追蹤；儲存在應用程式快取中並跨工作階段保留
+- **匯出錯誤記錄** — 新的設定項目（位於 System 下），可透過系統分享面板分享當機記錄以便回報問題；僅在記錄有資料時顯示
+- **硬碟空間預先檢查** — 當裝置儲存空間低於 1 GB 時，下載會被拒絕並顯示明確的錯誤
+
+### 改善
+- **HTTP 下載遞迴深度防護** — `_downloadHttp` 的續傳重啟路徑現在強制單次重試上限，避免伺服器持續回傳不符的內容長度時造成無限遞迴
+- **FocusSyncManager 索引安全性** — `ensureFocusNodes()` 會在剪除已釋放的節點後夾制 `_selectedIndex`；`validateState()` 會在欄數變動時夾制 `_targetColumn` — 避免快速調整格線大小時焦點跳到無效位置
+- **Zone 對齊** — `WidgetsFlutterBinding.ensureInitialized()` 與 `runApp()` 現在在同一個 `runZonedGuarded` zone 中執行，消除啟動時的「Zone mismatch」警告
+- **覆蓋層優先權釋放** — 所有 scope 類別（`OverlayFocusScope`、`DialogFocusScope`、`SearchFocusScope`、`ExitConfirmationOverlay`）都在 `dispose()` 中透過 `Future()` 延後執行 `release()`，修正 Riverpod 的「cannot modify provider during widget tree build」當機
+- **詳細畫面版面** — 系統名稱徽章以 `Flexible` 包裝並設定省略號溢位，修正系統名稱較長（例如「PlayStation 2」）時在窄螢幕上的 `RenderFlex` 溢位
+- **ConfigModeScreen dispose** — 音訊管理器改在 `initState` 中快取，避免在元件釋放後才呼叫 `ref.read()`
+- **下載佇列查詢** — `getDownloadById()` 改用簡單迴圈取代 `firstWhere` + try/catch，消除佇列還原期間吵雜的「Bad state: No element」記錄洗版
+
+### 修正
+- **覆蓋層優先權當機** — 在元件卸載期間釋放覆蓋層 token 不再拋出 Riverpod 狀態修改錯誤（先前會導致「At least listener of the StateNotifier threw an exception」當機）
+- **FocusSyncManager 焦點遺失** — 項目數量減少後，選取索引可能指向已釋放的 `FocusNode`，造成無聲的焦點失效
+
+### 內部
+- 新的 `CrashLogService` 單例（`lib/services/crash_log_service.dart`），提供 `log()`、`logError()`、`getLogFile()`、`clearLog()`、`getLogContent()`
+- `app_providers.dart` 中的 `crashLogServiceProvider`，在 `main.dart` 中覆寫
+- 全域錯誤處理器（`FlutterError.onError`、`PlatformDispatcher.onError`、`runZonedGuarded`）現在除了 `debugPrint` 之外也會寫入當機記錄
+- 移除 `FocusSyncManager._enforceFocus()` 中針對延後焦點的吵雜 `debugPrint`（每次捲動都會觸發）
+
+---
+
+## [0.9.7] Beta — 2026-02-22
+
+### 新增
+- **縮圖流程** — 常駐的 isolate 縮圖產生器（400px JPEG），在啟動時進行背景遷移，並在媒體庫掃描期間主動預先載入封面
+- **ROM 狀態 provider** — 透過檔案系統監看器與下載完成監聽器即時追蹤 ROM 安裝狀態，取代手動輪詢
+- **已安裝檔案 provider** — 集中式的 isolate 掃描索引，涵蓋所有系統中全部已安裝的 ROM 檔案
+- **封面預先載入** — 新的設定項目，可為所有遊戲批次產生縮圖
+- **關於區塊** — 設定中的應用程式版本、GitHub/Issues 連結與彩蛋標語
+- **Zip 解壓縮上限** — 由 2 GB 提高到 8 GB
+
+### 改善
+- **智慧封面載入** — 縮圖優先顯示，搭配 magic byte 驗證、對損毀快取項目重新編碼為 JPEG，以及捲動時抑制載入以減少快速捲動時的卡頓
+- **控制器按鈕樣式** — 膠囊形狀的肩鍵／扳機鍵、各配置對應的面板按鍵顏色（Xbox 綠／紅／藍／黃、PlayStation 配色），以及 Nintendo +/− 按鍵的形狀繪製器
+- **快速選單提示** — 面板按鍵提示現在會顯示符合配置的配色
+- **遊戲卡片效能** — 以靜態的 `Transform.scale`／`Container` 取代 `AnimatedScale`／`AnimatedContainer`，讓格線捲動更順暢；`SelectionAwareItem` 使用 `ValueNotifier`，在選取變更時只重建受影響的卡片
+- **搜尋覆蓋層** — 抽出 `SearchableScreenMixin`（由 GameListScreen 與 LibraryScreen 共用），並將 `SearchOverlay` 元件從 `features/game_list/widgets/` 移到 `widgets/` 以便跨畫面重用
+- **FocusSyncManager** 由 `features/game_list/logic/` 移至 `core/input/`，供 Library 與 Scan 畫面使用
+- **媒體庫畫面** — 現在使用 `SearchableScreenMixin`、`SelectionAwareItem`、`FocusSyncManager` 與捲動抑制，行為與 GameListScreen 一致
+- **影像快取速率限制器** — 可取消的待處理請求、提高並行抓取上限（50），以及主機層級的速率限制偵測
+- **資料庫結構描述 v4** — 新增 `thumb_hash` 與 `has_thumbnail` 欄位；縮圖旗標會在遊戲清單重新整理後保留
+- **`OverlayGuardedAction`** — 通用且可重用的守護動作，取代各畫面各自的私有動作類別
+
+### 修正
+- **Zip bomb 防護** — 解壓縮後的封存大小上限為 2 GB；超過上限時會中止解壓縮並顯示明確錯誤
+- **Web 提供者路徑穿越** — 目錄清單解析器會拒絕絕對 URL 與 `../` 的 href 值
+- **覆蓋層優先權拆解** — `OverlayFocusScope`、`DialogFocusScope` 與 `SearchFocusScope` 改用 `addPostFrameCallback` 搭配 try/catch，取代原始的 `Future()`，避免快速切換畫面時發生「disposed notifier」當機
+- **停用 Android 備份** — `android:allowBackup="false"` 可避免非預期的資料還原破壞應用程式狀態
+- **格線導覽防護** — `_GridNavigateAction` 現在會在 `isEnabled` 中檢查 `overlayPriorityProvider`，避免覆蓋層開啟時仍能用 D-pad 導覽
+- **焦點還原** — `mainFocusRequestProvider` 現在集中在 `ConsoleScreenMixin.initState` 中設定
+
+### 內部
+- 新相依套件：`image: ^4.3.0`、`crypto: ^3.0.6`
+- 新增 `GameItem.hasThumbnail` 欄位；`copyWith` 相應擴充
+- `adjustColumnCount()` 輔助方法抽出至 `ConsoleScreenMixin`
+- 刪除 4 個過時檔案：`animated_background.dart`、`radial_glow.dart`、`folder_analysis_view.dart`、`search_overlay.dart`（game_list 副本）
+
+---
+
+## [0.9.6] Beta — 2026-02-21
+
+### 新增
+- **Scan Library** 畫面 — 設定項目會開啟帶動畫的主機格線，顯示各系統掃描進度、遊戲數量徽章與完成摘要
+- **智慧導覽自動偵測** — 會在常見路徑（`/storage/emulated/0/ROMs`、`/Roms`、`/roms`）偵測既有的 ROM 資料夾，並提供掃描、建立、選取或略過等選項
+- **快取優先的遊戲清單載入** — 清單會先從 SQLite 快取即時載入，再無聲地從遠端提供者重新整理；只有在清單真的變動時才更新介面（以檔名比對差異）
+- **離線指示器** — 同步失敗時顯示琥珀色的「Offline — cached data」提示；同步徽章會顯示失敗狀態
+- **提供者重新排序** — 可在主機設定面板中用 D-pad 或方向按鈕調整提供者優先順序
+- **Test & Save** — 單一按鈕即可測試提供者連線並在成功時自動儲存（取代獨立的 Save 按鈕）
+- **使用者指南**（`docs/USER_GUIDE.md`）— 完整指南，涵蓋所有功能、操作方式、支援的系統與疑難排解
+
+### 改善
+- **ROM 格式涵蓋範圍** 擴充至 10 個以上的系統 — GameCube（ISO/GCM/CISO）、Wii（WBFS/WIA/CISO）、PS2（CSO）、PS3（PKG）、PSP（PBP）、Mega Drive（BIN/SMD）、Dreamcast（CDI/GDI）、Saturn（ISO）、Arcade（7z）、N64（V64）、SNES（SMC）
+- **以 isolate 進行本機掃描** — 檔案系統掃描透過 `compute()` 移交給 Dart isolate，讓介面更順暢
+- **媒體庫同步新鮮度** — 5 分鐘快取可避免多餘的重新同步；`clearFreshness()` 會在設定變更後強制重新整理
+- **同步涵蓋僅本機的系統** — `syncAll()` 現在也包含沒有遠端提供者的系統
+- **批次化的安裝狀態檢查** — 以每批 20 個的方式平行處理
+- **篩選器直通** — 沒有地區／語言中繼資料的遊戲現在會通過篩選器，而不會被排除
+- **主機格線徽章** — 僅本機的系統會顯示藍色資料夾徽章，而非綠色的提供者勾選標記
+- **設定後重新同步** — 從設定返回後會重新載入設定並清除新鮮度
+- **媒體庫已安裝偵測** — 能正確比對已解壓縮的 ROM 檔案（例如 `Game.zip` → `Game.iso`）
+- **以媒體庫為基礎的搜尋** — 在主畫面按 Y 會導向 Library 並開啟搜尋，取代獨立的全域搜尋覆蓋層
+
+### 修正
+- **GameDetail 變體索引** 已夾制在有效範圍內（避免變體清單變動時當機）
+- **搜尋覆蓋層** 焦點處理改善
+
+### 內部
+- 移除 `GlobalSearchOverlay`（675 行）— 由帶 `openSearch: true` 的 Library 取代
+- 移除 `RepoManager` 與 `RomHeaderParser`
+- 從 `pubspec.yaml` 移除 `archive` 相依套件
+- 抽出 `GameMergeHelper` 處理去重複邏輯（遠端與本機合併、封存展開、多檔案偵測）
+- `SystemModel` 新增 `archiveExtensions`、`allRomExtensions`、`allGameExtensions` 與 `isGameFile()`
+- 從 `app_providers`、`config_providers`、`download_providers` 清理未使用的 provider
+- `LibrarySyncService` 擴充 `discoverAll()`、`isFresh()`、`hadFailures` 狀態
+
+---
+
+## [0.9.5] Beta — 2026-02-20
+
+### 新增
+- **媒體庫畫面** — 統一的跨系統遊戲瀏覽器，具備 All/Installed/Favorites 分頁、搜尋、排序模式（A-Z／依系統）與可調整的格線縮放（LB/RB）
+- **背景媒體庫同步** — 啟動時自動同步提供者，並在主畫面顯示即時進度徽章
+- **Quick Menu**（Start/+ 按鈕）— 情境覆蓋層，提供搜尋、設定、縮放與下載的捷徑
+- **主畫面格線版面** — 可在主畫面切換輪播與格線檢視；格線欄數可用 LB/RB 調整
+- **ROM 標頭解析器** — 從 GB、GBC、GBA、NDS 與 SNES 的 ROM 標頭擷取內部遊戲標題（原始檔 + ZIP）
+- **收藏切換**（Select/- 按鈕）— 從遊戲詳細畫面快速收藏
+- **分頁切換**（LB/RB）— 在 Library 與篩選覆蓋層中切換篩選分頁
+- **僅本機篩選** — 篩選覆蓋層中的新開關，僅顯示已安裝在本機的 ROM
+
+### 改善
+- **BaseGameCard** 取代舊的遊戲卡片 — 統一設計，含系統徽章、已安裝指示、收藏愛心、變體數量與提供者標籤
+- **版本卡片** 簡化 — 大幅重構，移除多餘的版面邏輯
+- **ConsoleHud** 重構 — 更乾淨的插槽算繪、一致的間距、正確區分嵌入式與定位式模式
+- **篩選覆蓋層** — 改善版面，加入僅本機開關與多層篩選
+- **全域搜尋** — 結果現在會一致地顯示提供者標籤與地區旗標
+- **控制器配置** 偏好設定可跨工作階段保留
+- **主畫面版面** 偏好設定（輪播／格線）可跨工作階段保留
+
+### 修正
+- **下載覆蓋層 HUD 位置** — 按鍵圖例卡在左上角而非右下角（AnimatedOpacity 包住 Positioned 破壞了 Stack 版面）
+- **Quick Menu 下載選項** 現在只要佇列中有任何項目（包含已完成／失敗）就會顯示，而非僅限進行中與排隊中
+- 收藏名稱遷移會在應用程式啟動時清理舊有的 ID
+- **多檔案 ROM 的媒體庫項目重複** — 遠端封存合併現在會將解壓縮後的資料夾名稱加入去重複集合（bin/cue 遊戲不再出現兩次）
+- **子目錄中的 ROM 未被偵測** — `scanLocalGames`、`exists` 與 `delete` 現在會針對所有 ROM 副檔名檢查子目錄，而非僅限多檔案格式
+
+### 內部
+- 新的 `QuickMenuOverlay` 元件，具備覆蓋層優先權與控制器感知的捷徑提示
+- `AdjustColumnsIntent` 整合各畫面的縮放控制
+- `ToggleOverlayAction` 改用 `onToggle` 回呼，而非發布狀態請求
+- `SyncBadge` 元件，用於即時顯示同步進度
+- `LibrarySyncService` 改為 `StateNotifier<LibrarySyncState>`
+- app_providers 中的 `homeLayoutProvider`、`homeGridColumnsProvider`、`controllerLayoutProvider`
+
+---
+
+## [0.9.4] Beta — 2026-02-20
+
+> [!WARNING]
+> **遷移須知：** 由 `<= 0.9.3` 版本升級到 `0.9.4` 或更新版本時，因為後端資料庫與設定架構有重大變更，需要**全新安裝**。舊有的設定無法乾淨地轉移過來。
+
+### 新增
+- 啟用全域搜尋（主畫面，Y 按鈕）— 跨系統搜尋，含地區旗標與標籤徽章
+- 僅本機模式 — 沒有提供者的主機會顯示本機掃描到的 ROM 檔案，並附上橫幅提示
+- FTP 下載進度 — 即時回報每個區塊的進度，不再停在 0%
+- 下載閒置監控 — 60 秒停滯偵測並顯示明確的錯誤訊息
+- 遊戲手把按鍵修正 — 攔截某些遊戲手把驅動程式（AYN Thor 等）在按鍵放開／重複時送出的不符邏輯按鍵
+- 版本卡片上的提供者類型徽章（RomM、SMB、FTP、WEB）
+- 下載覆蓋層分區清單（Downloading／Queued／Complete 標題），具備以 ID 穩定的焦點與自動捲動
+- 佇列清空時下載覆蓋層自動關閉
+- SMB 網域驗證欄位
+- `ProviderConfig.validate()` 與 `shortLabel` 輔助方法
+- `showConsoleNotification()` — 全應用程式共用的主題化浮動 SnackBar
+- `getUserFriendlyError()` — 將原始例外對應為可讀的訊息
+
+### 改善
+- RomM 設定畫面改版 — 焦點感知的光暈邊框、可用 D-pad 導覽的欄位、以提示形式呈現的連線測試、各主機同步狀態與批次「Update stale」動作
+- 設定畫面 — 重新啟用 RomM Server 項目、並行下載元件加上箭頭符號、Reset App 移到 HUD 的 X 按鈕
+- 主畫面空狀態會顯示帶有設定／離開動作的 HUD 列；載入狀態為黑色畫面（不會閃爍）
+- 遊戲詳細載入時顯示遊戲名稱與系統配色的載入圈
+- 遊戲清單標題顯示目標資料夾路徑與僅本機橫幅
+- 遊戲格線提供情境相關的空狀態（搜尋無結果、篩選無結果、僅本機為空、連線錯誤）
+- 平台圖示已壓縮（檔案大小約縮小 70%）
+- 所有動作捷徑改用 `includeRepeats: false`（按住按鍵不再重複觸發；D-pad 保留重複）
+- `OverlayFocusScope` / `DialogFocusScope` — `_hasClaimed` 旗標可避免重複釋放覆蓋層優先權
+- RomM 封面退回鏈（CDN → small → large → 第一張螢幕截圖）
+- `UnifiedGameService` 的提供者呼叫包裹在 30 秒逾時中
+- `RommApiService` / `WebProvider` — 連線 15 秒／接收 30 秒逾時
+- README 更新，加入支援系統表格與「Building from Source」章節
+
+### 修正
+- **Zip Slip 漏洞** — Android 的 ZIP 解壓縮會在寫入前驗證正規化路徑
+- **路徑穿越** — `DownloadService` 與 `RomManager` 中的 `_safePath` 都改用 `p.basename()`
+- **原子式設定寫入** — `ConfigStorageService.saveConfig` 先寫入 `.tmp` 再重新命名
+- **資料庫初始化競爭條件** — `DatabaseService` 改用單一的 `static Future<Database>?` 防護
+- **AudioManager BGM 重新初始化迴圈** — `_hasAttemptedReinit` 旗標可避免遞迴重試
+- **重試計時器洩漏** — `DownloadQueueManager` 會追蹤 `Timer` 實例，並在 dispose 時取消
+- **FailedUrlsCache 無上限成長** — 以 `Map<String, DateTime>` + 5 分鐘 TTL 取代 `Set<String>`
+- **刪除對話框預設為 CANCEL**（選取索引為 1，而非 0）
+- FTP 下載取消現在會中斷 FTP 連線
+- `totalBytes` 夾制 — 將 `<= 0` 視為未知，讓進度條能正確運作
+- 全域搜尋的 `providerConfig` 傳遞 — 結果會以正確的提供者開啟
+- `RepoManager` 的 Dio 連線洩漏 — 在 `finally` 區塊中呼叫 `dio.close()`
+- `GameDetailController` / `GameListController` — 釋放防護可避免在 dispose 後呼叫 `notifyListeners()`
+- 在全域搜尋的文字欄位中按 Escape/B 會將焦點移到結果，而不是關閉搜尋
+- 搜尋覆蓋層的左右方向鍵在編輯時不再外洩到格線
+
+### 內部
+- `DownloadItem` 完全不可變（所有欄位皆為 `final`），並序列化 `systemId` + `providerConfig`
+- `DatabaseService` 結構描述 v3（新增 `provider_config` 欄位並含遷移）
+- `gamepad_key_fix.dart` 在應用程式啟動時透過 `main()` 安裝
+- 下載覆蓋層重構為 `_buildSectionedList` / `_buildCard` / `_buildSectionHeader` 輔助方法
+
+---
+
+## [0.9.3] Beta — 2026-02-19
+
+### 新增
+- RomM 導覽精靈 — 引導式的首次執行設定，含連線測試、平台自動探索與資料夾指派
+- 遊戲清單篩選覆蓋層（X 按鈕）— 依地區與語言篩選 ROM，並依主機分別保存
+- 全域搜尋覆蓋層基礎架構（跨系統搜尋，已串接但觸發功能停用至 v0.9.4）
+- Android 前景服務 — 下載可在背景繼續，並顯示常駐通知
+- 下載佇列保存 — 排隊中與發生錯誤的下載可撐過應用程式重新啟動
+- 自動下載重試搭配指數退避（3 次嘗試，5 秒／15 秒／45 秒）
+- 設定中可調整的並行下載上限（1–3）
+- RomM 設定畫面，可編輯伺服器網址、API key 與憑證
+- 本機資料夾掃描器與模糊系統 ID 比對器，用於導覽時的資料夾指派
+
+### 改善
+- RomM 的 ROM 清單抓取現在改為分頁（每頁 500 筆，大型媒體庫不再逾時）
+- RomM 平台 API 同時接受 `items` 與 `results` 回應鍵（支援多版本）
+- 下載覆蓋層的動作按鈕具備情境感知（取消／重試／清除）
+- 篩選與搜尋在遊戲清單中互斥
+- 導覽的主機設定不再要求必須有提供者（只設定目標資料夾也有效）
+
+### 修正
+- RomM 的 ROM 抓取使用了格式錯誤的 `platform_ids` 查詢參數
+- 下載覆蓋層對已完成的項目顯示「Retry」
+- 篩選器啟用時，遊戲格線傳入的是未經篩選的變體清單
+- 系統清單重新整理後，主畫面輪播索引會跳動
+
+### 內部
+- 新增 `flutter_foreground_task` 相依套件
+- Android manifest：前景服務、通知與電池最佳化權限
+- 抽出 `FilterState` / `ActiveFilters` 模型；導覽控制器新增 `RommSetupState`
+- `DownloadQueueManager` 現在接受 `StorageService`；`GameDetailController` 接受 `DownloadQueueManager`
+- `local_folder_matcher_test.dart` 單元測試
+
+---
+
+## [0.9.2] Beta — 2026-02-18
+
+### 新增
+- 遊戲卡片上針對已下載 ROM 的已安裝指示 LED 燈條
+- 供導覽與設定模式畫面共用的 `ConsoleSetupHud` 元件
+- `ConsoleHud` 以插槽為基礎的 API（`a`、`b`、`x`、`y`、`start`、`select`、`dpad`），取代原始的按鍵清單
+- `ConsoleFocusable` 透過 `Scrollable.ensureVisible` 在取得焦點時自動捲動
+
+### 改善
+- 導覽流程改版 — 簡化流程，並為提供者測試／儲存動作加入防護檢查
+- 輸入系統：全域 Actions 現在改用 `isEnabled()` 進行覆蓋層檢查，取代內嵌的防護判斷
+- `NavigateAction` 冷卻時間（100 毫秒）可避免按住 DPAD 時的連續快速導覽
+- `OverlayFocusScope` 在單一操作中同時取得優先權並請求焦點
+- 焦點狀態還原改用 `getFocusState()` 公開 API，而非直接存取 `StateNotifier.state`
+- `ConfigModeScreen` 簡化，與導覽流程共用 HUD 邏輯
+
+### 修正
+- 移除 `ConsoleFocusable` 的 `tick()` 回饋，修正按住 DPAD 產生重複導覽的問題
+- `ConsoleFocusable.didUpdateWidget` 能正確處理焦點節點的替換
+- `ExitConfirmationOverlay` 的覆蓋層優先權生命週期（在 `initState` 設定、在 `dispose` 重設）
+
+### 內部
+- 移除 `GameSourceService`（由統一的提供者系統取代）
+- `SystemModel` 重構以支援多來源的提供者設定
+- `FocusScopeObserver` 與 `OverlayScope` 清理
+
+---
+
+## [0.9.1] Beta — 2026-02-17
+
+### 新增
+- 多來源提供者系統 — 每台主機都可使用 Web、SMB、FTP 或 RomM 來源
+- RomM 伺服器整合，透過 IGDB 自動比對平台
+- 以 JSON 為基礎的設定系統，支援匯入／匯出
+- 設定中的設定編輯器，可在導覽流程後新增／移除／編輯主機
+- 統一遊戲服務，支援跨多來源的 merge 與 failover 策略
+- 互動式導覽精靈，可逐台主機設定
+
+### 改善
+- 所有可取得焦點的元件都支援滑鼠／觸控（點擊即可取得焦點並啟動）
+- 音量滑桿現在會回應拖曳與輕點輸入
+- 主畫面只顯示已設定的主機
+- 所有 HUD 按鈕與動作類別都加入輸入去抖動（避免重複觸發動作與重複音效）
+
+### 修正
+- 將 `romPath` 更名為 `targetFolder`，以解決下載系統中的路徑混淆
+- 下載佇列可向後相容舊有的 JSON 格式
+- 簡化應用程式啟動邏輯（不再需要對 romPath/repoUrl 進行 null 檢查）
+- 「Reset App」現在會完整清除所有偏好設定、SQLite 快取與影像快取
+
+### 內部
+- 新相依套件：`smb_connect`、`ftpconnect`、`share_plus`
+- provider 重新整理：`config_providers.dart`、`game_providers.dart`
+- `GameItem` 現在帶有 `providerConfig`，以支援需驗證的下載
+
+---
+
+## [0.9.0] Beta — 首次發行
+
+- 主機風格的介面，完整支援控制器
+- 下載佇列，具備即時進度與自動解壓縮（ZIP/7z）
+- 透過 libretro-thumbnails 自動取得封面圖
+- 針對大型媒體庫（5000 筆以上）的積極快取
+- 跨所有系統的即時搜尋
+- 支援 17 個系統（Nintendo、Sony、SEGA）
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dda33d1..7f594d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,5 @@
+> **English** | [繁體中文](CONTRIBUTING.zh-TW.md)
+
 # Contributing to R-Shop
 
 First off — **thank you!** 🎮 Whether you're fixing a typo or building a whole new feature, every contribution helps make R-Shop better. This project is maintained by a solo developer who is learning as they go, so patience and kindness are appreciated.
diff --git a/CONTRIBUTING.zh-TW.md b/CONTRIBUTING.zh-TW.md
new file mode 100644
index 0000000..7969ad1
--- /dev/null
+++ b/CONTRIBUTING.zh-TW.md
@@ -0,0 +1,61 @@
+> [English](CONTRIBUTING.md) | **繁體中文**
+
+# 為 R-Shop 做出貢獻
+
+首先——**謝謝你！** 🎮 無論你是修正一個錯字，還是打造一整個全新功能，每一份貢獻都讓 R-Shop 變得更好。本專案由一位獨立開發者維護，而且他仍在邊做邊學，因此還請多多包涵與體諒。
+
+## 如何貢獻
+
+### 回報 Bug
+
+1. 先查看[既有的 issue](../../issues) 以避免重複回報
+2. 開一個新的 issue，並附上：
+   - 清楚的標題
+   - 重現該 bug 的步驟
+   - 你預期的結果與實際發生的狀況
+   - 你的裝置資訊（Android 版本、裝置型號）
+   - 可以的話，附上螢幕擷圖或螢幕錄影
+
+### 建議新功能
+
+開一個帶有 **Feature Request** 標籤的 issue。描述你想要什麼，以及為什麼它會很有用。
+
+### 提交程式碼
+
+1. **Fork** 這個儲存庫
+2. 從 `main` **建立一個 branch**（`git checkout -b feature/your-feature`）
+3. **進行你的修改**——盡量讓每個 commit 聚焦且具描述性
+4. 可以的話，**在實機上測試**（本 App 是為 Android 掌機設計的）
+5. **開一個 Pull Request**，清楚描述你改了什麼以及為什麼
+
+### 程式碼風格
+
+- 遵循標準的 [Dart/Flutter 慣例](https://dart.dev/effective-dart/style)
+- 讓 widget 保持專注——一個 widget、一項職責
+- 使用 Riverpod 進行狀態管理（既有的模式）
+- 為任何不易一目了然的邏輯加上註解
+
+### 我們需要協助的地方
+
+- 🐛 Bug 修正與穩定性改善
+- 🎨 UI/UX 打磨與動畫
+- 🎮 手把輸入改善（D-pad 導覽、手把支援）
+- 📱 在不同 Android 裝置與掌機上測試
+- 📝 文件與指南
+- 🌍 翻譯／在地化
+
+## 開發環境設定
+
+1. 安裝 [Flutter](https://docs.flutter.dev/get-started/install)（SDK ≥ 3.0.0）
+2. Clone 這個儲存庫
+3. 執行 `flutter pub get`
+4. 連接一台 Android 裝置或模擬器
+5. 執行 `flutter run`
+
+## 行為準則
+
+友善待人、互相尊重、玩得開心。我們都因為熱愛復古遊戲而聚在這裡。 🕹️
+
+## 授權條款
+
+提交貢獻即表示你同意你的貢獻將依 [MIT License](LICENSE) 授權。
diff --git a/R-Shop-v1.7.0-zh.apk b/R-Shop-v1.7.0-zh.apk
new file mode 100644
index 0000000..3e19468
Binary files /dev/null and b/R-Shop-v1.7.0-zh.apk differ
diff --git a/README.md b/README.md
index 65bb7d8..763de9f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+> **English** | [繁體中文](README.zh-TW.md)
+
 # 🎮 R-Shop
 
 **The fastest way to turn your retro library into a console-like experience on Android.**
diff --git a/README.zh-TW.md b/README.zh-TW.md
new file mode 100644
index 0000000..c0ff61a
--- /dev/null
+++ b/README.zh-TW.md
@@ -0,0 +1,157 @@
+> [English](README.md) | **繁體中文**
+
+# 🎮 R-Shop
+
+**在 Android 上把你的復古遊戲收藏化為主機般體驗的最快方式。**
+
+R-Shop 是專為 Android 掌機與電視設計、以手把操作為優先的遊戲管理工具。連接你的本機資料夾、RomM 伺服器或網路共享，透過精緻的介面瀏覽你的收藏——那感覺更像 eShop，而不是檔案瀏覽器。
+
+<p align="center">
+  <a href="https://averageconsumer.github.io/R-Shop/">
+    <img src="screenshots/console_list.png" width="700" alt="R-Shop Console Overview" />
+  </a>
+</p>
+
+<p align="center">
+  <a href="https://github.com/averageconsumer/R-Shop/releases">
+    <img src="https://img.shields.io/badge/Download-Latest_APK-brightgreen?style=for-the-badge&logo=android&logoColor=white" alt="Download latest APK" />
+  </a>
+  <a href="https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://add/https://github.com/averageconsumer/r-shop">
+    <img src="https://img.shields.io/badge/Get_it_on-Obtainium-blue?style=for-the-badge" alt="Get it on Obtainium" />
+  </a>
+  <a href="https://averageconsumer.github.io/R-Shop/">
+    <img src="https://img.shields.io/badge/Website-Visit_R--Shop-blueviolet?style=for-the-badge&logo=google-chrome&logoColor=white" alt="Visit website" />
+  </a>
+  <a href="https://discord.gg/xVT26BHGqh">
+    <img src="https://img.shields.io/badge/Discord-Join_Community-5865F2?style=for-the-badge&logo=discord&logoColor=white" alt="Join Discord" />
+  </a>
+</p>
+
+<p align="center">
+  <img src="https://img.shields.io/badge/version-1.7.0-blue?style=flat-square" alt="Version" />
+  <img src="https://img.shields.io/badge/platform-Android-brightgreen?style=flat-square" alt="Platform" />
+  <img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="License" />
+  <img src="https://img.shields.io/github/stars/averageconsumer/R-Shop?style=flat-square&color=yellow" alt="GitHub stars" />
+</p>
+
+---
+
+## 為什麼選擇 R-Shop？
+
+大多數的復古遊戲環境都很強大，但用起來仍然像是在「架環境」。
+
+R-Shop 專注在使用者真正在意的那件事：**盡快進入遊戲**，並提供在掌機、手把或客廳沙發上都好用的介面。
+
+它盡可能移除設定過程中的摩擦：
+
+- **RomM 的 QR 配對**，讓使用者能在數秒內完成連線
+- **自動來源與系統對應**，運用已知的命名慣例
+- **自動取得中繼資料與美術圖**，不需要任何帳號
+- **自動比對 RetroAchievements**（在可用時）
+- **僅在必要時才手動覆寫**，而非預設流程
+
+目標很簡單：**掃描、連線、瀏覽、遊玩。**
+
+---
+
+## 與眾不同之處
+
+### 🎮 主機般的設計
+從一開始就以手把為核心設計，而非事後才加上。D-pad 導覽、焦點處理、版面決策與遊戲流程，都是為了在 Android 掌機與電視環境中感覺原生而設計。
+
+### ⚡ 快速設定、低摩擦
+R-Shop 最出色的地方，是讓原本複雜的復古遊戲庫設定變得輕而易舉。本機資料夾、RomM、SMB、FTP 與網路來源都能匯入同一套體驗。
+
+### 🧠 聰明的預設值
+系統會盡可能自動對應。RomM 來源會自動對應。中繼資料會自動載入。RetroAchievements 能自動比對。只有在需要修正時你才需要介入。
+
+### 🌐 多來源遊戲庫，單一前端
+把來自多個提供者的遊戲合併成一個乾淨的遊戲庫，不必再周旋於各種工具、啟動器或特定來源的檢視之間。
+
+---
+
+## 功能特色
+
+- **以手把為優先的介面**，適用於 Android 掌機與電視裝置
+- **統一的來源畫面**，支援 RomM、SMB、FTP、Web 與本機遊戲庫
+- **以 QR 進行 RomM 配對**，支援權杖驗證與重新配對
+- **自動系統對應**，適用於本機與網路遊戲庫
+- **自動取得中繼資料與封面圖**，不需手動登入
+- **RetroAchievements 整合**，包含遊戲比對、進度與徽章
+- **全遊戲庫瀏覽**，具備已安裝、我的最愛、搜尋與縮放控制
+- **可在背景執行的下載佇列**，在卡片與按鈕上顯示即時進度
+- **每張卡片的來源指示**，顯示各款遊戲可從何處取得
+- **只問一個問題的初次設定**，依使用者存放 ROM 的方式自動調整
+
+---
+
+## 螢幕擷圖
+
+<p align="center">
+  <img src="screenshots/console_list.png" width="400" alt="Console overview" />
+  <img src="screenshots/rom_list.png" width="400" alt="ROM list" />
+</p>
+<p align="center">
+  <img src="screenshots/detail_screen.png" width="400" alt="Game detail screen" />
+  <img src="screenshots/download_queue.png" width="400" alt="Download queue" />
+</p>
+<p align="center">
+  <img src="screenshots/smb_setup.png" width="400" alt="Source setup" />
+</p>
+
+---
+
+## 支援的系統
+
+R-Shop 支援 **66 種系統**，具備圖示、RetroAchievements 整合與自動資料夾對應。
+
+重點包含：
+- **Nintendo：** NES、SNES、N64、GameCube、Wii、Wii U、Switch、GB、GBC、GBA、NDS、3DS、DSi、Virtual Boy、FDS、Game & Watch
+- **Sony：** PlayStation、PS2、PS3、PSP、PS Vita
+- **Sega：** Master System、Mega Drive、Game Gear、Sega CD、32X、Saturn、Dreamcast、SG-1000
+- **Atari：** 2600、5200、7800、Lynx、Jaguar、Jaguar CD、ST
+- **NEC：** TurboGrafx-16、TurboGrafx-CD、PC-FX
+- **SNK：** Neo Geo Pocket、Neo Geo CD
+- **其他：** WonderSwan、ColecoVision、Intellivision、Vectrex、MSX、Amstrad CPC、Commodore 64、Amiga、ZX Spectrum、Arcade、DOS 等等
+
+---
+
+## 安裝方式
+
+### Obtainium
+最容易安裝並保持在最新版本的方式：
+
+[![Get it on Obtainium](https://raw.githubusercontent.com/ImranR98/Obtainium/main/assets/graphics/badge_obtainium.png)](https://apps.obtainium.imranr.dev/redirect.html?r=obtainium://add/https://github.com/averageconsumer/r-shop)
+
+### 手動安裝 APK
+從 [Releases](../../releases) 頁面下載最新的 APK。
+
+---
+
+## 開始使用
+
+1. 安裝 R-Shop
+2. 選擇你的遊戲庫存放方式
+3. 連接本機資料夾、網路來源或 RomM 伺服器
+4. 讓 R-Shop 自動對應系統並抓取中繼資料
+5. 瀏覽、下載、開始遊玩
+
+完整的操作導覽請參閱[使用者指南](docs/USER_GUIDE.zh-TW.md)。
+
+---
+
+## 理念
+
+R-Shop **不會**代管或散布 ROM。
+
+它是一套遊戲庫管理與瀏覽工具，用於使用者已經擁有、或透過自己的伺服器、目錄與裝置合法取得的內容。
+
+---
+
+## 參與貢獻
+
+歡迎各種形式的貢獻。請參閱 [CONTRIBUTING.zh-TW.md](CONTRIBUTING.zh-TW.md)。
+
+## 授權條款
+
+MIT
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 8207416..830c3b4 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -15,7 +15,7 @@ val keyProperties = Properties().apply {
 }
 
 android {
-    namespace = "com.retro.rshop"
+    namespace = "com.retro.rshop.tw"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -28,8 +28,14 @@ android {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
+    buildFeatures {
+        // MainActivity derives the platform-channel prefix from
+        // BuildConfig.APPLICATION_ID; AGP 8 disables BuildConfig by default.
+        buildConfig = true
+    }
+
     defaultConfig {
-        applicationId = "com.retro.rshop"
+        applicationId = "com.retro.rshop.tw"
 
         // Version values are pulled from pubspec.yaml automatically
         minSdk = flutter.minSdkVersion
@@ -63,6 +69,21 @@ android {
             )
         }
     }
+
+    applicationVariants.all {
+        val variant = this
+        outputs.all {
+            val output = this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
+            val fileName = "R-Shop-v${defaultConfig.versionName}.apk"
+            output.outputFileName = fileName
+        }
+    }
+}
+
+// 引入本地私有任務（若存在），此部分不進入 Git
+val localTasksFile = file("local-tasks.gradle.kts")
+if (localTasksFile.exists()) {
+    apply(from = localTasksFile)
 }
 
 dependencies {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6d08638..66d29dd 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 
     <application
-        android:label="R-Shop"
+        android:label="R-Shop-zh"
         android:name="${applicationName}"
         android:icon="@mipmap/launcher_icon"
         android:allowBackup="false"
diff --git a/android/app/src/main/kotlin/com/retro/rshop/MainActivity.kt b/android/app/src/main/kotlin/com/retro/rshop/tw/MainActivity.kt
similarity index 93%
rename from android/app/src/main/kotlin/com/retro/rshop/MainActivity.kt
rename to android/app/src/main/kotlin/com/retro/rshop/tw/MainActivity.kt
index 543ab38..29c603e 100644
--- a/android/app/src/main/kotlin/com/retro/rshop/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/retro/rshop/tw/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.retro.rshop
+package com.retro.rshop.tw
 
 import android.content.Context
 import android.net.wifi.WifiManager
@@ -17,11 +17,18 @@ import java.util.zip.ZipFile
 import java.util.zip.ZipInputStream
 
 class MainActivity : FlutterActivity() {
-    private val CHANNEL = "com.retro.rshop/zip"
-    private val STORAGE_CHANNEL = "com.retro.rshop/storage"
-    private val PROGRESS_CHANNEL = "com.retro.rshop/zip_progress"
-    private val SMB_CHANNEL = "com.retro.rshop/smb"
-    private val SMB_PROGRESS_CHANNEL = "com.retro.rshop/smb_progress"
+    // Single source of truth for the channel namespace. Derived from the
+    // applicationId in android/app/build.gradle.kts so it follows the branch
+    // automatically (upstream main = com.retro.rshop, main-zh = com.retro.rshop.tw).
+    // The Dart side mirrors this in lib/services/platform_channels.dart —
+    // both must resolve to the same strings or every native call fails with
+    // MissingPluginException at runtime.
+    private val CHANNEL_PREFIX = BuildConfig.APPLICATION_ID
+    private val CHANNEL = "$CHANNEL_PREFIX/zip"
+    private val STORAGE_CHANNEL = "$CHANNEL_PREFIX/storage"
+    private val PROGRESS_CHANNEL = "$CHANNEL_PREFIX/zip_progress"
+    private val SMB_CHANNEL = "$CHANNEL_PREFIX/smb"
+    private val SMB_PROGRESS_CHANNEL = "$CHANNEL_PREFIX/smb_progress"
     private val TAG = "MainActivity"
 
     private val extractorPool = Executors.newFixedThreadPool(2)
diff --git a/android/app/src/main/kotlin/com/retro/rshop/SmbService.kt b/android/app/src/main/kotlin/com/retro/rshop/tw/SmbService.kt
similarity index 99%
rename from android/app/src/main/kotlin/com/retro/rshop/SmbService.kt
rename to android/app/src/main/kotlin/com/retro/rshop/tw/SmbService.kt
index 9bb79aa..a9cd08e 100644
--- a/android/app/src/main/kotlin/com/retro/rshop/SmbService.kt
+++ b/android/app/src/main/kotlin/com/retro/rshop/tw/SmbService.kt
@@ -1,4 +1,4 @@
-package com.retro.rshop
+package com.retro.rshop.tw
 
 import android.util.Log
 import com.hierynomus.msdtyp.AccessMask
diff --git a/android/gradle.properties b/android/gradle.properties
index fbee1d8..d5da727 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,2 +1,6 @@
 org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
new file mode 100644
index 0000000..10c38be
--- /dev/null
+++ b/docs/ARCHITECTURE.md
@@ -0,0 +1,587 @@
+# R-Shop 架構圖集（深度）
+
+> **導覽**：先讀共用的 [GLOBAL_DEV_NOTES.md](../../GLOBAL_DEV_NOTES.md)（建置工具鏈、分支政策、紀錄格式），
+> 再依需要讀本專案 `docs/` 的其餘各份：
+> - [FIX_INDEX.md](FIX_INDEX.md) — 症狀 → 過去解過的條目
+> - [FIX_LOGS.md](FIX_LOGS.md) — 修復與功能紀錄（細節、取捨、教訓）
+> - [SPEC.md](SPEC.md) — 規格；**§12 定位指引回答「我要改 X，該動哪些檔」**
+> - [USER_GUIDE.md](USER_GUIDE.md) — 使用手冊
+
+
+> **基準分支：`main-zh`** ｜ `1.7.0-zh+13` ｜ `com.retro.rshop.tw`
+> 搭配 [SPEC.md](SPEC.md) 閱讀。
+
+**與根目錄 [../ARCHITECTURE.md](../ARCHITECTURE.md) 的分工**：
+
+| 文件 | 定位 | 內容 |
+|------|------|------|
+| [../ARCHITECTURE.md](../ARCHITECTURE.md) | 高階概覽（171 行 / 1 張圖） | 模組劃分、關鍵類別表、技術棧、功能總覽、目錄結構 |
+| **本文件** | 深度架構（Mermaid 圖集） | 來源抽象層、下載狀態機與時序、焦點系統、Platform Channel、資料流 |
+
+> ⚠️ 根目錄文件有幾處已知偏差（`FocusSyncManager` 路徑、絕對連結路徑、版本號），校正表見 [SPEC.md §0.2](SPEC.md)。
+
+---
+
+## 1. 整體分層
+
+```mermaid
+graph TB
+    subgraph ENTRY["入口"]
+        MAIN["main.dart<br/>ProviderScope · Theme · i18n<br/>GlobalInputWrapper · NoGlowScrollBehavior"]
+        APP["RShopApp<br/>ConsumerStatefulWidget<br/>+ WidgetsBindingObserver"]
+    end
+
+    subgraph FEAT["features/ — 功能頁面（8 模組）"]
+        HOME["home/<br/>eShop 風格首頁"]
+        GL["game_list/<br/>分類清單 + logic"]
+        GD["game_detail/<br/>詳情 + 成就（19 widgets）"]
+        LIB["library/<br/>已下載遊戲庫"]
+        ONB["onboarding/<br/>新手引導（11 widgets）"]
+        PAIR["pairing/<br/>RomM 配對"]
+        SRC["sources/<br/>來源管理"]
+        SET["settings/<br/>設定（11 widgets）"]
+    end
+
+    subgraph CORE["core/ — 基礎設施（22 檔）"]
+        INPUT["input/ ★ 手把焦點系統<br/>11 檔 / 1980 行"]
+        CW["widgets/<br/>console_focusable 564"]
+        RESP["responsive/<br/>breakpoints · spacing · typography"]
+        THEME["theme/app_theme"]
+    end
+
+    subgraph PROV["providers/ — Riverpod（9 檔 1426 行）"]
+        P1["app_providers 460"]
+        P2["game · download · ra<br/>shelf · library<br/>rom_status · source_health<br/>installed_files"]
+    end
+
+    subgraph SVC["services/ — 業務服務（43 檔，最大層）"]
+        RESOLVE["source_resolver 200<br/>provider_factory · source_provider"]
+        PRVD["providers/<br/>web 256 · smb 164<br/>ftp 299 · romm 167"]
+        DL["download_service 1245<br/>download_queue_manager 694<br/>download_foreground_service 161"]
+        DB["database_service 1066<br/>library_sync_service 630<br/>storage_service 528"]
+        RA["ra_api 328 · ra_sync 355<br/>ra_hash 223"]
+        IMG["thumbnail 388 · cover_preload 363<br/>thumbnail_index 316 · image_cache 248"]
+        NET["network_discovery 136（mDNS）<br/>romm_api 442 · romm_pairing 370"]
+        LOCAL["rom_folder 180<br/>local_folder_matcher 157<br/>remote_folder_scanner 177"]
+        AV["audio_manager 396<br/>haptic · feedback · input_debouncer"]
+    end
+
+    subgraph MODEL["models/ — 資料模型（11 檔）"]
+        SM["system_model 906<br/>★ 66 種主機字典"]
+        GI["game_item 121<br/>download_item 199<br/>game_metadata_info 179"]
+        CFG["config/<br/>app_config 255 · provider_config 335<br/>source 313 · system_config 122"]
+        RAM["ra_models 233<br/>custom_shelf 174"]
+    end
+
+    subgraph NAT["android/ — 原生（Kotlin）"]
+        MA["MainActivity.kt<br/>5 個 Platform Channel"]
+        SMBS["SmbService.kt<br/>smbj 0.13.0"]
+    end
+
+    MAIN --> APP
+    APP --> FEAT
+    FEAT --> INPUT
+    FEAT --> CW
+    FEAT --> RESP
+    FEAT --> PROV
+    PROV --> SVC
+    SVC --> MODEL
+    RESOLVE --> PRVD
+    PRVD --> NET
+    PRVD -.->|"SmbProvider 委派"| NAT
+    DL --> PRVD
+    DL --> MA
+    DB --> MODEL
+    MA --> SMBS
+
+    style INPUT fill:#f9a825,color:#000
+    style RESOLVE fill:#42a5f5,color:#000
+    style SM fill:#66bb6a,color:#000
+    style NAT fill:#ef5350,color:#fff
+```
+
+---
+
+## 2. 多來源抽象層（核心設計）
+
+```mermaid
+graph TB
+    subgraph USER["使用者設定"]
+        S["Source<br/>models/config/source.dart"]
+        ST["enum SourceType<br/>romm · smb · ftp · web · local<br/>（5 種）"]
+        S --> ST
+    end
+
+    subgraph RESOLVE["SourceResolver（全靜態）"]
+        R1["providersFor(system, ...)"]
+        R2["_typeMatches(SourceType, ProviderType)"]
+        R3["_connectionMatches(Source, ProviderConfig)"]
+        R4["_toProviderConfig(...)"]
+        R5["sourcesFor(...) 反查"]
+    end
+
+    subgraph ABS["抽象層"]
+        PC["ProviderConfig<br/>enum ProviderType<br/>web · smb · ftp · romm<br/>（4 種）"]
+        SP["abstract SourceProvider<br/>fetchGames(SystemConfig)<br/>resolveDownload(GameItem)<br/>testConnection()<br/>displayLabel"]
+        PF["ProviderFactory<br/>.getProvider(config)"]
+    end
+
+    subgraph IMPL["實作（services/providers/）"]
+        W["WebProvider 256<br/>HTTP 目錄索引 · dio"]
+        SM2["SmbProvider 164<br/>→ NativeSmbService"]
+        F["FtpProvider 299<br/>ftpconnect"]
+        RM["RommProvider 167<br/>→ RommApiService 442"]
+    end
+
+    subgraph LOCALPATH["本地來源（不走抽象層）"]
+        LF["rom_folder_service 180<br/>local_folder_matcher 157<br/>直接掃描檔案系統"]
+    end
+
+    ST --> R1
+    R1 --> R2 & R3 & R4
+    R4 --> PC
+    PC --> PF
+    PF --> W & SM2 & F & RM
+    W & SM2 & F & RM -.->|"實作"| SP
+
+    ST -.->|"local 無對應 ProviderType"| LF
+
+    AUTO["SourceTypeX.supportsAutoMap<br/>僅 romm == true<br/>→ RomM 自報平台清單<br/>其他需 SystemSourceMapping"]
+    ST -.- AUTO
+
+    NULLW["⚠️ SmbProvider 依賴注入的 _smbService<br/>必須先 ProviderFactory.init(smbService:)<br/>否則拋 StateError（訊息已具名）"]
+    SM2 -.- NULLW
+
+    style LF fill:#ffe0b2,color:#000
+    style NULLW fill:#ef5350,color:#fff
+    style AUTO fill:#f9a825,color:#000
+```
+
+> **兩個列舉不對稱是刻意的**：`local` 沒有網路協定要抽象，直接走檔案系統掃描。新增來源型別時要同時處理兩個列舉與 `_typeMatches`。
+
+---
+
+## 3. 遊戲庫載入流程
+
+```mermaid
+sequenceDiagram
+    autonumber
+    participant UI as game_list / library 畫面
+    participant PR as Riverpod providers
+    participant UGS as UnifiedGameService
+    participant SR as SourceResolver
+    participant PF as ProviderFactory
+    participant SP as SourceProvider 實作
+    participant DB as DatabaseService
+    participant SYNC as LibrarySyncService
+
+    UI->>PR: watch(gameProvider(system))
+    PR->>UGS: 查詢某主機的遊戲
+    UGS->>DB: 先查本地快取（離線可用）
+    DB-->>UGS: 已知 GameItem 清單
+    UGS-->>UI: 立即回傳（快速顯示）
+
+    par 背景同步
+        UGS->>SR: providersFor(system)
+        SR->>SR: 比對 SourceType ↔ ProviderType<br/>_connectionMatches 判斷同伺服器
+        SR-->>UGS: List&lt;ProviderConfig&gt;（可能多個來源）
+        loop 每個 provider
+            UGS->>PF: getProvider(config)
+            PF-->>UGS: SourceProvider
+            UGS->>SP: fetchGames(systemConfig)
+            SP-->>UGS: List&lt;GameItem&gt;
+        end
+        UGS->>SYNC: 合併去重 + 元資料補全
+        SYNC->>DB: 寫回 SQLite
+        DB-->>PR: 通知變更
+        PR-->>UI: 重繪
+    end
+```
+
+**多來源合併**：同一款遊戲可能同時存在於 RomM 與 SMB → 合併為一筆 `GameItem`，但保留所有來源，供下載失敗時切換（見 §5）。
+
+---
+
+## 4. 下載狀態機
+
+```mermaid
+stateDiagram-v2
+    [*] --> queued: addToQueue()<br/>（上限 _maxQueueSize = 100）
+
+    queued --> downloading: _processQueue()<br/>availableSlots > 0<br/>（maxConcurrent 預設 2）
+
+    downloading --> extracting: 下載完成 且 autoExtract
+    downloading --> moving: 下載完成 且 !autoExtract
+    downloading --> error: 失敗
+    downloading --> cancelled: cancelDownload()
+
+    extracting --> moving: 原生解壓完成
+    extracting --> error: 解壓失敗
+
+    moving --> completed: 歸檔至 targetFolder
+    moving --> error: 移動失敗
+
+    error --> queued: _scheduleRetry()<br/>retryCount < _maxRetries(3)<br/>帶 jitter 避免同時重試
+    error --> queued: _switchToAlternativeSource()<br/>★ 重試耗盡 → 換來源
+    error --> [*]: 無替代來源
+
+    completed --> [*]
+    cancelled --> [*]
+
+    note right of completed
+        isTerminal == true
+        completed / cancelled / error
+    end note
+
+    note right of queued
+        _persistQueue() 持久化
+        → App 重啟後 restoreQueue()
+        可續傳
+    end note
+```
+
+---
+
+## 5. 下載佇列管理時序
+
+```mermaid
+sequenceDiagram
+    autonumber
+    participant UI as 下載清單 UI
+    participant Q as DownloadQueueManager<br/>(ChangeNotifier)
+    participant DS as DownloadService
+    participant SP as SourceProvider
+    participant FG as ForegroundService
+    participant NAT as MainActivity.kt
+
+    UI->>Q: addToQueue(game, system, targetFolder, autoExtract)
+    Q->>Q: _generateId(game, system) 去重
+    Q->>Q: _persistQueue()
+    Q->>Q: _processQueue()
+
+    Q->>Q: availableSlots = maxConcurrent − activeCount
+    Q->>DS: _startDownload(item)
+    Q->>FG: _updateForegroundService() 啟動保活
+
+    DS->>SP: resolveDownload(game)
+    SP-->>DS: DownloadHandle（URL / 串流）
+    loop 傳輸中
+        DS-->>Q: 進度回報
+        Q->>Q: _throttledNotificationUpdate()<br/>★ 節流，避免高頻重繪
+        Q-->>UI: _safeNotify()
+    end
+
+    alt 下載成功 且 autoExtract
+        DS->>NAT: MethodChannel "…/zip" 解壓
+        NAT-->>DS: EventChannel "…/zip_progress" 進度
+    end
+
+    alt 下載失敗
+        Q->>Q: _isRetryableError(error)?
+        alt 可重試 且 retryCount < 3
+            Q->>Q: _scheduleRetry(id, retryCount)<br/>jitter 延遲
+        else 重試耗盡
+            Q->>Q: _switchToAlternativeSource(id)<br/>★ 改用同主機其他來源
+        end
+    end
+
+    Q->>Q: _onDownloadComplete(id)
+    Q->>Q: _stopForegroundServiceIfIdle()<br/>★ 佇列空閒即停，省電
+    Q-->>UI: onItemCompleted 回呼
+```
+
+---
+
+## 6. 手把焦點系統（控制器優先的核心）
+
+```mermaid
+graph TB
+    HW["實體輸入<br/>D-pad · 手把按鍵 · 鍵盤"]
+
+    HW --> GKF["gamepad_key_fix.dart 52<br/>★ 不同手把 keycode 差異修補"]
+    GKF --> GIW["global_input_wrapper.dart 90<br/>攔截並轉發"]
+
+    GIW --> AI["app_intents.dart 46<br/>Flutter Intent 定義"]
+    AI --> AA["app_actions.dart 300<br/>全域動作實作"]
+
+    GIW --> DEB["input_debouncer.dart 76<br/>連續輸入去重"]
+
+    subgraph FOCUS["焦點管理"]
+        FSM["focus_sync_manager.dart 393<br/>★ 焦點不遺失 · 不跳錯"]
+        FSO["focus_scope_observer.dart 82<br/>範圍變化觀察"]
+        OS["overlay_scope.dart 307<br/>對話框焦點隔離"]
+    end
+
+    AA --> FSM
+    FSM <--> FSO
+    FSM <--> OS
+
+    subgraph MIXIN["畫面 Mixin"]
+        CSM["console_screen_mixin.dart 239<br/>主機風格畫面通用行為"]
+        SSM["searchable_screen_mixin.dart 280<br/>可搜尋畫面"]
+    end
+
+    FSM --> CSM & SSM
+
+    subgraph WIDGET["可聚焦元件"]
+        CF["core/widgets/console_focusable.dart 564<br/>★ 焦點視覺與行為"]
+        CD["widgets/console_dialog.dart 252<br/>★ main-zh 新增<br/>手把最佳化對話框"]
+    end
+
+    CSM & SSM --> CF
+    OS --> CD
+
+    STYLE["main-zh 統一焦點高亮：<br/>白框 + 紅底<br/>⚠️ 改樣式要同時動<br/>console_focusable 與 console_dialog"]
+    CF -.- STYLE
+    CD -.- STYLE
+
+    PITFALL["已修坑：ConsoleDialog 需包 Material<br/>否則文字出現黃色底線"]
+    CD -.- PITFALL
+
+    IP["input_providers.dart 181<br/>Riverpod 輸入狀態"]
+    GIW --> IP
+
+    style FSM fill:#f9a825,color:#000
+    style CF fill:#f9a825,color:#000
+    style CD fill:#66bb6a,color:#000
+    style STYLE fill:#ffe0b2,color:#000
+    style PITFALL fill:#ef5350,color:#fff
+```
+
+> **新增任何對話框請用 `ConsoleDialog`**，不要直接 `showDialog` —— 否則手把焦點會失效。
+
+---
+
+## 7. Platform Channel（Flutter ↔ Android）
+
+```mermaid
+graph LR
+    subgraph DART["Flutter (Dart)"]
+        DS["download_service.dart"]
+        NSS["native_smb_service.dart 141"]
+        SS["storage_service.dart 528"]
+    end
+
+    subgraph CH["Platform Channels<br/>（名稱含 applicationId 前綴）"]
+        C1["com.retro.rshop.tw/zip<br/>MethodChannel"]
+        C2["com.retro.rshop.tw/zip_progress<br/>EventChannel"]
+        C3["com.retro.rshop.tw/storage<br/>MethodChannel"]
+        C4["com.retro.rshop.tw/smb<br/>MethodChannel"]
+        C5["com.retro.rshop.tw/smb_progress<br/>EventChannel"]
+    end
+
+    subgraph KT["Android (Kotlin)"]
+        MA["MainActivity.kt<br/>註冊 5 個 channel<br/>progressSink · smbProgressSink"]
+        SMB["SmbService.kt<br/>smbj 0.13.0<br/>SMB2/SMB3 認證 · 列舉 · 串流"]
+        FG["ForegroundService<br/>flutter_foreground_task 9.2.0"]
+    end
+
+    DS --> C1 --> MA
+    MA -.-> C2 -.-> DS
+    SS --> C3 --> MA
+    NSS --> C4 --> MA
+    MA -.-> C5 -.-> NSS
+    MA --> SMB
+    MA --> FG
+
+    WARN["⚠️ Channel 名稱含 com.retro.rshop.tw<br/>→ main 與 main-zh 名稱不同<br/>合併分支時 Kotlin 與 Dart 兩側都要改"]
+    CH -.- WARN
+
+    style WARN fill:#ef5350,color:#fff
+```
+
+---
+
+## 8. 資料層與快取
+
+```mermaid
+graph TB
+    subgraph PERSIST["持久化"]
+        SQL["SQLite (sqflite 2.4.2)<br/>database_service 1066<br/>遊戲元資料 · 來源設定<br/>下載歷史 · 成就"]
+        SP["SharedPreferences<br/>storage_service 528<br/>應用設定"]
+        SEC["flutter_secure_storage 9.2.4<br/>API key · 帳密"]
+        FILES["檔案系統<br/>已下載 ROM · 縮圖快取"]
+    end
+
+    subgraph CACHE["封面快取鏈（防 OOM）"]
+        CNI["cached_network_image 3.4.1<br/>+ flutter_cache_manager 3.4.1"]
+        ICS["image_cache_service 248<br/>記憶體 / 磁碟雙層"]
+        CPS["cover_preload_service 363<br/>預載"]
+        TS["thumbnail_service 388<br/>縮圖產生"]
+        TIS["thumbnail_index_service 316<br/>索引"]
+        TMS["thumbnail_migration_service 59<br/>舊版遷移"]
+    end
+
+    subgraph SYNC["同步"]
+        LSS["library_sync_service 630"]
+        UGS["unified_game_service 94<br/>統一查詢入口"]
+        CSS["config_storage_service 196<br/>config_parser 106<br/>config_bootstrap 10"]
+    end
+
+    subgraph MODELS["模型"]
+        SM["system_model 906<br/>66 種主機<br/>platform ID · 副檔名 · 預設目錄"]
+        RPM["romm_platform_matcher 128<br/>RomM 平台名 → SystemModel"]
+    end
+
+    UGS --> SQL
+    LSS --> SQL
+    LSS --> SM
+    RPM --> SM
+    CSS --> SQL
+    CSS --> FILES
+
+    TS --> TIS
+    TIS --> FILES
+    CPS --> ICS
+    ICS --> CNI
+    CNI --> FILES
+    TMS -.->|"一次性"| TIS
+
+    SEC -.->|"RomM / RA 憑證"| SQL
+
+    style SM fill:#66bb6a,color:#000
+    style ICS fill:#f9a825,color:#000
+```
+
+---
+
+## 9. RetroAchievements 整合
+
+```mermaid
+sequenceDiagram
+    autonumber
+    participant UI as game_detail / achievements_screen
+    participant PR as ra_providers 114
+    participant RS as RaSyncService 355
+    participant RH as RaHashService 223
+    participant RA as RaApiService 328
+    participant DB as DatabaseService
+
+    UI->>PR: watch(raProvider(game))
+    PR->>DB: 先查已快取成就
+    DB-->>UI: 立即顯示（離線可用）
+
+    PR->>RS: 觸發同步
+    RS->>RH: 計算 ROM 雜湊
+    Note over RH: ★ RA 有主機專屬雜湊規則，<br/>非單純檔案 MD5<br/>（不同主機演算法不同）
+    RH-->>RS: hash
+    RS->>RA: GET 遊戲 ID by hash
+    RA-->>RS: gameId
+    RS->>RA: GET 玩家成就進度
+    RA-->>RS: 成就清單 + 解鎖狀態
+    RS->>DB: 寫入 ra_models 資料
+    DB-->>PR: 通知變更
+    PR-->>UI: 顯示徽章與進度
+```
+
+---
+
+## 10. 來源配對（RomM）
+
+```mermaid
+flowchart TD
+    START["新增 RomM 來源"] --> WAY{"配對方式"}
+
+    WAY -->|QR 掃描| QR["mobile_scanner 5.2.3<br/>相機即時掃描"]
+    WAY -->|QR 圖片| QRI["從相簿載入圖片解碼"]
+    WAY -->|手動輸入| MAN["manual_pairing_screen<br/>（main-zh 修改 218 行）"]
+    WAY -->|區網發現| MDNS["network_discovery_service 136<br/>mDNS / Zeroconf"]
+
+    QR & QRI --> PARSE["romm_pairing_service 370<br/>解析 URL + API Key"]
+    MAN --> PARSE
+    MDNS --> LIST["列出區網 RomM 伺服器"]
+    LIST --> PARSE
+
+    PARSE --> AUTH["AuthConfig<br/>user / pass / apiKey / domain"]
+    AUTH --> PREF{"RomM 4.8+<br/>Client API Token？"}
+    PREF -->|有| BEARER["★ Bearer Token 優先"]
+    PREF -->|無| BASIC["帳號密碼"]
+
+    BEARER & BASIC --> TEST["RommProvider.testConnection()<br/>→ SourceConnectionResult"]
+    TEST --> OK{"success?"}
+    OK -->|是| SAVE["存入 Source<br/>secure_storage 保存憑證"]
+    OK -->|否| ERR["顯示 error / warning"]
+
+    SAVE --> AUTOMAP["supportsAutoMap == true<br/>→ 自動抓取平台清單<br/>不需逐主機設路徑"]
+    AUTOMAP --> MATCH["romm_platform_matcher<br/>對映到本地 SystemModel"]
+
+    style BEARER fill:#66bb6a,color:#000
+    style AUTOMAP fill:#f9a825,color:#000
+```
+
+**對比其他來源**（smb / ftp / web / local）：`supportsAutoMap == false`，**必須**為每個主機建立 `SystemSourceMapping` 指定路徑。
+
+---
+
+## 11. 狀態管理現況（兩種模式並存）
+
+```mermaid
+graph TB
+    subgraph RIV["Riverpod 2.6.1（9 檔 1426 行）"]
+        R1["app_providers 460<br/>設定 · 主題 · 語系"]
+        R2["game_providers 197"]
+        R3["download_providers 166"]
+        R4["source_health_providers 147"]
+        R5["ra_providers 114"]
+        R6["rom_status_providers 113"]
+        R7["shelf_providers 108"]
+        R8["installed_files_provider 90"]
+        R9["library_providers 31"]
+    end
+
+    subgraph CN["ChangeNotifier（services 層）"]
+        C1["DownloadQueueManager 694"]
+        C2["SourcesNotifier 498"]
+    end
+
+    UI["features/ 畫面"]
+    UI -->|"ref.watch()"| RIV
+    UI -->|"ListenableBuilder /<br/>addListener"| CN
+
+    R3 -.->|"橋接"| C1
+    R4 -.->|"橋接"| C2
+
+    NOTE["⚠️ 兩種模式並存<br/>新增狀態前先確認沿用哪種<br/>避免出現第三種寫法"]
+    CN -.- NOTE
+
+    style NOTE fill:#f9a825,color:#000
+```
+
+---
+
+## 12. `main-zh` 增量總覽
+
+```mermaid
+graph LR
+    subgraph ID["識別變更"]
+        A1["applicationId<br/>com.retro.rshop → .tw"]
+        A2["Kotlin 路徑<br/>rshop/ → rshop/tw/"]
+        A3["version 1.7.0-zh+13"]
+        A4["顯示名稱 R-Shop-zh"]
+        A5["APK: R-Shop-v{ver}.apk"]
+    end
+
+    subgraph L10N["語系"]
+        B1["統一到 zh locale<br/>（修正 zh / zh-TW 混用<br/>造成切換失效）"]
+        B2["app_localizations_zh.dart<br/>1582 行"]
+    end
+
+    subgraph UI2["UI / 手把體驗"]
+        C1["★ ConsoleDialog 新增<br/>widgets/console_dialog.dart 252"]
+        C2["焦點高亮統一<br/>白框 + 紅底"]
+        C3["Onboarding 改版<br/>5 檔大幅修改"]
+        C4["B 鍵離開確認"]
+        C5["Select 鍵 → 匯入設定"]
+        C6["返回鈕與標題統一<br/>pairing / sources"]
+    end
+
+    subgraph BUILD["建置"]
+        D1["APK 自動複製至<br/>D:\\test-apk"]
+    end
+
+    RISK["⚠️ 合併回上游的風險點<br/>① Kotlin 改名 → 全檔 diff<br/>② Channel 名稱含 applicationId<br/>　 Kotlin 與 Dart 兩側都要改"]
+
+    ID -.- RISK
+    style C1 fill:#66bb6a,color:#000
+    style RISK fill:#ef5350,color:#fff
+```
diff --git a/docs/FIX_BY_FILE.md b/docs/FIX_BY_FILE.md
new file mode 100644
index 0000000..a3def06
--- /dev/null
+++ b/docs/FIX_BY_FILE.md
@@ -0,0 +1,278 @@
+# R-Shop 檔案 → 紀錄 反查表
+
+> **自動產生，不要手改。** 來源是 [FIX_LOGS.md](FIX_LOGS.md) 每條的 `**檔案**` 欄。
+> 新增紀錄後重跑：`python scripts/build_fix_by_file.py`
+>
+> 用途與 [FIX_INDEX.md](FIX_INDEX.md) 相反：索引是「症狀 → 條目」，這裡是
+> **「我要改這個檔 → 它身上以前發生過什麼」**。改檔案前先查這裡，
+> 命中的條目多半就是會再踩一次的坑。
+
+### `.agents/skills/rshop-build-deploy/SKILL.md`
+- [R-Shop 建置環境失聯](FIX_LOGS.md)
+- [R-Shop 建置 JDK 不相容](FIX_LOGS.md)
+
+### `AGENTS.md`
+- [R-Shop 建置環境失聯](FIX_LOGS.md)
+
+### `android/app/build.gradle.kts`
+- [AppID 衝突](FIX_LOGS.md)
+- [R-Shop Channel 名稱硬編](FIX_LOGS.md)
+
+### `android/app/src/main/kotlin/com/retro/rshop/tw/MainActivity.kt`
+- [AppID 衝突](FIX_LOGS.md)
+- [R-Shop Channel 名稱硬編](FIX_LOGS.md)
+
+### `docs/HANDOVER.md`
+- [R-Shop Multi-Fallback實機驗證完成](FIX_LOGS.md)
+
+### `lib/features/game_list/widgets/game_grid.dart`
+- [R-Shop analyze 六項](FIX_LOGS.md)
+
+### `lib/features/game_list/{game_list_screen.dart,logic/game_list_controller.dart}`
+- [R-Shop 來源群組](FIX_LOGS.md)
+
+### `lib/features/home/home_view.dart`
+- [R-Shop 目前來源](FIX_LOGS.md)
+- [備援接進同步](FIX_LOGS.md)
+- [同步不知道是哪一台](FIX_LOGS.md)
+- [標頭高度與誤讀的按鍵字](FIX_LOGS.md)
+- [使用中與顯示分家](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+- [R-Shop 代理全域無縫同步與PR15提交](FIX_LOGS.md)
+
+### `lib/features/home/widgets/home_grid_view.dart`
+- [R-Shop 網格卡片版面溢位修復](FIX_LOGS.md)
+
+### `lib/features/library/library_screen.dart`
+- [R-Shop analyze 六項](FIX_LOGS.md)
+
+### `lib/features/onboarding/widgets/romm_legacy_login_screen.dart`
+- [R-Shop analyze 六項](FIX_LOGS.md)
+
+### `lib/features/onboarding/widgets/welcome_chooser_step.dart`
+- [R-Shop analyze 六項](FIX_LOGS.md)
+
+### `lib/features/settings/sources_screen.dart`
+- [R-Shop 目前來源](FIX_LOGS.md)
+- [浮層只做了手把](FIX_LOGS.md)
+- [黃色條與雙入口](FIX_LOGS.md)
+- [標頭高度與誤讀的按鍵字](FIX_LOGS.md)
+- [來源清單快捷鍵](FIX_LOGS.md)
+- [使用中與顯示分家](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 群組浮層焦點](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+- [R-Shop 來源與備援邊框與高對比風格](FIX_LOGS.md)
+- [R-Shop 代理全域無縫同步與PR15提交](FIX_LOGS.md)
+- [R-Shop Multi-Fallback實機驗證完成](FIX_LOGS.md)
+
+### `lib/features/sources/endpoint_edit_screen.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+
+### `lib/features/sources/endpoint_picker_overlay.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+- [連線方式共用憑證](FIX_LOGS.md)
+- [同步不知道是哪一台](FIX_LOGS.md)
+- [浮層只做了手把](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 浮層操作形狀](FIX_LOGS.md)
+- [R-Shop 連線方式對齊群組](FIX_LOGS.md)
+- [R-Shop 模式收成打勾](FIX_LOGS.md)
+
+### `lib/features/sources/fallback_picker_overlay.dart`
+- [R-Shop 來源備援](FIX_LOGS.md)
+- [浮層只做了手把](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+- [R-Shop 來源與備援邊框與高對比風格](FIX_LOGS.md)
+- [R-Shop 代理全域無縫同步與PR15提交](FIX_LOGS.md)
+- [R-Shop Multi-Fallback實機驗證完成](FIX_LOGS.md)
+
+### `lib/features/sources/group_picker_overlay.dart`
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 群組合併卡住](FIX_LOGS.md)
+- [R-Shop 群組浮層焦點](FIX_LOGS.md)
+- [R-Shop 浮層操作形狀](FIX_LOGS.md)
+- [R-Shop 模式收成打勾](FIX_LOGS.md)
+
+### `lib/features/sources/manual_source_add_screen.dart`
+- [R-Shop analyze 六項](FIX_LOGS.md)
+
+### `lib/l10n/app_*.arb`
+- [連線方式共用憑證](FIX_LOGS.md)
+- [同步不知道是哪一台](FIX_LOGS.md)
+- [來源清單快捷鍵](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+- [R-Shop 連線方式對齊群組](FIX_LOGS.md)
+- [R-Shop 模式收成打勾](FIX_LOGS.md)
+
+### `lib/l10n/app_zh.arb`
+- [R-Shop 代理全域無縫同步與PR15提交](FIX_LOGS.md)
+
+### `lib/l10n/app_{de,en,es,fr,ja,pt,zh}.arb`
+- [R-Shop 來源群組](FIX_LOGS.md)
+
+### `lib/l10n/app_{de,es,fr,ja,pt}.arb`
+- [R-Shop onboarding 五語系缺字串](FIX_LOGS.md)
+
+### `lib/models/config/app_config.dart`
+- [R-Shop 目前來源](FIX_LOGS.md)
+- [使用中與顯示分家](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `lib/models/config/provider_config.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+
+### `lib/models/config/source.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+- [R-Shop 來源備援](FIX_LOGS.md)
+- [連線方式共用憑證](FIX_LOGS.md)
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `lib/providers/app_providers.dart`
+- [同步不知道是哪一台](FIX_LOGS.md)
+- [R-Shop 代理全域無縫同步與PR15提交](FIX_LOGS.md)
+
+### `lib/services/database_service.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 群組合併卡住](FIX_LOGS.md)
+
+### `lib/services/device_info_service.dart`
+- [R-Shop Channel 名稱硬編](FIX_LOGS.md)
+
+### `lib/services/disk_space_service.dart`
+- [R-Shop Channel 名稱硬編](FIX_LOGS.md)
+
+### `lib/services/download_service.dart`
+- [R-Shop Channel 名稱硬編](FIX_LOGS.md)
+
+### `lib/services/endpoint_probe_service.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+- [備援接進同步](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `lib/services/library_sync_service.dart`
+- [R-Shop 來源群組](FIX_LOGS.md)
+
+### `lib/services/native_smb_service.dart`
+- [R-Shop Channel 名稱硬編](FIX_LOGS.md)
+
+### `lib/services/platform_channels.dart`
+- [R-Shop Channel 名稱硬編](FIX_LOGS.md)
+
+### `lib/services/provider_factory.dart`
+- [R-Shop ProviderFactory 隱式初始化](FIX_LOGS.md)
+
+### `lib/services/source_failover.dart`
+- [R-Shop 來源備援](FIX_LOGS.md)
+- [備援接進同步](FIX_LOGS.md)
+- [使用中與顯示分家](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 同步路線解算](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+- [R-Shop 代理全域無縫同步與PR15提交](FIX_LOGS.md)
+
+### `lib/services/source_resolver.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+- [R-Shop 目前來源](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `lib/services/sources_notifier.dart`
+- [R-Shop 連線路由](FIX_LOGS.md)
+- [R-Shop 目前來源](FIX_LOGS.md)
+- [R-Shop 來源備援](FIX_LOGS.md)
+- [使用中與顯示分家](FIX_LOGS.md)
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `lib/widgets/console_dialog.dart`
+- [R-Shop analyze 六項](FIX_LOGS.md)
+
+### `lib/widgets/sync_badge.dart`
+- [同步不知道是哪一台](FIX_LOGS.md)
+- [R-Shop 來源群組](FIX_LOGS.md)
+- [R-Shop 代理全域無縫同步與PR15提交](FIX_LOGS.md)
+
+### `scripts/build_fix_by_file.py`
+- [R-Shop 反查不到](FIX_LOGS.md)
+
+### `test/active_source_test.dart`
+- [使用中與顯示分家](FIX_LOGS.md)
+
+### `test/database_service_merge_perf_test.dart`
+- [R-Shop 群組合併卡住](FIX_LOGS.md)
+
+### `test/database_service_routes_test.dart`
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+
+### `test/database_service_v15_migration_test.dart`
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+
+### `test/endpoint_probe_service_test.dart`
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `test/l10n_completeness_test.dart`
+- [R-Shop onboarding 五語系缺字串](FIX_LOGS.md)
+
+### `test/source_endpoint_test.dart`
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+
+### `test/source_failover_choice_test.dart`
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `test/source_failover_sync_test.dart`
+- [使用中與顯示分家](FIX_LOGS.md)
+- [R-Shop 同步路線解算](FIX_LOGS.md)
+- [R-Shop 備援架構重構](FIX_LOGS.md)
+
+### `test/source_resolver_test.dart`
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+
+### `test/sources_notifier_endpoints_test.dart`
+- [R-Shop 路線各自驗證](FIX_LOGS.md)
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+
+### `test/widgets/endpoint_picker_overlay_test.dart`
+- [R-Shop 自動選最優路線](FIX_LOGS.md)
+- [R-Shop 連線方式對齊群組](FIX_LOGS.md)
+
+### `test/widgets/sources_screen_test.dart`
+- [來源清單快捷鍵](FIX_LOGS.md)
+
+### `test/widgets/{endpoint_picker_overlay,group_picker_overlay}_test.dart`
+- [R-Shop 浮層操作形狀](FIX_LOGS.md)
+- [R-Shop 模式收成打勾](FIX_LOGS.md)
+
+### `test/{database_service_v16_migration,sources_notifier_groups,widgets/group_picker_overlay}_test.dart`
+- [R-Shop 來源群組](FIX_LOGS.md)
+
+---
+
+## 尚未指明檔案的條目
+
+這些條目沒有可反查的檔案。**多數是正確狀態**——環境診斷、部署作業、需求判定本來就沒有程式碼變更，`**檔案**` 欄寫的是「無程式碼變更」。
+
+只有標成「待補」的才是真的欠一份說明。
+
+- R-Shop 測試基準
+- R-Shop 實機重裝
+- R-Shop 自動選最快
+- R-Shop ƴsب^
+- R-Shop 來源停用快取
+- R-Shop QR碼手把導覽
+- R-Shop QR碼手把導覽
+- R-Shop 語系鎖定詞彙統一
+- R-Shop 主頁面移除來源切換
diff --git a/docs/FIX_INDEX.md b/docs/FIX_INDEX.md
new file mode 100644
index 0000000..af890a8
--- /dev/null
+++ b/docs/FIX_INDEX.md
@@ -0,0 +1,78 @@
+# R-Shop 解決方案索引
+
+> **導覽**：先讀共用的 [GLOBAL_DEV_NOTES.md](../../GLOBAL_DEV_NOTES.md)（建置工具鏈、分支政策、紀錄格式），
+> 再依需要讀本專案 `docs/` 的其餘各份：
+> - [ARCHITECTURE.md](ARCHITECTURE.md) — 模組分層與依賴方向
+> - [FIX_LOGS.md](FIX_LOGS.md) — 修復與功能紀錄（細節、取捨、教訓）
+> - [HANDOVER.md](HANDOVER.md) — **還沒做完的事、等實機確認的事**。「繼續任務」先讀這份
+> - [FIX_BY_FILE.md](FIX_BY_FILE.md) — **反查表：我要改這個檔，它身上以前發生過什麼**（自動產生）
+> - [SPEC.md](SPEC.md) — 規格；**§12 定位指引回答「我要改 X，該動哪些檔」**
+>
+> 會重複的作法收在 [`.agents/skills/`](../.agents/skills/)：
+> `rshop-build-deploy`（建置的三個陷阱）· `rshop-touch-and-gamepad`（**動 UI 之前一定先讀**）·
+> `rshop-source-routing`（來源／路由／備援的四條不變式）· `rshop-l10n`。
+> - [USER_GUIDE.md](USER_GUIDE.md) — 使用手冊
+
+
+> 關鍵字對應 [FIX_LOGS.md](FIX_LOGS.md) 的 `## [關鍵字]` 標題，**必須逐字一致**。
+> **不要在這裡寫死條目總數**——多個工作階段會同時追加，寫死的數字必定過時。
+> 要對帳就跑 `grep -c '^## \[' docs/FIX_LOGS.md`。
+
+## 🔌 來源與連線
+
+| 關鍵字 | 症狀 / 根因 | 主要動到的檔案 |
+| :--- | :--- | :--- |
+| **R-Shop 連線路由** ✨ | 同一台伺服器的遠端與區網兩條路，切的是位址不是來源。**每條路各自存一份清單**（schema v14） | `lib/models/config/source.dart`（`SourceEndpoint`／`resolveEndpoint`／`withLiveEndpoint`）· `lib/services/sources_notifier.dart`（路由增刪改） · `lib/services/endpoint_probe_service.dart` · `lib/services/database_service.dart`（v14 migration、`saveGamesByRoute`、`getGamesForRoutes`） · `lib/services/source_resolver.dart` · `lib/models/config/provider_config.dart`（`endpointId`） · `lib/features/sources/endpoint_picker_overlay.dart` · `lib/features/sources/endpoint_edit_screen.dart` |
+| **R-Shop 目前來源** ✨ | 兩個來源都啟用時會**兩個都抓再合併**，使用者無從得知在看哪一個 | `lib/models/config/app_config.dart`（`activeSourceId`） · `lib/services/source_resolver.dart`（`providersFor(activeSourceId:)`） · `lib/services/sources_notifier.dart`（`setActiveSource`） · `lib/features/home/home_view.dart`（標題列、L2/R2 切換） · `lib/features/settings/sources_screen.dart`（徽章） |
+| **R-Shop 來源備援** ✨ | 移除群組與連線路線，改採多組備援鏈與自動選擇 (Auto-Select) 探測模式。**備援來源可獨立顯示與切換** | `lib/models/config/source.dart`（`fallbackSourceIds`／`fallbackAutoSelect`） · `lib/services/source_failover.dart`（多組探測與併發 auto-select） · `lib/services/sources_notifier.dart`（備援鏈管理） · `lib/features/sources/fallback_picker_overlay.dart` |
+| **R-Shop 代理全域無縫同步與PR15提交** ✨ | 代理設定異動全域無縫同步，強化 `isFallback` 嚴格校驗，字串統一更名為代理，並成功提交 PR #15 | `lib/providers/app_providers.dart` · `lib/services/source_failover.dart` · `lib/features/settings/sources_screen.dart` · `lib/widgets/sync_badge.dart` |
+| **R-Shop Multi-Fallback實機驗證完成** ✨ | 多組備援與連線方式 UI 實機操作驗證全數通過，包含開關眼睛、打勾使用中、自動選擇探測與高對比白邊框 | `lib/features/settings/sources_screen.dart` · `lib/features/sources/fallback_picker_overlay.dart` · `docs/HANDOVER.md` |
+| **R-Shop 備援新建取消返回** | 從備援設定點「新建全新備援來源」後，取消或完成建立皆能復原/更新備援設定浮層而不致退回來源主清單 | `lib/features/settings/sources_screen.dart`（`_addingFallbackForSourceId`） · `test/widgets/sources_screen_test.dart` |
+| **同步不知道是哪一台** | 徽章只寫進度不寫來源；連線方式只能新增不能刪；提示用的是「同一台伺服器」這種**使用者判斷不了**的判準 | `lib/providers/app_providers.dart`（`syncingSourceProvider`，標題列與徽章共用） · `lib/widgets/sync_badge.dart`（`_withSource`） · `lib/features/home/home_view.dart`（`_resolveSyncTarget` 抽出，**修掉自動同步沒走備援解析的漏洞**） · `lib/features/sources/endpoint_picker_overlay.dart`（`[X]` 刪 `[Y]` 改） |
+| **備援接進同步** | 同步前先探測，連不上就換備援。**重建的是記憶體中的 config，磁碟不動**——所以偏好的來源會自己回來 | `lib/services/source_failover.dart`（`withEffectiveSource`／`resolveForSync`） · `lib/features/home/home_view.dart`（`_syncAll` 注入、`_fallbackInUse`、標題列橘色） · `lib/services/endpoint_probe_service.dart`（`_probeableEndpoints` 修復：**endpoints 為空時原本會靜默判定不可達**，而不可達正是觸發備援的條件） |
+| **連線方式共用憑證** ⚠️ | `auth` 掛在 `Source`，**路由沒有自己的憑證**。同一台伺服器的多位址共用一個 token 沒問題；**指向另一台會送錯 token 回 401，而錯誤看起來像伺服器掛了**。兩台不同伺服器要用「兩個來源 + 備援」 | `lib/models/config/source.dart`（`endpoints` 註解說明假設） · `lib/features/sources/endpoint_picker_overlay.dart`（提示） · `lib/l10n/app_*.arb`（`sources_routeSameServerHint`） |
+| **R-Shop 路線各自驗證** ✨ | 同一台伺服器的多個位址**各自需要登入**，但清單只有一份。`SourceEndpoint` 有自己的 `auth`，`Source.auth` 改為 getter；schema **v15** 唯一鍵拿掉 `endpoint_id`，v14 重複列去重 | `lib/models/config/source.dart` · `lib/services/sources_notifier.dart` · `lib/services/database_service.dart`（v15 遷移、`getGameCountsPerSource`／`deleteSourceCache`） · `test/database_service_v15_migration_test.dart` |
+| **R-Shop 自動選最優路線** ✨ | 探測改回**延遲並排序**，沒有覆寫就挑最快的；`pin` 語意改為「使用者覆寫」。浮層顯示延遲與自動會選誰，編輯頁補上路線自己的登入欄位（留空＝沿用來源的） | `lib/services/endpoint_probe_service.dart`（`ProbeResults`／`probeFor`） · `lib/models/config/source.dart`（`resolveEndpoint` 改吃排序清單） · `lib/services/sources_notifier.dart`（`autoSelectEndpoint`／`clearEndpointOverride`／bootstrap 離線對齊） · `lib/features/sources/endpoint_picker_overlay.dart` · `lib/features/sources/endpoint_edit_screen.dart` · `lib/l10n/app_*.arb` · `test/widgets/endpoint_picker_overlay_test.dart` |
+| **R-Shop 自動選最快** ⚠️ | 自動探測延遲挑最快的路線 —— 當初判定不做，**結論已被推翻並做掉了**，見 `R-Shop 自動選最優路線`。前提錯在把路線之間當成來源之間。不要照這條 | 無程式碼變更（需求判定） |
+| **AppID 衝突** | `applicationId` 與原廠主線一致，無法共存 | `android/app/build.gradle.kts` · Kotlin package 重構 |
+| **R-Shop Channel 名稱硬編** | 5 個 channel 名稱含 `applicationId`，Kotlin＋Dart 各自硬編共 20 處。**危險在靜默半合併** | `lib/services/platform_channels.dart`（新增，單一前綴） · `android/app/src/main/kotlin/.../MainActivity.kt`（`BuildConfig.APPLICATION_ID`） · `android/app/build.gradle.kts`（`buildFeatures.buildConfig = true`） · `native_smb_service` / `download_service` / `disk_space_service` / `device_info_service` |
+| **R-Shop ProviderFactory 隱式初始化** | 文件稱「未 init 就崩」，查證後**生產不可達**，是契約缺陷 | `lib/services/provider_factory.dart`（具名 `StateError` + `@visibleForTesting reset()`） |
+
+## 🎮 輸入與焦點
+
+| 關鍵字 | 症狀 / 根因 | 主要動到的檔案 |
+| :--- | :--- | :--- |
+| **使用中與顯示分家** ⚠️ | ① `??=` 種值表達不了「刻意是 null」，取消要按兩次。② **使用中**（同步＋預設顯示，`primarySourceId`）與**顯示**（主畫面 L2/R2，`activeSourceId`）拆成兩件事；同步改讀 primary。舊設定檔靠 `?? activeSourceId` 回填，無遷移。③ 兩個都放進來源清單：**眼睛＝開／關（`L1`，就是 `enabled`）、打勾＝使用中（`[X]`）**，兩個功能不共用圖示。**曾經多做一個 `Source.showOnHome` 是錯的，已收回** |
+| **進場多一列空白** ⚠️ | `rs.safeAreaTop` **在沉浸模式下不是常數**——第一幀有、之後沒有。同一成因犯兩次：橫幅的 `SafeArea`、格線的 `top: rs.safeAreaTop + 40.0` | `lib/features/home/widgets/home_grid_view.dart` · `lib/features/home/home_view.dart` |
+| **環裡多一個 A+B** | L2/R2 的環原本含「全部來源」那格，兩台就走成 A → B → A+B。拿掉該格，並在 bootstrap 正規化：開著的來源超過一個而沒選過時落在 `primarySourceId ?? 第一個` | `lib/features/home/home_view.dart`（`_cycleActiveSource`、橫幅） · `lib/services/sources_notifier.dart`（bootstrap 正規化） |
+| **建置部署腳本** | 同一串指令重複手打，容易漏掉 JDK 檢查那步 | `scripts/deploy.ps1`（驗 JDK → analyze → build → install → 啟動 → 抓 logcat） |
+| **R-Shop 來源停用快取** ✨ | 停用來源時（`setEnabled(id, false)`）不再呼叫 `_purgeCachedGamesFor`，消除在主執行緒上對數千筆遊戲進行檔案 `existsSync` 檢查與單筆 SQL 刪除所導致的凍結與 Lag | `lib/services/sources_notifier.dart`（`setEnabled`） · `test/sources_notifier_test.dart` |
+| **切換來源會 lag** ⚠️ | ① 標籤讀 `bootstrappedConfigProvider`，`invalidate` 後**在重新讀檔完成前 `valueOrNull` 還是舊值**。解：`SourcesState` 鏡像兩個 id。② `setEnabled(false)` 同步等清快取（每筆 `File.existsSync`），改 `unawaited` | `lib/services/sources_notifier.dart`（`SourcesState.primarySourceId`／`activeSourceId`、`setEnabled` 的 `unawaited`） · `lib/features/settings/sources_screen.dart` |
+| **焦點白框貼著字** | `ConsoleFocusable` 的白框緊貼 child；child 自己有邊框時兩條線差幾像素，像畫錯 | `lib/features/onboarding/widgets/ra_onboarding_screen.dart`（`_textBox` 加內距與較大 `borderRadius`） | `lib/models/config/app_config.dart`（`primarySourceId`） · `lib/services/sources_notifier.dart`（`setPrimarySource`） · `lib/services/source_failover.dart`（`resolveForSync`） · `lib/features/settings/sources_screen.dart` · `lib/features/home/home_view.dart` |
+| **來源清單快捷鍵** ✨ | 停用／移除／目前顯示原本都得先開選單。綁 `[X]`／`L1`／`R1`，**L1/R1 是從全域的格線欄數搶過來的**，且**必須用 `overlayPriorityProvider` 擋浮層**（沒有東西處理 L1/R1，會作用在看不見的卡上）。移除補了確認框 | `lib/features/settings/sources_screen.dart`（`_SourceShortcutIntent`／`_focusedSourceId`／`_confirmRemoveSource`／`_buildHud`） · `lib/l10n/app_*.arb` · `test/widgets/sources_screen_test.dart` |
+| **黃色條與雙入口** ⚠️ | 那條黃黑斜紋是 `RenderFlex` **版面溢位警示**不是功能；把功能從選單列搬到圖示上會**弄丟手把入口**（圖示預設只有觸控） | `lib/features/settings/sources_screen.dart`（選單改 `SingleChildScrollView`、卡片列與標頭各加一個眼睛） |
+| **標頭高度與誤讀的按鍵字** | 圖示旁的裸字母 `X` 被讀成關閉鈕；沉浸模式在 `initState` 才切，**第一幀還有狀態列 inset**，包了 `SafeArea` 的標題列會進場高一列再縮回去 | `lib/features/settings/sources_screen.dart` · `lib/features/home/home_view.dart`（`_buildSourceBanner` 拿掉 `SafeArea`） |
+| **R-Shop QR碼手把導覽** ✨ | `QrPairingScreen` 掃碼頁加入搖桿/D-pad 焦點切換邏輯與初始化 Focus，支援手把切換至返回按鈕與手動輸入按鈕及底部 ConsoleHud | `lib/features/pairing/qr_pairing_screen.dart` · `test/widgets/qr_pairing_screen_test.dart` |
+| **R-Shop 主頁面移除來源切換** ✨ | 主頁面移除頂部來源條與 L2/R2 來源切換快捷鍵及 HUD 提示，改由來源清單統一管理主要與備援來源 | `lib/features/home/home_view.dart` |
+| **R-Shop 來源與備援邊框與高對比風格** ✨ | 來源設置與備援設定浮層統一採用清晰全列白邊框 (Colors.white24 / Colors.white) 與純白高對比文字 | `lib/features/settings/sources_screen.dart` · `lib/features/sources/fallback_picker_overlay.dart` |
+| **R-Shop 網格卡片版面溢位修復** ✨ | 主畫面縮小網格（欄數增加，卡片變窄）且遊戲數量達到數萬個時，卡片標籤 Row 未限制寬度觸發 OVERFLOWED BY 5.4 PIXELS 溢位警示條。修復：包裹 FittedBox(fit: BoxFit.scaleDown) 自動適應寬度 | `lib/features/home/widgets/home_grid_view.dart` |
+
+## 🛠️ 建置與環境
+
+| 關鍵字 | 症狀 / 根因 | 主要動到的檔案 |
+| :--- | :--- | :--- |
+| **R-Shop 建置 JDK 不相容** ⚠️ | Gradle 8.14 解析不了 Java 25（Android Studio 的 `jbr`），只吐一行 `25.0.2`，**極易誤判成 NDK 缺失** | 無程式碼變更。`flutter config --jdk-dir` + `gradlew --stop` |
+| **R-Shop 建置環境失聯** ⚠️ | 文件的 `D:\flutter` 是上一台機器的，本機從未裝過 | `AGENTS.md §5`（加註警告） |
+| **R-Shop 測試基準** | `flutter test` 的 7 個既有環境失敗**不是回歸** | 無程式碼變更。診斷方法紀錄 |
+| **R-Shop 實機重裝** | 裝置上是別台機器建的 **release** 版，debug 版覆蓋不上且資料備不出來 | 無程式碼變更。`run-as` 判斷法 |
+| **R-Shop onboarding 五語系缺字串** | `DE has all EN keys` 長期紅——**是真的缺三個 onboarding 字串**（de/es/fr/ja/pt），不是環境問題。缺字串不會讓建置失敗，會出貨成空白 | `lib/l10n/app_{de,es,fr,ja,pt}.arb` · `test/l10n_completeness_test.dart` |
+| **R-Shop 語系鎖定詞彙統一** ✨ | 多語系（de/es/ja/pt）「已鎖定/Locked」相關詞彙統一與 `app_ja.arb` 格式整理 | `lib/l10n/app_{de,es,ja,pt}.arb` · `lib/l10n/app_localizations_{de,es,ja,pt}.dart` |
+| **R-Shop analyze 六項** | 累積的 6 個 analyze 問題（未用 import／未用區域變數／`cacheExtent` 已棄用）。`cacheExtent` 要換 `ScrollCacheExtent.pixels()` 而非 `.viewport()`，**單位不同** | `lib/features/game_list/widgets/game_grid.dart` · `lib/features/library/library_screen.dart` · `lib/widgets/console_dialog.dart` · `lib/features/onboarding/widgets/{romm_legacy_login_screen,welcome_chooser_step}.dart` · `lib/features/sources/manual_source_add_screen.dart` |
+| **R-Shop 反查不到** | `build_fix_by_file.py` 報的 `entries without paths` **不是待辦**——沒動到檔的紀錄在反查表上無處可去，數字只會隨這類紀錄往上走 | `scripts/build_fix_by_file.py`（改掉誤導的說明字串） |
+
+---
+
+## 維護規則
+
+新增 `FIX_LOGS.md` 條目後，**同一次操作內**在上表補一列。
+「主要動到的檔案」是這份索引的重點——下次要改同一塊，看這欄就知道去哪，不必重新搜尋。
diff --git a/docs/FIX_LOGS.md b/docs/FIX_LOGS.md
new file mode 100644
index 0000000..7b3e830
--- /dev/null
+++ b/docs/FIX_LOGS.md
@@ -0,0 +1,829 @@
+# R-Shop 修復與功能紀錄
+
+> **導覽**：先讀共用的 [GLOBAL_DEV_NOTES.md](../../GLOBAL_DEV_NOTES.md)（建置工具鏈、分支政策、紀錄格式），
+> 再依需要讀本專案 `docs/` 的其餘各份：
+> - [ARCHITECTURE.md](ARCHITECTURE.md) — 模組分層與依賴方向
+> - [FIX_INDEX.md](FIX_INDEX.md) — 症狀 → 過去解過的條目
+> - [SPEC.md](SPEC.md) — 規格；**§12 定位指引回答「我要改 X，該動哪些檔」**
+> - [USER_GUIDE.md](USER_GUIDE.md) — 使用手冊
+
+
+> 本專案自己的詳細紀錄。關鍵字索引見 [FIX_INDEX.md](FIX_INDEX.md)。
+> 跨專案／全域的問題仍記在 `D:\ThorAPK\StudioProjects\FIX_LOGS.md`。
+
+## 寫入格式
+
+每條**必須**有 `**檔案**` 欄位，列出這次實際改動的檔案與位置。
+那是下次要改同一塊時最需要的資訊——有它就不必重新搜尋整個專案。
+
+    ## [關鍵字] 一句話講清楚症狀
+    
+    - **檔案**：`lib/services/foo.dart:120-160`（做了什麼）
+               `lib/models/bar.dart`（新增欄位 X）
+    - **現象** / **根因** / **解** / **驗證** / **教訓** / **Commit**
+
+新增條目後，**同一次操作內**補 [FIX_INDEX.md](FIX_INDEX.md)（關鍵字須與 `## [關鍵字]` 逐字一致）。
+一律用**追加**，不要讀全檔再寫回——多個工作階段可能同時在寫。
+
+---
+
+## [AppID 衝突] R-Shop: 無法與原版共存
+- **原因**：`applicationId` 與原廠主線一致。
+- **解法**：修改 ID 為 `com.retro.rshop.tw` 並執行 Kotlin Package 重構。
+- **檔案**：`android/app/build.gradle.kts` · `android/app/src/main/kotlin/com/retro/rshop/tw/MainActivity.kt`（package 重構）
+
+---
+
+
+## [R-Shop 建置環境失聯] R-Shop: 文件寫的 Flutter SDK 路徑在這台機器上根本不存在
+
+- **現象**：準備驗證 R-Shop 的改動時，`D:\flutter\bin\flutter.bat` 不存在。全碟遞迴搜尋（`C:` 與 `D:`，深度 6）**零命中**，`flutter` / `dart` 也不在 PATH。
+- **根因**：`SKILLS.md` 與 R-Shop 舊 `AGENT.md` 的建置環境是從**上一台機器**（`C:\Users\Mini-PC\...` 時代）繼承來的。目前這台是使用者 `Guset` 的機器，從來沒裝過 Flutter。佐證：R-Shop 的 `.dart_tool\`、`pubspec.lock`、`build\` **全都不存在**——這個工作副本從未解析過相依套件。
+- **危險之處**：兩個子代理都照文件跑 `D:\flutter\bin\flutter.bat`，都失敗。**若當時把「照著跑了」當成「驗證過了」，整批未編譯的程式碼就會被當成已驗證交出去。**
+- **解**：安裝 Flutter stable **3.44.8 / Dart 3.12.2**（官方 `storage.googleapis.com/flutter_infra_release`，1813 MB，解壓至 `D:\flutter`）。專案要求 `sdk: '>=3.0.0 <4.0.0'`，符合。
+- **連帶踩到的兩個環境坑**：
+  - `flutter pub get` 相依解析成功（142 個套件）但最後失敗於 `Building with plugins requires symlink support` —— Windows 需啟用**開發人員模式**。只擋 Android 建置，**不擋 `analyze` 與 `test`**（`.dart_tool\package_config.json` 已產生）。
+  - PowerShell 5.1 的 `Invoke-WebRequest` 預設用 IE 解析引擎，在 NonInteractive 下會直接拋「無法提示」而不是網路錯誤。加 `-UseBasicParsing`。
+- **教訓**：**環境路徑屬於「每台機器不同」的事實，不該只寫在跟著 repo 走的文件裡。** 已在 R-Shop `AGENTS.md §5` 加註警告，並明令「不要回報你沒真的拿到的 `flutter analyze` / `flutter test` 結果，就說被擋住了」。
+- **檔案**：無程式碼變更。`AGENTS.md` §5（加註路徑警告）· `.agents/skills/rshop-build-deploy/SKILL.md`（現行工具鏈）
+- **Commit**：未提交（環境設定，非程式碼變更）
+
+
+## [R-Shop 測試基準] R-Shop: 完整測試有 8 個失敗，其中 7 個是既有環境問題、1 個是隨機不穩定
+
+- **現象**：`flutter test` 跑出 1652 通過 / 8 失敗。乍看像是改壞了東西。
+- **查證方法**（重點在方法，不在結論）：先 `git stash push -u` 退回乾淨 HEAD 跑**完整**測試取得基準，再還原比對。**第一次只跑 5 個檔想省時間，結果不可比**——完整跑是 77 個檔平行執行，負載完全不同，差異全是假的。
+- **結果**：乾淨 HEAD 也是 **8 個失敗**。其中 **7 個兩邊完全相同**：
+  | 失敗 | 性質 |
+  |---|---|
+  | `l10n_completeness: DE has all EN keys` | 德文真的缺 3 個 key（`onboarding_folderExplanation*`、`onboarding_continueToPicker`）|
+  | `network_discovery: mDNS` | Windows socket `errno = 10042`（`joinMulticast` 不受支援）|
+  | `rom_folder_service` ×3 | 測試期望檔名，服務回傳完整路徑——Windows 路徑行為 |
+  | `romm_pairing_live_smoke` ×2 | 標了 `live` tag，需要真的有 RomM 跑在 `localhost:8090` |
+- **第 8 個每次不一樣**：基準跑出 `config_storage: AsyncLock save during load does not deadlock`，含改動那次跑出 `game_list_controller: Filter persistence restoreFilters`。**兩者單獨執行都通過**（隔離跑 234 個測試全綠），都是時序敏感型 → 平行負載下的既有不穩定測試。
+- **教訓**：**比對基準時，執行條件必須一致**。測試數量、平行度、機器負載任一不同，得到的差異就沒有意義。另外「失敗總數相同」還不夠——要逐項比對名稱，否則會漏掉「一個修好、一個弄壞」互相抵銷的情況。
+- **檔案**：無程式碼變更（診斷方法紀錄）
+- **Commit**：未提交（診斷紀錄）
+
+
+## [R-Shop Channel 名稱硬編] R-Shop: 5 個 platform channel 名稱散在 20 處，合併 upstream 會靜默半套
+
+- **現象**：無人回報。盤點 R-Shop 已知問題時發現。
+- **根因**：5 個 platform channel（`/zip`、`/zip_progress`、`/storage`、`/smb`、`/smb_progress`）的完整名稱含 `applicationId`，在 Kotlin 與 Dart 兩側**各自硬編**，共 20 處（Kotlin 5 + Dart 6 + 測試 9）。本分支是 `com.retro.rshop.tw`，upstream `main` 是 `com.retro.rshop`。
+- **真正的危險不是衝突，是靜默半合併**：若合併時採用 upstream 的 Kotlin 卻保留本地的 Dart，**編譯完全通過**，但執行期所有 `invokeMethod` 拋 `MissingPluginException`（SMB／解壓／儲存空間全掛）。而 `native_smb_service.dart:61-63` 把 `PlatformException` 吞成 `(success: false, error: ...)`，錯誤會偽裝成「連線失敗」，極難定位。Kotlin 檔還位於 `.../kotlin/com/retro/rshop/tw/` 目錄下，git 多半判為 add/add 而非修改，3-way merge 直接失效。
+- **解**：Dart 側新增 `lib/services/platform_channels.dart`（單一 `kChannelPrefix` + 五個具名常數）；Kotlin 側 `MainActivity.kt:19-32` 改用 `BuildConfig.APPLICATION_ID` 組出前綴。**執行期字串值完全未變**，是純重構。
+- **必要的連帶改動**：AGP 8.11.1 預設關閉 BuildConfig，`android/app/build.gradle.kts` 必須加 `buildFeatures { buildConfig = true }`，否則編不過。
+- **成果**：全 repo 的 `'com.retro.rshop...'` 字面值從 **20 處降到 1 處**。
+- **實機驗證** ✅：`flutter build apk --debug` 成功（202.4 MB，exit 0），安裝到 AYN Thor 啟動正常，logcat **無 `MissingPluginException`**——這正是本條最該驗的一項，代表 Kotlin 與 Dart 兩側名稱仍然對得上。
+- **教訓**：`analyze` 與 `test` **碰不到 Kotlin 與 Gradle**。這類改動只有 `flutter build apk` 會驗到——單元測試全綠不代表這條改動是對的。**而這次差點驗不成**：建置一開始因 JDK 版本問題失敗，見 `[R-Shop 建置 JDK 不相容]`。
+- **檔案**：`lib/services/platform_channels.dart`（新增）· `android/app/src/main/kotlin/com/retro/rshop/tw/MainActivity.kt` · `android/app/build.gradle.kts`（`buildFeatures.buildConfig`）· `lib/services/native_smb_service.dart` · `lib/services/download_service.dart` · `lib/services/disk_space_service.dart` · `lib/services/device_info_service.dart`
+- **Commit**：未提交
+
+
+## [R-Shop ProviderFactory 隱式初始化] R-Shop: 未 init 就取 SMB provider 只拋裸的 null assertion
+
+- **現象**：文件（`docs/SPEC.md`）長期記載「`SmbProvider` 依賴 `_smbService!`，未 `init()` 就會崩」。
+- **查證後的定性修正**：**生產流程實務上不可達**。全 App 只有一個進入點，`main.dart:87` 的 `ProviderFactory.init()` 在 `runApp()` **之前**，所以任何 UI 觸發的 `getProvider` 必定在其後；唯一另一個 `@pragma('vm:entry-point')`（下載前景服務）的 handler 三個回呼全是空實作，不碰 ProviderFactory。所以這是**契約缺陷**（隱式初始化順序依賴 + static 狀態無法重設），不是現行 crash。**測試層面才真的可達**。
+- **解**：`_smbService == null` 時丟具名 `StateError`，訊息點名 `ProviderFactory.init(smbService:)` 且說明正常應在 `main()` 的 `runApp()` 之前。新增 `@visibleForTesting reset()` 讓測試能重設 static 狀態，並補測試驗證訊息可辨識、以及未初始化時 `web` provider 仍正常。**未改建構式簽章**——改成注入式會牽動 4 個呼叫端。
+- **教訓**：文件把一個缺陷寫成「會崩」，實際查證後是「不可達但脆弱」。**定性錯誤會影響修法選擇**：若真的會崩，該做的是改建構式注入；既然只是契約問題，加一個好訊息的 `StateError` 就夠，改動面小得多。
+- **檔案**：`lib/services/provider_factory.dart`
+- **Commit**：未提交
+
+
+## [R-Shop 連線路由] R-Shop: 同一台伺服器的遠端與區網兩條路，切的是位址不是來源 ✨ 功能新增（非修復）
+
+> ⚠️ **進度：模型層與 `SourcesNotifier` 已完成並驗證（42 個測試全通過）。探測服務、切換器 UI 與位址編輯畫面尚未動工。**
+
+- **需求**：使用者有一台 RomM，同時從遠端與區網登入，想在兩種連線方式之間切換，而且「一次顯示一個，不要兩個疊在一起」，其他來源型別（SMB/FTP/Web）也要能這樣切。
+- **三次修正需求理解的過程**（值得記著，我連錯兩次）：
+  1. 先理解成「多個來源的全域篩選器」→ 錯，使用者要的是連線方式不是來源。
+  2. 再理解成「兩個 Source 互斥切換」→ 也錯，那會讓同一台伺服器的同一批遊戲存兩份、合併去重後看不出走哪條線。
+  3. 正解：**一個 Source 帶多個連線位址（endpoint），一次只有一個生效**。
+- **關鍵設計決定**：頂層連線欄位（`url`/`host`/`port`/`share`）**就是「目前生效的路由」**，`endpoints` 只是候選清單。因此 `SourceResolver`、`connectionKey`、`hostLabel`、`ProviderFactory`、四個 provider **一行都不用改**——切換只是把選中位址寫回頂層欄位。
+- **不需要設定檔遷移**：`Source.id` 不變，`fromJson` 在沒有 `endpoints` 鍵時自動從舊欄位補出第一條路由（id 為 `primary`），舊設定檔直接可用。
+- **但需要資料庫改動（v13→v14）** —— 這點我來回搞錯兩次，值得記著：
+  - 我先假設「同一台伺服器＝同一份遊戲資料」，據此宣稱不必動 DB。
+  - 使用者否決：「你想把遠端查的清單跟數量與在家區網查到的當作同一份看啊，不用這樣啊」「就是遠端清單改成區網清單而已」。**要的是每條路由各自留一份清單與數量，切過去就看那條路自己查到的東西。**
+  - 教訓：「同一台伺服器」是我的推論，不是需求。使用者要的是**能分別看見每條路的結果**，那本來就不可能靠共用一份資料達成。
+- **選路規則**（`resolveEndpoint()`，純函式，`reachable` 由呼叫端探測後傳入）：
+  - `pinned`：使用者的選擇**絕對優先，就算連不上也不改道**。鎖定的意義正是「不要自己跑掉」，讓同步噴出真正的連線錯誤比較誠實。
+  - `auto`：取清單順序中第一個通的。清單順序即偏好順序，把區網放前面，「在家快、在外通」就自然成立。
+  - `auto` 且全都不通：回傳**第一條**而非 null——回 null 會讓同步靜靜地什麼都不做。
+  - pin 指向已刪除的路由：退回 auto，不卡死。
+- **切換時刻意保留**：帳密（兩條路通往同一台伺服器，共用同一組帳號，每次切換都要重新登入毫無意義）、`knownPlatforms`、`Source.id`。
+- **`SourcesNotifier` 層**（`switchEndpoint` / `setEndpointSelection` / `addEndpoint` / `updateEndpoint` / `removeEndpoint`）：全部走 `updateSource`，因此**永遠不碰 `_purgeCachedGamesFor`**。這是本功能最關鍵的不變量——若切換路由會清快取，每次切換就等於一次完整重新同步，功能本身就沒意義了。專案裡 `setEnabled(false)` 與 `removeSource` **會**清快取，兩者語意必須分乾淨。
+  - 邊界決定（各有測試）：**拒絕刪除最後一條路由**（沒有路由的來源等於沒有位址）；刪掉正在用的那條由第一條遞補；刪掉被鎖定的那條則清 pin 並退回 auto，不留懸空指標；**重複位址拒絕新增**（忽略標籤，`http://h:1/` 與 `http://h:1` 視為同一個，否則 `liveEndpoint` 會變成任意選一個）；編輯正在用的那條立即生效，編輯待命的那條不動現行連線；`setEndpointSelection(pinned)` 在還沒選過時鎖定**目前正在用的**那條（使用者看到什麼就是什麼意思）。
+- **每條路由各自存清單（schema v14）**：`games` 加 `source_id` / `endpoint_id`，唯一索引由 `(systemSlug, filename)` 改成 `(systemSlug, filename, source_id, endpoint_id)`。
+  - **兩欄是 `NOT NULL DEFAULT ''` 而非可為 null** —— SQLite 的 UNIQUE 索引把 NULL 視為互異，用 null 會讓本機掃描悄悄失去去重。本機檔案存在 `''`/`''` 這個「無路由」桶，因為它們本來就不屬於任何路由。
+  - **孤兒刪除縮到路由範圍**：不改的話，區網同步會把遠端那條路的整份資料當孤兒刪光。
+  - **cascade 要先確認沒有別的路由還列著該檔**：`game_metadata` / `ra_matches` 的鍵是 `(system, filename)`，沒有路由維度；區網刪掉一款就連帶清掉封面與 RA 進度，而遠端那份還在顯示它。
+  - migration 用 `json_extract` 從 `provider_config` 回填 `source_id`（該鍵一直都在），`endpoint_id` 補成 `primary`，對應 `Source.fromJson` 自動補出的那條路由 → **既有資料不會消失**。
+  - 順帶解決舊有的「依來源查詢只能 `LIKE '%\"source_id\":\"x\"%'` 掃全表」問題，現在是索引查詢。
+- **接線**：`ProviderConfig` 加 `endpointId`；`SourceResolver` 五處填入 `source.liveEndpoint?.id`；新增 `DatabaseService.saveGamesByRoute()` 依每個 `GameItem` 自己的 `providerConfig` 分組存檔（**呼叫端不必知道路由**，15 個呼叫點只換方法名）；`getGamesForRoutes()` 讓遊戲清單只讀「這個系統目前生效的那些路由 + 本機桶」。
+- **UI**：`EndpointPickerOverlay`（動作選單 → 連線方式）顯示自動／各路由／可達狀態／新增；`EndpointEditScreen` 輸入標籤與位址。七語系各補 13 個字串。切換器**開啟時停在目前生效的那條**（誤按 A 是無操作）、**每次開啟重新探測不吃快取**（會打開它就是想知道現在哪條通）。
+- **測試**：`source_endpoint_test` 21 ＋ `sources_notifier_endpoints_test` 21（注入 `_SpyDb` 斷言 **switch/add/remove 皆不 purge、`setEnabled(false)` 仍 purge**）＋ `endpoint_probe_service_test` 19 ＋ `database_service_routes_test` 14（含 **「區網同步絕不刪掉遠端那條路」** 與 cascade 保護）。合計 75 個，全通過；完整套件 1693→ 僅剩 7 個既有環境失敗，**零回歸**。
+- **教訓**：**需求裡的「切換來源」有歧義，而不同解讀導致的架構完全不同**（一個要動資料庫 schema，一個完全不用）。連錯兩次的共同原因是我拿使用者的詞去對映系統既有的概念（Source），而不是先問「你要切的到底是什麼」。
+- **檔案**：`lib/models/config/source.dart` · `lib/services/sources_notifier.dart` · `lib/services/endpoint_probe_service.dart` · `lib/services/database_service.dart`（v14 migration）· `lib/services/source_resolver.dart` · `lib/models/config/provider_config.dart` · `lib/features/sources/endpoint_picker_overlay.dart` · `lib/features/sources/endpoint_edit_screen.dart`
+- **Commit**：未提交
+
+
+## [R-Shop 建置 JDK 不相容] R-Shop: Gradle 8.14 看不懂 Java 25，只吐一行「25.0.2」
+
+- **現象**：`flutter build apk --debug` 失敗，Gradle 的 `* What went wrong:` 底下**只有一行 `25.0.2`**，沒有任何其他訊息。
+- **誤判過程**（值得記著）：`25.0.2` 看起來像版本號，而 SDK 底下確實**沒有 `ndk` 目錄**，所以我第一時間判定是「NDK 未安裝」。**錯的。** 真正的堆疊要加 `--stacktrace` 才看得到：
+  ```
+  java.lang.IllegalArgumentException: 25.0.2
+      at ...intellij.util.lang.JavaVersion.parse(JavaVersion.java:307)
+      at ...JavaVersion.current()
+      at ...KotlinCoreEnvironment.<init>
+  ```
+  `25.0.2` 是 **JDK 版本**——Android Studio 的 `jbr` 是 Java 25，而 Gradle 8.14 內嵌的 Kotlin DSL 編譯器在解析自己執行環境的 Java 版本時就拋例外，連 `build.gradle.kts` 都還沒編譯完。
+- **第二個坑：改 `JAVA_HOME` 沒用。** 設成 JDK 21 後**還是報 25.0.2，而且只跑 1 秒**。原因有二：(a) Flutter 挑 JDK 的優先序是 **`flutter config --jdk-dir` ＞ Android Studio 的 JBR ＞ `JAVA_HOME`**，JBR 蓋過了環境變數；(b) 舊的 Gradle daemon 仍跑在 Java 25 上被重用。「1 秒就結束」正是重用 daemon 的特徵。
+- **解**：`flutter config --jdk-dir="C:\Program Files\Java\jdk-21"` ＋ `gradlew --stop`。之後建置一路通過（936 秒，途中 Gradle **自動補裝** NDK 28.2.13676358 與 23.1.7779620、SDK Platform 36、CMake 3.22.1——**不需要 cmdline-tools／sdkmanager**，Gradle 有自己的下載器）。
+- **不影響 megingiard**：它是 Gradle 9.3.1 且 `gradle/gradle-daemon-jvm.properties` 釘了 `toolchainVersion=21`，由 Gradle 自行挑 JVM，**`JAVA_HOME` 對它根本無效**。所以同一條「JAVA_HOME 設 jbr」的舊指令對 megingiard 無害、對 R-Shop 致命。**兩套機制不要互相照抄。**
+- **教訓**：Gradle 把例外訊息當成 `What went wrong` 的全部內容時（只有一個裸值、沒有句子），**先加 `--stacktrace`**，不要照那個值的「長相」去猜它是什麼。
+- **檔案**：無程式碼變更。`.agents/skills/rshop-build-deploy/SKILL.md`（Step 0 的檢查步驟）
+- **Commit**：未提交（環境設定）
+
+
+## [R-Shop 實機重裝] R-Shop: 舊版是 release 簽章，debug 版覆蓋不上且資料備不出來
+
+- **現象**：新建的 debug APK 無法 `adb install -r` 覆蓋裝置上的 `com.retro.rshop.tw`。
+- **根因**：兩者簽章不同——裝置上是 `1dbe6fec…`，新版是 `cf35438e…`。追查後發現裝置上那份是**上一台機器建的 release 版**（`run-as` 回 `package not debuggable`），而本機**沒有 `android/key.properties`**，所以現在只能產 debug 簽章。
+- **資料無法備份**：`run-as` 因非 debuggable 被拒；`adb backup` 也不行——`dumpsys` 的 `flags` 裡沒有 `ALLOW_BACKUP`。兩條路都堵死，**使用者確認可接受後才移除**。
+- **實際損失與倖存**：
+  - ❌ 消失：app 內部資料（`config.json` 的 RomM 來源與 token、遊戲庫 DB、縮圖快取）
+  - ✅ 倖存：`/storage/emulated/0/ROMs` **19 GB / 253 檔 / 22 個主機資料夾**——移除 app 不影響外部儲存
+  - ✅ 保留：移除前已把舊的 release APK 拉下來存到 `D:	est-apk\R-Shop-v1.7.0-zh-RELEASE-舊機簽章.apk`（99.7 MB），要回舊版可用
+- **教訓**：**動裝置上的 app 之前先確認它是哪種簽章**。`run-as` 能不能用就是最快的判斷——不能用代表是 release 版，那麼資料多半也備不出來（release 通常關掉 `allowBackup`）。這個判斷要在**移除之前**做，不是之後。
+- **檔案**：無程式碼變更（`run-as` 判斷法）
+- **Commit**：未提交（部署作業）
+
+
+## [R-Shop 目前來源] R-Shop: 兩個來源都啟用時會合併同步，使用者無從得知現在看的是哪一個 ✨ 功能新增（非修復）
+
+- **現象**：使用者設了兩個 RomM 來源（`Thor localhost` = 區網 IP、`Thor out` = DDNS），回報「我要怎麼判斷目前同步的是哪一個來源，我一次只會同步也只會看一個，沒看到切換跟顯示」。
+- **查證**：用 `adb exec-out run-as … cat config.json` **直接讀實機設定**（此版是 debug 建置，`run-as` 可用），確認是**兩個獨立 Source**、各自只有一條自動回填的 `primary` 路由、且**兩個都 `enabled: true`**。
+- **根因**：R-Shop 的既有行為是「所有啟用的來源都抓，然後用 `UnifiedGameService._fetchMerged` 合併，優先序高的贏」。所以使用者不只是「看不出是哪一個」，而是**兩個都在同步、清單是混合的**。而唯一的控制手段 `setEnabled(false)` **會 purge 快取**，切回來要重新同步。
+- **這是我第四次修正需求範圍**，前三次見 `[R-Shop 連線路由]`。決定性的一句是使用者說的「**就算是同一台，我也要當不同台**」——來源一律各自獨立，與背後是不是同一台伺服器無關。**這是他的模型，不是可以從 URL 推論的東西**（那兩個網址同為 9080 埠，我原本推論是同一台，且推論正確，但無關緊要）。
+- **解**：`AppConfig.activeSourceId`（null＝全部，維持既有行為）。`SourceResolver.providersFor()` 加 `activeSourceId` 過濾 → **同步與清單一次跟上**，因為兩者都是讀 `system.providers`。
+  - **切換絕不 purge**：走 `_writeAndPublish` 重建 providers，不碰 `_purgeCachedGamesFor`。因為先前已做 per-route 分開存（見 `[R-Shop 連線路由]`），另一個來源的遊戲仍在 DB，切回去立即可見。`setEnabled(false)` / `removeSource` 仍會 purge，語意分開且各有測試。
+  - **未知 id 退回「顯示全部」而非空清單**：來源被刪掉時若還被選著，不能讓使用者得到一個空的遊戲庫。
+  - **停用勝過選中**：已關閉的來源即使是 active 也不參與。
+- **UI**：來源卡片加綠色「目前顯示」徽章（否則這件事完全不可見）；`[A]` 動作加「只看這個來源／顯示全部來源」。七語系各補 4 個字串。
+- **測試**：`test/active_source_test.dart` 13 個，含 `NEVER purges — switching back must be instant, not a re-sync`、`but disabling a source still purges it`、未知 id、停用勝過選中、重載後保留。完整套件 1720 通過 / 7 個既有環境失敗，**零回歸**。
+- **教訓**：**使用者說「切換」時，先確認他實際在 UI 上建了什麼**。這次直接讀實機 `config.json` 一眼就看出我做的功能在錯的層級——比再問一輪快，也比猜可靠。debug 建置的 `run-as` 就是這個能力的來源。
+- **檔案**：`lib/models/config/app_config.dart` · `lib/services/source_resolver.dart` · `lib/services/sources_notifier.dart` · `lib/features/home/home_view.dart` · `lib/features/settings/sources_screen.dart`
+- **Commit**：未提交
+
+---
+
+
+## [R-Shop 來源備援] R-Shop: 內外網兩台伺服器互為備援，連不上就換 ✨ 功能新增（非修復）
+
+> ⚠️ **進度：模型／選路邏輯／指派 UI 已完成並驗證。接同步流程尚未動工**——所以現在設得起來、看得到，但還不會作用。
+
+- **需求**：使用者有兩台 RomM（Thor localhost 內網、Thor out 外網 DDNS），要求「增加一個關聯性」「timeout 後切換另一個來源」，並明確表示「**至少要能指派一個備援就好**」。
+- **關鍵決定：備援是暫時代打，不是改變偏好。** `Source.fallbackSourceId` 只記「誰來頂」，`AppConfig.activeSourceId`（使用者選的偏好）**完全不動**。
+  - 理由：使用者選的是「我要用內網那台」。人在外面連不上而改用外網是**當下的權宜**；若永久切過去，回到家還得手動切回來。不動偏好，回家再同步時內網通了就自動用回內網。
+  - 畫面仍看得出來：標題列會標示正在用備援，不會讓人誤以為在用內網。
+- **四個邊界（各有測試）**：
+  - **兩個都連不上 → 停在偏好那個**。這樣同步的錯誤訊息指的是使用者真正想連的機器；報備援的錯會害他去查錯的機器。
+  - **偏好被停用 → 不失效轉移**。停用是主動關閉不是斷線，悄悄把遊戲庫交給另一台伺服器是錯的。
+  - **備援指向自己 / 已刪除 → 忽略**，不會迴圈也不會懸空。
+  - **沒有選定來源 → 無事可做**（正在顯示全部）。
+- **探測沿用 `EndpointProbeService`**：TCP 連得上即可達，短逾時。**不能等同步逾時**——RomM 的同步逾時至少 10 分鐘，等它跑完才切換體感極差。
+- **UI**：Sources → `[A]` → 「備援來源」開 `FallbackPickerOverlay`（列出其他來源＋「不設定」，已選的打勾）；卡片顯示 `備援 → <名稱>`，否則設完看不出來。只有兩個以上來源才出現此選項。七語系各補 3 個字串。
+- **測試**：`test/source_failover_choice_test.dart` 11 個，全數通過。
+- **待辦**：接進同步流程（同步前探測 → 不通改用備援 → 標題列標示備援中）。
+- **檔案**：`lib/models/config/source.dart` · `lib/services/source_failover.dart` · `lib/services/sources_notifier.dart` · `lib/features/sources/fallback_picker_overlay.dart`
+- **Commit**：未提交
+
+
+## [連線方式共用憑證] R-Shop: 路由沒有自己的 auth，指向別台伺服器會 401
+
+- **檔案**：`lib/models/config/source.dart`（`endpoints` 欄位註解說明假設；`SourceEndpoint` 刻意**沒有** auth 欄位）
+             `lib/features/sources/endpoint_picker_overlay.dart`（切換器加同伺服器提示）
+             `lib/l10n/app_*.arb`（七語系新增 `sources_routeSameServerHint`）
+- **現象**：使用者問「我 romm 一個外網一個內網，他好像要做認證的耶，這樣切換的了嗎？」
+- **查證**：`auth` 掛在 `Source` 上（`source.dart:226`），`SourceEndpoint` **只有 id/label/url/host/port/share，沒有憑證欄位**。`withLiveEndpoint` 原樣保留 `auth`，`SourceResolver` 四處都餵 `source.auth` 給 provider。
+- **結論：「連線方式」只適用於同一台伺服器的多個位址。** RomM 的 token 由伺服器發、不綁位址，所以同一台的兩個位址共用一個 token 沒問題；**但指向另一台伺服器就會送錯 token，回 401，而那個錯誤看起來像伺服器掛了**，極難聯想到是設定用錯機制。
+- **使用者的情境不適用路由**：他明確說過「其實是不同的兩台伺服器」。正確做法是**兩個獨立來源各自登入，再用 `fallbackSourceId` 配成備援**——切換來源時 auth 跟著換（見 `[R-Shop 來源備援]`）。他現有的設定本來就是對的。
+- **解**：不改架構（per-endpoint 憑證會讓「同一台伺服器」這個前提失去意義，也讓 token 續期變成 N 份）。改為**把假設講出來**：切換器加一行提示指向正確做法，並在 `Source.endpoints` 的註解寫明為什麼沒有 per-route auth，免得後人以為是漏做。
+- **教訓**：**設計時的隱含假設要寫在使用者看得到的地方，不是只寫在程式註解裡。** 我在程式碼裡註明了「both routes reach the same server with the same account」，但 UI 上一個字都沒有——使用者當然會拿它來接兩台不同的伺服器。會問這題的人不只一個。
+- **Commit**：未提交
+
+## [備援接進同步] R-Shop: 同步前先探測，連不上就換備援那台
+
+- **檔案**：`lib/services/source_failover.dart`（`withEffectiveSource`／`resolveForSync`）
+             `lib/features/home/home_view.dart`（`_syncAll` 注入、`_fallbackInUse` 狀態、標題列橘色標示）
+             `lib/services/endpoint_probe_service.dart`（`_probeableEndpoints` 修復）
+- **需求**：使用者要「綁定多台，可以依序或自動，幫我選連線正常的那台」。他決定**兩台各自獨立設定**，理由是「連線位置不同，兩次都會需要認證，就相當於兩台不同的伺服器了」。
+- **注入點**：`_syncAll` 拿到 config 之後、傳給 `LibrarySyncService` 之前，用 `resolveForSync` 重建一份**記憶體中的** config。**磁碟上什麼都沒改**，所以偏好的來源會自己回來——這是整個設計的核心，不是實作細節。
+- **只探測最多兩台**：偏好的通就完全不探備援（探了也改變不了結果，在掌機上省一次連線）。有測試釘住 `net.asked` 只有一筆。
+- **短逾時**：TCP 連得上即可，**不能等 RomM 的同步逾時**（至少 10 分鐘）。
+- **手動切換來源會清掉備援標示**——使用者主動選了就是他說了算。
+- **順手修掉一個真實破綻**：`EndpointProbeService.reachableFor` 原本遇到 `endpoints` 為空就直接回傳空集合。而**位址回填只發生在 `Source.fromJson`**，程式碼裡直接建構的 `Source`（有 `url` 但 `endpoints` 空）會被**靜默判定為不可達**——而「不可達」正是觸發備援的條件，等於可能在沒真的連過的情況下就把某台停用掉。改為 endpoints 為空時用來源本身的連線欄位探測。**這是測試抓到的，不是我想到的**：測試直接建構 Source，剛好是正式路徑從沒遇過的形狀。
+- **測試**：`source_failover_sync_test.dart` 9 個（含「偏好未被更動」「偏好通就不探備援」「兩台都不通停在偏好」）。完整套件 1740 通過 / 7 個既有環境失敗，零回歸。
+- **Commit**：`d5d7522`（功能）、`e79007e`（探測修復）
+
+## [同步不知道是哪一台] R-Shop: 徽章只寫進度沒寫來源；連線方式也只能新增不能刪
+
+- **檔案**：`lib/providers/app_providers.dart`（新增 `syncingSourceProvider`）
+             `lib/features/home/home_view.dart`（`_resolveSyncTarget` 抽出，自動同步也走它；標題列改讀 provider）
+             `lib/widgets/sync_badge.dart`（`_withSource` 把來源名接在主機名後）
+             `lib/features/sources/endpoint_picker_overlay.dart`（`[X]` 移除、`[Y]` 編輯、錯誤訊息、提示列）
+             `lib/l10n/app_*.arb`（`sources_routeCannotRemoveLast` 新增；`sources_routeSameServerHint` 改寫）
+- **使用者回報三件事**：
+  1. 「連線方式新增後沒有可以移除的方法」
+  2. 「是不是要說明 不需要驗證的話 / 要驗證要走備援方式」
+  3. 「同步中 指的是哪一台?? 好像沒有標示出來」
+- **解 1**：`[X]` 移除、`[Y]` 編輯目前反白的那條，**刻意不放在 `[A]`**——切換是最常做的動作，要保持一鍵。刪最後一條時 notifier 會拒絕，UI 要**顯示原因**而不是默默沒反應（沒有位址的來源無法使用）。
+- **解 2**：提示原本寫「同一台伺服器的不同位址」——那是**我的技術判準**，使用者未必知道兩個位址背後是不是同一台。改成他實際遇到的現象：「**如果那個位址要你重新登入**，請改成新增來源再互設備援」。判準要用使用者觀察得到的東西表達。
+- **解 3**：新增 `syncingSourceProvider`，標題列與徽章讀同一份，不會各說各話。徽章從 `3/8 · SNES` 變成 `3/8 · SNES · Thor localhost`，用備援時標「（備援）」。
+- **順手修掉的漏洞**：**自動背景同步（`syncSmart`）原本沒走備援解析**，只有手動同步會。所以背景同步可能一直打連不上的那台，而徽章顯示的是另一台。抽出 `_resolveSyncTarget` 讓兩條路徑共用。
+- **教訓**：這三項都是**只有實機操作才會發現**的（同類第六、七、八次，見記憶 `ui-problems-only-surface-on-device`）。特別是第 2 點——**寫給使用者看的說明，判準要用他觀察得到的現象，不是我的內部模型**。
+- **驗證**：1740 通過 / 7 個既有環境失敗，零回歸。
+- **Commit**：未提交
+
+## [浮層只做了手把] R-Shop: 刪掉最後一筆來源後手把失效；三個浮層完全不吃觸控
+
+- **檔案**：`lib/features/settings/sources_screen.dart`（`_ensureInteractiveFocus` 放棄宣告、`_OverlayButton` 加 `onTap`、動作選單加回「只看這個來源」）
+             `lib/features/sources/endpoint_picker_overlay.dart`（`_RouteRow` 加 `onTap`，4 個呼叫點）
+             `lib/features/sources/fallback_picker_overlay.dart`（`_Row` 加 `onTap`，3 個呼叫點）
+- **使用者回報**：「當我刪除最後一筆來源，回到新增來源，我的控制都失效只剩觸控」「點選來源後的頁面卻不能觸控」「到新增來源我又不能觸控」「來源設定那邊也要能指定本次要顯示哪個，不然我還要跑去主頁面」
+- **焦點卡死的根因**：`_ensureInteractiveFocus` 開頭是 `if (_initialFocusClaimed || ...) return;`。那個旗標**一旦設為 true 就永不重置**。刪掉最後一筆來源時，持有焦點的卡片連同它的 `FocusNode` 一起被回收（`_gcFocusNodes`），螢幕上再也沒有任何節點有焦點，而旗標讓它不再重取——手把因此完全沒反應，只剩觸控還能用。**解**：焦點不在任何卡片也不在空狀態按鈕上時就放棄宣告，讓空狀態接手。
+- **觸控的根因**：`ConsoleFocusable`（來源卡片用的）**本身有 `GestureDetector`**，所以卡片點得動；但三個浮層裡的列是我自己寫的純 `Container`，**一個點擊處理都沒有**。做浮層時只想著手把，忘了這台機器有觸控螢幕。**解**：三處都包 `GestureDetector(behavior: HitTestBehavior.opaque)`，且**點一下直接執行**而不是只移動游標——已經點到的東西還要再確認一次是純粹的摩擦。
+- **「只看這個來源」加回來源頁**：先前是照使用者說的「那邊不用控制」拿掉的。他實際用過後說「不然我還要跑去主頁面」——**兩邊都要有**：扳機是快速路徑，但決定要哪個來源的當下人就在來源清單上。
+- **教訓**：**手把與觸控是兩套獨立的輸入，做了一套不代表另一套會動**。既有元件（`ConsoleFocusable`）兩套都處理，我自訂的浮層只做了一套，而它們外觀一模一樣——從畫面上看不出差別，只有真的去點才會發現。
+- **驗證**：1740 通過 / 7 個既有環境失敗，零回歸。
+- **Commit**：未提交
+
+> **後續（2026-08-02）**：漏了第四個浮層——`_SourceTypePickerOverlay`（按 `[Y]` 的來源種類選單）。
+> 使用者回報「新增來源還是不能觸控」。**我只修了他當時點過的三個，沒有回頭找同類的。**
+> 這次掃過整個 `lib/` 並**逐一核對每個呼叫點**（連線方式 4/4、備援 3/3、動作＋種類 2/2，
+> 既有的離開確認框本來就有），確認沒有漏網。
+> 修的時候順手把類型選單的選取抽成 `_pickSelected()`，讓按鍵與觸控走**同一條路徑**——
+> 各自呼叫 `onPick` 的話，日後有人在按鍵那條加一個步驟，觸控就會悄悄不同步，
+> 那正是這次問題的同一種病因。
+
+## [黃色條與雙入口] R-Shop: 那條黃色是版面溢位警示；把功能搬到圖示上會弄丟手把入口
+
+- **檔案**：`lib/features/settings/sources_screen.dart`（動作選單改 `SingleChildScrollView`、卡片列加眼睛圖示、選單標題右上角加眼睛＋綁 `[X]`）
+- **黃色條**：使用者問「來源設定的取消上面蓋了一條黃色條，不知道幹嘛用」。**那不是功能，是 Flutter 的版面溢位警示（黃黑斜紋）。** logcat 證實 `A RenderFlex overflowed by 39 pixels on the bottom`——我在動作選單陸續加了「只看這個來源／備援來源／連線方式」三列，3.92 吋螢幕裝不下。**解**：選單改可捲動，之後再加列也不會重現。
+- **查法值得記**：先用 `adb shell screencap` 想直接看，但截到的是雙螢幕的另一面；改用 `adb logcat` grep `RenderFlex|overflowed` 一次命中。**版面問題優先查 logcat，比截圖可靠。**
+- **雙入口**：使用者要求「目前顯示」也能在來源設定裡操作，並指出「可以做成右上角的眼睛圖示，不一定要佔一列」，接著訂下規則：**功能都要有兩個入口，一個觸控、一個手把（或按鍵）**。
+  - 我原本把它從選單搬到清單列上的眼睛圖示——**那是純觸控的 `GestureDetector`，手把按不到**。只做觸控跟只做手把一樣違規。
+  - **解**：選單標題右上角放小眼睛（觸控）＋綁 `[X]`（手把），提示列寫出來。用角落圖示而非多一列，因為選單先前就已經溢位過。
+- **教訓**：**把功能從 A 處搬到 B 處時，要確認 B 處兩套輸入都有**。搬移看起來只是移動，實際上會連帶改變可達性——選單列本來按鍵與觸控都通，圖示按鈕預設只有觸控。
+- **驗證**：實機無溢位、無崩潰。
+- **Commit**：見下
+
+## [標頭高度與誤讀的按鍵字] R-Shop: 圖示旁的裸字母被當成關閉鈕；標題列進場高一列再縮回去
+
+- **檔案**：`lib/features/settings/sources_screen.dart`（動作選單標頭）· `lib/features/home/home_view.dart`（`_buildSourceBanner`）
+- **裸字母**：使用者問「來源那邊你右上圖示也寫一個 X 是幹嘛用？」。眼睛圖示旁邊那個 `X` 是想標示綁定的按鍵，但**擺在圖示旁就讀成了關閉按鈕**。而且它還違反我自己記下的規則——裝置支援 `nintendo/xbox/playstation` 三種配置，**同一個實體鍵在三種配置下名字不同，字母不能寫死**。**解**：刪掉標頭那個字，按鍵提示只留在底部提示列。
+- **高度會跳**：使用者說「主頁面的標題在初始時跟下面圖示隔了兩行，但是向下移動後又變成隔一行」。根因是 `SystemChrome.setEnabledSystemUIMode(immersiveSticky)` 在 `initState` 才執行，所以**第一幀還帶著狀態列 inset，後面的幀沒有**——標題列包了 `SafeArea`，就會進場高一列然後縮回去。**解**：全螢幕沉浸的畫面不要包 `SafeArea`，改用純 `IgnorePointer`。
+- **教訓**：**`SafeArea` 的 inset 在沉浸模式下是會變的量，不是常數。** 只要 `initState` 之後才切沉浸，第一幀跟穩態就不一致。這種「只在進場時出現一次」的差異，靜態分析與截圖都抓不到，只有真的進出畫面才看得見。
+- **Commit**：`dac11d6`
+
+## [來源清單快捷鍵] R-Shop: 停用／移除／目前顯示原本都得先開選單，改成清單上直接按 ✨ 功能新增（非修復）
+
+- **檔案**：`lib/features/settings/sources_screen.dart`（`additionalShortcuts` 三個綁定、`_SourceShortcutIntent`／`_SourceShortcutAction`、`_focusedSourceId`／`_focusedSource`、`_confirmRemoveSource`、`_buildHud`、`_Header` 計數列）· `lib/l10n/app_*.arb`（七個語系各 5 個新字串）· `test/widgets/sources_screen_test.dart`
+- **需求**：使用者要「停用／移除／使用中」在**來源清單上就能按**，不要每次都先進動作選單。
+- **綁定**：`[X]` 目前顯示（與動作選單標頭同一顆，語意一致）· `L1` 停用／啟用 · `R1` 移除。三個都同時出現在 HUD 上，而 **HUD 的每個提示本身就是可點的按鈕**——手把與觸控各自都走得完，符合雙入口規則。
+- **L1／R1 是全域搶來的**：`app_actions.dart` 把 L1/R1 綁在 `AdjustColumnsIntent`（格線欄數）。`ScreenActionsWrapper` 把 `additionalShortcuts` **展開在預設之後**，所以本畫面覆蓋得掉，其他畫面不受影響。
+- **一定要擋浮層**：動作選單自己吃掉 `[X]`，但**沒有任何東西處理 L1/R1**——不擋的話浮層開著時按下去會作用在看不見的那張卡上。`_SourceShortcutAction.isEnabled` 用 `overlayPriorityProvider == OverlayPriority.none` 擋掉，跟 `_GridNavigateAction` 同一套判準。
+- **移除要先問**：`_removeSource` 原本**完全沒有確認**。在選單裡要三次刻意的按壓才點得到，勉強可以；掛到 `R1` 之後變成一鍵，所以補了 `showConsoleDialog`。訊息據實寫：清單會消失，但**已下載到裝置上的遊戲會保留**——`purgeOrDetachSource` 對檔案還在的那些是 `detach`（把 `provider_config` 設 NULL）而不是 delete。
+- **焦點要自己記**：HUD 的字要跟著焦點那張卡變（停用／啟用、只看這個／看全部），但**焦點變動不會觸發 rebuild**。所以在 `_focusFor` 建節點時掛 listener 記進 `_focusedSourceId`。**只在取得焦點時寫，失焦不清**——卡片之間移動會經過一個誰都沒有焦點的瞬間，清掉的話每按一次方向鍵 HUD 就閃一次。
+- **順手修掉的中文化漏洞**：標題副標原本是 `'$count source${count == 1 ? "" : "s"} · [Y] add new'` ——**寫死英文，又把 `[Y]` 寫死在字串裡**（裝置支援三種手把配置，按鍵名不能寫死）。改成 `sources_countLabel`，按鍵名交給 HUD 依 `ControllerLayout` 繪製。標題本身依使用者要求改成「來源清單」。
+- **後續改名**：使用者說「只看這個／看全部 這功能應該叫做 **目前使用這個** 而不是看全部」。他從頭到尾用的詞是「使用」不是「顯示」——他一次只用一個來源，所以「看全部」根本不在他的模型裡。改成 `sources_useThisShort`（目前使用這個）／`sources_stopUsingShort`（取消使用），卡片徽章 `sources_activeSource` 從「目前顯示」改成「**使用中**」（這是他自己在需求裡用的字）。**ARB 的 key 也一起改**，因為 `viewOnly`／`viewAll` 已經描述錯了。順帶查到 `sources_useThisSource`／`sources_showAllSources` 兩個 key **在 Dart 裡已經沒有任何使用**——眼睛搬到列上時選單那兩列就拿掉了，字串留著沒清。
+- **驗證**：`analyze` 無新增問題；`sources_screen_test.dart` 9 項全過（新增 3 項：三個提示都在、停用的來源顯示「啟用」、沒有焦點時不顯示）。HUD 從 2 顆變 5 顆，1080×1920@369dpi 橫向邏輯寬約 832，估算約 460 不會溢位，且 `ControlButton` 的文字有 `maxWidth` + ellipsis 保底。
+- **Commit**：見下
+
+## [使用中與顯示分家] R-Shop: X 要按兩次才取消；而且「在看哪一個」跟「用哪一個」本來就不該是同一件事
+
+- **檔案**：`lib/models/config/app_config.dart`（新增 `primarySourceId`／`primarySource`／`clearPrimarySource`） · `lib/services/sources_notifier.dart`（`setPrimarySource`、`_writeAndPublish` 的 `setPrimary`） · `lib/services/source_failover.dart`（`resolveForSync` 改讀 primary） · `lib/features/settings/sources_screen.dart`（拿掉 `_activeSourceId` 鏡像） · `lib/features/home/home_view.dart`（橫幅顏色、`_cycleActiveSource` 註解） · `test/active_source_test.dart` · `test/source_failover_sync_test.dart`
+- **現象**：使用者說「為啥我會按了 目前→取消→取消 變兩次取消的流程」。
+- **根因**：`sources_screen` 用 `_activeSourceId ??= storedActive` 從設定檔種值。**`??=` 表達不了「刻意是 null」**——按下取消之後欄位變成 null，下一次 build 又從設定檔種回原本的 id（而且此時 `invalidate` 還沒回來，讀到的是舊值），所以標籤又變回「取消使用」，得再按一次。**解：整個鏡像欄位拿掉**，畫面上每個標籤都直接讀設定檔。卡片上的徽章本來就是直接讀的——所以 HUD 跟徽章其實一直可能不一致，只是先前沒被注意到。
+- **使用者接著提出的分家**：「一個是**使用中**（主畫面預設顯示 以及 同步的），一個是**顯示**（顯示在主畫面 可以切換選擇的），是兩種功能」。
+- **做法**：`AppConfig` 加 `primarySourceId`。
+  - `activeSourceId` 維持原意＝**顯示**（主畫面 L2/R2 切的那個）。這樣**不必動顯示路徑**——顯示是靠 `_writeAndPublish` 依 active 重寫 `system.providers` 生效的，改成執行期覆寫要動到整條讀取鏈。
+  - `primarySourceId` ＝ **使用中**：同步的目標；設定它時順帶把顯示也指過去（「主畫面預設顯示」）。
+  - `resolveForSync` 改讀 `primarySourceId ?? activeSourceId`。**`?? activeSourceId` 是舊設定檔的相容路徑**，`fromJson` 也做同樣的回填，所以沒有遷移步驟。
+  - 來源清單的 `[X]`／眼睛／徽章一律指 **使用中**；主畫面的 L2/R2 只動 **顯示**。
+- **橫幅多了一個訊號**：顯示的來源就是使用中的那個才是綠色，切走了變灰。不然「我在看 A，但同步跑去 B」完全看不出來——這正是分家之後才可能出現的困惑。
+- **驗證**：`analyze` 無新增問題。完整 `flutter test` 1753 passed / 7 failed，**7 個與既有基準完全相同**（見 `[R-Shop 測試基準]`）。新增 10 項測試，其中「一次按壓就清掉，沒有第二次取消」直接釘住這次的 bug。
+- **兩個功能都要進來源清單**：使用者接著說「來源清單那邊 增加的功能是 **是否顯示** 跟 **使用中** 兩個」。分家之後「顯示」只剩主畫面的 L2/R2 能改，等於又變成「要跑去別的畫面」——正是最早那條抱怨。
+  - 卡片上放**兩個圖示**：**眼睛＝顯示**（`activeSourceId`）、**打勾＝使用中**（`primarySourceId`）。**兩個功能不能用同一個圖示**，否則使用者又回到分不清的狀態；動作選單標頭那顆也從眼睛改成打勾（那裡指的是使用中）。
+  - 按鍵：`L2` 顯示這個／顯示全部。**選 L2 是因為主畫面就是用扳機切顯示的**——同一個動作，換個畫面還是同一顆。`[X]` 維持使用中。
+  - HUD 因此變成六顆（返回／新增來源／顯示／使用中／停用／移除）。
+- **再一次修正：眼睛是複選不是單選**。使用者說「**有眼睛就代表都可以看到，所以是選填功能**，不用再顯示全部這個文字，而是 主畫面顯示」。我原本把眼睛接到 `activeSourceId`（單選），錯了。
+  - 改成 `Source.showOnHome`（bool，預設 true，持久化）。**每個有眼睛的來源都會出現在主畫面，可以同時多個。**
+  - `providersFor` 的過濾規則：**只有在沒指定來源時才套用可見性**。指定了來源就是刻意指定的——**使用中的來源被隱藏時，同步還是要照跑**，不然「隱藏」會變成偷偷停掉同步。
+  - **隱藏不清快取**（`setEnabled(false)` 才清）。這是「隱藏」與「停用」唯一的差別，也是使用者按眼睛時預期能按回來的原因。
+  - 隱藏當下正被單獨檢視的那個來源時要把 `activeSourceId` 清掉，否則主畫面被收窄到一個不該顯示的來源，會整片空白。主畫面的 L2/R2 環也跳過隱藏的來源。
+  - 提示文字固定一句 `sources_showOnHome`（中文「**主畫面顯示**」）。**複選不需要方向性文字**——列上的眼睛本身就說明了現在是開還是關。舊的 `showThisShort`／`showAllShort` 移除。
+- **橫幅在只剩一個可見來源時收起來**：使用者說「當顯示只剩一個 並且 是使用中，主畫面就不用 顯示全部來源 的文字了」。原本只判斷 `sources.length < 2`，所以兩個來源關掉一個之後，橫幅還在，而且寫著「全部來源」——**那句話本身就是錯的**，畫面上只有一個來源，只是它剛好是全部可見的。改成：可見來源只剩一個且它就是使用中的那個 → 整條收起來；可見只剩一個但不是使用中的 → 橫幅留著並**寫出它的名字**，不寫「全部來源」。
+- **「全部來源」這句話整個拿掉**：使用者說「**永遠不用出現 全部來源 這個文字**」，並且「橫幅收起來 那行應該就可以不見，不然他又會跟移動後的高低不一致」。
+  - 橫幅的職責改成**只寫一台伺服器的名字**。沒有單一一台可寫時（多個來源同時顯示、沒有單獨選擇）就**整行消失**，不寫佔位字。
+  - 收起來一律 `SizedBox.shrink()`——**零高度，不是空白列**。留一條空白條會讓下面的東西依狀態差一行，正是先前那個高度不一致。
+  - `sources_allSources` 因此變成死字串，連同先前查到的 `sources_useThisSource`／`sources_showAllSources` 一起從七個語系刪掉。
+- **我把橫幅收得太過頭**：上一輪為了拿掉「全部來源」，我讓「多個來源同時顯示、沒單獨選一個」也收起橫幅。使用者回報「**我明明都顯示了 但是我的橫幅文字卻消失了**」「**顯示在主畫面有選的話 主畫面橫幅都要出現**」。
+  - 規則改成：**只要有任何一個來源開著眼睛，橫幅就在**。只有一個都沒開才收（`SizedBox.shrink()`）。
+  - 多個同時顯示時**把名字列出來**（`A · B`），不是佔位字。這是實話——畫面上就是那幾個。
+  - 這樣高度也穩定了：使用者問「原始 移動時候 到底是 有橫幅那行還是沒有」，答案現在是**一直都有**。
+- **選使用中會強制打開眼睛，取消不會關掉**：使用者原話。**同步一個看不到的來源不是一個值得存在的狀態**；反過來，放棄指派並不代表不想再看它，**偷偷把別人沒要求隱藏的東西藏起來是比較糟的那個猜測**。
+- **`showOnHome` 整個收回去**：使用者說「**你的停用 啟用 不就是眼睛嗎 = = 不用再做一個**」。對——`enabled` 為 false 的來源本來就不會出現在主畫面也不會同步，我等於做了第二個一樣的開關。
+  - `Source.showOnHome` 刪除，`setShowOnHome` 刪除，`L2` 綁定刪除，`sources_showOnHome` 七語系刪除。
+  - **卡片上的眼睛改成 `enabled` 的開關**，`L1` 停用／啟用維持不變（同一件事的按鍵入口）。`setPrimarySource` 改成把 `enabled` 打開。
+  - 代價要記住：**眼睛關掉會清掉那個來源的快取清單**（`setEnabled(false)` 一直都會清），再打開需要重新同步。這是併回 `enabled` 的必然後果。
+- **主畫面進場多一列空白**：使用者說「一開始兩行(有一行空白行) 但是移動後 變成一行」。不是橫幅——是 `home_grid_view.dart` 的 `top: rs.safeAreaTop + 40.0`。**沉浸模式在 `initState` 才切，第一幀還有狀態列 inset**，跟先前橫幅那次是同一個成因，只是換一個地方。改成固定 `40.0`。
+  - **教訓：這個專案裡任何 `rs.safeAreaTop` 都要懷疑。** 全螢幕沉浸之下它不是常數。
+- **RA 設定頁的白框貼著字**：`ra_onboarding_screen.dart` 的 `_textBox` 把 `ConsoleFocusable` 直接包住 Column，焦點白框緊貼標籤與輸入框自己的邊框，兩條線差幾個像素，看起來像畫錯而不是焦點。加內距 `fromLTRB(8,6,8,8)` 並把 `borderRadius` 提到 12。
+- **切換會 lag**：使用者說「在來源清單 切換啟用 跟使用 時 會 lag」。兩個成因：
+  - **UI 在等磁碟**：畫面的標籤讀 `bootstrappedConfigProvider`，而切換後要 `invalidate` 再等重新讀檔；**在那之前 `valueOrNull` 回的還是舊值**，所以按下去看起來沒反應。解：`SourcesState` 加上 `primarySourceId`／`activeSourceId` 兩個鏡像，`_writeAndPublish` 設 state 時一起發佈，畫面改讀 notifier——同一幀就更新。
+  - **清快取擋在路上**：`setEnabled(false)` 會 `await _purgeCachedGamesFor`，那支要走過該來源每一筆快取並對每筆做 `File.existsSync`。改成 `unawaited`——`updateSource` 已經先把 providers 重寫掉了，被關掉的來源在第一筆被碰到之前就已經不在任何查詢裡，清除只是後續整理。
+- **停用→啟用第二次按會停頓**：使用者原話「啟用後在停用 在起用 會停頓一下」。上一輪只把清快取改成不擋，**但快取還是被清掉了**——所以重新啟用時整份清單要重抓，那才是停頓。而且清除在背景跑，使用者手快的話**會刪掉剛重抓回來的資料**。
+  - **改成停用完全不清快取。** 當初清除的理由是「不然格線還會顯示剛關掉的來源」，那在 schema v14 之後就不成立了：每筆列按路線存，讀取一律走該系統當下的 providers，**停用的來源不在 providers 裡，那些列根本不會被查到**。
+  - 唯一直接讀表不走 providers 的是圖書館頁（`getAllGames`），所以過濾改在那一側做：`provider_config.sourceId` 屬於已停用的來源、而且檔案不在裝置上，就跳過。**已經下載到裝置上的照樣列出**——它就在機器上，跟來源開不開無關。
+  - `removeSource` 仍然清除，那個來源不會回來了。
+- **環裡多一個 A+B**：使用者原話「為什麼 主頁面的 來源 有A 有B 卻還有A+B」。L2/R2 的環原本是 `全部 → s1 → … → sn → 全部`，第 0 格代表 `activeSourceId = null`＝合併顯示所有來源。兩台就走成 A → B → A+B——**那個 A+B 不是清單上的任何一個來源**。
+  - 環改成只有來源本身，拿掉第 0 格。沒選過或 id 失效時，第一次按直接落在第一個（反向則落在最後一個）。
+  - 光拿掉環還不夠：**開機時 `activeSourceId` 若是 null 而開著的來源超過一個，畫面本來就是合併的**。所以 notifier bootstrap 加一段正規化，落在 `primarySourceId ?? 第一個開著的`。**只有一個來源時維持 null**——那時 null 的意思是「就這一個」，沒有東西可以合併。
+  - 橫幅因此不再需要用 `·` 串名字，那段拿掉。
+- **測試基準的教訓（再一次）**：完整套件先跑出 8 個失敗，其中 `game_list_controller: restoreFilters` 看起來像回歸；單獨執行也失敗一次，我一度判定是我改壞的。**但接著連跑三次都通過**，完整套件重跑也回到 7 個。**單次的隔離執行不足以認定回歸**——這個測試就是既有紀錄裡點名的時序敏感型之一。
+- **Commit**：見下
+
+
+## [R-Shop 自動選最快] R-Shop: 「自動挑最快的那條路線」在現行前提下沒有意義，決定不做
+
+> ⚠️ **這條的結論已被 `[R-Shop 路線各自驗證]` 與 `[R-Shop 自動選最優路線]` 推翻，2026-08-05。**
+> 底下的推理沒有錯，**錯在前提**：當時把「兩個位址」一律當成兩個來源，所以替使用者換一條路
+> ＝替他換一個來源。使用者後來確認的前提是——**同一個來源底下的多條路線就是同一台伺服器**
+> （只是各自需要登入），清單也收斂成一份。在那個前提下換路線**換不到別的清單、也換不掉他選的來源**，
+> 不變式 2 與 3 都沒有被碰到，所以自動選最快是可以做的，而且已經做了。
+>
+> **「同一台也當不同台」仍然成立**——它管的是**來源之間**，不是同一個來源底下的路線之間。
+> 這兩件事當初被混為一談，這條紀錄就是那次混淆的產物。**要看現行行為請讀
+> `[R-Shop 自動選最優路線]`，不要照這條。**
+
+- **問題**：待辦裡掛著「自動選最快的那條路線」——多個位址時由程式探測延遲、自己挑最快的那個。使用者提過，但當時就決定先不做，理由沒有寫下來，所以每次讀交接都會再想一次「這條到底還要不要做」。
+- **修復**：不做，並把理由寫進紀錄。前提是使用者的原話「**就算是同一台，我也要當不同台**」（`.agents/skills/rshop-source-routing`「使用者要的到底是什麼」那節）。來源一律各自獨立，**與背後是不是同一台伺服器無關**——這是他的模型，不是可以從 URL 推論出來的東西。
+- **檔案**：無程式碼變更（需求判定）
+
+「自動挑最快」預設兩個位址是**同一份東西的兩條路**，程式因此有權替使用者換一條。但在「同一台也當不同台」之下，換一條路等於**替他換了一個來源**——那是他明確要自己決定的事（`activeSourceId` 的存在就是為了這個）。所以這不是「還沒做」，是**做了會違反不變式 2 與 3**。
+
+真正需要自動換路的情境已經有東西在做了：連不上時走**備援**（`chooseSource` / `withEffectiveSource`），而備援刻意**只改記憶體中的 config、不寫磁碟**，所以偏好的那台醒過來就自己回去。速度不是那條路的觸發條件，**可達性才是**——這也是對的，延遲高一點跟連不上是兩件事，只有後者值得替使用者做決定。
+
+**要重開這條的唯一理由**：使用者哪天改變「同一台也當不同台」的前提。在那之前把它留在待辦只會讓每個工作階段重新評估一次。
+
+> **後記**：前提真的改了——不是他推翻了「同一台也當不同台」，是我們發現那句話講的是**來源之間**，
+> 而「路線」這一層從頭到尾都在同一台伺服器裡面。條件觸發了，這條就重開並做掉了。
+> **一條寫清楚重開條件的「不做」是有用的**：它讓下一次的判斷變成核對條件，而不是重新辯論一遍。
+
+## [R-Shop 反查不到] R-Shop: `build_fix_by_file.py` 每次都報 2 條沒有路徑，那是正確狀態不是漏洞
+
+- **問題**：`python scripts/build_fix_by_file.py` 收尾時固定印出 `entries without paths: 2`，看起來像有兩條紀錄漏了 `**檔案**` 欄。
+- **修復**：不用補。那兩條是 `R-Shop 測試基準` 與 `R-Shop 實機重裝`，**本來就沒有程式碼變更**，`**檔案**` 欄寫的就是「無程式碼變更」。實跑確認 `files: 29　entries without paths: 2`，數字與內容都與紀錄相符。順手改掉腳本裡誤導的那句話，讓它不必靠交接文件解釋。
+- **檔案**：`scripts/build_fix_by_file.py`（「尚未指明檔案的條目」那段的說明字串）
+
+反查表的用途是「**我要改這個檔，它身上以前發生過什麼**」。沒有動到任何檔的紀錄（環境診斷、部署作業、需求判定）**在這張表上本來就無處可去**，不是資料缺失。原本的說明寫「缺漏或標為待補，所以無法反查。**補上之後重跑即可**」——那句話對這幾條是錯的，等於每個工作階段都被指示去補一個不該存在的東西，交接文件為此還得反過來澄清一次。改成點名「多數是正確狀態」，只有「待補」才是真的欠。
+
+**這個數字不會歸零，也不該當成待辦。** 寫完上面那條 `[R-Shop 自動選最快]`（純需求判定，沒有程式碼變更）之後，它就從 2 變成 3。所以基準值會隨著這類紀錄增加而往上走，**只要對照最後新增的那幾條即可，不必整檔掃**。
+
+
+## [R-Shop 路線各自驗證] R-Shop: 憑證跟著路線走，清單跟著來源走（schema v15）
+
+- **問題**：一個來源底下的多條連線方式（區網直連、DDNS）**共用同一組憑證**——`auth` 掛在 `Source` 上，路線沒有自己的。使用者實際的設定是同一台伺服器、但兩個位址**各自需要驗證**，所以他只能拆成兩個來源才會動，而拆成兩個來源又拿到了兩份各自同步的清單。同時「連線方式手動切、來源自動備援」剛好是反的：**該自動的那個是手動，比較該由他決定的那個反而自動**。使用者原話：「不覺得功能重複了嗎?」
+- **修復**：`SourceEndpoint` 加自己的可選 `auth`，沒設就沿用來源層的（舊設定檔零遷移）；`Source.auth` 改成 getter `liveEndpoint?.auth ?? _defaultAuth`，下游照樣只讀這一個。清單反過來收斂：schema v15 把唯一鍵從 `(systemSlug, filename, source_id, endpoint_id)` 改成 `(systemSlug, filename, source_id)`，`endpoint_id` 留著只記「上次從哪條路抓的」。
+- **檔案**：`lib/models/config/source.dart`（`SourceEndpoint.auth`／`hasOwnAuth`／`Source.auth` getter／`defaultAuth`）· `lib/services/sources_notifier.dart`（endpoint 增刪改帶憑證）· `lib/services/database_service.dart`（v15 遷移與去重、`getGameCountsPerSource`／`getGameCountForSource`／`deleteSourceCache`）· `test/database_service_v15_migration_test.dart`（新增）· `test/database_service_routes_test.dart`（改寫）· `test/source_endpoint_test.dart` · `test/source_resolver_test.dart` · `test/sources_notifier_endpoints_test.dart`
+
+**整個設計就兩句：憑證跟著路線走，清單跟著來源走。** 這兩句是反方向的，而反方向才是對的——路線之所以是不同的路線，就是因為它們的**入口**不同（不同的前門、不同的登入）；而它們之所以是同一個來源的路線，是因為門後面是**同一台機器、同一份清單**。舊設計把兩者都綁在同一層，所以兩邊都錯。
+
+**我原本打算「讀取時把兩份清單合併」，那是錯的解。** 使用者一句話點掉：「你覺得清單只有一份 你分的出來嗎」。要寫合併邏輯，就表示分裂本身不該存在。**程式分不出兩個位址是不是同一台，也不該去猜**——先前從埠號推論過一次，推論是對的，但那不算數。能宣告這件事的只有使用者，這就是「同一台也當不同台」的真正意思：**預設不猜，他宣告了才照宣告走**。他宣告了，清單就是一份。
+
+**`connectionKey` 刻意不含憑證，查證後確認是對的。** 我一開始要求把憑證算進去，理由是「換路線換 token 時它必須跟著變，否則會重用錯的連線」。實際上它只用在舊設定檔的合併遷移（`app_config.dart:209` 是唯一呼叫點，**runtime 沒有任何連線快取用它**），而同一個位址不論當初存的是哪組登入都該收成一個來源——folding 進去反而會把它們拆回兩個。它本來就每換一條路就變，因為 `sameAddressAs` 不准同一個來源有兩條位址相同的路線。
+
+**v15 去重唯一有資料風險的地方**：`games` 表沒有本機路徑欄位，安裝狀態是從檔案系統推的，而遷移不能做那種 IO。表內唯一的訊號是 `purgeOrDetachSource` 留下的狀態（`provider_config` / `url` 被清空——那種列的存在本身就代表檔案在磁碟上找到過）。判準收在 `_v15OnDeviceRank`，換訊號只要改那一行。去重用 self-join 找**輸家**而不是找贏家，配一個全序（先看是否在裝置上，再看 `id` 最小），所以每組必定恰好活一筆；刪之前先把 `cover_url` / `has_thumbnail` / `alternative_sources` 從同組撿回來。最後還有一道 `NOT IN (SELECT MIN(id) …)` 保險並記 log——**留下任何一筆重複都會讓 `CREATE UNIQUE INDEX` 拋例外，而每次啟動都拋例外的遷移等於資料庫再也打不開**。
+
+`deleteRoute` 改名 `deleteSourceCache` 不只是換字：**刪一條路線現在不准順手刪快取**，舊名字會讓人以為要。
+
+**未完成的部分見 `docs/HANDOVER.md` §2.0**——自動選最優路線、UI、七語系都還沒做。
+
+
+## [R-Shop 自動選最優路線] R-Shop: 探測改回延遲並排序，沒有覆寫就自己挑最快的那條
+
+- **問題**：`EndpointProbeService` 只回「通不通」，所以「自動」等於「清單裡第一條通的」——使用者要用最快的那條就得自己去挑，而挑了之後 `pin: true` 又把它永久固定住，網路換了也不會變。同時路線各自驗證的資料層已經完成，UI 卻還沒有地方輸入路線自己的憑證，功能等於沒接上。
+- **修復**：探測改回延遲：`probeFor()` 給 `ProbeResults`（`ranked` 最快在前、`latencyOf(id)`、`fastestId`），`resolve()` 在沒有覆寫時挑能通的裡面最快的；`pin: true` 的語意從「選定」改成「**使用者覆寫**」，浮層加一列「自動」走 `clearEndpointOverride`。連線方式編輯頁補上路線自己的登入欄位（留空＝沿用來源的），浮層每一列顯示延遲、最快、使用中、已鎖定、專屬登入。
+- **檔案**：`lib/services/endpoint_probe_service.dart`（`ProbeResults`／`RouteLatency`／`probeFor`） · `lib/models/config/source.dart`（`resolveEndpoint` 改吃排序後的 `List<String>`） · `lib/services/sources_notifier.dart`（`autoSelectEndpoint`／`clearEndpointOverride`／`autoSelectAllEndpoints`、bootstrap 離線對齊） · `lib/features/sources/endpoint_picker_overlay.dart`（延遲欄、自動列、徽章） · `lib/features/sources/endpoint_edit_screen.dart`（路線憑證欄位＋繼承說明） · `lib/l10n/app_*.arb`（10 個新 key，`sources_routeAutoHint`／`sources_routeSameServerHint` 改寫） · `test/endpoint_probe_service_test.dart` · `test/source_endpoint_test.dart` · `test/sources_notifier_endpoints_test.dart` · `test/widgets/endpoint_picker_overlay_test.dart`（新增）
+
+**這條做的事，`[R-Shop 自動選最快]` 當初判定「不做」。** 不是那次判斷草率，是**前提真的變了**：當時把「兩個位址」一律當成兩個來源，換路＝替使用者換來源；`[R-Shop 路線各自驗證]` 之後，同一個來源底下的路線就是同一台伺服器、同一份清單，換路換不到別的清單也換不掉他選的來源。**「同一台也當不同台」管的是來源之間，不是路線之間**——這兩層被混為一談，才生出那條「不做」。舊紀錄已加註取代，不要照它。
+
+**`resolveEndpoint` 吃的是排序後的 id 清單，不是延遲。** `lib/models` 不准 import 服務層的型別，這是一個理由；更實際的理由是**傳清單比傳「最快的那一個」多一層韌性**——探測到套用之間那條最快的路被刪掉時，會自動退到第二快，傳單一 id 就只剩清單順序可退。
+
+**`_bootstrap` 不探測，是刻意的。** 開機不能等網路，而且測試裡建一個 notifier 就會開真的 socket。它只做離線對齊：釘選指向不存在的路線就退回 `auto`，有效的釘選把值鏡回頂層欄位（不變式 4），真的有變才寫磁碟。
+
+**`autoSelectEndpoint` 探測完會重讀一次狀態才動手。** 探測那一秒內使用者可能剛好按下釘選，不重讀就會把他的覆寫蓋掉——**自動化蓋掉使用者剛做的決定，比自動化沒生效更糟**。
+
+**順手修掉一個既有的競態**：被整體預算放棄的探測，原本仍可能把自己加進**已經回傳且已經寫進快取**的那個 `Set`，於是「這條路通」會在快取裡憑空出現。現在結果先快照再進快取，並補了測試。
+
+**UI 兩個入口**：浮層每一列的 `onTap` 走 `_tapRow`，它先把游標移過去再呼叫 `_activate()`——**跟按 `[A]` 完全同一條路徑**，不是各寫一份（`rshop-touch-and-gamepad` 的鐵則；這四個浮層每一個都曾經是觸控死的）。新增的 widget 測試就是在測這件事。
+
+**憑證欄位留空必須產生 `null`，不是空的 `AuthConfig`。** `hasOwnAuth` 只問物件在不在，空物件會宣稱「這條路線用自己的登入，而且沒有帳密」——那會讓一個本來繼承得好好的路線變成 401。`_authOrNull()` 就是為這件事存在的。畫面上還即時顯示現在是「沿用來源的登入資訊」還是「用自己的」，因為「空白＝繼承」是一條**看不見的規則**，只寫在說明裡不夠。
+
+
+## [R-Shop onboarding 五語系缺字串] R-Shop: `DE has all EN keys` 一直紅，是真的缺字串不是環境問題
+
+- **問題**：`test/l10n_completeness_test.dart` 的 `DE has all EN keys` 長期失敗，混在「7 個既有失敗」裡被當成環境問題略過。實際上 `onboarding_folderExplanationTitle`／`onboarding_folderExplanationMessage`／`onboarding_continueToPicker` 只有 en 與 zh 有，**de / es / fr / ja / pt 五個語系全缺**——使用者在那五個語系下看到的是空白。
+- **修復**：五個 `.arb` 各補三個 key，位置與 en 一致。順便拿 en 的 key 集合對六個語系全掃一次，確認沒有別的缺口。
+- **檔案**：`lib/l10n/app_{de,es,fr,ja,pt}.arb` · `test/l10n_completeness_test.dart`（區域函式 `_translationKeys` 改名，清掉 analyze 的 info）
+
+**教訓在「既有失敗」這個標籤本身。** 一旦某個失敗被寫進交接的「已知不修」，之後每個工作階段都會直接跳過它——**包括它其實是真的壞掉的那一個**。這次是交接文件自己點名「它是真的缺，不是環境問題」才沒有繼續被略過。所以基準清單裡的每一條都該寫**為什麼**它不算回歸（Windows socket、Windows 路徑、需要真的伺服器），寫不出理由的那條就是還沒查清楚。
+
+**缺字串不會讓建置失敗，會直接出貨成空白**（`rshop-l10n`）。這也是為什麼字串要跟功能同一次補齊，而不是「之後補」。
+
+
+## [R-Shop analyze 六項] R-Shop: 清掉累積的 6 個 analyze 問題，含兩處已棄用的 `cacheExtent`
+
+- **問題**：`flutter analyze` 長期帶著 6 個問題：2 個未使用的 import、2 個未使用的區域變數、2 處已棄用的 `cacheExtent`。不是某一次改動造成的，但沒人清，於是每次跑 analyze 都要先分辨「這 6 個是舊的」。
+- **修復**：全部清掉。`cacheExtent: X` 改成 `scrollCacheExtent: ScrollCacheExtent.pixels(X)`，兩檔各補 `import 'package:flutter/rendering.dart'`（`material.dart` 沒轉出 `ScrollCacheExtent`）。現在 `flutter analyze` 是乾淨的。
+- **檔案**：`lib/features/onboarding/widgets/romm_legacy_login_screen.dart` · `lib/features/sources/manual_source_add_screen.dart` · `lib/features/onboarding/widgets/welcome_chooser_step.dart` · `lib/widgets/console_dialog.dart` · `lib/features/game_list/widgets/game_grid.dart` · `lib/features/library/library_screen.dart`
+
+**`.pixels()` 不是 `.viewport()`，這個選擇有理由。** Flutter 3.41 起 `cacheExtent`（double，邏輯像素）換成 `ScrollCacheExtent`，兩個 factory 的**單位不同**：`.pixels(double)` 與舊的完全等價，`.viewport(double)` 是 viewport 主軸長度的倍數。這兩處的值來自 `device_info_service.dart` 依記憶體分級算出的像素值（格線 200/400/600、圖書館 300/600/800），**本來就是以像素為單位設計的**，換成 `.viewport()` 會把分級意圖整個破壞掉。SDK 自己的相容轉接也是 `ScrollCacheExtent.pixels(cacheExtent!)`。
+
+**`console_dialog.dart` 刪掉未使用的 `rs` 之後，`responsive.dart` 的 import 跟著變成未使用**——只清一半會換來一個新 warning。焦點白框的樣式完全沒動：那份樣式同時存在於這個檔與 `core/widgets/console_focusable.dart`，**動一邊就會兩邊不同步**（`AGENTS.md` §3）。
+
+## [R-Shop 來源群組] 「備援」換成群組：幾個來源是同一台，就只有一份清單
+
+- **問題**：使用者要的不是備援。他的話是「應該不是備援 而是 我想指定兩個來源 其實是指向同一台伺服器，那它們可以選擇誰優先 或著自動」「應該是設成群組」「因為同一群組 應該實際是同一台之類 所以清單也只需要一份」。舊的 `fallbackSourceId` 是單向配對，他上一輪就抱怨過功能重複（「不覺得功能重複了嗎?」）。
+- **修復**：`SourceGroup`（成員有序、模式 `auto`／`ordered`）取代備援；`games` 表加 `cache_owner_id`，唯一鍵從來源改成擁有者，一個群組只存一份清單；notifier 補齊群組 CRUD，每個動作都同時把快取安置好；畫面上「備援」整個消失，換成群組編輯浮層與連線方式浮層的「照我排的順序」。
+- **檔案**：`lib/models/config/app_config.dart`（`SourceGroup`／`sourceGroupsFromFallbacks`／`sanitizeGroups`／`cacheOwnerIdFor`／`collapsedSources`） · `lib/services/database_service.dart`（schema v16、`_collapseDuplicates`、`adoptCacheInto`／`moveCacheOwnership`／`releaseCacheFrom`、`purgeOrDetachSource` 的 `protectedOwnerIds`） · `lib/services/sources_notifier.dart`（群組 CRUD、`ordered` 分支、`reorderEndpoints`／`moveEndpointTo`／`useOrderedSelection`） · `lib/services/source_failover.dart`（`chooseSource`／`resolveForSync` 走群組） · `lib/services/endpoint_probe_service.dart`（`resolve()`） · `lib/features/sources/group_picker_overlay.dart`（新增，取代刪掉的 `fallback_picker_overlay.dart`） · `lib/features/sources/endpoint_picker_overlay.dart` · `lib/features/settings/sources_screen.dart` · `lib/features/home/home_view.dart` · `lib/widgets/sync_badge.dart` · `lib/features/game_list/{game_list_screen.dart,logic/game_list_controller.dart}` · `lib/services/library_sync_service.dart` · `lib/l10n/app_{de,en,es,fr,ja,pt,zh}.arb` · `test/{database_service_v16_migration,sources_notifier_groups,widgets/group_picker_overlay}_test.dart`
+
+**遷移為什麼一列都不刪。** v16 只加欄位、把 `cache_owner_id` 從 `source_id` 一對一補上、換索引。合併留給 `adoptCacheInto`，因為群組住在設定檔裡、資料庫層讀不到——在遷移裡猜使用者分了哪些群組，就是憑猜測刪列。舊的配對照樣自動變成群組，但那發生在 `AppConfig.fromJson`（`sourceGroupsFromFallbacks`），而且群組的擁有者就是配對的排頭，所以既有安裝**一次也不用重新同步**。
+
+**去重判準沒有另發明。** `_v15OnDeviceRank` 改名 `_onDeviceRank`（現在不只 v15 用），規則照舊：已經下載到機器上的那一列贏，因為那是使用者真的擁有的東西，遠端的重抓就有。合併時會**暫時 drop 唯一索引**再重建——重建就是驗證，還有殘留就整筆 rollback，不會留下半合併的圖書館。
+
+**移出群組什麼都拿不到，是刻意的。** 合併之後沒有任何欄位記得哪一筆是哪個成員先看到的，而「這個問題不重要」正是群組的前提。所以要嘛騙人地平分，要嘛老實讓它重新同步——選後者，並且 UI 一定要先問。
+
+**刪掉群組成員時的連坐。** `purgeOrDetachSource` 是用 `provider_config` 的 JSON 比對的，刪掉的成員名字還印在那些列上，即使 `source_id` 已經改蓋成擁有者。所以多了 `protectedOwnerIds`：屬於還活著的群組的列不准動。順便修掉一個舊的過度殺傷——那兩個 UPDATE／DELETE 只比對 `(systemSlug, filename)`，會連別的來源同名遊戲一起清掉。
+
+**群組是對稱的，舊配對是單向的。** 這讓兩個舊測試的前提失效：以前「wan 沒有備援所以原地不動」，現在 wan 和 lan 同在一個群組，選誰都是選那個群組，偏好一律是群組的排頭。測試改成「不在群組裡的來源才原地不動」，另外補一條把新語意釘住。
+
+**兩套入口都做了。** 群組浮層每一列都能點，成員順序有角落的上下箭頭（觸控）也綁 `[X]`／`[Y]`（手把）；連線方式浮層的「照我排的順序」是自己一列（點某條路線一律是釘選＝覆寫，兩件事不能共用同一個手勢），路線順序用 ◀ ▶ 與角落箭頭。這一塊的四個浮層每一個都曾經是觸控死的，所以新的那個一開始就補了 widget 測試盯著。
+
+## [R-Shop 群組合併卡住] 加入群組按下去像當掉——去重的自連結沒有索引
+
+- **問題**：實機上點「與其他來源設成群組…」再選另一個來源，畫面完全沒反應。沒有例外、沒有崩潰，logcat 只有 `database has been locked for 0:00:10`。
+- **修復**：`_rekeyOwnership` 為了改寫 `cache_owner_id` 會先 drop 唯一索引，而那個索引正是去重自連結唯一的支撐；補上臨時索引 `idx_games_dedupe_tmp (cache_owner_id, systemSlug, filename)`，結束時 drop 再重建唯一索引。**65k 列從十分鐘以上變成 411 毫秒。**
+- **檔案**：`lib/services/database_service.dart`（`_rekeyOwnership` 的臨時索引） · `test/database_service_merge_perf_test.dart`（新增，65k 列的計時守衛） · `lib/features/sources/group_picker_overlay.dart`（`_busy` 擋重入）
+
+v15 的遷移**知道**要建這個臨時索引（那段還寫了註解說明為什麼），v16 的執行期路徑是另外寫的，就漏了。**同一個道理散在兩處實作，第二處一定會忘記**——這也是為什麼去重本身收在 `_collapseDuplicates` 一支裡。
+
+抓到它的方法值得記：實機沒有任何錯誤訊息可查，改用**本機測試重現規模**（seed 65k 列再計時），一次就現形。那個測試留下來了，門檻設 30 秒——有索引是毫秒級、沒索引是分鐘級，中間沒有灰色地帶。順帶：跑失控的效能測試要先設 timeout，砍掉 dart 程序會留下 `build/native_assets/windows/sqlite3.dll` 的鎖擋住下一次測試。
+
+## [R-Shop 群組浮層焦點] 建立群組之後手把不動了
+
+- **問題**：群組建好，浮層還在畫面上，但手把完全沒反應。
+- **修復**：來源清單的 `_ensureInteractiveFocus` 會在「沒有卡片持有焦點」時把焦點搶回第一張卡，而它的例外只認得動作選單。寫入群組會重建整個清單，於是焦點被搶走。改成任何浮層開著都不搶（`_anyOverlayOpen`），浮層每次寫入後也自己把焦點要回來。
+- **檔案**：`lib/features/settings/sources_screen.dart`（`_anyOverlayOpen`） · `lib/features/sources/group_picker_overlay.dart`（`_reclaimFocus`）
+
+**「焦點不能鎖死」的另一面**：那段搶焦點的程式本身是為了修「刪光來源之後手把失效」而寫的，方向相反但同一個節點。加浮層的人要記得去更新它的例外清單，否則新浮層一律中槍。
+
+## [R-Shop 浮層操作形狀] 游標看不見、模式列會關掉、排序看不出來
+
+- **問題**：實機回報四件——① 群組設定往下走，畫面不跟著捲，看不到下面的項目；② 連線方式選「自動選擇」或「照我排的順序」會直接關掉浮層；③ 從最上面往上繞回「取消」時游標消失，而且取消那列被底下的提示遮住；④ 排序按了看不出有沒有動。
+- **修復**：①③ 每一列給 `GlobalKey` 並在移動後 `Scrollable.ensureVisible`（**包含最後兩列**，漏掉就是游標消失的原因），捲動區加下方 padding 讓提示不遮住最後一列；② 模式是設定不是目的地，選了留在原地就地更新，只有選某條路線（＝覆寫）才關閉；④ 移動前後量測該列的 y 座標，用 180 毫秒把它從舊位置滑到新位置。
+- **檔案**：`lib/features/sources/endpoint_picker_overlay.dart` · `lib/features/sources/group_picker_overlay.dart` · `test/widgets/{endpoint_picker_overlay,group_picker_overlay}_test.dart`
+
+**按鍵重排也是他要的**：`[A]` 從「切換並鎖定」改成單純「使用這條路線」，鎖定移到 `[X]`，移除移到肩鍵 `[R1]`／`[L1]` 並補確認框；群組的退出同樣移到肩鍵。理由一致：**天天按的動作放最順的鍵，破壞性的動作放遠一點並且先問**。
+
+**排序的互動形狀繞了三圈**：先做成兩個小箭頭（他問「那個箭頭是幹嘛用? 不是應該移除嗎??」）→ 改成點一下跳出動作選單（「我要的移動 不是開視窗 是那邊會有小圖示 我焦點移到小圖示上面」）→ 最後定案：圖示留在列上，▶ 把焦點移上去，按下移動鍵之後上下鍵直接連續排序。**每一列底下加一行說明，並且把 ▶ 這個動作寫進去**——圖示不寫出來就等於藏起來。
+
+## [R-Shop 連線方式對齊群組] 按 A 沒有停在你選的那條，而且游標開在錯的一列
+
+- **問題**：實機回報「連線方式點 `[A]` 還是有問題」。兩件事疊在一起：① 開啟浮層時游標算錯一列——路線列從索引 2 開始（上面多了「照我排的順序」），`_initialIndex()` 卻回 `i + 1`，所以鎖在第一條路線的來源一打開，游標其實停在「照我排的順序」那列，不動就按 `[A]` 等於把整個來源改成 ordered 模式；② `[A]` 在路線列是 `switchEndpoint(pin: false)`，下一次探測可以自己換走，使用者看到的是「我選的那條又跳回去了」。
+- **修復**：使用者指定「連線方式參考群組設定那邊的拖移方式跟 `[A]` 的方式」。`[A]`／點擊路線列改成進入移動模式（與群組成員完全相同的手勢），浮層留在原地；`_initialIndex()` 改用 `_firstRouteIndex`，並讓 ordered 模式直接開在 ordered 那列。
+- **檔案**：`lib/features/sources/endpoint_picker_overlay.dart`（`_initialIndex`／`_activate`／新增 `_toggleSorting`／HUD 的 `[A]` 標籤／`_actionsForRoute` 的 ≡ 改共用） · `lib/l10n/app_*.arb`（`sources_routeRowHint` 七語系） · `test/widgets/endpoint_picker_overlay_test.dart`
+
+**「使用這條路線」這個動作被拿掉了，不是搬家。** 拿掉是對的：它本來就留不住——不鎖定就等下一次探測，鎖定的話那是 `[X]`。現在三條路各自有明確的入口：要最快的走「自動」，要自己的順序走「照我排的順序」加 `[A]` 排序，要死釘一條走 `[X]` 鎖定。`sources_routeUse` 這個字串因此沒人用了，七個語系都還留著，沒有刪。
+
+**那個差一列的 bug 是加「照我排的順序」那一列時漏改的**，`_initialIndex` 的註解還寫著「開在生效中的那條，所以不動就按 `[A]` 是 no-op」——註解描述的正是它做不到的事。加了 `_firstRoutePinnedSource` 這個 fixture 盯著：鎖在**第一條**路線才踩得到，鎖在第二條只是差一列、看起來像選錯，不會改到模式。
+
+**兩支浮層現在是同一套手勢**：`[A]` 移動、`[X]`／`[Y]` 是各自的第二第三動作、肩鍵是破壞性動作、▶ 走到列尾圖示、≡ 是觸控版的移動、✓ 結束。列底下那行說明改成不寫按鍵字母（`sources_groupMemberHint` 裡寫死的 `[A]` 在 PlayStation 配置下就是錯的，那條先留著沒動）。
+
+## [R-Shop 模式收成打勾] 兩列互斥的模式，其實是一個打勾寫成長的
+
+- **問題**：連線方式與群組兩個浮層都用**兩列互斥**表示只有兩種狀態的設定（自動／照我排的順序）。要關掉「自動」得去點另一列，而「照我排的順序」那一列講的東西底下的清單已經在講了。使用者指示：「移掉照我排序，把自動選擇改成選填、打勾之類，群組跟連線有這個情況都改一下」。
+- **修復**：兩個浮層各收成**一列打勾**。勾了＝自動（最快的／先回應的那台），沒勾＝照清單順序。副標依勾選狀態換成原本兩列各自的說明，`Icons.check_box` / `check_box_outline_blank` 當列首圖示，「使用中」徽章拿掉——打勾本身就是徽章。模型層的 `EndpointSelection.ordered` 與 `SourceGroupMode.ordered` **原封不動**，改的只有 UI。
+- **檔案**：`lib/features/sources/endpoint_picker_overlay.dart`（`_rowCount`／`_firstRouteIndex` 改 1／刪 `_orderedIndex`／`_activate` 的第 0 列改成切換） · `lib/features/sources/group_picker_overlay.dart`（模式兩列合一、成員索引 `i + 2` → `i + 1`） · `lib/l10n/app_*.arb`（`sources_groupModeAuto` 改成「自動選擇」） · `test/widgets/{endpoint_picker_overlay,group_picker_overlay}_test.dart`
+
+**索引偏移這次改成不寫死**。上一輪才因為 `i + 1` 對不上 `_firstRouteIndex` 而出事，這輪列數又變了一次——同一個地方兩天內漏改兩次，所以 `_initialIndex` 改成一律走 `_firstRouteIndex`，測試也留著 `_firstRoutePinnedSource` 這個 fixture 盯著「開在鎖定的那條，不是開在打勾那列」。**下次再加一列，這裡不用跟著改。**
+
+**沒用到的字串留著沒刪**：`sources_routeOrdered`、`sources_groupModeOrdered`、`sources_routeUse` 三個現在沒有呼叫點，七個語系都還在。刪掉要動 21 個地方而且對行為沒有影響，等哪次順手再說。
+
+## [R-Shop 同步路線解算] resolveForSync 未解算 selected/winner source 的 liveEndpoint 導致多路線來源同步時走預設死路線
+
+- **問題**：當來源具有多條連線路線（例如 LAN IP 與 DDNS）時，`resolveForSync` 雖然能判定該來源「有任意路線通」，但產出的 AppConfig/ProviderConfig 仍維持 `source.liveEndpoint` 的預設位址（例如處於外網時的 LAN IP）。導致 `LibrarySyncService` 在同步時仍連向已死的首選位址而失敗。
+- **根因**：`resolveForSync` 僅透過 `svc.reachableFor(source)` 檢查整體可達性，並未將 `svc.resolve(source)` 算出的最新可達 `SourceEndpoint` 套用到內存中的 `Source` 物件。
+- **修復**：在 `resolveForSync` 中，於確定選定/備援來源（`choice.source`）後，呼叫 `svc.resolve(choice.source)` 取得最佳可達 endpoint，並透過 `choice.source.withLiveEndpoint(resolvedEp)` 產生更新後的 `Source` 物件，隨後將其替換回 `AppConfig.sources`，使產出的 `ProviderConfig` 具有正確的 URL 與 endpointId。
+- **檔案**：`lib/services/source_failover.dart:354-378`（在 resolveForSync 中新增選定來源之 liveEndpoint 解算與 config 替換） · `test/source_failover_sync_test.dart:212-261`（新增多路線來源同步測試）
+
+
+## [R-Shop 備援架構重構] 移除群組與連線路線，改採多組備援鏈與自動選擇模式
+
+- **問題**：原有的 `SourceGroup`（群組）與 `SourceEndpoint`（連線方式/路線）造成架構過於複雜。使用者指示：「不用群組 也不用連線方式 改用備援 但是備援 可以多組 然後 新增備援的方式跟 被備援的來源 一樣的方式新增」「備援來源是否單獨顯示於主畫面選擇 可以是其他來源 也可以變成獨立來源 備援除了順序 增加一個自動選擇的 選填項」。
+- **根因**：舊架構使用雙層抽象（Sources -> Endpoints 與 SourceGroups -> Members），導致管理複雜。
+- **修復**：
+  1. 重構 `Source` 模型：移除 `SourceEndpoint` / `EndpointSelection` / `SourceGroup`，新增 `fallbackSourceIds: List<String>` 與 `fallbackAutoSelect: bool`。備援來源為獨立的 `Source` 實例，可獨立顯示與切換。
+  2. 重構服務層：簡化 `EndpointProbeService` 為單一 Source TCP 探測；重構 `SourceFailover` / `resolveForSync` 支援多組順序備援鏈與併發自動選擇 (Auto-Select) 探測；`SourcesNotifier` 新增備援鏈管理方法。
+  3. UI 浮層更新：刪除 `GroupPickerOverlay` 與 `EndpointPickerOverlay`，新增 `FallbackPickerOverlay`，支援勾選「自動選擇」、拖曳/上下調備援順序、刪除備援、新建備援來源與選擇既有來源。
+- **檔案**：`lib/models/config/source.dart` · `lib/models/config/app_config.dart` · `lib/services/source_failover.dart` · `lib/services/endpoint_probe_service.dart` · `lib/services/sources_notifier.dart` · `lib/services/source_resolver.dart` · `lib/features/sources/fallback_picker_overlay.dart` · `lib/features/settings/sources_screen.dart` · `lib/features/home/home_view.dart` · `test/source_failover_sync_test.dart` · `test/source_failover_choice_test.dart` · `test/endpoint_probe_service_test.dart`
+- **驗證**：單元測試套件執行通過（包含 multi-entry fallback 測試），且透過 `deploy.ps1` 順利打包並實機部署至 AYN Thor 測試（PID 3917, logcat 正常無例外）。
+
+
+
+## [R-Shop ƴsب^] sإsƴӷΧ^ӷ]w
+
+- **D**Gbƴ]wBh]FallbackPickerOverlay^Iu+ sإsƴӷvɡAF _fallbackPickerSourceIdC򤣽צbӷܾ [B] BbsWӷ^BΦ\إ߷sӷA|^ӷ]wDM]SourcesScreen^A^ƴ]wBhΦ۰ʸjwsƴC
+- **״_**Gb _SourcesScreenState sW _addingFallbackForSourceId lܵo_ƴsتӷ IDCsWAɡA۰ʫ_ _fallbackPickerSourceId ^ӳƴ]wBhF\sWɡA۰ʩIs ddFallbackSource jwsӷí}ƴ]wBhC
+- **ɮ**Glib/features/settings/sources_screen.dart]sW _addingFallbackForSourceId AP _addFreshFallbackSource / _closeTypePicker / _addManualSource / _addRommSource / _addRommLegacy _޿^ P 	est/widgets/sources_screen_test.dart]sW fresh fallback _ա^
+
+
+## [R-Shop 來源停用快取] 停用來源時執行整庫刪除與實體檔案檢查導致畫面卡死
+
+- **問題**：使用者在來源設定頁面停用來源（Toggle Disabled）時，畫面出現極大的 Lag 甚至當掉。
+- **根因**：setEnabled(id, false) 在停用時誤呼叫了 _purgeCachedGamesFor(id)。該方法會對資料庫中該來源的數千筆遊戲逐一進行 SD 卡/儲存空間 File.existsSync() 實體檔案檢查與單筆 SQL 刪除，在主執行緒上造成嚴重 UI 卡死與卡頓。且依據專案規範「停用不再清快取」，停用來源只需變更 nabled 狀態，不應清除快取（永久刪除來源 
+emoveSource 才需清除）。
+- **修復**：從 setEnabled 中移除 _purgeCachedGamesFor 的呼叫。停用來源切換變為 0ms 即時反應，重新啟用來源時亦可即時從快取載入。
+- **檔案**：lib/services/sources_notifier.dart（setEnabled 移除快取清理） · 	est/sources_notifier_test.dart
+
+## [R-Shop QR碼手把導覽] QrPairingScreen 掃碼頁不支援手把搖桿切換焦點與按鈕選擇
+
+- **問題**：開啟 QR code 掃瞄頁面（QrPairingScreen）時，手把搖桿/D-pad 無法在「左上角返回按鈕」與「底部手動輸入配對碼按鈕」之間切換焦點；且全域鍵盤監聽強制攔截了 [A] 鍵，導致游標就算停在返回按鈕上按下 [A] 仍會強制跳轉至手動輸入頁面。
+- **根因**：_handleScreenKey 寫死了全域 [A] 鍵觸發 _openManual()，且 initState 未指派初始焦點至可聚焦按鈕；畫面缺乏上下方向鍵切換邏輯與 ConsoleHud 手把提示。
+- **修復**：
+  1. initState 中加入 ddPostFrameCallback 預設聚焦至「手動輸入配對碼」按鈕（_manualFocus），畫面開啟即顯示白色手把焦點框。
+  2. _handleScreenKey 移除全域 [A] 攔截，交由 ConsoleFocusable 自身的焦點處理；新增搖桿/D-pad 上/下（rrowUp/rrowDown）方向鍵在 _manualFocus 與 _backFocus 之間的切換邏輯並播放按鍵音效。
+  3. 底部加入 ConsoleHud 顯示手把提示 ([B] 返回 · [A] 確定 / 選擇)。
+- **檔案**：lib/features/pairing/qr_pairing_screen.dart（手把焦點切換、ConsoleHud 與初始化焦點） · 	est/widgets/qr_pairing_screen_test.dart（新增手把導覽單元測試）
+
+## [R-Shop QR碼手把導覽] QrPairingScreen 掃碼頁不支援手把搖桿切換焦點與按鈕選擇
+
+- **問題**：開啟 QR code 掃瞄頁面（QrPairingScreen）時，手把搖桿/D-pad 無法在「左上角返回按鈕」與「底部手動輸入配對碼按鈕」之間切換焦點；且全域鍵盤監聽強制攔截了 [A] 鍵，導致游標就算停在返回按鈕上按下 [A] 仍會強制跳轉至手動輸入頁面。
+- **根因**：_handleScreenKey 寫死了全域 [A] 鍵觸發 _openManual()，且 initState 未指派初始焦點至可聚焦按鈕；畫面缺乏上下方向鍵切換邏輯與 ConsoleHud 手把提示。
+- **修復**：
+  1. initState 中加入 ddPostFrameCallback 預設聚焦至「手動輸入配對碼」按鈕（_manualFocus），畫面開啟即顯示白色手把焦點框。
+  2. _handleScreenKey 移除全域 [A] 攔截，交由 ConsoleFocusable 自身的焦點處理；新增搖桿/D-pad 上/下/左/右（rrowUp/rrowDown/rrowLeft/rrowRight）方向鍵在 _manualFocus 與 _backFocus 之間的切換邏輯並播放按鍵音效。
+  3. 底部加入 ConsoleHud 顯示手把提示 ([B] 返回 · [A] 確定 / 選擇)。
+- **檔案**：lib/features/pairing/qr_pairing_screen.dart（手把焦點切換、ConsoleHud 與初始化焦點） · 	est/widgets/qr_pairing_screen_test.dart（新增手把導覽單元測試）
+
+## [R-Shop 語系鎖定詞彙統一] 多語系「已鎖定/Pinned」詞彙統一與 Unicode 跳脫清理
+
+- **問題**：sources_routePinned、sources_routeLock、sources_routeUnlock、sources_routeReleasePin 等連線與鎖定相關詞彙在 de/es/pt/ja 語系之間用詞不一致（如 de 混用 Fixiert/festlegen、es/pt 混用 Fijada/Fixada、ja 混用 固定/ロック），且 pp_ja.arb 檔案後半段跳脫格式混用。
+- **根因**：過往多語系翻譯分散新增時使用了非標準同義詞。
+- **修復**：
+  1. 統一德語 (Gesperrt/Sperre aufheben)、西班牙語與葡萄牙語 (Bloqueada/Desbloquear)、日語 (ロック中/ロックを解除) 的「鎖定/Locked」系列翻譯詞彙。
+  2. 重新執行 lutter gen-l10n 產生 pp_localizations_*.dart 檔案。
+- **檔案**：lib/l10n/app_{de,es,ja,pt}.arb · lib/l10n/app_localizations_{de,es,ja,pt}.dart
+
+## [R-Shop 主頁面移除來源切換] 主頁面移除頂部來源標籤條與 L2/R2 手把切換來源功能
+
+- **問題**：先前主頁面頂部設有來源標籤條（Source Banner），並允許手把 L2/R2 觸發切換作用來源；使用者明確需求為簡化介面，主頁面一次只顯示目前唯一作用來源，來源與備援來源的選擇與切換統一在「來源清單」頁面設定。
+- **根因**：舊設計在主頁面上提供了額外來源切換入口。
+- **修復**：
+  1. lib/features/home/home_view.dart 移除頂部來源條 _buildSourceBanner() 及其在 ody 版面中的 Column 擴展包覆。
+  2. 移除全域快捷鍵 TabLeftIntent (L2) / TabRightIntent (R2) 觸發來源切換的監聽綁定及 _cycleActiveSource() 輔助函式。
+  3. 移除底部 ConsoleHud 手把提示中的 L2: 前的提供元 與 R2: 次的提供元 按鈕圖示。
+- **檔案**：lib/features/home/home_view.dart（移除來源顯示條、L2/R2 Intents 與 HUD 提示）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 來源與備援邊框與高對比風格] 來源設置與備援設定採用全列白邊框與純白高對比文字風格
+
+- **問題**：來源設置與備援設定浮層項目邊框不夠顯眼，副標題與說明文字顏色較暗（`Colors.grey.shade500`），手把焦點與視覺選取清晰度有待提升。
+- **根因**：過往卡片未統一設置清晰的白邊框與高對比白字。
+- **修復**：
+  1. `SourcesScreen`（`_SourceCard`）：邊框統一改為清晰白邊框（未聚焦時 `Colors.white24` 1.5px，聚焦時 `ConsoleFocusable` 純白 2px 邊框與深紅高亮背景）；副標題、類型、主機與遊戲計數統一採用純白/亮白（`Colors.white` / `Colors.white70`）高對比字體。
+  2. `FallbackPickerOverlay`（備援設定）：全面對齊 `SourcesScreen` 風格，選項列均採用 `0xFF1C1C1C` 卡片底色、`Colors.white24` 未選邊框 / `Colors.white` 2px 選取白邊框、`Colors.white` 與 `Colors.white70` 高對比文字。
+- **檔案**：`lib/features/settings/sources_screen.dart`（_SourceCard 白邊框與高對比文字） · `lib/features/sources/fallback_picker_overlay.dart`（對齊來源設置視覺風格與邊框）
+
+## [R-Shop 代理全域無縫同步與PR15提交] 代理設定異動全域無縫同步、字串統一更名為代理並成功提交 PR #15
+
+- **現象**：編輯/移除代理伺服器時其他頁面殘留舊代理狀態，且界面詞彙需精準區隔。
+- **根因**：`activeFailoverChoiceProvider` 過去未全域監聽 `sourcesProvider` 異動，導致快取與狀態未實時刷新。
+- **解法**：
+  1. `activeFailoverChoiceProvider` 升級為全域 `StateNotifierProvider` 並監聽 `sourcesProvider`，任何代理設定異動（新增/移除/排序/開關）一秒內自動清空快取、重測並全域動態連動同步。
+  2. 強化 `SourceChoice.isFallback` 嚴格校驗（移出代理清單或停用時即刻無效化）。
+  3. 全系統詞彙統一更名為「代理」（`🛡️ 已設代理` / `⚡ 代理中` / `⚠️ 斷線 (已切換至: XXX)`）。
+  4. 完成與官方原作者 GitHub `upstream/main` (`AverageConsumer/R-Shop`) 100% 同步，並成功提交 PR #15。
+- **檔案**：`lib/providers/app_providers.dart` · `lib/services/source_failover.dart` · `lib/features/settings/sources_screen.dart` · `lib/widgets/sync_badge.dart` · `lib/features/home/home_view.dart` · `lib/features/sources/fallback_picker_overlay.dart` · `lib/l10n/app_zh.arb`
+
+## [R-Shop Multi-Fallback實機驗證完成] 多組備援與連線方式 UI 實機驗證全數通過
+- **問題**：多組備援鏈 (fallbackSourceIds / fallbackAutoSelect) 及路線浮層觸控+手把雙入口改動需於 AYN Thor 實機操作驗證。
+- **修復**：使用者完成實機測試，確認開關眼睛、打勾使用中、自動選擇探測、徽章高對比白邊框、手把與觸控雙入口功能均運作正常無誤。
+- **檔案**：`lib/features/settings/sources_screen.dart` · `lib/features/sources/fallback_picker_overlay.dart` · `docs/HANDOVER.md`
+
+## [R-Shop 網格卡片版面溢位修復] 主畫面縮小網格時數量膠囊標籤觸發 OVERFLOWED BY 5.4 PIXELS 溢位條
+
+- **問題**：主畫面網格縮小（欄數變多，卡片變窄）且遊戲數量達到數萬~十多萬個時，卡片右上/右側出現白底紅字 `OVERFLOWED BY 5.4 PIXELS` 警示條。
+- **根因**：`HomeGridView` 底部的遊戲數量膠囊標籤 `Row` 未限制與卡片寬度同寬，當位數變長或雙標籤併排時，在窄卡片上超出 5.4 像素觸發 Flutter RenderFlex 溢位警告。
+- **修復**：將 `_buildLibraryItem` 與 `_buildGridItem` 中的數量標籤 `Row` 包裹 `FittedBox(fit: BoxFit.scaleDown, alignment: Alignment.centerLeft)`，確保卡片在任何寬度下均可自動微縮適應。實機截圖驗證溢位完全消除。
+- **檔案**：`lib/features/home/widgets/home_grid_view.dart:205,380`（包裹 FittedBox scaleDown 適應寬度）
+
diff --git a/docs/HANDOVER.md b/docs/HANDOVER.md
new file mode 100644
index 0000000..fe8c1d8
--- /dev/null
+++ b/docs/HANDOVER.md
@@ -0,0 +1,101 @@
+# R-Shop 交接：現在停在哪
+
+> **這份是「未完成」清單，不是紀錄。** 做完的事寫進 [FIX_LOGS.md](FIX_LOGS.md) 並在
+> [FIX_INDEX.md](FIX_INDEX.md) 補一列，然後**把它從這裡刪掉**。
+> 留在這裡的每一條都應該是真的還沒做完。
+>
+> **使用者會講的那句話是「R-Shop 繼續任務」。** 聽到就照下面的載入確認做完，
+> 把清單念一次（**等實機確認的先講**），然後**問他要接哪一項**——不要自己挑了就動手。
+
+---
+
+## 開工前必做：載入確認（不是說明，是要執行）
+
+**這份檔常常是被單獨打開的**——使用者的講法是「繼續未完成的事，先看 HANDOVER」。
+所以先讀完下面五項再動待辦，**並在回覆裡以一行列出你實際讀到什麼**。
+沒列出來就等於沒讀，只說「已讀取」不算。
+
+| # | 要讀的 | 回覆裡要講出什麼 |
+| :--- | :--- | :--- |
+| 1 | `D:\ThorAPK\StudioProjects\GLOBAL_DEV_NOTES.md` | 建置工具鏈有沒有變、有無新增規則 |
+| 2 | `R-Shop/AGENTS.md` | 這個專案特有的限制，哪幾條跟這次任務有關 |
+| 3 | `docs/FIX_INDEX.md` 與 `docs/FIX_BY_FILE.md` | 你要碰的檔或症狀有沒有前例（**有就讀那一條**） |
+| 4 | `R-Shop/.agents/skills/` | 跟這次任務相關的技能有哪些 |
+| 5 | 長期記憶的 `MEMORY.md` | 使用者偏好裡跟這次任務有關的是哪幾條 |
+
+**第 4 項**：`rshop-build-deploy`（建置的三個陷阱，含 `scripts/deploy.ps1`）·
+`rshop-touch-and-gamepad`（**動 UI 之前一定先讀**）·
+`rshop-source-routing`（來源／路由／**群組**的不變式）· `rshop-l10n`。
+
+**第 5 項**：長期記憶在
+`C:\Users\Guset\.claude\projects\D--ThorAPK-StudioProjects\memory\`。
+**只有 Claude Code 開在這個工作區才會自動載入，其他 AI 工具拿不到，必須自己 Read。**
+裡面是使用者的偏好與工作方式（回答要多短、批次多大就該部署、哪些坑重複踩過），
+不讀的話會用錯的方式工作而不自知。
+
+**收尾時同樣要執行**：寫 `docs/FIX_LOGS.md`（問題／修復／檔案 三個固定欄位）、
+補 `docs/FIX_INDEX.md`、重跑 `python scripts/build_fix_by_file.py`、
+**把做完的那條從本檔刪掉**。少做一件都不算完成。
+
+---
+
+## 1. 等實機確認（程式已出版，等回報）
+
+目前尚無待驗證項目（多組備援 Multi-Fallback 與來源 UI 實機驗證已於 2026-08-09 通過測試）。
+
+---
+
+## 2. 待辦
+
+目前無進行中之待辦事項。
+
+---
+
+---
+
+## 3. 已知不修
+
+### 3.1 測試基準：6 個失敗是既有的
+
+`flutter test` 完整跑 **1907 通過 / 6 失敗**（`wip/source-groups`，2026-08-05 實測；
+`main-zh` 是 1825 通過，差在群組那批新測試）。**6 個都不是回歸**：
+
+    network_discovery: mDNS                 Windows socket errno 10042
+    rom_folder_service ×3                   Windows 路徑行為
+    romm_pairing_live_smoke ×2              需要真的有 RomM 跑在 localhost:8090
+
+> 原本是 7 個。第 7 個（`l10n_completeness: DE has all EN keys`）**是真的缺字串**，
+> 已補完並綠了——見 `docs/FIX_LOGS.md` 的 `[R-Shop onboarding 五語系缺字串]`。
+> **教訓**：基準清單裡的每一條都要寫得出「為什麼它不算回歸」，寫不出來的那條就是還沒查。
+
+**另外有一個時序敏感的測試會偶爾多失敗一個**：
+`game_list_controller: restoreFilters applies saved filters`。
+**單次隔離執行失敗不足以認定回歸**——我為此誤判過一次，連跑三次就會發現它自己會過。
+
+### 3.2 ~~自動選最快的那條路線：決定不做~~ → 已重開並做完（2026-08-05）
+
+**這條不再是「不修」。** 當初的理由是「同一台也當不同台，替他換路＝替他換來源」，
+但那句話管的是**來源之間**，不是同一個來源底下的**路線之間**——
+`[R-Shop 路線各自驗證]` 把路線收斂成同一台、同一份清單之後，重開條件就成立了。
+現行行為見 `docs/FIX_LOGS.md` 的 `[R-Shop 自動選最優路線]`。
+
+### 3.3 `FIX_BY_FILE.md` 的「反查不到」不是待辦
+
+`build_fix_by_file.py` 印的 `entries without paths` **不用歸零**——環境診斷、部署作業、
+需求判定本來就沒有程式碼變更，在反查表上無處可去。這個數字會隨這類紀錄往上走
+（現在是 3）。腳本裡誤導的說明字串已改掉。
+見 `docs/FIX_LOGS.md` 的 `[R-Shop 反查不到]`。
+
+### 3.4 桌面平台的 7 個產生檔一直是未提交狀態
+
+    linux/flutter/generated_plugin_registrant.{cc,h}
+    linux/flutter/generated_plugins.cmake
+    macos/Flutter/GeneratedPluginRegistrant.swift
+    windows/flutter/generated_plugin_registrant.{cc,h}
+    windows/flutter/generated_plugins.cmake
+
+每次 `flutter pub get` 都會重寫。**這個專案只出 Android**，提交它們只會製造雜訊。
+`git status` 看到它們是正常的，不要順手 `git add`。
+
+> 這也是為什麼 **`git add` 一律用明確路徑，不要用 `-A`**——
+> 而且工作區有多個視窗同時在改（見 `GLOBAL_DEV_NOTES.md` 開頭）。
diff --git a/docs/SPEC.md b/docs/SPEC.md
new file mode 100644
index 0000000..4f26168
--- /dev/null
+++ b/docs/SPEC.md
@@ -0,0 +1,414 @@
+# R-Shop 規格書（`main-zh`）
+
+> **導覽**：先讀共用的 [GLOBAL_DEV_NOTES.md](../../GLOBAL_DEV_NOTES.md)（建置工具鏈、分支政策、紀錄格式），
+> 再依需要讀本專案 `docs/` 的其餘各份：
+> - [ARCHITECTURE.md](ARCHITECTURE.md) — 模組分層與依賴方向
+> - [FIX_INDEX.md](FIX_INDEX.md) — 症狀 → 過去解過的條目
+> - [FIX_LOGS.md](FIX_LOGS.md) — 修復與功能紀錄（細節、取捨、教訓）
+> - [USER_GUIDE.md](USER_GUIDE.md) — 使用手冊
+
+
+> **基準分支：`main-zh`**（領先 upstream `main` 26 個 commit）
+> Flutter 專案名：`retro_eshop` ｜ Android 套件名：`com.retro.rshop.tw`
+> 版本：`1.7.0-zh+13` ｜ Dart SDK `>=3.0.0 <4.0.0` ｜ Material 3
+> 目標裝置：Android 復古掌機（Anbernic / Retroid Pocket / AYN Odin 等）與 Android TV
+> 支援平台目錄：`android` / `ios` / `linux` / `macos` / `windows` / `web`（實際維護以 Android 為主）
+
+> **相關文件**：[../ARCHITECTURE.md](../ARCHITECTURE.md)（高階概覽，1 張圖）｜[ARCHITECTURE.md](ARCHITECTURE.md)（深度架構，Mermaid 圖集）｜[../docs/USER_GUIDE.md](USER_GUIDE.md)（25KB 使用手冊）
+
+---
+
+## 0. 分支說明與既有文件校正
+
+### 0.1 `main-zh` vs `main`
+
+| 項目 | `main`（上游） | `main-zh`（本分支） |
+|------|---------------|---------------------|
+| `applicationId` / `namespace` | `com.retro.rshop` | `com.retro.rshop.tw` |
+| Kotlin 原始碼路徑 | `.../kotlin/com/retro/rshop/` | `.../kotlin/com/retro/rshop/tw/` |
+| `pubspec.yaml` version | `1.7.x` | `1.7.0-zh+13` |
+| App 顯示名稱 | R-Shop | **R-Shop-zh** |
+| APK 檔名 | 預設 | `R-Shop-v{versionName}.apk` |
+| 語系 | 多語，繁中不完整 | `lib/l10n/app_zh.arb` 統一為 `zh` locale（原有 `zh` 與 `zh-TW` 混用問題已修正）；新增 `app_localizations_zh.dart`（1582 行） |
+
+**`main-zh` 的實質功能增補**：
+
+| 新增 / 變更 | 位置 | 說明 |
+|-------------|------|------|
+| **`ConsoleDialog`** | `lib/widgets/console_dialog.dart`（252 行，新檔） | 手把最佳化對話框元件，統一焦點高亮樣式（白框 + 紅底） |
+| Onboarding 流程改版 | `lib/features/onboarding/`（5 檔大幅修改） | 歡迎選擇步驟、RA 引導、RomM 登入畫面重構 |
+| B 鍵離開確認 | `onboarding_screen.dart` | 手把 B 鍵觸發離開確認對話框 |
+| Select 鍵映射匯入設定 | `onboarding_screen.dart` | 手把 Select 鍵 → 匯入設定檔 |
+| 焦點高亮統一 | `lib/core/widgets/console_focusable.dart` | 全 App 統一白框 + 紅底選取樣式 |
+| 返回鈕與標題統一 | `pairing` / `sources` 畫面 | 返回箭頭位置與標題樣式一致化 |
+| 語系切換修正 | — | 修正相似語言代碼（`zh` 與 `zh-TW`）切換失效問題 |
+| APK 部署任務 | `android/` gradle | 自動複製改名後的 APK 至 `D:\test-apk` |
+
+> **合併回上游注意**：與 ImageOverlay 相同，`.tw` 套件路徑重命名會讓 Kotlin 檔案在 `git diff` 中全檔標記變更。Dart 側沒有改名，回推較容易。
+
+### 0.2 既有 [../ARCHITECTURE.md](../ARCHITECTURE.md) 的已知偏差
+
+| 記載 | 實際 | 狀態 |
+|------|------|------|
+| `FocusSyncManager` 位於 `lib/core/focus/` | `lib/core/focus/` 不存在；實為 `lib/core/input/focus_sync_manager.dart` | ✅ **已修正**（2026-07-30） |
+| 檔案連結為 `file:///c:/Users/Mini-PC/StudioProjects/...` | 實際路徑為 `D:\ThorAPK\StudioProjects\` | ✅ **已改為相對路徑** |
+| 版本 v1.7.0 | `main-zh` 為 `1.7.0-zh+13` | ✅ **已更新** |
+| `GlobalInputWrapper` 位於 `lib/core/input/` | 正確（`lib/core/input/global_input_wrapper.dart`） | — 無誤 |
+| 「66 種主機字典」 | `system_model.dart` 的 `supportedSystems` 實際為 **66 個 `SystemModel(...)` 條目**（:56 起、:883 收尾）；`grep -c "SystemModel("` 數到 67 是把 `:16` 的建構式宣告 `const SystemModel({` 也算進去了 | ✅ **已核實**：文件寫 66 種正確，無須修改程式碼 |
+
+---
+
+## 1. 產品定位
+
+**控制器優先（Controller-First）**的復古遊戲庫管理器與下載前端，視覺風格模仿 Nintendo eShop。
+
+核心命題：把散落在**本地儲存、RomM 伺服器、SMB 網路共享、FTP 伺服器、Web 目錄**的 ROM，統一成一個可用手把完整操作的遊戲庫。
+
+**設計約束**：
+| 約束 | 說明 |
+|------|------|
+| 無觸控可用 | 所有選單、列表、設定、對話框都必須能純靠 D-pad + 手把按鍵操作 |
+| 小記憶體裝置 | 掌機記憶體有限，大量高畫質封面需防 OOM |
+| 背景下載不中斷 | 下載與解壓縮須靠 Android 前台服務保活 |
+| 離線可用 | 已下載的遊戲庫與元資料存於本地 SQLite |
+
+---
+
+## 2. 分層結構
+
+```
+lib/
+├── main.dart              入口：Riverpod scope、主題、i18n、全域輸入監聽
+├── core/                  基礎設施（22 檔）
+│   ├── input/             ★ 手把焦點系統（11 檔，1980 行）
+│   ├── widgets/           console_focusable.dart（564 行）等通用元件
+│   ├── responsive/        breakpoints / spacing / typography
+│   ├── theme/             app_theme.dart
+│   └── util/              色彩對比、來源配色
+├── features/              功能頁面（8 個模組）
+│   ├── home/  game_list/  game_detail/  library/
+│   ├── onboarding/  pairing/  sources/  settings/
+├── models/                資料模型（11 檔）
+│   ├── system_model.dart  ★ 906 行，主機字典
+│   └── config/            app_config / provider_config / source / system_config
+├── providers/             Riverpod 狀態（9 檔，1426 行）
+├── services/              ★ 業務服務（43 檔，最大層）
+├── widgets/               全域共用 UI（18 + download 9 檔）
+├── utils/                 工具函式（8 檔）
+└── l10n/                  7 種語言 .arb + 產生的 dart
+
+android/app/src/main/kotlin/com/retro/rshop/tw/
+├── MainActivity.kt        Platform Channels（zip / storage / smb）
+└── SmbService.kt          smbj 原生 SMB 存取
+```
+
+### 2.1 各層檔案規模（找程式碼的參考）
+
+| 層 | 檔案數 | 最大單檔 |
+|----|--------|----------|
+| `services/` | 43 | `download_service.dart` 1245、`database_service.dart` 1066、`download_queue_manager.dart` 694、`library_sync_service.dart` 630 |
+| `features/` | 約 90 | 依模組分散 |
+| `core/` | 22 | `console_focusable.dart` 564、`focus_sync_manager.dart` 393 |
+| `models/` | 11 | `system_model.dart` 906、`provider_config.dart` 335、`source.dart` 313 |
+| `providers/` | 9 | `app_providers.dart` 460 |
+| `widgets/` | 27 | — |
+
+---
+
+## 3. 多來源抽象層（本專案的核心設計）
+
+### 3.1 兩個型別系統的區別（易混淆，務必分清）
+
+```dart
+// lib/models/config/source.dart
+enum SourceType { romm, smb, ftp, web, local }   // 5 種 — 使用者看到的「來源」
+
+// lib/models/config/provider_config.dart
+enum ProviderType { web, smb, ftp, romm }        // 4 種 — 可抽象化的「取得管道」
+```
+
+> ⚠️ **`local` 沒有對應的 `ProviderType`** —— 本地來源**不走 `SourceProvider` 抽象**，而是由 `rom_folder_service.dart` / `local_folder_matcher.dart` 直接掃描檔案系統。新增來源型別時要留意這個不對稱。
+
+**`SourceTypeX.supportsAutoMap`**：只有 `romm` 為 `true`。
+- RomM 能自報平台清單 → 不需逐主機設定路徑
+- 其他來源（smb/ftp/web/local）**必須**為每個主機建立 `SystemSourceMapping`，系統才知道內容在哪
+
+### 3.2 `SourceProvider` 抽象介面
+
+```dart
+abstract class SourceProvider {
+  ProviderConfig get config;
+  Future<List<GameItem>> fetchGames(SystemConfig system);
+  Future<DownloadHandle> resolveDownload(GameItem game);
+  Future<SourceConnectionResult> testConnection();
+  String get displayLabel;
+}
+```
+
+實作（`lib/services/providers/`）：
+
+| 實作 | 行數 | 協定 |
+|------|------|------|
+| `WebProvider` | 256 | HTTP 目錄索引解析（dio） |
+| `SmbProvider` | 164 | 委派給原生 `NativeSmbService`（smbj） |
+| `FtpProvider` | 299 | `ftpconnect` |
+| `RommProvider` | 167 | RomM REST API（委派 `RommApiService` 442 行） |
+
+`ProviderFactory.getProvider(config)` 依 `ProviderType` 建立實例。
+**注意**：`SmbProvider` 需要 `ProviderFactory.init(smbService:)` 先注入 `NativeSmbService`（正式流程於 `main.dart:87` 的 `runApp()` 之前完成），否則會拋出具名 `StateError` 說明尚未初始化。測試可用 `ProviderFactory.reset()`（`@visibleForTesting`）清除 static 狀態。
+
+### 3.3 `SourceResolver`（全靜態工具類）
+
+負責把「使用者設定的 `Source`」解析成「可用的 `ProviderConfig` 清單」：
+
+| 方法 | 用途 |
+|------|------|
+| `providersFor(...)` | 針對某主機解析出所有可用 provider 設定 |
+| `sourcesFor(...)` | 反查 provider 對應的 Source |
+| `_typeMatches(SourceType, ProviderType)` | 跨兩個列舉的型別對映 |
+| `_connectionMatches(Source, ProviderConfig)` | 連線參數比對（判斷是否同一台伺服器） |
+| `_toProviderConfig(...)` | Source → ProviderConfig 轉換 |
+| `_joinUrl(base, segment)` | URL 拼接 |
+
+> 一個主機可能有多個來源同時提供 → 這是下載失敗時「自動切換替代來源」（§4.3）的基礎。
+
+### 3.4 RomM 認證
+
+`AuthConfig` 支援 `user`/`pass`/`apiKey`/`domain`。**RomM 4.8+ 的 Client API Token（Bearer）優先於帳密**。
+
+配對方式（`lib/features/pairing/`，3 檔）：
+- QR Code 掃描（`mobile_scanner` 5.2.3，支援相機與相簿圖片）
+- 手動輸入（`manual_pairing_screen.dart`，`main-zh` 有 218 行修改）
+- mDNS 區網自動發現（`network_discovery_service.dart` 136 行）
+
+---
+
+## 4. 下載系統
+
+### 4.1 狀態機
+
+```dart
+enum DownloadStatus {
+  queued, downloading, extracting, moving, completed, cancelled, error;
+  bool get isTerminal => this == completed || this == cancelled || this == error;
+}
+```
+
+`DownloadItem` 欄位：`id`、`game`、`system`、`targetFolder`、`autoExtract`、`addedAt`、`status`、`progress`、`receivedBytes`、`totalBytes`、`downloadSpeed`、`error`、`retryCount`。
+
+### 4.2 佇列管理（`DownloadQueueManager`，`ChangeNotifier`）
+
+| 常數 / 設定 | 值 |
+|-------------|-----|
+| `_maxRetries` | 3 |
+| `_maxQueueSize` | 100 |
+| `maxConcurrent` | 預設 **2**，可由設定調整（`setMaxConcurrent()`，有 clamp） |
+
+**關鍵行為**：
+- `_processQueue()` 依 `availableSlots = maxConcurrent - activeCount` 啟動新任務
+- `_isRetryableError()` 判斷是否可重試；`_scheduleRetry()` 帶 **jitter**（`_jitterRandom`）避免同時重試打爆伺服器
+- **`_switchToAlternativeSource()`** — 重試耗盡後，自動改用同主機的其他來源（§3.3 的價值所在）
+- `_generateId(game, system)` 產生穩定 ID → 可去重
+- `_persistQueue()` / `restoreQueue()` — 佇列持久化，App 重啟後可續傳
+- `_throttledNotificationUpdate()` — 節流通知更新，避免高頻 UI 重繪
+- `_stopForegroundServiceIfIdle()` — 佇列空閒時停止前台服務省電
+- `_safeNotify()` — 包裝 `notifyListeners()` 防止 dispose 後呼叫
+
+### 4.3 下載執行（`DownloadService`，1245 行）
+
+支援斷點續傳與 HTTP / FTP / SMB 串流讀寫，並與 Android 前台服務（`flutter_foreground_task` 9.2.0）同步進度。
+`DownloadHandle`（78 行）為各 provider 回傳的統一下載句柄。
+
+### 4.4 解壓縮
+
+下載完成且 `autoExtract` 為 true 時，透過 Platform Channel 交給 Android 原生解壓（見 §6）。
+
+---
+
+## 5. 手把焦點系統（`lib/core/input/`，11 檔 1980 行）
+
+這是「控制器優先」的實作核心，也是本專案最需要理解才敢改的部分。
+
+| 檔案 | 行數 | 職責 |
+|------|------|------|
+| `focus_sync_manager.dart` | 393 | **焦點同步管理器**，確保無觸控環境下焦點不遺失、不跳錯 |
+| `overlay_scope.dart` | 307 | 對話框 / 覆蓋層的焦點範圍隔離 |
+| `app_actions.dart` | 300 | 全域動作定義（Flutter `Actions`） |
+| `searchable_screen_mixin.dart` | 280 | 可搜尋畫面的通用行為 |
+| `console_screen_mixin.dart` | 239 | 主機風格畫面的通用行為 |
+| `input_providers.dart` | 181 | 輸入相關 Riverpod provider |
+| `global_input_wrapper.dart` | 90 | 攔截 D-pad / 手把 / 鍵盤事件並轉發 |
+| `focus_scope_observer.dart` | 82 | 焦點範圍變化觀察 |
+| `gamepad_key_fix.dart` | 52 | **手把按鍵相容性修補**（不同手把 keycode 差異） |
+| `app_intents.dart` | 46 | Flutter `Intent` 定義 |
+| `input.dart` | 10 | barrel export |
+
+搭配 `lib/core/widgets/console_focusable.dart`（**564 行**）—— 可聚焦元件的視覺與行為封裝。
+
+> **`main-zh` 統一了焦點高亮樣式為「白框 + 紅底」**，並新增 `ConsoleDialog`（`lib/widgets/console_dialog.dart` 252 行）解決對話框在手把下的焦點問題。改動焦點樣式時請同時檢查 `console_focusable.dart` 與 `console_dialog.dart`，避免兩處不一致。
+>
+> 已修過的坑：`ConsoleDialog` 需要包 `Material` widget，否則文字出現黃色底線（Flutter 預設 debug 樣式）。
+
+---
+
+## 6. Android 原生橋接
+
+`MainActivity.kt` 註冊 5 個 channel：
+
+| Channel | 型別 | 用途 |
+|---------|------|------|
+| `com.retro.rshop.tw/zip` | MethodChannel | 解壓縮 |
+| `com.retro.rshop.tw/zip_progress` | EventChannel | 解壓進度串流 |
+| `com.retro.rshop.tw/storage` | MethodChannel | 儲存權限與路徑 |
+| `com.retro.rshop.tw/smb` | MethodChannel | SMB 操作 |
+| `com.retro.rshop.tw/smb_progress` | EventChannel | SMB 傳輸進度串流 |
+
+> ⚠️ **Channel 名稱含 applicationId 前綴 `com.retro.rshop.tw`** —— 這代表 `main` 與 `main-zh` 的 channel 名稱**不同**。若要合併分支，channel 字串必須同步修改 Kotlin 與 Dart 兩側（`native_smb_service.dart:22-23` 的 `_channel` / `_progressChannel` 宣告）。
+
+`SmbService.kt` 使用 `smbj` 0.13.0 處理 SMB2/SMB3 認證、檔案列舉與串流傳輸。
+
+---
+
+## 7. 資料層
+
+### 7.1 SQLite（`DatabaseService`，1066 行）
+
+儲存遊戲元資料、來源設定、下載歷史、成就資料。`sqflite` 2.4.2。
+
+相關服務：
+- `library_sync_service.dart`（630 行）— 遊戲庫同步
+- `unified_game_service.dart`（94 行）— 統一遊戲查詢入口
+- `config_storage_service.dart`（196 行）+ `config_parser.dart`（106）+ `config_bootstrap.dart`（10）— 設定檔匯入匯出
+- `storage_service.dart`（528 行）— `SharedPreferences` 層設定
+
+### 7.2 主機字典（`system_model.dart`，906 行）
+
+66 種經典主機（NES / SNES / N64 / Game Boy / PS1 / PSP…），每筆含 platform ID、顯示名稱、副檔名清單、預設目錄映射。
+
+配套：`romm_platform_matcher.dart`（128 行）把 RomM 的平台名稱對映到本地 `SystemModel`。
+
+### 7.3 封面與快取（防 OOM 的關鍵）
+
+| 服務 | 行數 | 職責 |
+|------|------|------|
+| `thumbnail_service.dart` | 388 | 縮圖產生與管理 |
+| `cover_preload_service.dart` | 363 | 封面預載 |
+| `thumbnail_index_service.dart` | 316 | 縮圖索引 |
+| `image_cache_service.dart` | 248 | 記憶體 / 磁碟雙層快取 |
+| `thumbnail_migration_service.dart` | 59 | 舊版縮圖遷移 |
+
+搭配 `cached_network_image` 3.4.1 + `flutter_cache_manager` 3.4.1。
+
+### 7.4 RetroAchievements 整合
+
+| 服務 | 行數 | 職責 |
+|------|------|------|
+| `ra_api_service.dart` | 328 | RA 官方 REST API |
+| `ra_sync_service.dart` | 355 | 成就同步與比對 |
+| `ra_hash_service.dart` | 223 | ROM 雜湊計算（RA 專用演算法，非單純 MD5） |
+
+模型：`ra_models.dart`（233 行）。
+
+---
+
+## 8. 狀態管理（Riverpod 2.6.1）
+
+9 個 provider 檔案，共 1426 行：
+
+| 檔案 | 行數 | 範圍 |
+|------|------|------|
+| `app_providers.dart` | 460 | 全域設定、主題、語系 |
+| `game_providers.dart` | 197 | 遊戲清單與查詢 |
+| `download_providers.dart` | 166 | 下載佇列狀態 |
+| `source_health_providers.dart` | 147 | 來源連線健康度 |
+| `ra_providers.dart` | 114 | RetroAchievements |
+| `rom_status_providers.dart` | 113 | ROM 安裝狀態 |
+| `shelf_providers.dart` | 108 | 自訂書架（`custom_shelf.dart` 174 行） |
+| `installed_files_provider.dart` | 90 | 已安裝檔案 |
+| `library_providers.dart` | 31 | 遊戲庫 |
+
+> 混合模式注意：`DownloadQueueManager` 是 **`ChangeNotifier`**（非 Riverpod `Notifier`），`SourcesNotifier`（498 行）亦然。新增狀態時請確認要沿用哪種模式，避免第三種寫法。
+
+---
+
+## 9. 依賴清單（`pubspec.yaml`）
+
+| 分類 | 套件 | 版本 |
+|------|------|------|
+| 狀態管理 | `flutter_riverpod` | 2.6.1 |
+| 網路 | `dio` | 5.9.1 |
+| HTML 解析 | `html` | 0.15.6 |
+| FTP | `ftpconnect` | 2.0.10 |
+| 資料庫 | `sqflite` | 2.4.2 |
+| 安全儲存 | `flutter_secure_storage` | 9.2.4 |
+| 一般儲存 | `shared_preferences` | 2.5.4 |
+| 音效 | `flutter_soloud` | 2.1.7 |
+| 前台服務 | `flutter_foreground_task` | 9.2.0 |
+| QR 掃描 | `mobile_scanner` | 5.2.3 |
+| 圖片快取 | `cached_network_image` / `flutter_cache_manager` | 3.4.1 / 3.4.1 |
+| 圖片處理 | `image` | 4.3.0 |
+| 壓縮 | `archive` | 3.6.1 |
+| 雜湊 | `crypto` | 3.0.7 |
+| 字型 | `google_fonts` | 6.3.3 |
+| SVG | `flutter_svg` | 2.0.17 |
+| 其他 | `path_provider` 2.1.5、`permission_handler` 11.4.0、`file_picker` 8.3.7、`share_plus` 10.1.4、`url_launcher` 6.3.2、`package_info_plus` 8.3.1、`confetti` 0.8.0、`intl` 0.20.2 | |
+| 原生（Kotlin） | `smbj` | 0.13.0 |
+
+---
+
+## 10. 多語系
+
+7 種語言 `.arb`：`en`（基準）、`de`、`es`、`fr`、`ja`、`pt`、`zh`。
+設定於 `l10n.yaml`，產生 `lib/l10n/app_localizations*.dart`（**產生檔已納入 git**，改 `.arb` 後需重新產生並一併提交）。
+
+> `main-zh` 把繁中統一到 `zh` locale（原有 `zh` 與 `zh-TW` 並存造成切換失效）。`app_localizations_zh.dart` 為 1582 行。
+> 用語請依 [GLOBAL_DEV_NOTES.md](../../GLOBAL_DEV_NOTES.md) 的台灣在地化詞彙表。
+
+---
+
+## 11. 音效與觸覺
+
+- `audio_manager.dart`（396 行）+ `flutter_soloud` — 主機選單風格音效，資產於 `assets/sounds/`
+- `haptic_service.dart`（59 行）、`feedback_service.dart`（61 行）
+- `sound_settings.dart`（39 行）— 音效設定模型
+- `input_debouncer.dart`（76 行）— 輸入防抖（手把連續輸入去重）
+
+---
+
+## 12. 已知問題與待辦
+
+| 項目 | 現況 | 位置 |
+|------|------|------|
+| Channel 名稱含 applicationId | `main` 與 `main-zh` channel 名稱不同，合併時易漏 | `MainActivity.kt` + `native_smb_service.dart` |
+| `local` 型別不對稱 | `SourceType.local` 無對應 `ProviderType`，不走抽象層 | `source.dart` / `provider_config.dart` |
+| `ProviderFactory` 隱式初始化依賴 | static 狀態且無自動初始化；未 `init()` 就取 SMB provider 會拋 `StateError`（訊息已明確，不再是裸的 null assertion）。正式流程由 `main.dart:87` 在 `runApp()` 前 init | `provider_factory.dart` |
+| 兩種狀態管理模式並存 | Riverpod + `ChangeNotifier`（`DownloadQueueManager`、`SourcesNotifier`） | `services/` |
+| 大型單檔 | `download_service` 1245、`database_service` 1066、`system_model` 906、`download_queue_manager` 694 | `services/` `models/` |
+| 測試覆蓋 | `test/` 已有 64 個單元測試檔 + `test/widgets/` 13 個 Widget 測試檔（涵蓋 `source_model` / `source_resolver` / `sources_notifier` / `source_failover` / `app_config` / `provider_config` / `provider_factory` / `library_sync_service` / `database_service` / `download_*` / `romm_*` / `ra_*` / `thumbnail_*` 等）；缺口在 `features/` 畫面層與 `download_service` 的整合情境 | `test/` |
+| 多平台目錄未維護 | ios / linux / macos / windows / web 目錄存在但未實際支援 | 專案根 |
+
+---
+
+## 13. 修改功能的定位指引
+
+| 想改的東西 | 動這些檔案 |
+|-----------|-----------|
+| **新增一種來源型別** | ① `models/config/source.dart` 加 `SourceType` ② `provider_config.dart` 加 `ProviderType` ③ `services/providers/` 新增實作 `SourceProvider` ④ `provider_factory.dart` 加 case ⑤ `source_resolver.dart` 的 `_typeMatches` / `_toProviderConfig` ⑥ `features/sources/` UI ⑦ 若不支援自動對映，確認 `supportsAutoMap` 為 false |
+| **新增主機（平台）** | `models/system_model.dart` 加 `SystemModel(...)` → `romm_platform_matcher.dart` 補 RomM 平台名對映 → 確認副檔名與預設目錄 |
+| **調整下載併發／重試** | `download_queue_manager.dart` 的 `_maxRetries` / `_maxQueueSize` / `maxConcurrent` 預設值 + `_isRetryableError()` + `_scheduleRetry()` jitter |
+| **改下載傳輸邏輯（續傳、串流）** | `download_service.dart`（1245 行）+ 對應 provider 的 `resolveDownload()` + `download_handle.dart` |
+| **改自動切換替代來源行為** | `download_queue_manager.dart` 的 `_switchToAlternativeSource()` + `source_resolver.dart` 的 `providersFor()` |
+| **改手把按鍵行為** | `core/input/app_actions.dart`（動作）+ `app_intents.dart`（意圖）+ `global_input_wrapper.dart`（攔截）；手把相容問題看 `gamepad_key_fix.dart` |
+| **改焦點高亮樣式** | `core/widgets/console_focusable.dart` **與** `widgets/console_dialog.dart`（兩處都要，否則不一致） |
+| **新增對話框** | 用 `widgets/console_dialog.dart`（`main-zh` 新增），勿自行 `showDialog` —— 否則手把焦點會失效。記得包 `Material` |
+| **改焦點同步／不跳焦點問題** | `core/input/focus_sync_manager.dart`（393 行）+ `overlay_scope.dart`（覆蓋層隔離）+ `focus_scope_observer.dart` |
+| **改資料庫 schema** | `services/database_service.dart`（1066 行）—— 注意 migration 路徑 |
+| **改封面載入／解 OOM** | `image_cache_service.dart` + `cover_preload_service.dart` + `thumbnail_service.dart` + `thumbnail_index_service.dart` |
+| **改 RetroAchievements 比對** | `ra_hash_service.dart`（雜湊演算法，RA 有特殊規則）→ `ra_api_service.dart` → `ra_sync_service.dart` |
+| **改 RomM API** | `romm_api_service.dart`（442 行）+ `romm_provider.dart` + `romm_pairing_service.dart`（370 行） |
+| **改原生解壓／SMB** | `android/.../MainActivity.kt`（channel handler）+ `SmbService.kt`；Dart 側 `native_smb_service.dart` |
+| **新增設定項** | `models/config/app_config.dart` → `storage_service.dart` 讀寫 → `providers/app_providers.dart` → `features/settings/` UI |
+| **改音效** | `audio_manager.dart` + `models/sound_settings.dart` + `assets/sounds/` |
+| **多語系文案** | `lib/l10n/app_*.arb`（**改完要重新產生 `app_localizations*.dart` 並提交**）；用語依 [GLOBAL_DEV_NOTES.md](../../GLOBAL_DEV_NOTES.md) |
+| **改 onboarding 流程** | `features/onboarding/onboarding_screen.dart` + `widgets/`（11 檔，`main-zh` 大幅改過） |
+| **改版本／套件名／APK 命名** | `pubspec.yaml`（version）+ `android/app/build.gradle.kts`（namespace / applicationId / outputFileName） |
diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md
index bb8b6c9..4181641 100644
--- a/docs/USER_GUIDE.md
+++ b/docs/USER_GUIDE.md
@@ -1,3 +1,13 @@
+
+> **導覽**：先讀共用的 [GLOBAL_DEV_NOTES.md](../../GLOBAL_DEV_NOTES.md)（建置工具鏈、分支政策、紀錄格式），
+> 再依需要讀本專案 `docs/` 的其餘各份：
+> - [ARCHITECTURE.md](ARCHITECTURE.md) — 模組分層與依賴方向
+> - [FIX_INDEX.md](FIX_INDEX.md) — 症狀 → 過去解過的條目
+> - [FIX_LOGS.md](FIX_LOGS.md) — 修復與功能紀錄（細節、取捨、教訓）
+> - [SPEC.md](SPEC.md) — 規格；**§12 定位指引回答「我要改 X，該動哪些檔」**
+
+> **English** | [繁體中文](USER_GUIDE.zh-TW.md)
+
 # R-Shop User Guide
 
 R-Shop is a retro game manager with a console-style UI. It organizes, downloads, and manages ROM files from your own servers and network shares, with full gamepad and keyboard support.
diff --git a/docs/USER_GUIDE.zh-TW.md b/docs/USER_GUIDE.zh-TW.md
new file mode 100644
index 0000000..6720914
--- /dev/null
+++ b/docs/USER_GUIDE.zh-TW.md
@@ -0,0 +1,685 @@
+> [English](USER_GUIDE.md) | **繁體中文**
+
+# R-Shop 使用手冊
+
+R-Shop 是一款具備主機風格介面的復古遊戲管理工具。它可以從你自己的伺服器與網路共享資料夾整理、下載與管理 ROM 檔案，並完整支援手把與鍵盤操作。
+
+**R-Shop 並不是模擬器。** 它是用來瀏覽、下載與整理遊戲檔案的檔案管理工具。若要實際玩遊戲，請另外使用 RetroArch、Dolphin、PPSSPP 或任何你偏好的模擬器。
+
+> **法律聲明：** R-Shop 不代管、不散布，也不連結至任何受著作權保護的遊戲檔案。使用者必須自行提供合法取得的檔案。支援的來源包括：你自己擁有的卡匣與光碟的個人備份、homebrew（自製）遊戲、公共領域的 ROM，以及合法購買的數位版本。
+
+---
+
+## 目錄
+
+1. [開始使用](#開始使用)
+2. [首頁畫面](#首頁畫面)
+3. [瀏覽遊戲](#瀏覽遊戲)
+4. [Game Detail 遊戲詳情](#game-detail-遊戲詳情)
+5. [Library 遊戲庫](#library-遊戲庫)
+6. [RetroAchievements](#retroachievements)
+7. [Provider 設定指南](#provider-設定指南)
+8. [Downloads 下載](#downloads-下載)
+9. [設定參考](#設定參考)
+10. [操作控制參考](#操作控制參考)
+11. [支援的系統](#支援的系統)
+12. [疑難排解與常見問題](#疑難排解與常見問題)
+13. [法律聲明](#法律聲明)
+
+---
+
+## 開始使用
+
+首次啟動時，R-Shop 會帶你走完 7 個步驟的初次設定流程，用來設定你的遊戲來源。
+
+### 步驟 1：歡迎畫面
+
+由 App 吉祥物向你打招呼。按 A 繼續。
+
+### 步驟 2：法律聲明
+
+你必須確認：你有責任為所有透過 R-Shop 管理的遊戲檔案持有合法版本。
+
+### 步驟 3：RomM 設定（選用）
+
+如果你的網路上有執行 [RomM](https://github.com/rommapp/romm) 伺服器，可以在這裡連線：
+
+1. 輸入你的 RomM 伺服器網址（例如 `http://192.168.1.100:8080`）
+2. 提供驗證資訊：API key 或帳號／密碼
+3. 按 Y 測試連線
+4. 選擇要從伺服器匯入哪些平台
+5. 選擇一個用來存放 ROM 檔案的本機資料夾
+
+如果你沒有使用 RomM，選擇「No」略過這個步驟，改為進入 Local Setup（本機設定）。
+
+### 步驟 4：Local Setup 本機設定（選用）
+
+如果你略過了 RomM，這個步驟會協助你設定本機 ROM 資料夾：
+
+- **自動偵測**：R-Shop 會掃描你裝置上既有的 ROM 目錄
+- **建立資料夾**：為所有支援的系統產生一套標準資料夾結構
+- **選擇資料夾**：手動挑選一個既有資料夾來掃描
+
+偵測到的資料夾會自動對應到各個系統。你可以逐一開啟或關閉系統，也可以手動指派那些沒有比對成功的資料夾。
+
+### 步驟 5：Console Setup 主機設定
+
+主要的設定畫面。畫面上會以格狀顯示所有支援的系統。針對每一台主機，你可以：
+
+- 設定存放 ROM 檔案的**目標資料夾**
+- 切換壓縮檔的**自動解壓縮**
+- 切換**合併模式**，把多個 provider 的結果合在一起
+- 切換**啟動時自動同步**，用來決定這個系統是自動同步（會遵守冷卻時間設定），還是只透過快速選單手動同步
+- **新增 provider**（Web、SMB、FTP 或 RomM）並填入連線資訊
+
+按 Y 新增 provider，接著填寫該類型專屬的欄位並測試連線。每一台主機都可以新增多個 provider，並重新排列它們的優先順序。
+
+至少要設定一台主機，才能繼續下一步。
+
+### 步驟 6：RetroAchievements（選用）
+
+如果你有 [RetroAchievements](https://retroachievements.org) 帳號，可以在此連結帳號，用來追蹤成就進度並驗證你的 ROM：
+
+1. 選擇「Yes, connect my account」（或選「No, skip」不使用 RA 直接繼續）
+2. 輸入你的 RA 帳號名稱
+3. 輸入你的 API key（可在 retroachievements.org/controlpanel.php 找到）
+4. 按 Y 測試連線
+
+成功後，R-Shop 會在背景同步支援系統的成就資料。你也可以之後隨時在 Settings（設定）中設定。
+
+### 步驟 7：完成
+
+顯示你已設定主機的摘要。按 Select 可以把設定匯出成 JSON 備份檔，然後按 A 進入 App。
+
+**你隨時都可以稍後從 Settings（設定）重新設定主機與 provider。**
+
+---
+
+## 首頁畫面
+
+首頁畫面會顯示你已設定的系統。
+
+### 輪播模式（預設）
+
+用滑動或 D-pad 捲動系統卡片。每張卡片會顯示主機名稱、製造商與推出年份。按 A 進入該系統。
+
+### 格狀模式
+
+可在 Settings（設定）中切換。系統會以格狀版面排列。用 L1（增加欄數）與 R1（減少欄數）調整欄數。
+
+### Library 卡片
+
+在你的系統之間會出現一張特殊卡片，用來進入跨系統的 Library（遊戲庫）瀏覽器。
+
+### 下載 badge（標記）
+
+有下載進行中時，左上角會出現一個閃動的指示標記。
+
+### 快速選單
+
+按 Start 開啟快速選單，其中包含以下選項：
+
+- **Search** — 跳至遊戲搜尋
+- **Sync [系統名稱]** — 同步目前選取的系統（副標題會顯示上次同步時間；只有在有選取系統時才會出現）
+- **Sync All** — 強制完整同步所有已設定的系統，不受冷卻時間限制（設定多個系統時才會出現）
+- **Settings** — 開啟 App 設定
+- **Downloads** — 檢視下載佇列（佇列中有項目時才會出現）
+
+### 離開 App
+
+在首頁畫面按 B 會顯示離開確認對話框。
+
+---
+
+## 瀏覽遊戲
+
+從首頁畫面選取一個系統，就會開啟遊戲清單。
+
+### 版面
+
+遊戲會以封面圖的格狀方式顯示。用 L1（增加，範圍 3-8）與 R1（減少）調整欄數。標頭會顯示系統標誌、遊戲總數、僅本機的指示標記（若沒有遠端 provider），以及目標資料夾路徑。
+
+背景會動態顯示目前選取遊戲的封面圖，並套上該系統的色調。
+
+### 搜尋
+
+按 Y 開啟搜尋覆蓋視窗。輸入文字即可依名稱即時篩選遊戲。按 Down 或 B 離開搜尋並回到格狀清單。
+
+### 篩選
+
+按 X 依序切換篩選選項：
+
+- **Region 地區** — 只顯示所選地區的遊戲（OR 邏輯）
+- **Language 語言** — 只顯示所選語言的遊戲（OR 邏輯）
+- **Favorites Only 僅最愛** — 只顯示你已加入最愛的遊戲
+- **Local Only 僅本機** — 只顯示已安裝在你裝置上的遊戲
+
+沒有地區或語言中繼資料的遊戲會直接通過這些篩選條件。你的篩選選擇會依系統分別儲存。
+
+### 遊戲分組
+
+名稱相同但版本不同的遊戲（例如 USA、Europe、Japan）會被歸為同一組。選取一個群組會開啟 Game Detail（遊戲詳情）畫面，讓你挑選特定版本。
+
+---
+
+## Game Detail 遊戲詳情
+
+詳情畫面會顯示遊戲的封面圖、標題、系統 badge，若來源是 RomM，還會在「About This Game」卡片中顯示豐富的中繼資料，包括類型、開發商、推出年份與簡介。
+
+### About This Game 關於這款遊戲
+
+當遊戲具有 IGDB 中繼資料（透過 RomM 提供）時，會顯示一張毛玻璃風格的資訊卡，內含類型標籤、開發商、推出年份與簡短說明。可從快速選單（Start > Description）開啟完整說明。
+
+### 版本變體
+
+如果一款遊戲存在多個版本（不同地區、語言或發行版本），按 A 會開啟**版本選擇覆蓋視窗**，列出所有版本及其地區、語言、格式與安裝狀態。用 D-pad 上／下瀏覽，按 A 下載或刪除特定版本，按 B 關閉。
+
+### RetroAchievements 資訊
+
+如果該遊戲有比對到 RetroAchievements 資料，中繼資料下方會出現一個資訊區塊，顯示比對類型（名稱比對或雜湊驗證）、成就數量與你的進度。按 Start 並從快速選單選擇「Achievements」即可開啟完整的成就畫面。
+
+### 操作
+
+| 操作 | 按鍵 | 條件 |
+|--------|--------|-----------|
+| 下載 | A | 單一版本、尚未安裝 |
+| 刪除 | A | 單一版本、已安裝 |
+| 選擇版本 | A | 多個版本 |
+| 加入最愛 | Select | 隨時可切換 |
+| 加入／移出書架 | Select 選單或 Start 選單 | 加入或移出自訂書架 |
+| 快速選單 | Start | 標籤、說明、檔名、成就、下載來源、書架管理 |
+
+### 下載
+
+在尚未安裝的單一版本遊戲上按 A，會把它加入下載佇列。對於多版本遊戲，按 A 會開啟版本選擇器，讓你下載個別版本。
+
+### 刪除
+
+在已安裝的單一版本遊戲上按 A，會開啟確認對話框。對話框預設停在 **Cancel（取消）**，以避免誤刪。對於多版本遊戲，請在選擇器中選取某個版本後按 A 刪除。
+
+---
+
+## Library 遊戲庫
+
+Library（遊戲庫）提供跨系統檢視所有遊戲的方式。可從首頁畫面的 Library 卡片進入。
+
+### 分頁
+
+用 L2（左）與 R2（右）切換分頁：
+
+| 分頁 | 內容 |
+|-----|----------|
+| All | 資料庫中的所有遊戲 |
+| Installed | 只顯示有本機檔案的遊戲 |
+| Favorites | 你已加入最愛的遊戲 |
+
+### 排序
+
+按 X 在排序模式之間切換：
+
+- **依字母順序** — 依顯示名稱由 A 到 Z
+- **依系統** — 先依主機分組，再依字母順序
+
+### 搜尋
+
+按 Y 開啟搜尋列。輸入文字即可依遊戲名稱即時篩選。
+
+### 格狀清單
+
+用 D-pad 瀏覽遊戲格狀清單。用 L1／R1 調整欄數（範圍：3-8）。按 A 開啟該遊戲的詳情畫面。
+
+---
+
+## RetroAchievements
+
+R-Shop 整合了 [RetroAchievements](https://retroachievements.org)，用來顯示成就資料、驗證 ROM 並追蹤你的進度。
+
+### 設定
+
+可在初次設定流程中連結你的 RA 帳號，或之後透過 Settings > RetroAchievements 設定。你需要準備帳號名稱與 API key（可在 retroachievements.org/controlpanel.php 找到）。
+
+### 運作方式
+
+連結完成後，R-Shop 會以三個階段執行背景同步：
+
+1. **目錄擷取** — 為每個支援的系統下載 RA 遊戲目錄（快取 24 小時）
+2. **名稱比對** — 依標題把你的本機遊戲比對到 RA 條目（完全相符、包含、No-Intro 檔名，或模糊比對）
+3. **雜湊驗證** — 為已安裝的遊戲計算 ROM 雜湊值，並與 RA 資料庫進行驗證
+
+當你下載新的 ROM 時，下載完成後會自動計算雜湊值並進行比對。
+
+### 遊戲卡片
+
+有比對到 RA 的遊戲，卡片上會顯示一個 badge：
+
+| Badge 顏色 | 意義 |
+|-------------|---------|
+| 金色 | 名稱比對成功（標題相符，ROM 尚未通過雜湊驗證） |
+| 綠色 | 雜湊已驗證（ROM 已透過 MD5 雜湊確認） |
+| 綠色外框 | 已精通（取得全部成就） |
+
+Badge 上會顯示該遊戲可取得的成就數量。
+
+### 成就畫面
+
+可從遊戲的詳情畫面透過快速選單（Start > Achievements）開啟成就畫面。畫面會顯示：
+
+- 遊戲圖示與標題，以及完成百分比
+- 進度列（已取得／總成就數）
+- 全部成就取得時顯示「MASTERED」標籤
+- 完整成就清單，含 badge 圖示、說明、點數與取得日期
+- 用 D-pad 上／下瀏覽，按 B 返回
+
+### RetroAchievements 支援的系統
+
+RetroAchievements 資料可用於：NES、SNES、N64、Game Boy、Game Boy Color、Game Boy Advance、NDS、Mega Drive、Master System、Game Gear、Sega 32X、Atari 2600、Atari 7800 與 Atari Lynx。
+
+### 設定選項
+
+RA 設定畫面（Settings > RetroAchievements）提供：
+
+| 操作 | 說明 |
+|--------|-------------|
+| Test Connection（Y） | 對 RA API 驗證你的帳密資訊 |
+| Enable/Disable | 切換是否在遊戲卡片上顯示 RA 資料 |
+| Refresh Database | 強制重新完整同步 RA 目錄 |
+| Clear Cache | 移除所有已快取的 RA 資料 |
+| Save（Start） | 儲存帳密資訊的變更 |
+| Clear（X） | 重設所有欄位 |
+
+---
+
+## Provider 設定指南
+
+Provider（來源）是 R-Shop 用來擷取遊戲檔案的地方。每一台主機都可以有多個 provider。可在初次設定流程中設定，或之後透過 Settings > Edit Consoles 設定。
+
+### Web Provider
+
+一台已啟用目錄清單的 HTTP 伺服器。
+
+**設定項目：**
+
+| 欄位 | 必填 | 說明 |
+|-------|----------|-------------|
+| URL | 是 | 伺服器的基礎網址 |
+| Path | 否 | 網址底下的子目錄 |
+| Username | 否 | HTTP Basic Auth 帳號 |
+| Password | 否 | HTTP Basic Auth 密碼 |
+
+**範例：** `http://192.168.1.100/roms/nes/`
+
+**需求：** 伺服器必須提供含目錄清單的 HTML 頁面（可點擊的檔案連結）。可搭配 nginx autoindex、Apache 目錄清單，以及簡易 HTTP 檔案伺服器使用。
+
+### SMB Provider（網路共享）
+
+你區域網路上的 Windows 或 Samba 檔案共享。
+
+**設定項目：**
+
+| 欄位 | 必填 | 說明 |
+|-------|----------|-------------|
+| Host | 是 | 伺服器 IP 或主機名稱 |
+| Share | 是 | 共享名稱 |
+| Path | 否 | 共享底下的子目錄 |
+| Username | 否 | 預設為 `guest` |
+| Password | 否 | 預設為空白 |
+| Domain | 否 | Windows 網域 |
+
+**範例：** Host `192.168.1.50`、Share `games`、Path `NES`
+
+**注意：** SMB 一律使用連接埠 445。若未提供帳密資訊，會嘗試以 guest 存取。
+
+### FTP Provider
+
+標準的 FTP 伺服器。
+
+**設定項目：**
+
+| 欄位 | 必填 | 說明 |
+|-------|----------|-------------|
+| Host | 是 | 伺服器 IP 或主機名稱 |
+| Port | 否 | 預設為 21 |
+| Path | 否 | 遠端目錄（預設為 `/`） |
+| Username | 否 | 預設為 `anonymous` |
+| Password | 否 | 預設為空白 |
+
+**範例：** Host `192.168.1.100`、Port `21`、Path `/roms/snes`
+
+**注意：** 未提供帳密資訊時會使用匿名登入。連線逾時為 30 秒。目錄清單操作最多允許 60 秒。
+
+### RomM Provider
+
+與自架的 RomM 遊戲庫伺服器整合。
+
+**設定項目：**
+
+| 欄位 | 必填 | 說明 |
+|-------|----------|-------------|
+| Server URL | 是 | 你的 RomM 執行個體網址 |
+| API Key | 否* | 用於 API 存取的 Bearer token |
+| Username | 否* | Basic auth 帳號 |
+| Password | 否* | Basic auth 密碼 |
+
+*驗證時請擇一提供 API key 或帳號／密碼。
+
+**範例：** URL `https://192.168.1.100:8080`、API key `your-api-key`
+
+**優點：** RomM 提供整理過的中繼資料、封面圖與結構化的遊戲庫。需要你的網路上有一個運作中的 RomM 執行個體。
+
+### 多 Provider 與合併模式
+
+每一台主機都可以有多個 provider，並依優先順序排列（數字越小越先嘗試）。
+
+**容錯移轉（預設）：** 依優先順序逐一嘗試 provider。第一個成功連線的 provider 會提供遊戲清單。
+
+**合併模式：** 所有 provider 的結果會合併，並依檔名去除重複。當不同伺服器分別存放不同地區或版本時特別有用。
+
+---
+
+## Downloads 下載
+
+R-Shop 使用佇列系統來管理檔案下載。
+
+### 佇列行為
+
+| 屬性 | 值 |
+|----------|-------|
+| 同時下載數 | 最多 3 個（預設：2，可在 Settings 中調整） |
+| 自動重試 | 每個檔案最多 3 次 |
+| 重試退避時間 | 5 秒、15 秒、45 秒（含最多 3 秒的隨機抖動） |
+| 不重試的錯誤 | 404 Not Found、SSL 錯誤 |
+| 進度更新 | 每 500 毫秒更新一次，含速度（KB/s）與百分比 |
+| 閒置逾時 | 60 秒未收到任何資料 |
+| HTTP 逾時 | 連線 30 秒、閒置 5 分鐘 |
+| FTP 逾時 | 連線 30 秒、目錄清單 60 秒 |
+| SMB 逾時 | 連線 30 秒 |
+
+### 保留機制
+
+下載佇列會在 App 重新啟動後保留。進行中的下載會在下次啟動時從佇列繼續。
+
+### 壓縮檔解壓縮
+
+當系統啟用自動解壓縮時，ZIP 檔會自動解壓。多檔案遊戲（例如 PlayStation 的 .bin/.cue 配對）會解壓到子資料夾中，並保留原有的檔案結構。
+
+多檔案遊戲（bin/cue 配對）也可以透過 SMB 與 FTP provider 直接以完整資料夾的形式下載，不需要使用壓縮檔。
+
+7z 壓縮檔會直接搬移，不進行解壓縮。
+
+### 限制
+
+個別下載沒有暫停／繼續功能。取消下載後就必須從頭重新開始。
+
+### 下載 badge
+
+首頁畫面上閃動的 badge 表示有下載進行中。當佇列中有項目時，快速選單（Start）會顯示 Downloads 選項。
+
+---
+
+## 設定參考
+
+在首頁畫面從快速選單（Start）開啟 Settings（設定）。
+
+### Preferences 偏好設定
+
+| 設定 | 可選值 | 預設 | 說明 |
+|---------|--------|---------|-------------|
+| Home Screen Layout | Carousel／Grid | Carousel | 首頁畫面的顯示模式 |
+| Controller Layout | Nintendo／Xbox／PlayStation | Nintendo | 按鍵標示與對應配置 |
+| Haptic Feedback | On／Off | On | 按下按鍵時震動 |
+| Sound Effects | On／Off | On | 介面操作的音訊回饋 |
+| Hide Empty Consoles | On／Off | Off | 在首頁畫面隱藏沒有遊戲的系統 |
+
+### Sync 同步
+
+| 設定 | 可選值 | 預設 | 說明 |
+|---------|--------|---------|-------------|
+| Sync Timeout | 1 分鐘／2 分鐘／5 分鐘／10 分鐘 | 2 分鐘 | 單一系統同步的最長等待時間 |
+| Auto-Sync Cooldown | Always／15 分鐘／30 分鐘／1 小時／2 小時／6 小時 | 1 小時 | 每個系統自動重新同步之間的最短間隔；「Always」表示每次啟動都同步 |
+
+### Audio 音訊
+
+| 設定 | 範圍 | 預設 | 說明 |
+|---------|-------|---------|-------------|
+| Background Music | 0–100% | 30% | 環境背景音樂音量 |
+| SFX Volume | 0–100% | 70% | 介面音效音量 |
+
+用 D-pad 的左／右調整音訊滑桿（每次 5%）。
+
+### Downloads 下載
+
+| 設定 | 範圍 | 預設 | 說明 |
+|---------|-------|---------|-------------|
+| Max Concurrent Downloads | 1–3 | 2 | 同時進行的下載數量 |
+
+### Connections 連線
+
+| 設定 | 說明 |
+|---------|-------------|
+| RomM Server | 設定全域的 RomM 伺服器網址與驗證資訊 |
+
+### System 系統
+
+| 設定 | 說明 |
+|---------|-------------|
+| Edit Consoles | 新增、移除或重新設定主機系統與 provider |
+| Scan Library | 重新掃描所有主機資料夾以探索遊戲 |
+| Search Game Covers | 為所有遊戲批次產生縮圖 |
+| RetroAchievements | 設定 RA 帳密資訊、測試連線、同步資料庫與清除快取 |
+| Export Error Log | 分享當機記錄檔以便回報問題（只有在記錄檔有內容時才會顯示） |
+| Reset Application | 回復原廠設定：清除所有設定、資料庫與快取 |
+
+### About 關於
+
+| 項目 | 說明 |
+|---------|-------------|
+| GitHub | 在瀏覽器中開啟 R-Shop 的 GitHub 儲存庫 |
+| Issues | 開啟 GitHub issues 頁面以回報問題或提出功能需求 |
+
+---
+
+## 操作控制參考
+
+R-Shop 支援遊戲手把與鍵盤輸入。手把配置可在 Settings（設定）中變更。
+
+### Nintendo 配置（預設）
+
+| 按鍵 | 操作 |
+|--------|--------|
+| A | 確認／選擇 |
+| B | 返回／取消 |
+| X | 資訊／篩選／切換 |
+| Y | 搜尋／標籤 |
+| D-pad | 瀏覽 |
+| L／L1 | 縮小（增加欄數） |
+| R／R1 | 放大（減少欄數） |
+| ZL／L2 | 分頁往左（Library） |
+| ZR／R2 | 加入最愛（替代鍵） |
+| Start／+ | 快速選單 |
+| Select／- | 加入最愛／匯出設定 |
+
+### Xbox 配置
+
+Xbox 配置與 Nintendo 相比，對調了確認／返回以及資訊／搜尋：
+
+| 按鍵 | 操作 |
+|--------|--------|
+| B（下方） | 確認／選擇 |
+| A（右方） | 返回／取消 |
+| Y（上方） | 資訊／篩選／切換 |
+| X（左方） | 搜尋／標籤 |
+| D-pad | 瀏覽 |
+| LB／RB | 縮放／分頁 |
+| LT／RT | 分頁／加入最愛 |
+| Start／+ | 快速選單 |
+| Select／- | 加入最愛／匯出設定 |
+
+### PlayStation 配置
+
+PlayStation 配置使用符號按鍵：
+
+| 按鍵 | 操作 |
+|--------|--------|
+| 圈 | 確認／選擇 |
+| 叉 | 返回／取消 |
+| 三角 | 資訊／篩選／切換 |
+| 方 | 搜尋／標籤 |
+| D-pad | 瀏覽 |
+| L1／R1 | 縮放／分頁 |
+| L2／R2 | 分頁／加入最愛 |
+| Start／+ | 快速選單 |
+| Select／- | 加入最愛／匯出設定 |
+
+### 鍵盤
+
+| 按鍵 | 操作 |
+|-----|--------|
+| 方向鍵 | 瀏覽 |
+| Enter／Space | 確認／選擇 |
+| Escape／Backspace | 返回／取消 |
+| PageUp | 縮小（增加欄數） |
+| PageDown | 放大（減少欄數） |
+| I | 搜尋 |
+| F | 加入最愛 |
+| [ | 分頁往左 |
+| ] | 分頁往右 |
+
+### 各畫面專屬操作
+
+**首頁畫面：** L1／R1 調整格狀欄數。Y 開啟 Library。X 開啟 Settings。B 顯示離開對話框。
+
+**遊戲清單：** Y 開啟搜尋。X 切換篩選。L1／R1 調整欄數。
+
+**Game Detail：** A 用於下載、刪除或開啟版本選擇器（多版本時）。Select 加入最愛。Start 開啟快速選單，內含標籤、說明、檔名切換與成就。
+
+**Library：** L2／R2 切換分頁。X 循環切換排序模式。Y 開啟搜尋。L1／R1 調整欄數。
+
+**Settings：** 左／右調整滑桿與切換項目。A 確認選擇。
+
+---
+
+## 支援的系統
+
+R-Shop 支援 5 家製造商、共 29 個系統。除了各自原生的 ROM 副檔名之外，所有系統都支援壓縮檔格式（`.zip`、`.7z`、`.rar`）。
+
+### Nintendo
+
+| 系統 | ID | 年份 | ROM 副檔名 |
+|--------|----|------|----------------|
+| Nintendo Entertainment System | `nes` | 1983 | `.nes` |
+| Game Boy | `gb` | 1989 | `.gb` |
+| Super Nintendo | `snes` | 1990 | `.sfc`、`.smc` |
+| Nintendo 64 | `n64` | 1996 | `.z64`、`.n64`、`.v64` |
+| Game Boy Color | `gbc` | 1998 | `.gbc`、`.gb` |
+| Game Boy Advance | `gba` | 2001 | `.gba` |
+| Nintendo GameCube | `gc` | 2001 | `.rvz`、`.iso`、`.gcm`、`.ciso` |
+| Nintendo DS | `nds` | 2004 | `.nds` |
+| Nintendo Wii | `wii` | 2006 | `.rvz`、`.wbfs`、`.iso`、`.wia`、`.ciso` |
+| Nintendo 3DS | `n3ds` | 2011 | `.3ds`、`.cia` |
+| Nintendo Wii U | `wiiu` | 2012 | `.wua`、`.wud`、`.wux`、`.rpx` |
+| Nintendo Switch | `switch` | 2017 | `.nsp`、`.xci` |
+
+### Sony
+
+| 系統 | ID | 年份 | ROM 副檔名 |
+|--------|----|------|----------------|
+| PlayStation | `psx` | 1994 | `.chd`、`.pbp`、`.cue`、`.iso`、`.img` |
+| PlayStation 2 | `ps2` | 2000 | `.iso`、`.chd`、`.cso` |
+| PlayStation Portable | `psp` | 2004 | `.iso`、`.cso`、`.pbp`、`.chd` |
+| PlayStation 3 | `ps3` | 2006 | `.iso`、`.pkg` |
+| PlayStation Vita | `psvita` | 2011 | `.vpk` |
+
+多檔案系統：PlayStation 與 PlayStation 2 支援 `.bin` + `.cue` 配對。下載內含多個 `.bin` 檔的壓縮檔時，R-Shop 會把它們解壓到子資料夾中，並保留原有的檔案結構。
+
+### Sega
+
+| 系統 | ID | 年份 | ROM 副檔名 |
+|--------|----|------|----------------|
+| Master System | `mastersystem` | 1985 | `.sms` |
+| Mega Drive | `megadrive` | 1988 | `.md`、`.gen`、`.bin`、`.smd` |
+| Game Gear | `gamegear` | 1990 | `.gg` |
+| Sega CD | `segacd` | 1991 | `.chd`、`.cue`、`.iso` |
+| Sega 32X | `sega32x` | 1994 | `.32x` |
+| Saturn | `saturn` | 1994 | `.chd`、`.cue`、`.iso` |
+| Dreamcast | `dreamcast` | 1998 | `.chd`、`.cdi`、`.gdi` |
+
+Sega CD 與 Saturn 同樣支援 `.bin` + `.cue` 的多檔案配對。
+
+### Atari
+
+| 系統 | ID | 年份 | ROM 副檔名 |
+|--------|----|------|----------------|
+| Atari 2600 | `atari2600` | 1977 | `.a26`、`.bin` |
+| Atari 5200 | `atari5200` | 1982 | `.a52`、`.bin` |
+| Atari 7800 | `atari7800` | 1986 | `.a78`、`.bin` |
+| Atari Lynx | `lynx` | 1989 | `.lnx` |
+
+### 其他
+
+| 系統 | ID | 年份 | ROM 副檔名 |
+|--------|----|------|----------------|
+| PICO-8 | `pico8` | 2015 | `.p8` |
+
+---
+
+## 疑難排解與常見問題
+
+### 找不到任何遊戲
+
+- 確認 provider 的網址或路徑正確且可以存取
+- 檢查伺服器是否已啟用目錄清單（Web provider）
+- 確認檔案的副檔名符合該系統（請參閱[支援的系統](#支援的系統)）
+- 檢查目標資料夾路徑是否設定正確
+
+### 下載卡住或失敗
+
+- 檢查你的網路連線
+- 下載最多會重試 3 次，間隔逐次拉長（5 秒、15 秒、45 秒）
+- 失敗的網址會被快取 5 分鐘後才重試 —— 請稍候或重新啟動 App
+- 若 60 秒沒有收到任何資料，下載會停滯
+
+### 無法連線到 SMB 共享
+
+- 確認主機 IP、共享名稱與帳密資訊
+- 確保連接埠 445 已開啟且未被防火牆封鎖
+- 試著使用明確的帳號／密碼，而不是 guest 存取
+
+### RomM 沒有顯示任何平台
+
+- 確認伺服器網址正確且可連線
+- 在 provider 設定中測試連線（按 Y）
+- 檢查你的 API key 或帳密資訊是否有效
+- 確認 RomM 伺服器上已設定平台
+
+### 掃描後遊戲不見了
+
+- 檢查副檔名是否符合該系統支援的格式
+- 確認目標資料夾路徑正確
+- 若是壓縮檔，請確認其中包含具有有效 ROM 副檔名的檔案
+
+### 沒有聲音
+
+- 檢查 Settings 中的 Sound Effects 是否已啟用
+- 確認 BGM Volume 與 SFX Volume 滑桿都高於 0%
+- 在某些裝置上音訊初始化可能會無聲地失敗 —— 試著重新啟動 App
+
+### 如何重設 App
+
+前往 Settings，然後在 System 區塊選擇 Reset Application。這會清除所有設定、資料庫項目與快取資料。
+
+### 如何匯出或匯入設定
+
+在初次設定流程中（步驟 6：完成），按 Select 可以把設定匯出成 JSON 檔。這份備份可用來在另一台裝置上還原設定。
+
+## 法律聲明
+
+R-Shop 不代管、不散布，也不連結至任何受著作權保護的遊戲檔案。本應用程式是一個檔案管理工具，用來連線到使用者自行設定的伺服器與網路共享資料夾。
+
+使用者必須自行提供合法取得的遊戲檔案。支援的來源包括：
+
+- 你自己擁有的卡匣與光碟的個人備份
+- 由獨立開發者製作的 homebrew（自製）遊戲
+- 公共領域的 ROM
+- 合法購買的數位版本
+
+R-Shop 的開發者對於使用者選擇如何使用本軟體不負任何責任。
diff --git a/lib/core/theme/app_theme.dart b/lib/core/theme/app_theme.dart
index eb3fd77..14074b5 100644
--- a/lib/core/theme/app_theme.dart
+++ b/lib/core/theme/app_theme.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:google_fonts/google_fonts.dart';
 
 class AppTheme {
diff --git a/lib/core/widgets/console_focusable.dart b/lib/core/widgets/console_focusable.dart
index 1ed91cc..b0bafc3 100644
--- a/lib/core/widgets/console_focusable.dart
+++ b/lib/core/widgets/console_focusable.dart
@@ -104,7 +104,9 @@ class _ConsoleFocusableState extends ConsumerState<ConsoleFocusable>
   void _updateFocusState() {
     final hasFocus = _focusNode.hasFocus;
     if (hasFocus != _isFocused) {
-      _isFocused = hasFocus;
+      setState(() {
+        _isFocused = hasFocus;
+      });
       if (hasFocus) {
         _controller.forward();
         WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -293,7 +295,9 @@ class _ConsoleFocusableCardState extends ConsumerState<ConsoleFocusableCard>
   void _updateFocusState() {
     final hasFocus = _focusNode.hasFocus;
     if (hasFocus != _isFocused) {
-      _isFocused = hasFocus;
+      setState(() {
+        _isFocused = hasFocus;
+      });
       if (hasFocus) {
         _controller.forward();
         WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -475,7 +479,9 @@ class _ConsoleFocusableListItemState
   void _updateFocusState() {
     final hasFocus = _focusNode.hasFocus;
     if (hasFocus != _isFocused) {
-      _isFocused = hasFocus;
+      setState(() {
+        _isFocused = hasFocus;
+      });
       if (hasFocus) {
         _controller.forward();
         WidgetsBinding.instance.addPostFrameCallback((_) {
diff --git a/lib/features/game_list/game_list_screen.dart b/lib/features/game_list/game_list_screen.dart
index 16dd490..c71b772 100644
--- a/lib/features/game_list/game_list_screen.dart
+++ b/lib/features/game_list/game_list_screen.dart
@@ -171,6 +171,9 @@ class _GameListScreenState extends ConsumerState<GameListScreen>
       systemConfig: systemConfig ?? SystemConfig(id: widget.system.id, name: widget.system.name, targetFolder: widget.targetFolder, providers: []),
       installedFilenames: installedData?.bySystem[widget.system.id],
       storage: ref.read(storageServiceProvider),
+      // Sources the user grouped share one cached library; without this the
+      // grid would read the member's own (empty) list after a switch.
+      cacheOwnerOf: appConfig.cacheOwnerIdFor,
     )..addListener(_onControllerChanged);
 
     _controller.onGamesSaved = () {
diff --git a/lib/features/game_list/logic/game_list_controller.dart b/lib/features/game_list/logic/game_list_controller.dart
index 7dbeedc..00c7d1d 100644
--- a/lib/features/game_list/logic/game_list_controller.dart
+++ b/lib/features/game_list/logic/game_list_controller.dart
@@ -98,6 +98,15 @@ class GameListController extends ChangeNotifier {
   final UnifiedGameService _unifiedService;
   final DatabaseService _databaseService;
   final StorageService? _storage;
+
+  /// Maps a source id to the id that owns its cached games — the group when
+  /// the user put it in one, otherwise the source itself.
+  ///
+  /// Injected rather than read from [AppConfig] here because this controller
+  /// only ever knew about one system's config; pass
+  /// `AppConfig.cacheOwnerIdFor`. Left null, every source owns its own list,
+  /// which is what an install with no groups looks like.
+  final String Function(String sourceId)? _cacheOwnerOf;
   bool _disposed = false;
   Timer? _thumbnailDebounce;
 
@@ -130,9 +139,11 @@ class GameListController extends ChangeNotifier {
     UnifiedGameService? unifiedService,
     DatabaseService? databaseService,
     StorageService? storage,
+    String Function(String sourceId)? cacheOwnerOf,
   })  : _unifiedService = unifiedService ?? UnifiedGameService(),
         _databaseService = databaseService ?? DatabaseService(),
-        _storage = storage {
+        _storage = storage,
+        _cacheOwnerOf = cacheOwnerOf {
     _pendingInstalledFilenames = installedFilenames;
     loadGames();
   }
@@ -153,14 +164,23 @@ class GameListController extends ChangeNotifier {
         _groupGames();
         _restoreFilters();
         _resolveInstalledStatus();
-        await _databaseService.saveGames(system.id, _state.allGames, forceDeleteOrphans: true);
+        await _databaseService.saveGamesByRoute(system.id, _state.allGames, forceDeleteOrphans: true, cacheOwnerOf: _cacheOwnerOf);
         onGamesSaved?.call();
         return;
       }
 
       // Cache-first: show cached games immediately if available
       if (!forceRefresh && await _databaseService.hasCache(system.id)) {
-        var cached = await _databaseService.getGames(system.id);
+        // Only this system's *currently live* routes. The other route's rows
+        // stay in the DB untouched, so switching back shows them again
+        // without a re-sync.
+        var cached = await _databaseService.getGamesForRoutes(
+          system.id,
+          systemConfig.providers.map(
+            (p) => (source: p.sourceId ?? '', endpoint: p.endpointId ?? ''),
+          ),
+          cacheOwnerOf: _cacheOwnerOf,
+        );
         if (cached.isNotEmpty) {
           // DB strips auth for security — rehydrate from config
           cached = GameItem.rehydrateAuth(cached, systemConfig.providers);
@@ -190,7 +210,7 @@ class GameListController extends ChangeNotifier {
     _groupGames();
     _restoreFilters();
     _resolveInstalledStatus();
-    _databaseService.saveGames(system.id, _state.allGames, deleteOrphans: true);
+    _databaseService.saveGamesByRoute(system.id, _state.allGames, deleteOrphans: true, cacheOwnerOf: _cacheOwnerOf);
     onGamesSaved?.call();
   }
 
@@ -223,7 +243,7 @@ class GameListController extends ChangeNotifier {
         _restoreFilters();
         _resolveInstalledStatus();
       }
-      _databaseService.saveGames(system.id, games, deleteOrphans: true);
+      _databaseService.saveGamesByRoute(system.id, games, deleteOrphans: true, cacheOwnerOf: _cacheOwnerOf);
       _storage?.setLastSyncTime(system.id, DateTime.now());
       onGamesSaved?.call();
       if (_state.isOffline) {
diff --git a/lib/features/game_list/widgets/game_grid.dart b/lib/features/game_list/widgets/game_grid.dart
index 9211b5b..755469d 100644
--- a/lib/features/game_list/widgets/game_grid.dart
+++ b/lib/features/game_list/widgets/game_grid.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../core/responsive/responsive.dart';
@@ -175,7 +176,8 @@ class _GameGridState extends ConsumerState<GameGrid> {
         onNotification: widget.onScrollNotification,
         child: RepaintBoundary(
           child: GridView.builder(
-            cacheExtent: widget.gridCacheExtent,
+            scrollCacheExtent:
+                ScrollCacheExtent.pixels(widget.gridCacheExtent),
             controller: widget.scrollController,
             padding: EdgeInsets.only(
               left: rs.spacing.lg,
diff --git a/lib/features/home/home_view.dart b/lib/features/home/home_view.dart
index fbe5f91..83bd5dd 100644
--- a/lib/features/home/home_view.dart
+++ b/lib/features/home/home_view.dart
@@ -12,8 +12,10 @@ import '../../providers/game_providers.dart';
 import '../../widgets/quick_menu.dart';
 import '../../providers/library_providers.dart';
 import '../../providers/ra_providers.dart';
+import '../../models/config/app_config.dart';
 import '../../services/config_bootstrap.dart';
 import '../../services/input_debouncer.dart';
+import '../../services/source_failover.dart';
 import '../../widgets/exit_confirmation_overlay.dart';
 import '../../core/util/color_contrast.dart';
 import '../../widgets/console_hud.dart';
@@ -153,7 +155,12 @@ class _HomeViewState extends ConsumerState<HomeView>
   }
 
   Future<void> _triggerLibrarySync({Set<String> forceSystemIds = const {}}) async {
-    final config = await ref.read(bootstrappedConfigProvider.future);
+    final loaded = await ref.read(bootstrappedConfigProvider.future);
+    if (!mounted) return;
+    // The automatic sync resolves its source the same way the manual one
+    // does. Without this, a background sync would quietly keep hammering an
+    // unreachable source while the badge named the wrong server.
+    final config = await _resolveSyncTarget(loaded);
     if (!mounted) return;
     if (config.systems.isNotEmpty) {
       final timeout = Duration(seconds: ref.read(syncTimeoutProvider));
@@ -486,8 +493,16 @@ class _HomeViewState extends ConsumerState<HomeView>
   }
 
   void _syncAll() async {
-    final config = await ref.read(bootstrappedConfigProvider.future);
-    if (config.systems.isEmpty) return;
+    final loaded = await ref.read(bootstrappedConfigProvider.future);
+    if (loaded.systems.isEmpty) return;
+    // Check the selected source is up before committing to a sync that could
+    // otherwise sit on a dead address for the full RomM timeout, and stand its
+    // partner in when it is not. Only the config passed to the sync changes —
+    // the stored preference is untouched, so the usual source comes back on
+    // its own once it answers.
+    final config = await _resolveSyncTarget(loaded);
+    if (!mounted) return;
+
     final syncService = ref.read(librarySyncServiceProvider.notifier);
     if (ref.read(librarySyncServiceProvider).isSyncing) {
       syncService.cancel();
@@ -522,6 +537,22 @@ class _HomeViewState extends ConsumerState<HomeView>
     SystemNavigator.pop();
   }
 
+  /// Probes the selected source, stands its partner in if it is silent, and
+  /// publishes which one won so the header and the sync badge can name it.
+  ///
+  /// Returns the config to sync with. Only that in-memory copy changes — the
+  /// stored preference is left alone, which is what lets the usual source
+  /// resume on its own once it answers again.
+  Future<AppConfig> _resolveSyncTarget(AppConfig loaded) async {
+    final resolved = await resolveForSync(config: loaded);
+    final chosen = resolved.choice.source;
+    ref.read(syncingSourceProvider.notifier).state = chosen == null
+        ? null
+        : (name: chosen.name, isFallback: resolved.choice.isFallback);
+    ref.read(activeFailoverChoiceProvider.notifier).choice = resolved.choice;
+    return resolved.config;
+  }
+
   KeyEventResult _handleKeyEvent(FocusNode node, KeyEvent event) {
     if (event is KeyUpEvent) {
       _debouncer.stopHold();
@@ -529,6 +560,20 @@ class _HomeViewState extends ConsumerState<HomeView>
     return KeyEventResult.ignored;
   }
 
+  /// Steps the **shown** source by [delta] over the ring
+  /// `all → first → … → last → all`.
+  ///
+  /// Changes what is on screen and nothing else. The source in use — what
+  /// syncs — is set in the sources list and is not touched here, so browsing
+  /// another library never redirects the next sync at it.
+  ///
+  /// Bound to L2/R2 rather than a face button so the right thumb never has to
+  /// leave A, and made bidirectional so overshooting costs one press instead
+  /// of a full lap.
+  ///
+  /// The ring is the sources and nothing else. It used to carry an extra "all
+
+
   @override
   Widget build(BuildContext context) {
     final rs = context.rs;
@@ -621,25 +666,30 @@ class _HomeViewState extends ConsumerState<HomeView>
           padding: EdgeInsets.zero,
           body: Stack(
             children: [
-              if (isGrid)
-                HomeGridView(
-                  systems: _configuredSystems,
-                  selectedIndex: _currentIndex,
-                  columns: _columns,
-                  scrollController: _gridScrollController,
-                  itemKeys: _gridItemKeys,
-                  onSelect: (idx) {
-                    setState(() => _currentIndex = idx);
-                    ref.read(feedbackServiceProvider).tick();
-                  },
-                  onConfirm: _navigateToCurrentSystem,
-                  rs: rs,
-                )
-              else if (rs.isPortrait)
-                _buildPortraitLayout(rs, currentSystem, isLibrary)
-              else
-                _buildLandscapeLayout(rs, currentSystem, isLibrary),
-              if (isGrid) _buildControls(rs),
+              Stack(
+                children: [
+                  if (isGrid)
+                    HomeGridView(
+                      systems: _configuredSystems,
+                      selectedIndex: _currentIndex,
+                      columns: _columns,
+                      scrollController: _gridScrollController,
+                      itemKeys: _gridItemKeys,
+                      onSelect: (idx) {
+                        setState(() => _currentIndex = idx);
+                        ref.read(feedbackServiceProvider).tick();
+                      },
+                      onConfirm: _navigateToCurrentSystem,
+                      rs: rs,
+                    )
+                  else if (rs.isPortrait)
+                    _buildPortraitLayout(rs, currentSystem, isLibrary)
+                  else
+                    _buildLandscapeLayout(rs, currentSystem, isLibrary),
+                  if (isGrid) _buildControls(rs),
+                ],
+              ),
+              // Modal overlays stay above everything.
               if (showQuickMenu)
                 QuickMenuOverlay(
                   items: _buildQuickMenuItems(),
@@ -697,6 +747,7 @@ class _HomeViewState extends ConsumerState<HomeView>
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
+        _buildFailoverBadgePill(),
         _buildGameCountBadges(system),
         Text(
           '${system.manufacturer} · ${system.releaseYear}',
@@ -785,6 +836,7 @@ class _HomeViewState extends ConsumerState<HomeView>
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
+        _buildFailoverBadgePill(),
         _buildLibraryCountBadges(),
         Text(
           L.of(context).home_allGames,
@@ -977,6 +1029,48 @@ class _HomeViewState extends ConsumerState<HomeView>
     );
   }
 
+  Widget _buildFailoverBadgePill() {
+    final failoverChoice = ref.watch(activeFailoverChoiceProvider);
+    if (failoverChoice == null || !failoverChoice.isFallback) {
+      return const SizedBox.shrink();
+    }
+    final actName = failoverChoice.source?.name ?? '代理';
+    return _PulsingWidget(
+      child: Container(
+        margin: const EdgeInsets.only(bottom: 8),
+        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 3),
+        decoration: BoxDecoration(
+          color: Colors.amberAccent,
+          borderRadius: BorderRadius.circular(20),
+          border: Border.all(color: Colors.white, width: 1),
+          boxShadow: const [
+            BoxShadow(
+              color: Colors.black54,
+              blurRadius: 6,
+              offset: Offset(0, 2),
+            ),
+          ],
+        ),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Icon(Icons.bolt, size: 12, color: Colors.black),
+            const SizedBox(width: 4),
+            Text(
+              '⚡ 代理使用中: $actName',
+              style: const TextStyle(
+                color: Colors.black,
+                fontSize: 10,
+                fontWeight: FontWeight.w900,
+                letterSpacing: 0.5,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
   Widget _buildControls(Responsive rs) {
     // Check full queue (including history) to see if overlay has content
     final hasAnyDownloads = ref.watch(
@@ -1046,3 +1140,43 @@ class _GameCountPill extends StatelessWidget {
   }
 }
 
+class _PulsingWidget extends StatefulWidget {
+  final Widget child;
+  const _PulsingWidget({required this.child});
+
+  @override
+  State<_PulsingWidget> createState() => _PulsingWidgetState();
+}
+
+class _PulsingWidgetState extends State<_PulsingWidget>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _controller;
+  late Animation<double> _animation;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 1200),
+    )..repeat(reverse: true);
+    _animation = Tween<double>(begin: 0.7, end: 1.0).animate(
+      CurvedAnimation(parent: _controller, curve: Curves.easeInOut),
+    );
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FadeTransition(
+      opacity: _animation,
+      child: widget.child,
+    );
+  }
+}
+
diff --git a/lib/features/home/widgets/home_grid_view.dart b/lib/features/home/widgets/home_grid_view.dart
index d6b8d1f..8b8f142 100644
--- a/lib/features/home/widgets/home_grid_view.dart
+++ b/lib/features/home/widgets/home_grid_view.dart
@@ -47,7 +47,11 @@ class HomeGridView extends ConsumerWidget {
           padding: EdgeInsets.only(
             left: horizontalPadding,
             right: horizontalPadding,
-            top: rs.safeAreaTop + 40.0,
+            // No safe-area inset. The app turns immersive in HomeView's
+            // initState, so the first frame still reports a status bar and
+            // every frame after does not — adding it here renders a blank row
+            // above the grid on entry that vanishes as soon as you move.
+            top: 40.0,
             bottom: bottomPadding,
           ),
           gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
@@ -198,24 +202,28 @@ class HomeGridView extends ConsumerWidget {
                         if (totalRemote > 0 || totalLocal > 0)
                           Padding(
                             padding: const EdgeInsets.only(bottom: 4),
-                            child: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                if (totalRemote > 0) _GridCountPill(
-                                  icon: Icons.cloud_outlined,
-                                  count: totalRemote,
-                                  color: accentColor,
-                                  isSmall: rs.isSmall,
-                                ),
-                                if (totalRemote > 0 && totalLocal > 0)
-                                  const SizedBox(width: 4),
-                                if (totalLocal > 0) _GridCountPill(
-                                  icon: Icons.folder_outlined,
-                                  count: totalLocal,
-                                  color: accentColor,
-                                  isSmall: rs.isSmall,
-                                ),
-                              ],
+                            child: FittedBox(
+                              fit: BoxFit.scaleDown,
+                              alignment: Alignment.centerLeft,
+                              child: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  if (totalRemote > 0) _GridCountPill(
+                                    icon: Icons.cloud_outlined,
+                                    count: totalRemote,
+                                    color: accentColor,
+                                    isSmall: rs.isSmall,
+                                  ),
+                                  if (totalRemote > 0 && totalLocal > 0)
+                                    const SizedBox(width: 4),
+                                  if (totalLocal > 0) _GridCountPill(
+                                    icon: Icons.folder_outlined,
+                                    count: totalLocal,
+                                    color: accentColor,
+                                    isSmall: rs.isSmall,
+                                  ),
+                                ],
+                              ),
                             ),
                           ),
                         Text(
@@ -374,24 +382,28 @@ class HomeGridView extends ConsumerWidget {
                         if (counts != null && (counts.remote > 0 || counts.local > 0))
                           Padding(
                             padding: const EdgeInsets.only(bottom: 4),
-                            child: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                if (counts.remote > 0) _GridCountPill(
-                                  icon: Icons.cloud_outlined,
-                                  count: counts.remote,
-                                  color: system.textAccentColor,
-                                  isSmall: rs.isSmall,
-                                ),
-                                if (counts.remote > 0 && counts.local > 0)
-                                  const SizedBox(width: 4),
-                                if (counts.local > 0) _GridCountPill(
-                                  icon: Icons.folder_outlined,
-                                  count: counts.local,
-                                  color: system.textAccentColor,
-                                  isSmall: rs.isSmall,
-                                ),
-                              ],
+                            child: FittedBox(
+                              fit: BoxFit.scaleDown,
+                              alignment: Alignment.centerLeft,
+                              child: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  if (counts.remote > 0) _GridCountPill(
+                                    icon: Icons.cloud_outlined,
+                                    count: counts.remote,
+                                    color: system.textAccentColor,
+                                    isSmall: rs.isSmall,
+                                  ),
+                                  if (counts.remote > 0 && counts.local > 0)
+                                    const SizedBox(width: 4),
+                                  if (counts.local > 0) _GridCountPill(
+                                    icon: Icons.folder_outlined,
+                                    count: counts.local,
+                                    color: system.textAccentColor,
+                                    isSmall: rs.isSmall,
+                                  ),
+                                ],
+                              ),
                             ),
                           ),
                         Text(
diff --git a/lib/features/library/library_screen.dart b/lib/features/library/library_screen.dart
index 0d00767..8121711 100644
--- a/lib/features/library/library_screen.dart
+++ b/lib/features/library/library_screen.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart' show setEquals;
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:path/path.dart' as p;
@@ -259,6 +260,18 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
       await _refreshInstalledFiles();
     }
 
+    // Rows are read straight from the table here, not through a system's
+    // providers, so a switched-off source would still show up. Turning one
+    // off no longer deletes its rows — that made off-on cost a re-sync — so
+    // the filtering happens on this side instead. Anything already on disk
+    // stays listed: it is on the device whatever the source is doing.
+    final offSourceIds = ref
+        .read(sourcesProvider)
+        .sources
+        .where((s) => !s.enabled)
+        .map((s) => s.id)
+        .toSet();
+
     final entries = <LibraryEntry>[];
     for (final row in rawGames) {
       final systemSlug = row['systemSlug'] as String;
@@ -273,6 +286,12 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
       }
 
       final fname = row['filename'] as String;
+      final sourceId = providerConfig?.sourceId;
+      if (sourceId != null &&
+          offSourceIds.contains(sourceId) &&
+          !_installedFiles.contains(fname)) {
+        continue;
+      }
       entries.add(LibraryEntry(
         filename: fname,
         displayName: GameMetadata.cleanTitle(fname),
@@ -1273,7 +1292,8 @@ class _LibraryScreenState extends ConsumerState<LibraryScreen>
       onNotification: _handleScrollNotification,
       child: RepaintBoundary(
         child: GridView.builder(
-        cacheExtent: deviceMemory.libraryCacheExtent,
+        scrollCacheExtent:
+            ScrollCacheExtent.pixels(deviceMemory.libraryCacheExtent),
         controller: _scrollController,
         padding: EdgeInsets.only(
           left: rs.spacing.lg,
diff --git a/lib/features/onboarding/onboarding_screen.dart b/lib/features/onboarding/onboarding_screen.dart
index 058d100..c9b9db1 100644
--- a/lib/features/onboarding/onboarding_screen.dart
+++ b/lib/features/onboarding/onboarding_screen.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../../core/input/input.dart';
 import '../../core/responsive/responsive.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/widgets/console_focusable.dart';
@@ -11,6 +12,7 @@ import '../../providers/app_providers.dart';
 import '../../utils/friendly_error.dart';
 import '../../providers/game_providers.dart';
 import '../../providers/ra_providers.dart';
+import '../../widgets/console_dialog.dart';
 import '../../widgets/console_hud.dart';
 import '../../widgets/console_notification.dart';
 import '../../widgets/download_overlay.dart';
@@ -87,6 +89,21 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
     }
   }
 
+  Future<void> _showExitConfirmation() async {
+    final l = L.of(context);
+    final confirmed = await showConsoleDialog(
+      context,
+      title: l.exit_title,
+      message: l.exit_message,
+      primaryLabel: l.exit_confirmButton,
+      secondaryLabel: l.exit_cancelButton,
+      isDestructive: true,
+    );
+    if (confirmed == true) {
+      SystemNavigator.pop();
+    }
+  }
+
   Future<void> _finishOnboarding() async {
     final controller = ref.read(onboardingControllerProvider.notifier);
     final audioManager = ref.read(audioManagerProvider);
@@ -131,41 +148,69 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
     final state = ref.watch(onboardingControllerProvider);
     final rs = context.rs;
 
-    return Focus(
-      focusNode: _focusNode,
-      onKeyEvent: _handleKeyEvent,
-      autofocus: true,
-      child: PopScope(
-        canPop: false,
-        onPopInvokedWithResult: (didPop, _) {},
-        child: Scaffold(
-          backgroundColor: Colors.black,
-          body: Stack(
-            children: [
-              const _AnimatedBackground(),
-              const _RadialGlow(),
-              SafeArea(
-                child: Padding(
-                  padding: EdgeInsets.symmetric(
-                    horizontal: rs.isSmall ? rs.spacing.md : rs.spacing.lg,
-                    vertical: rs.isSmall ? rs.spacing.md : rs.spacing.xxl,
-                  ),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Expanded(child: _buildContent(state)),
-                    ],
+    return buildWithActions(
+      Focus(
+        focusNode: _focusNode,
+        onKeyEvent: _handleKeyEvent,
+        autofocus: true,
+        child: PopScope(
+          canPop: false,
+          onPopInvokedWithResult: (didPop, _) {},
+          child: Scaffold(
+            backgroundColor: Colors.black,
+            body: Stack(
+              children: [
+                const _AnimatedBackground(),
+                const _RadialGlow(),
+                SafeArea(
+                  child: Padding(
+                    padding: EdgeInsets.symmetric(
+                      horizontal: rs.isSmall ? rs.spacing.md : rs.spacing.lg,
+                      vertical: rs.isSmall ? rs.spacing.md : rs.spacing.xxl,
+                    ),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Expanded(child: _buildContent(state)),
+                      ],
+                    ),
                   ),
                 ),
-              ),
-              _buildControls(state),
-            ],
+                _buildControls(state),
+              ],
+            ),
           ),
         ),
       ),
     );
   }
 
+  Widget buildWithActions(Widget child) {
+    return Actions(
+      actions: {
+        BackIntent: CallbackAction<BackIntent>(
+          onInvoke: (_) {
+            if (ref.read(onboardingControllerProvider).currentStep ==
+                OnboardingStep.welcome) {
+              _showExitConfirmation();
+            }
+            return null;
+          },
+        ),
+        FavoriteIntent: CallbackAction<FavoriteIntent>(
+          onInvoke: (_) {
+            if (ref.read(onboardingControllerProvider).currentStep ==
+                OnboardingStep.welcome) {
+              _importConfig();
+            }
+            return null;
+          },
+        ),
+      },
+      child: child,
+    );
+  }
+
   Widget _buildContent(OnboardingState state) {
     return AnimatedSwitcher(
       duration: const Duration(milliseconds: 400),
@@ -197,7 +242,9 @@ class _OnboardingScreenState extends ConsumerState<OnboardingScreen> {
     // drop in a JSON config without going through any setup wizard.
     if (state.currentStep == OnboardingStep.welcome) {
       return ConsoleHud(
-        select: HudAction(L.of(context).onboarding_importConfig, onTap: _importConfig),
+        b: HudAction(L.of(context).common_exit, onTap: _showExitConfirmation),
+        select: HudAction(L.of(context).onboarding_importConfig,
+            onTap: _importConfig),
       );
     }
 
diff --git a/lib/features/onboarding/widgets/ra_onboarding_screen.dart b/lib/features/onboarding/widgets/ra_onboarding_screen.dart
index 14fb9d6..a02a9ca 100644
--- a/lib/features/onboarding/widgets/ra_onboarding_screen.dart
+++ b/lib/features/onboarding/widgets/ra_onboarding_screen.dart
@@ -386,42 +386,54 @@ class _RaOnboardingScreenState extends ConsumerState<RaOnboardingScreen> {
             ? AppTheme.primaryColor
             : Colors.white70;
 
-    return ConsoleFocusable(
-      focusNode: focusNode,
-      focusScale: 1.0,
-      focusBorderColor: color,
-      borderRadius: 10,
-      onSelect: onSelect,
-      child: Container(
-        width: double.infinity,
-        padding: const EdgeInsets.symmetric(vertical: 14),
-        alignment: Alignment.center,
-        decoration: BoxDecoration(
-          color: color.withValues(alpha: 0.12),
-          borderRadius: BorderRadius.circular(6),
-        ),
-        child: busy
-            ? SizedBox(
-                width: 18,
-                height: 18,
-                child: CircularProgressIndicator(strokeWidth: 2, color: color),
-              )
-            : Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Icon(icon, size: 16, color: color),
-                  const SizedBox(width: 8),
-                  Text(
-                    label,
-                    style: TextStyle(
-                      color: color,
-                      fontSize: 15,
-                      fontWeight: FontWeight.w600,
-                    ),
+    return ListenableBuilder(
+      listenable: focusNode,
+      builder: (context, _) {
+        final isFocused = focusNode.hasFocus;
+        final effectiveColor = isFocused ? Colors.white : color;
+        final bgColor = isFocused
+            ? color.withValues(alpha: 0.3)
+            : color.withValues(alpha: 0.12);
+
+        return ConsoleFocusable(
+          focusNode: focusNode,
+          focusScale: 1.02,
+          focusBorderColor: Colors.white,
+          borderRadius: 10,
+          onSelect: onSelect,
+          child: Container(
+            width: double.infinity,
+            padding: const EdgeInsets.symmetric(vertical: 14),
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: bgColor,
+              borderRadius: BorderRadius.circular(6),
+            ),
+            child: busy
+                ? SizedBox(
+                    width: 18,
+                    height: 18,
+                    child:
+                        CircularProgressIndicator(strokeWidth: 2, color: effectiveColor),
+                  )
+                : Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Icon(icon, size: 16, color: effectiveColor),
+                      const SizedBox(width: 8),
+                      Text(
+                        label,
+                        style: TextStyle(
+                          color: effectiveColor,
+                          fontSize: 15,
+                          fontWeight: isFocused ? FontWeight.w700 : FontWeight.w600,
+                        ),
+                      ),
+                    ],
                   ),
-                ],
-              ),
-      ),
+          ),
+        );
+      },
     );
   }
 
@@ -476,12 +488,19 @@ class _RaOnboardingScreenState extends ConsumerState<RaOnboardingScreen> {
       focusNode: f.consoleFocus,
       focusScale: 1.0,
       onSelect: () => f.textFocus.requestFocus(),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          _label(f.label),
-          ListenableBuilder(
+      // The white focus frame is drawn tight around the child, so without
+      // room of its own it lands on the label and on the field's own border —
+      // two lines a couple of pixels apart, which reads as a rendering fault
+      // rather than as focus.
+      borderRadius: 12,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(8, 6, 8, 8),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            _label(f.label),
+            ListenableBuilder(
             listenable: f.textFocus,
             builder: (context, _) {
               final hasFocus = f.textFocus.hasFocus;
@@ -491,7 +510,7 @@ class _RaOnboardingScreenState extends ConsumerState<RaOnboardingScreen> {
                   borderRadius: BorderRadius.circular(8),
                   border: Border.all(
                     color: hasFocus
-                        ? AppTheme.primaryColor
+                        ? Colors.white
                         : AppTheme.primaryColor.withValues(alpha: 0.4),
                     width: 2,
                   ),
@@ -517,9 +536,10 @@ class _RaOnboardingScreenState extends ConsumerState<RaOnboardingScreen> {
                   ),
                 ),
               );
-            },
-          ),
-        ],
+              },
+            ),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/features/onboarding/widgets/romm_legacy_login_screen.dart b/lib/features/onboarding/widgets/romm_legacy_login_screen.dart
index 8d41f6e..240b81d 100644
--- a/lib/features/onboarding/widgets/romm_legacy_login_screen.dart
+++ b/lib/features/onboarding/widgets/romm_legacy_login_screen.dart
@@ -8,7 +8,6 @@ import '../../../core/theme/app_theme.dart';
 import '../../../core/widgets/console_focusable.dart';
 import '../../../l10n/app_localizations.dart';
 import '../../../models/config/source.dart';
-import '../../../widgets/console_hud.dart';
 import '../../../models/system_model.dart';
 import '../../../providers/app_providers.dart';
 import '../../../services/romm_api_service.dart';
@@ -42,6 +41,7 @@ class _RommLegacyLoginScreenState
   final _passCtl = TextEditingController();
 
   late List<_Field> _fields;
+  final _backFocus = FocusNode(debugLabel: 'romm_legacy_back');
   final _saveFocus = FocusNode(debugLabel: 'romm_legacy_save');
   final _screenFocus = FocusNode(debugLabel: 'romm_legacy_screen');
 
@@ -91,6 +91,7 @@ class _RommLegacyLoginScreenState
       f.consoleFocus.dispose();
       f.textFocus.dispose();
     }
+    _backFocus.dispose();
     _saveFocus.dispose();
     _screenFocus.dispose();
     super.dispose();
@@ -162,7 +163,7 @@ class _RommLegacyLoginScreenState
   }
 
   List<FocusNode> get _navOrder =>
-      [..._fields.map((f) => f.consoleFocus), _saveFocus];
+      [_backFocus, ..._fields.map((f) => f.consoleFocus), _saveFocus];
 
   void _moveFocus(int delta) {
     final order = _navOrder;
@@ -178,6 +179,10 @@ class _RommLegacyLoginScreenState
   }
 
   void _activateFocused() {
+    if (_backFocus.hasFocus) {
+      Navigator.of(context).maybePop();
+      return;
+    }
     for (final f in _fields) {
       if (f.consoleFocus.hasFocus) {
         f.textFocus.requestFocus();
@@ -254,21 +259,28 @@ class _RommLegacyLoginScreenState
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: AppTheme.backgroundColor,
-      body: Stack(
-        children: [
-          SafeArea(
+      body: SafeArea(
         child: Focus(
           focusNode: _screenFocus,
           autofocus: true,
           onKeyEvent: _handleScreenKey,
-          child: Center(
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(maxWidth: 560),
-              child: Padding(
-                padding: const EdgeInsets.all(24),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+          child: Column(
+            children: [
+              // Fixed Header
+              Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 16, 8),
+                child: Row(
                   children: [
+                    ConsoleFocusable(
+                      focusNode: _backFocus,
+                      onSelect: () => Navigator.of(context).maybePop(),
+                      child: const Padding(
+                        padding: EdgeInsets.all(8),
+                        child: Icon(Icons.arrow_back,
+                            color: Colors.white, size: 26),
+                      ),
+                    ),
+                    const SizedBox(width: 4),
                     Text(
                       L.of(context).rommLogin_title,
                       style: const TextStyle(
@@ -277,120 +289,127 @@ class _RommLegacyLoginScreenState
                         fontWeight: FontWeight.w600,
                       ),
                     ),
-                    const SizedBox(height: 4),
-                    Text(
-                      'Use this for RomM servers older than 4.8 — the ones '
-                      'without QR pairing.',
-                      style: TextStyle(
-                          color: Colors.grey.shade500, fontSize: 12),
-                    ),
-                    const SizedBox(height: 20),
-                    Expanded(child: SingleChildScrollView(child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                    for (final f in _fields) ...[
-                      _textBox(f),
-                      const SizedBox(height: 12),
-                    ],
-                    if (_probedVersion != null) ...[
-                      const SizedBox(height: 4),
-                      Container(
-                        padding: const EdgeInsets.symmetric(
-                            horizontal: 12, vertical: 8),
-                        decoration: BoxDecoration(
-                          color: _probeSupportsTokens
-                              ? Colors.amber.withValues(alpha: 0.12)
-                              : Colors.green.withValues(alpha: 0.10),
-                          borderRadius: BorderRadius.circular(6),
-                          border: Border.all(
-                            color: _probeSupportsTokens
-                                ? Colors.amber.withValues(alpha: 0.5)
-                                : Colors.green.withValues(alpha: 0.4),
+                  ],
+                ),
+              ),
+              // Scrollable Content
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 24),
+                  child: Center(
+                    child: ConstrainedBox(
+                      constraints: const BoxConstraints(maxWidth: 560),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          const SizedBox(height: 8),
+                          Text(
+                            'Use this for RomM servers older than 4.8 — the ones '
+                            'without QR pairing.',
+                            style: TextStyle(
+                                color: Colors.grey.shade500, fontSize: 12),
                           ),
-                        ),
-                        child: Row(
-                          children: [
-                            Icon(
-                              _probeSupportsTokens
-                                  ? Icons.qr_code_2
-                                  : Icons.check_circle_outline,
-                              color: _probeSupportsTokens
-                                  ? Colors.amber
-                                  : Colors.greenAccent,
-                              size: 16,
-                            ),
-                            const SizedBox(width: 8),
-                            Expanded(
-                              child: Text(
-                                _probeSupportsTokens
-                                    ? 'RomM $_probedVersion supports QR — '
-                                        'tap B and use the QR option for an easier setup.'
-                                    : 'RomM $_probedVersion reachable',
-                                style: const TextStyle(
-                                  color: Colors.white70,
-                                  fontSize: 12,
+                          const SizedBox(height: 20),
+                          for (final f in _fields) ...[
+                            _textBox(f),
+                            const SizedBox(height: 12),
+                          ],
+                          if (_probedVersion != null) ...[
+                            const SizedBox(height: 4),
+                            Container(
+                              padding: const EdgeInsets.symmetric(
+                                  horizontal: 12, vertical: 8),
+                              decoration: BoxDecoration(
+                                color: _probeSupportsTokens
+                                    ? Colors.amber.withValues(alpha: 0.12)
+                                    : Colors.green.withValues(alpha: 0.10),
+                                borderRadius: BorderRadius.circular(6),
+                                border: Border.all(
+                                  color: _probeSupportsTokens
+                                      ? Colors.amber.withValues(alpha: 0.5)
+                                      : Colors.green.withValues(alpha: 0.4),
                                 ),
                               ),
+                              child: Row(
+                                children: [
+                                  Icon(
+                                    _probeSupportsTokens
+                                        ? Icons.qr_code_2
+                                        : Icons.check_circle_outline,
+                                    color: _probeSupportsTokens
+                                        ? Colors.amber
+                                        : Colors.greenAccent,
+                                    size: 16,
+                                  ),
+                                  const SizedBox(width: 8),
+                                  Expanded(
+                                    child: Text(
+                                      _probeSupportsTokens
+                                          ? 'RomM $_probedVersion supports QR — '
+                                              'tap B and use the QR option for an easier setup.'
+                                          : 'RomM $_probedVersion reachable',
+                                      style: const TextStyle(
+                                        color: Colors.white70,
+                                        fontSize: 12,
+                                      ),
+                                    ),
+                                  ),
+                                ],
+                              ),
                             ),
                           ],
-                        ),
-                      ),
-                    ],
-                    if (_error != null) ...[
-                      const SizedBox(height: 8),
-                      Text(_error!,
-                          style: const TextStyle(
-                              color: Colors.redAccent, fontSize: 13)),
-                    ],
-                    const SizedBox(height: 16),
-                    ConsoleFocusable(
-                      focusNode: _saveFocus,
-                      focusScale: 1.0,
-                      onSelect: _busy ? null : _save,
-                      child: Container(
-                        width: double.infinity,
-                        padding: const EdgeInsets.symmetric(vertical: 14),
-                        alignment: Alignment.center,
-                        decoration: BoxDecoration(
-                          color: AppTheme.primaryColor.withValues(alpha: 0.18),
-                          borderRadius: BorderRadius.circular(8),
-                          border: Border.all(
-                              color: AppTheme.primaryColor, width: 2),
-                        ),
-                        child: _busy
-                            ? const SizedBox(
-                                width: 18,
-                                height: 18,
-                                child: CircularProgressIndicator(
-                                  strokeWidth: 2,
-                                  color: AppTheme.primaryColor,
-                                ),
-                              )
-                            : Text(
-                                L.of(context).common_connect,
+                          if (_error != null) ...[
+                            const SizedBox(height: 8),
+                            Text(_error!,
                                 style: const TextStyle(
-                                  color: AppTheme.primaryColor,
-                                  fontSize: 15,
-                                  fontWeight: FontWeight.w600,
-                                  letterSpacing: 1,
-                                ),
+                                    color: Colors.redAccent, fontSize: 13)),
+                          ],
+                          const SizedBox(height: 16),
+                          ConsoleFocusable(
+                            focusNode: _saveFocus,
+                            focusScale: 1.0,
+                            onSelect: _busy ? null : _save,
+                            child: Container(
+                              width: double.infinity,
+                              padding: const EdgeInsets.symmetric(vertical: 14),
+                              alignment: Alignment.center,
+                              decoration: BoxDecoration(
+                                color: AppTheme.primaryColor
+                                    .withValues(alpha: 0.18),
+                                borderRadius: BorderRadius.circular(8),
+                                border: Border.all(
+                                    color: AppTheme.primaryColor, width: 2),
                               ),
+                              child: _busy
+                                  ? const SizedBox(
+                                      width: 18,
+                                      height: 18,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 2,
+                                        color: AppTheme.primaryColor,
+                                      ),
+                                    )
+                                  : Text(
+                                      L.of(context).common_connect,
+                                      style: const TextStyle(
+                                        color: AppTheme.primaryColor,
+                                        fontSize: 15,
+                                        fontWeight: FontWeight.w600,
+                                        letterSpacing: 1,
+                                      ),
+                                    ),
+                            ),
+                          ),
+                          const SizedBox(height: 40),
+                        ],
                       ),
                     ),
-                  ],
-                    ))),
-                  ],
+                  ),
                 ),
               ),
-            ),
+            ],
           ),
         ),
-      ),
-          ConsoleHud(
-            b: HudAction(L.of(context).common_back,
-                onTap: () => Navigator.maybePop(context)),
-          ),
-        ],
       ),
     );
   }
@@ -422,7 +441,7 @@ class _RommLegacyLoginScreenState
                   borderRadius: BorderRadius.circular(8),
                   border: Border.all(
                     color: hasFocus
-                        ? AppTheme.primaryColor
+                        ? Colors.white
                         : AppTheme.primaryColor.withValues(alpha: 0.4),
                     width: 2,
                   ),
diff --git a/lib/features/onboarding/widgets/welcome_chooser_step.dart b/lib/features/onboarding/widgets/welcome_chooser_step.dart
index 025bbe2..81d5abc 100644
--- a/lib/features/onboarding/widgets/welcome_chooser_step.dart
+++ b/lib/features/onboarding/widgets/welcome_chooser_step.dart
@@ -13,6 +13,7 @@ import '../../../services/romm_api_service.dart';
 import '../../../services/romm_pairing_service.dart';
 import '../../../services/romm_platform_matcher.dart';
 import '../../../models/system_model.dart';
+import '../../../widgets/console_dialog.dart';
 import '../../pairing/qr_pairing_screen.dart';
 import '../../sources/manual_source_add_screen.dart';
 import '../../sources/source_mappings_screen.dart';
@@ -99,9 +100,20 @@ class _WelcomeChooserStepState extends ConsumerState<WelcomeChooserStep> {
   // ---- path handlers ----
 
   Future<String?> _pickRomBaseFolder() async {
+    final l = L.of(context);
+    final confirmed = await showConsoleDialog(
+      context,
+      title: l.onboarding_folderExplanationTitle,
+      message: l.onboarding_folderExplanationMessage,
+      primaryLabel: l.onboarding_continueToPicker,
+      secondaryLabel: l.common_cancel,
+    );
+
+    if (confirmed != true) return null;
+
     try {
       return await FilePicker.platform.getDirectoryPath(
-        dialogTitle: L.of(context).onboarding_selectFolderPrompt,
+        dialogTitle: l.onboarding_selectFolderPrompt,
       );
     } catch (e) {
       debugPrint('WelcomeChooser: folder picker failed: $e');
@@ -415,58 +427,76 @@ class _ChoiceTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ConsoleFocusable(
-      focusNode: focusNode,
-      onSelect: onSelect,
-      borderRadius: 12,
-      focusScale: 1.0,
-      focusBorderColor: AppTheme.primaryColor,
-      child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
-        decoration: BoxDecoration(
-          color: const Color(0xFF1C1C1C),
-          borderRadius: BorderRadius.circular(12),
-        ),
-        child: Row(
-          children: [
-            Container(
-              width: 44,
-              height: 44,
-              decoration: BoxDecoration(
-                color: AppTheme.primaryColor.withValues(alpha: 0.18),
-                borderRadius: BorderRadius.circular(8),
-              ),
-              child: Icon(icon, color: AppTheme.primaryColor, size: 22),
+    return ListenableBuilder(
+      listenable: focusNode,
+      builder: (context, _) {
+        final isFocused = focusNode.hasFocus;
+        final bgColor = isFocused
+            ? AppTheme.primaryColor.withValues(alpha: 0.35)
+            : const Color(0xFF1C1C1C);
+
+        return ConsoleFocusable(
+          focusNode: focusNode,
+          onSelect: onSelect,
+          borderRadius: 12,
+          focusScale: 1.02,
+          focusBorderColor: Colors.white,
+          child: Container(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
+            decoration: BoxDecoration(
+              color: bgColor,
+              borderRadius: BorderRadius.circular(12),
             ),
-            const SizedBox(width: 14),
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    title,
-                    style: const TextStyle(
-                      color: Colors.white,
-                      fontSize: 15,
-                      fontWeight: FontWeight.w600,
-                    ),
+            child: Row(
+              children: [
+                Container(
+                  width: 44,
+                  height: 44,
+                  decoration: BoxDecoration(
+                    color: isFocused
+                        ? Colors.white.withValues(alpha: 0.2)
+                        : AppTheme.primaryColor.withValues(alpha: 0.08),
+                    borderRadius: BorderRadius.circular(8),
                   ),
-                  const SizedBox(height: 2),
-                  Text(
-                    subtitle,
-                    style: TextStyle(
-                      color: Colors.grey.shade400,
-                      fontSize: 12,
-                    ),
+                  child: Icon(icon,
+                      color: isFocused ? Colors.white : AppTheme.primaryColor.withValues(alpha: 0.7),
+                      size: 22),
+                ),
+                const SizedBox(width: 14),
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        title,
+                        style: TextStyle(
+                          color: isFocused ? Colors.white : Colors.white,
+                          fontSize: 15,
+                          fontWeight:
+                              isFocused ? FontWeight.w700 : FontWeight.w600,
+                        ),
+                      ),
+                      const SizedBox(height: 2),
+                      Text(
+                        subtitle,
+                        style: TextStyle(
+                          color: isFocused
+                              ? Colors.white.withValues(alpha: 0.7)
+                              : Colors.grey.shade400,
+                          fontSize: 12,
+                        ),
+                      ),
+                    ],
                   ),
-                ],
-              ),
+                ),
+                Icon(Icons.chevron_right,
+                    color: isFocused ? Colors.white : Colors.white30),
+              ],
             ),
-            const Icon(Icons.chevron_right, color: Colors.white30),
-          ],
-        ),
-      ),
+          ),
+        );
+      },
     );
   }
 }
diff --git a/lib/features/pairing/manual_pairing_screen.dart b/lib/features/pairing/manual_pairing_screen.dart
index 1b430ec..8992eab 100644
--- a/lib/features/pairing/manual_pairing_screen.dart
+++ b/lib/features/pairing/manual_pairing_screen.dart
@@ -231,110 +231,136 @@ class _ManualPairingScreenState extends ConsumerState<ManualPairingScreen> {
           focusNode: _screenFocus,
           autofocus: true,
           onKeyEvent: _handleScreenKey,
-          child: Center(
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(maxWidth: 560),
-              child: SingleChildScrollView(
-                padding: const EdgeInsets.all(24),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+          child: Column(
+            children: [
+              // Fixed Header
+              Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 16, 8),
+                child: Row(
                   children: [
-                    Row(
-                      children: [
-                        ConsoleFocusable(
-                          focusNode: _backFocus,
-                          onSelect: () => Navigator.of(context).maybePop(),
-                          child: const Padding(
-                            padding: EdgeInsets.all(8),
-                            child: Icon(Icons.arrow_back, color: Colors.white),
-                          ),
-                        ),
-                        const SizedBox(width: 12),
-                        Text(
-                          L.of(context).pairing_manualTitle,
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 22,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                      ],
+                    ConsoleFocusable(
+                      focusNode: _backFocus,
+                      onSelect: () => Navigator.of(context).maybePop(),
+                      child: const Padding(
+                        padding: EdgeInsets.all(8),
+                        child: Icon(Icons.arrow_back,
+                            color: Colors.white, size: 26),
+                      ),
                     ),
-                    const SizedBox(height: 8),
+                    const SizedBox(width: 4),
                     Text(
-                      '${L.of(context).pairing_manualInstructions}'
-                      'Profile → API Tokens → Pair Device.',
-                      style: TextStyle(color: Colors.grey.shade400, fontSize: 13),
-                    ),
-                    const SizedBox(height: 24),
-                    _label(L.of(context).pairing_serverUrl),
-                    _textField(
-                      controller: _urlController,
-                      consoleFocus: _urlConsoleFocus,
-                      textFocus: _urlTextFocus,
-                      hint: 'https://romm.example.com',
-                      monospace: true,
-                    ),
-                    const SizedBox(height: 6),
-                    _probeStatus(),
-                    const SizedBox(height: 16),
-                    _label(L.of(context).pairing_pairingCode),
-                    _textField(
-                      controller: _codeController,
-                      consoleFocus: _codeConsoleFocus,
-                      textFocus: _codeTextFocus,
-                      hint: L.of(context).pairing_pairingCodeHint,
-                      monospace: true,
-                      uppercase: true,
-                    ),
-                    if (_submitError != null) ...[
-                      const SizedBox(height: 12),
-                      Text(
-                        _submitError!,
-                        style: const TextStyle(
-                            color: Colors.redAccent, fontSize: 13),
+                      L.of(context).pairing_manualTitle,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 22,
+                        fontWeight: FontWeight.w600,
                       ),
-                    ],
-                    const SizedBox(height: 24),
-                    ConsoleFocusable(
-                      focusNode: _submitFocus,
-                      onSelect: _busy ? null : _submit,
-                      child: Container(
-                        width: double.infinity,
-                        padding: const EdgeInsets.symmetric(vertical: 14),
-                        alignment: Alignment.center,
-                        decoration: BoxDecoration(
-                          color: AppTheme.primaryColor.withValues(alpha: 0.18),
-                          borderRadius: BorderRadius.circular(8),
-                          border: Border.all(
-                            color: AppTheme.primaryColor,
-                            width: 2,
+                    ),
+                  ],
+                ),
+              ),
+              // Scrollable Content
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 24),
+                  child: Center(
+                    child: ConstrainedBox(
+                      constraints: const BoxConstraints(maxWidth: 560),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          const SizedBox(height: 8),
+                          Text(
+                            '${L.of(context).pairing_manualInstructions}'
+                            'Profile → API Tokens → Pair Device.',
+                            style: TextStyle(
+                                color: Colors.grey.shade400, fontSize: 13),
                           ),
-                        ),
-                        child: _busy
-                            ? const SizedBox(
-                                height: 18,
-                                width: 18,
-                                child: CircularProgressIndicator(
-                                  strokeWidth: 2,
-                                  color: AppTheme.primaryColor,
-                                ),
-                              )
-                            : Text(
-                                L.of(context).common_connect,
-                                style: const TextStyle(
-                                  color: AppTheme.primaryColor,
-                                  fontSize: 15,
-                                  fontWeight: FontWeight.w600,
-                                  letterSpacing: 1,
+                          const SizedBox(height: 24),
+                          _label(L.of(context).pairing_serverUrl),
+                          _textField(
+                            controller: _urlController,
+                            consoleFocus: _urlConsoleFocus,
+                            textFocus: _urlTextFocus,
+                            hint: 'https://romm.example.com',
+                            monospace: true,
+                          ),
+                          const SizedBox(height: 6),
+                          _probeStatus(),
+                          const SizedBox(height: 16),
+                          _label(L.of(context).pairing_pairingCode),
+                          _textField(
+                            controller: _codeController,
+                            consoleFocus: _codeConsoleFocus,
+                            textFocus: _codeTextFocus,
+                            hint: L.of(context).pairing_pairingCodeHint,
+                            monospace: true,
+                            uppercase: true,
+                          ),
+                          if (_submitError != null) ...[
+                            const SizedBox(height: 12),
+                            Text(
+                              _submitError!,
+                              style: const TextStyle(
+                                  color: Colors.redAccent, fontSize: 13),
+                            ),
+                          ],
+                          const SizedBox(height: 24),
+                          ListenableBuilder(
+                            listenable: _submitFocus,
+                            builder: (context, _) {
+                              final isFocused = _submitFocus.hasFocus;
+                              final color =
+                                  isFocused ? Colors.white : AppTheme.primaryColor;
+                              final bgColor = isFocused
+                                  ? AppTheme.primaryColor.withValues(alpha: 0.3)
+                                  : AppTheme.primaryColor.withValues(alpha: 0.18);
+
+                              return ConsoleFocusable(
+                                focusNode: _submitFocus,
+                                onSelect: _busy ? null : _submit,
+                                focusScale: 1.02,
+                                focusBorderColor: Colors.white,
+                                child: Container(
+                                  width: double.infinity,
+                                  padding: const EdgeInsets.symmetric(vertical: 14),
+                                  alignment: Alignment.center,
+                                  decoration: BoxDecoration(
+                                    color: bgColor,
+                                    borderRadius: BorderRadius.circular(8),
+                                  ),
+                                  child: _busy
+                                      ? SizedBox(
+                                          height: 18,
+                                          width: 18,
+                                          child: CircularProgressIndicator(
+                                            strokeWidth: 2,
+                                            color: color,
+                                          ),
+                                        )
+                                      : Text(
+                                          L.of(context).common_connect,
+                                          style: TextStyle(
+                                            color: color,
+                                            fontSize: 15,
+                                            fontWeight: isFocused
+                                                ? FontWeight.w700
+                                                : FontWeight.w600,
+                                            letterSpacing: 1,
+                                          ),
+                                        ),
                                 ),
-                              ),
+                              );
+                            },
+                          ),
+                          const SizedBox(height: 40),
+                        ],
                       ),
                     ),
-                  ],
+                  ),
                 ),
               ),
-            ),
+            ],
           ),
         ),
       ),
@@ -378,7 +404,7 @@ class _ManualPairingScreenState extends ConsumerState<ManualPairingScreen> {
               borderRadius: BorderRadius.circular(8),
               border: Border.all(
                 color: hasFocus
-                    ? AppTheme.primaryColor
+                    ? Colors.white
                     : AppTheme.primaryColor.withValues(alpha: 0.4),
                 width: 2,
               ),
@@ -457,6 +483,6 @@ class _ManualPairingScreenState extends ConsumerState<ManualPairingScreen> {
         ],
       );
     }
-    return const SizedBox(height: 16);
+    return const SizedBox.shrink();
   }
 }
diff --git a/lib/features/pairing/qr_pairing_screen.dart b/lib/features/pairing/qr_pairing_screen.dart
index cedaaf2..b91e0c5 100644
--- a/lib/features/pairing/qr_pairing_screen.dart
+++ b/lib/features/pairing/qr_pairing_screen.dart
@@ -8,6 +8,7 @@ import '../../core/widgets/console_focusable.dart';
 import '../../l10n/app_localizations.dart';
 import '../../providers/app_providers.dart';
 import '../../services/romm_pairing_service.dart';
+import '../../widgets/console_hud.dart';
 import 'manual_pairing_screen.dart';
 import 'pairing_result_screen.dart';
 
@@ -39,6 +40,9 @@ class _QrPairingScreenState extends ConsumerState<QrPairingScreen> {
       detectionSpeed: DetectionSpeed.normal,
       formats: const [BarcodeFormat.qrCode],
     );
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) _manualFocus.requestFocus();
+    });
   }
 
   @override
@@ -50,12 +54,8 @@ class _QrPairingScreenState extends ConsumerState<QrPairingScreen> {
     super.dispose();
   }
 
-  /// Top-level key handler so [B]/Escape always closes the scanner and
-  /// [A]/Enter always opens manual entry, regardless of which inner
-  /// widget happens to have focus. The QR screen has no real "primary
-  /// action" target since the camera does the work, so it makes more
-  /// sense to bind A globally to the only manual-action escape hatch
-  /// than to require the user to tab onto a button first.
+  /// Top-level key handler supporting gamepad joystick navigation between
+  /// top-left back button and bottom manual-entry button, and [B] back.
   KeyEventResult _handleScreenKey(FocusNode node, KeyEvent event) {
     if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
       return KeyEventResult.ignored;
@@ -67,12 +67,21 @@ class _QrPairingScreenState extends ConsumerState<QrPairingScreen> {
       Navigator.of(context).maybePop();
       return KeyEventResult.handled;
     }
-    if (key == LogicalKeyboardKey.gameButtonA ||
-        key == LogicalKeyboardKey.enter ||
-        key == LogicalKeyboardKey.numpadEnter ||
-        key == LogicalKeyboardKey.select) {
-      _openManual();
-      return KeyEventResult.handled;
+    if (key == LogicalKeyboardKey.arrowUp ||
+        key == LogicalKeyboardKey.arrowLeft) {
+      if (_manualFocus.hasFocus) {
+        _backFocus.requestFocus();
+        ref.read(feedbackServiceProvider).tick();
+        return KeyEventResult.handled;
+      }
+    }
+    if (key == LogicalKeyboardKey.arrowDown ||
+        key == LogicalKeyboardKey.arrowRight) {
+      if (_backFocus.hasFocus) {
+        _manualFocus.requestFocus();
+        ref.read(feedbackServiceProvider).tick();
+        return KeyEventResult.handled;
+      }
     }
     return KeyEventResult.ignored;
   }
@@ -283,6 +292,12 @@ class _QrPairingScreenState extends ConsumerState<QrPairingScreen> {
                           ),
                         ),
                       ),
+                      const SizedBox(height: 8),
+                      ConsoleHud(
+                        embedded: true,
+                        b: const HudAction('返回'),
+                        a: const HudAction('確定 / 選擇'),
+                      ),
                       if (_processing)
                         const Padding(
                           padding: EdgeInsets.only(top: 12),
diff --git a/lib/features/settings/sources_screen.dart b/lib/features/settings/sources_screen.dart
index 9a1aaee..a48ad84 100644
--- a/lib/features/settings/sources_screen.dart
+++ b/lib/features/settings/sources_screen.dart
@@ -19,10 +19,13 @@ import '../../services/romm_api_service.dart';
 import '../../services/romm_pairing_service.dart';
 import '../../services/romm_platform_matcher.dart';
 import '../../services/sources_notifier.dart';
+import '../../services/source_failover.dart';
+import '../../widgets/console_dialog.dart';
 import '../../widgets/console_hud.dart';
 import '../../widgets/console_notification.dart';
 import '../onboarding/widgets/romm_legacy_login_screen.dart';
 import '../pairing/qr_pairing_screen.dart';
+import '../sources/fallback_picker_overlay.dart';
 import '../sources/manual_source_add_screen.dart';
 import '../sources/source_mappings_screen.dart';
 
@@ -58,12 +61,54 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
   Source? _activeActionsSource;
   bool _showTypePicker = false;
 
+
+  /// Which source is designated as in use, read straight from the notifier.
+  ///
+  /// Deliberately not mirrored in a field of this State. It used to be, seeded
+  /// with `_activeSourceId ??= stored` — and `??=` cannot represent
+  /// "deliberately none", so the next build re-seeded it from the stored value
+  /// and the toggle needed a second press to take. One source of truth.
+  String? get _primarySourceId => ref.read(sourcesProvider).primarySourceId;
+
+  /// Set while the fallback picker is open.
+  String? _fallbackPickerSourceId;
+
+  /// Set while creating a new source triggered from inside the fallback picker.
+  /// When source creation finishes or cancels, fallback picker re-opens for this source.
+  String? _addingFallbackForSourceId;
+
+  /// Which card the gamepad is sitting on. The list-level shortcuts act on
+  /// this source, and the HUD reads its state — the disable hint has to say
+  /// which of the two things it is about to do.
+  ///
+  /// Kept rather than recomputed on demand because focus changes do not
+  /// rebuild this widget by themselves, and a stale hint is worse than none.
+  String? _focusedSourceId;
+
   /// True once we've successfully moved focus off of the screen-level
   /// Focus stub created by [ConsoleScreenMixin.buildWithActions]. Until
   /// that happens, the gamepad input bypasses our cards entirely (the
   /// stub eats the key event before it reaches ConsoleFocusable).
   bool _initialFocusClaimed = false;
 
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _probeFailoverState();
+    });
+  }
+
+  Future<void> _probeFailoverState() async {
+    final config = ref.read(bootstrappedConfigProvider).valueOrNull;
+    if (config != null) {
+      final resolved = await resolveForSync(config: config);
+      if (mounted) {
+        ref.read(activeFailoverChoiceProvider.notifier).choice = resolved.choice;
+      }
+    }
+  }
+
   @override
   String get routeId => 'sources_screen';
 
@@ -76,12 +121,28 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
         // leak focus into the screen-level Focus stub or the HUD when
         // there is nothing to move to.
         NavigateIntent: NavigateAction(ref, onNavigate: _onNavigate),
+        _SourceShortcutIntent: _SourceShortcutAction(ref, _onSourceShortcut),
       };
 
   @override
   Map<ShortcutActivator, Intent>? get additionalShortcuts => {
         const SingleActivator(LogicalKeyboardKey.gameButtonY,
             includeRepeats: false): const SearchIntent(),
+        // The three things done most often here, bound on the list itself so
+        // they no longer cost a menu. The menu keeps them as well: the eye on
+        // the row and the menu rows are the finger half of the same actions.
+        //
+        // L1/R1 are the grid column controls globally; this map is merged
+        // after the defaults, so on this screen they mean these instead.
+        const SingleActivator(LogicalKeyboardKey.gameButtonX,
+                includeRepeats: false):
+            const _SourceShortcutIntent(_SourceShortcut.toggleActive),
+        const SingleActivator(LogicalKeyboardKey.gameButtonLeft1,
+                includeRepeats: false):
+            const _SourceShortcutIntent(_SourceShortcut.toggleEnabled),
+        const SingleActivator(LogicalKeyboardKey.gameButtonRight1,
+                includeRepeats: false):
+            const _SourceShortcutIntent(_SourceShortcut.remove),
       };
 
   @override
@@ -99,7 +160,21 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
   /// once focus has landed on a real interactive widget the flag stays
   /// flipped and subsequent state changes won't yank focus around.
   void _ensureInteractiveFocus(SourcesState state) {
-    if (_initialFocusClaimed || _activeActionsSource != null) return;
+    // Deleting the last source disposes the card that had focus, leaving the
+    // screen with nothing focusable — the gamepad then does nothing at all and
+    // only touch still works. The claim has to be given up whenever the list
+    // the focus was living in disappears, so the empty state can take it.
+    if (_initialFocusClaimed &&
+        !_cardFocusNodes.values.any((n) => n.hasFocus) &&
+        !_addEmptyFocus.hasFocus) {
+      _initialFocusClaimed = false;
+    }
+    // ...and it must not run while an overlay owns the focus. Any overlay,
+    // not just the actions menu: the group editor stays open across a config
+    // write (creating a group rewrites the sources list), and the rebuild that
+    // followed used to yank focus onto the card behind it — the pad stopped
+    // driving the overlay mid-edit while it was still on screen.
+    if (_initialFocusClaimed || _anyOverlayOpen) return;
     if (state.loading) return;
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted || _initialFocusClaimed) return;
@@ -117,13 +192,31 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     });
   }
 
+  /// True while anything is layered over the list. Each of these has its own
+  /// focus scope, so the list must not compete for focus with it.
+  bool get _anyOverlayOpen =>
+      _activeActionsSource != null ||
+      _fallbackPickerSourceId != null ||
+      _showTypePicker;
+
   /// Returns the focus node for [sourceId], creating it on first access.
   /// Stable across rebuilds so the visible focus indicator doesn't jump
   /// when the list mutates.
   FocusNode _focusFor(String sourceId) {
     return _cardFocusNodes.putIfAbsent(
       sourceId,
-      () => FocusNode(debugLabel: 'source_card_$sourceId'),
+      () {
+        final node = FocusNode(debugLabel: 'source_card_$sourceId');
+        // Only ever set, never cleared on focus loss: moving between cards
+        // passes through a moment where nothing is focused, and clearing
+        // there would blank the HUD hints on every press.
+        node.addListener(() {
+          if (!mounted || !node.hasFocus) return;
+          if (_focusedSourceId == sourceId) return;
+          setState(() => _focusedSourceId = sourceId);
+        });
+        return node;
+      },
     );
   }
 
@@ -138,6 +231,58 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     for (final id in stale) {
       _cardFocusNodes.remove(id)?.dispose();
     }
+    // A removed source must not keep driving the HUD hints.
+    if (_focusedSourceId != null && !liveIds.contains(_focusedSourceId)) {
+      _focusedSourceId = null;
+    }
+  }
+
+  /// The source the shortcuts and the HUD act on. Reads live focus first so a
+  /// press is always applied to what the border is drawn around, and falls
+  /// back to the last remembered card for the gap between two cards.
+  Source? _focusedSource(List<Source> sources) {
+    for (final entry in _cardFocusNodes.entries) {
+      if (entry.value.hasFocus) {
+        return sources.where((s) => s.id == entry.key).firstOrNull;
+      }
+    }
+    final id = _focusedSourceId;
+    if (id == null) return null;
+    return sources.where((s) => s.id == id).firstOrNull;
+  }
+
+  /// Runs one of the three list-level shortcuts against the focused card.
+  void _onSourceShortcut(_SourceShortcut shortcut) {
+    final source = _focusedSource(ref.read(sourcesProvider).sources);
+    if (source == null) return;
+    switch (shortcut) {
+      case _SourceShortcut.toggleActive:
+        ref.read(feedbackServiceProvider).confirm();
+        _toggleActiveSource(source);
+      case _SourceShortcut.toggleEnabled:
+        ref.read(feedbackServiceProvider).confirm();
+        _toggleSourceEnabled(source);
+      case _SourceShortcut.remove:
+        _confirmRemoveSource(source);
+    }
+  }
+
+  /// Removal from the list asks first. In the menu it takes three deliberate
+  /// presses to reach; here it is one, and it drops the source's whole
+  /// library listing — so the one press has to be the one that opens a
+  /// question, not the one that does it.
+  Future<void> _confirmRemoveSource(Source source) async {
+    final l = L.of(context);
+    ref.read(feedbackServiceProvider).tick();
+    final confirmed = await showConsoleDialog(
+      context,
+      title: l.sources_removeConfirmTitle,
+      message: l.sources_removeConfirmMessage(source.name),
+      primaryLabel: l.common_remove,
+      isDestructive: true,
+    );
+    if (confirmed != true || !mounted) return;
+    await _removeSource(source);
   }
 
   void _goBack() {
@@ -198,9 +343,33 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     setState(() => _showTypePicker = true);
   }
 
+  void _addFreshFallbackSource(String parentId) {
+    _addingFallbackForSourceId = parentId;
+    ref.read(feedbackServiceProvider).tick();
+    setState(() {
+      _fallbackPickerSourceId = null;
+      _activeActionsSource = null;
+      _showTypePicker = true;
+    });
+  }
+
+  @visibleForTesting
+  void addFreshFallbackSourceForTest(String parentId) =>
+      _addFreshFallbackSource(parentId);
+
+  @visibleForTesting
+  void closeTypePickerForTest() => _closeTypePicker();
+
   void _closeTypePicker() {
     if (!_showTypePicker) return;
-    setState(() => _showTypePicker = false);
+    setState(() {
+      _showTypePicker = false;
+      if (_addingFallbackForSourceId != null) {
+        _fallbackPickerSourceId = _addingFallbackForSourceId;
+        _addingFallbackForSourceId = null;
+        _activeActionsSource = null;
+      }
+    });
   }
 
   Future<void> _onTypePicked(_TypeOption option) async {
@@ -218,9 +387,31 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     final result = await Navigator.of(context).push<Source?>(
       MaterialPageRoute(builder: (_) => ManualSourceAddScreen(type: type)),
     );
-    if (!mounted || result == null) return;
+    if (!mounted) return;
+    if (result == null) {
+      if (_addingFallbackForSourceId != null) {
+        setState(() {
+          _fallbackPickerSourceId = _addingFallbackForSourceId;
+          _addingFallbackForSourceId = null;
+          _activeActionsSource = null;
+        });
+      }
+      return;
+    }
+
+    if (_addingFallbackForSourceId != null) {
+      final parentId = _addingFallbackForSourceId!;
+      _addingFallbackForSourceId = null;
+      await ref.read(sourcesProvider.notifier).addFallbackSource(parentId, result.id);
+      setState(() {
+        _fallbackPickerSourceId = parentId;
+        _activeActionsSource = null;
+      });
+    }
+
     ref.invalidate(bootstrappedConfigProvider);
     ref.invalidate(gamesProvider);
+    if (!mounted) return;
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
       _focusFor(result.id).requestFocus();
@@ -235,9 +426,19 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
 
   Future<void> _addRommSource() async {
     final result = await Navigator.of(context).push<RommPairResult?>(
-      MaterialPageRoute(builder: (_) => const QrPairingScreen()),
+      MaterialPageRoute(builder: (_) => QrPairingScreen()),
     );
-    if (!mounted || result == null) return;
+    if (!mounted) return;
+    if (result == null) {
+      if (_addingFallbackForSourceId != null) {
+        setState(() {
+          _fallbackPickerSourceId = _addingFallbackForSourceId;
+          _addingFallbackForSourceId = null;
+          _activeActionsSource = null;
+        });
+      }
+      return;
+    }
 
     final source = buildSourceFromPairResult(result);
 
@@ -259,6 +460,16 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     final addedSource = source.copyWith(knownPlatforms: knownPlatforms);
     await notifier.addSource(addedSource);
 
+    if (_addingFallbackForSourceId != null) {
+      final parentId = _addingFallbackForSourceId!;
+      _addingFallbackForSourceId = null;
+      await notifier.addFallbackSource(parentId, addedSource.id);
+      setState(() {
+        _fallbackPickerSourceId = parentId;
+        _activeActionsSource = null;
+      });
+    }
+
     // Auto-create SystemConfigs for platforms the user doesn't have yet.
     final basePath = ref.read(storageServiceProvider).getRomPath()
         ?? '/storage/emulated/0/ROMs';
@@ -301,11 +512,31 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     final source = await Navigator.of(context).push<Source?>(
       MaterialPageRoute(builder: (_) => const RommLegacyLoginScreen()),
     );
-    if (!mounted || source == null) return;
+    if (!mounted) return;
+    if (source == null) {
+      if (_addingFallbackForSourceId != null) {
+        setState(() {
+          _fallbackPickerSourceId = _addingFallbackForSourceId;
+          _addingFallbackForSourceId = null;
+          _activeActionsSource = null;
+        });
+      }
+      return;
+    }
 
     final notifier = ref.read(sourcesProvider.notifier);
     await notifier.addSource(source);
 
+    if (_addingFallbackForSourceId != null) {
+      final parentId = _addingFallbackForSourceId!;
+      _addingFallbackForSourceId = null;
+      await notifier.addFallbackSource(parentId, source.id);
+      setState(() {
+        _fallbackPickerSourceId = parentId;
+        _activeActionsSource = null;
+      });
+    }
+
     final basePath = ref.read(storageServiceProvider).getRomPath()
         ?? '/storage/emulated/0/ROMs';
     final newConsoles = await notifier.ensureSystemsForSource(
@@ -344,6 +575,47 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     setState(() => _activeActionsSource = source);
   }
 
+  Source? _sourceById(String id) =>
+      ref.read(sourcesProvider).sources.where((s) => s.id == id).firstOrNull;
+
+  void _openFallbackPicker(Source source) {
+    setState(() {
+      _activeActionsSource = null;
+      _fallbackPickerSourceId = source.id;
+    });
+  }
+
+  void _closeFallbackPicker() {
+    if (_fallbackPickerSourceId == null) return;
+    final source = _sourceById(_fallbackPickerSourceId!);
+    setState(() {
+      _fallbackPickerSourceId = null;
+      _activeActionsSource = source;
+    });
+  }
+
+  /// Designates the source in use — what syncs, and what the home screen
+  /// opens on. A plain two-state toggle: this one, or none.
+  ///
+  /// Not the same button as the home screen's triggers. Those change what is
+  /// **shown**, which is a look you can take back; this one changes what the
+  /// app actually works against.
+  ///
+  /// **Never discards cached games** — the other source's library stays in the
+  /// database so coming back is instant. That is what separates this from
+  /// disabling a source.
+  Future<void> _toggleActiveSource(Source source) async {
+    final next = _primarySourceId == source.id ? null : source.id;
+    setState(() => _activeActionsSource = null);
+    try {
+      await ref.read(sourcesProvider.notifier).setPrimarySource(next);
+      ref.invalidate(bootstrappedConfigProvider);
+    } catch (e) {
+      debugPrint('SourcesScreen: setPrimarySource failed: $e');
+    }
+  }
+
+
   void _closeSourceActions() {
     if (_activeActionsSource == null) return;
     final source = _activeActionsSource!;
@@ -374,7 +646,7 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     setState(() => _activeActionsSource = null);
 
     final result = await Navigator.of(context).push<RommPairResult?>(
-      MaterialPageRoute(builder: (_) => const QrPairingScreen()),
+      MaterialPageRoute(builder: (_) => QrPairingScreen()),
     );
     if (!mounted || result == null) return;
 
@@ -458,13 +730,54 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
     }
   }
 
+  /// The per-source hints only appear once a card is focused, because their
+  /// labels depend on that card: "disable" or "enable", "use this" or "stop
+  /// using". With nothing focused they would have to guess.
+  Widget _buildHud(
+    BuildContext context,
+    SourcesState state,
+    String? primary,
+  ) {
+    final l = L.of(context);
+    final source = state.loading ? null : _focusedSource(state.sources);
+    return ConsoleHud(
+      b: HudAction(l.common_back, onTap: _goBack),
+      y: HudAction(l.sources_addSource, onTap: _addSource),
+      x: source == null
+          ? null
+          : HudAction(
+              primary == source.id
+                  ? l.sources_stopUsingShort
+                  : l.sources_useThisShort,
+              onTap: () => _toggleActiveSource(source),
+            ),
+      lb: source == null
+          ? null
+          : HudAction(
+              source.enabled ? l.sources_disable : l.sources_enable,
+              onTap: () => _toggleSourceEnabled(source),
+            ),
+      rb: source == null
+          ? null
+          : HudAction(
+              l.common_remove,
+              onTap: () => _confirmRemoveSource(source),
+            ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final rs = context.rs;
     final state = ref.watch(sourcesProvider);
+    final primary = state.primarySourceId;
     _gcFocusNodes(state.sources);
     _ensureInteractiveFocus(state);
 
+    ref.listen(sourcesProvider, (prev, next) {
+      _probeFailoverState();
+    });
+
     return buildWithActions(
       ScreenLayout(
         body: Stack(
@@ -485,16 +798,17 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
                               sources: state.sources,
                               focusForId: _focusFor,
                               onTap: _openSourceActions,
+                              onToggleActive: _toggleActiveSource,
+                              onToggleShown: _toggleSourceEnabled,
                               scrollController: _scrollController,
                               rs: rs,
                             ),
                 ),
               ],
             ),
-            ConsoleHud(
-              b: HudAction(L.of(context).common_back, onTap: _goBack),
-              y: HudAction(L.of(context).sources_addSource, onTap: _addSource),
-            ),
+            // Every hint here is also a button: the HUD is the finger half of
+            // the same three shortcuts, so neither input is a dead end.
+            _buildHud(context, state, primary),
             if (_activeActionsSource != null)
               _SourceActionsOverlay(
                 source: _activeActionsSource!,
@@ -505,12 +819,34 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
                 onRepair: () => _repairSource(_activeActionsSource!),
                 onEditMappings: () =>
                     _editMappings(_activeActionsSource!),
+                onEditFallback: () =>
+                    _openFallbackPicker(_activeActionsSource!),
+                isActive: primary == _activeActionsSource!.id,
+                onToggleActive: () =>
+                    _toggleActiveSource(_activeActionsSource!),
+                hasOtherSources: state.sources.length > 1,
               ),
             if (_showTypePicker)
               _SourceTypePickerOverlay(
                 onClose: _closeTypePicker,
                 onPick: _onTypePicked,
               ),
+            if (_fallbackPickerSourceId != null)
+              Builder(
+                builder: (context) {
+                  final src = ref
+                      .watch(sourcesProvider)
+                      .sources
+                      .where((s) => s.id == _fallbackPickerSourceId)
+                      .firstOrNull;
+                  if (src == null) return const SizedBox.shrink();
+                  return FallbackPickerOverlay(
+                    sourceId: src.id,
+                    onClose: _closeFallbackPicker,
+                    onAddFreshSource: () => _addFreshFallbackSource(src.id),
+                  );
+                },
+              ),
           ],
         ),
       ),
@@ -518,6 +854,36 @@ class _SourcesScreenState extends ConsumerState<SourcesScreen>
   }
 }
 
+/// The list-level shortcuts. One intent with a payload rather than three
+/// intent types, because [ConsoleScreenMixin.screenActions] is keyed by type
+/// and three keys would need three near-identical actions.
+enum _SourceShortcut { toggleActive, toggleEnabled, remove }
+
+class _SourceShortcutIntent extends Intent {
+  const _SourceShortcutIntent(this.shortcut);
+  final _SourceShortcut shortcut;
+}
+
+class _SourceShortcutAction extends Action<_SourceShortcutIntent> {
+  _SourceShortcutAction(this.ref, this.onShortcut);
+
+  final WidgetRef ref;
+  final void Function(_SourceShortcut) onShortcut;
+
+  /// Held off while any overlay is up. The action menu answers X itself, but
+  /// nothing answers L1/R1 — without this they would fire underneath an open
+  /// overlay, acting on a card the user can no longer see.
+  @override
+  bool isEnabled(_SourceShortcutIntent intent) =>
+      ref.read(overlayPriorityProvider) == OverlayPriority.none;
+
+  @override
+  Object? invoke(_SourceShortcutIntent intent) {
+    onShortcut(intent.shortcut);
+    return null;
+  }
+}
+
 class _Header extends StatelessWidget {
   const _Header({required this.rs, required this.count});
   final Responsive rs;
@@ -546,9 +912,12 @@ class _Header extends StatelessWidget {
           ),
           SizedBox(height: rs.spacing.xs),
           Text(
+            // Was an English literal with a hardcoded [Y] in it. The key name
+            // is the HUD's job — it draws from the configured controller
+            // layout, which this line could not.
             count == 0
                 ? L.of(context).sources_noSourcesConfigured
-                : '$count source${count == 1 ? "" : "s"} · [Y] add new',
+                : L.of(context).sources_countLabel(count),
             style: TextStyle(
               fontSize: rs.isSmall ? 10 : 12,
               color: Colors.grey.shade500,
@@ -649,6 +1018,8 @@ class _SourceList extends ConsumerWidget {
     required this.sources,
     required this.focusForId,
     required this.onTap,
+    required this.onToggleActive,
+    required this.onToggleShown,
     required this.scrollController,
     required this.rs,
   });
@@ -656,6 +1027,8 @@ class _SourceList extends ConsumerWidget {
   final List<Source> sources;
   final FocusNode Function(String sourceId) focusForId;
   final void Function(Source source) onTap;
+  final void Function(Source source) onToggleActive;
+  final void Function(Source source) onToggleShown;
   final ScrollController scrollController;
   final Responsive rs;
 
@@ -695,6 +1068,13 @@ class _SourceList extends ConsumerWidget {
                 onTap: () => onTap(source),
                 rs: rs,
                 mappingCount: mappingCounts[source.id] ?? 0,
+                isActive: ref.watch(sourcesProvider).primarySourceId == source.id,
+                onToggleActive: () => onToggleActive(source),
+                // The eye is the on/off switch. It was briefly a second,
+                // separate "show on home" flag — but that is what turning a
+                // source off already did, so there is one switch again.
+                isShown: source.enabled,
+                onToggleShown: () => onToggleShown(source),
               );
             },
           ),
@@ -713,6 +1093,10 @@ class _SourceCard extends ConsumerWidget {
     required this.onTap,
     required this.rs,
     this.mappingCount = 0,
+    this.isActive = false,
+    this.onToggleActive,
+    this.isShown = false,
+    this.onToggleShown,
   });
 
   final Source source;
@@ -722,6 +1106,20 @@ class _SourceCard extends ConsumerWidget {
   final Responsive rs;
   final int mappingCount;
 
+  /// True when this is the source in use — what syncs, and what the home
+  /// screen opens on. Marked with a tick.
+  final bool isActive;
+
+  /// Designates this source as the one in use, from the tick on the row.
+  final VoidCallback? onToggleActive;
+
+  /// True when this source is switched on: its library is on the home screen
+  /// and it takes part in syncs.
+  final bool isShown;
+
+  /// Switches this source on or off, from the eye on the row.
+  final VoidCallback? onToggleShown;
+
   Color get _accent {
     if (source.borrowed) return Colors.lightBlueAccent;
     switch (source.type) {
@@ -782,6 +1180,32 @@ class _SourceCard extends ConsumerWidget {
     final health = healthState.statusFor(source.id);
     final healthError = healthState.errorFor(source.id);
 
+    final failoverChoice = ref.watch(activeFailoverChoiceProvider);
+    final isFailoverActive = source.enabled &&
+        failoverChoice != null &&
+        failoverChoice.isFallback;
+    final allSources = ref.watch(sourcesProvider).sources;
+    final fallbackSources = [
+      for (final fbId in source.fallbackSourceIds)
+        ...allSources.where((s) => s.id == fbId),
+    ];
+    final firstEnabledFallback =
+        fallbackSources.where((s) => s.enabled).firstOrNull;
+    final hasEnabledFallback = firstEnabledFallback != null;
+
+    final isPreferredFailed = source.enabled &&
+        hasEnabledFallback &&
+        ((isFailoverActive && source.id == failoverChoice.preferred?.id) ||
+            (isActive && health == SourceHealth.invalid));
+
+    final fallbackName = failoverChoice?.source?.name ??
+        firstEnabledFallback?.name ??
+        '代理來源';
+
+    final isFallbackInUse = source.enabled &&
+        isFailoverActive &&
+        source.id == failoverChoice.source?.id;
+
     return ConsoleFocusable(
       focusNode: focusNode,
       autofocus: autofocus,
@@ -793,14 +1217,31 @@ class _SourceCard extends ConsumerWidget {
           color: const Color(0xFF1C1C1C),
           borderRadius: BorderRadius.circular(12),
           border: Border.all(
-            color: source.enabled
-                ? _accent.withValues(alpha: 0.4)
-                : Colors.white12,
-            width: 2,
+            color: Colors.white24,
+            width: 1.5,
           ),
         ),
         child: Row(
           children: [
+            // Two separate decisions, two separate marks. Both are one tap on
+            // the row, with no menu to open first — they are what this screen
+            // The tick is single and names the one the app works against.
+            GestureDetector(
+              behavior: HitTestBehavior.opaque,
+              onTap: onToggleActive,
+              child: Padding(
+                padding: const EdgeInsets.only(right: 10),
+                child: Icon(
+                  isActive
+                      ? Icons.check_circle
+                      : Icons.radio_button_unchecked,
+                  size: 21,
+                  color: isActive
+                      ? const Color(0xFF7BC67B)
+                      : Colors.white38,
+                ),
+              ),
+            ),
             Container(
               width: 44,
               height: 44,
@@ -831,6 +1272,113 @@ class _SourceCard extends ConsumerWidget {
                           ),
                         ),
                       ),
+                      // Which source the library is actually showing is
+                      // otherwise invisible, and with two sources configured
+                      // that is the first thing you need to know.
+                      if (isActive) ...[
+                        const SizedBox(width: 6),
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 6, vertical: 2),
+                          decoration: BoxDecoration(
+                            color: const Color(0xFF7BC67B)
+                                .withValues(alpha: 0.22),
+                            borderRadius: BorderRadius.circular(4),
+                            border: Border.all(
+                              color: const Color(0xFF7BC67B)
+                                  .withValues(alpha: 0.6),
+                            ),
+                          ),
+                          child: Text(
+                            L.of(context).sources_activeSource,
+                            style: const TextStyle(
+                              color: Color(0xFF7BC67B),
+                              fontSize: 9,
+                              fontWeight: FontWeight.w700,
+                              letterSpacing: 0.8,
+                            ),
+                          ),
+                        ),
+                      ],
+                      if (isPreferredFailed) ...[
+                        const SizedBox(width: 6),
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 6, vertical: 2),
+                          decoration: BoxDecoration(
+                            color: const Color(0xFFD97706).withValues(alpha: 0.25),
+                            borderRadius: BorderRadius.circular(4),
+                            border: Border.all(
+                              color: Colors.amber,
+                              width: 1,
+                            ),
+                          ),
+                          child: Text(
+                            '⚠️ 斷線 (已切換至: $fallbackName)',
+                            style: const TextStyle(
+                              color: Colors.amberAccent,
+                              fontSize: 9,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ),
+                      ],
+                      if (isFallbackInUse) ...[
+                        const SizedBox(width: 6),
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 6, vertical: 2),
+                          decoration: BoxDecoration(
+                            color: Colors.amberAccent,
+                            borderRadius: BorderRadius.circular(4),
+                          ),
+                          child: const Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Icon(Icons.bolt, size: 10, color: Colors.black),
+                              SizedBox(width: 2),
+                              Text(
+                                '代理中',
+                                style: TextStyle(
+                                  color: Colors.black,
+                                  fontSize: 9,
+                                  fontWeight: FontWeight.w900,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                      if (source.enabled &&
+                          source.fallbackSourceIds.isNotEmpty &&
+                          !isPreferredFailed) ...[
+                        const SizedBox(width: 6),
+                        Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: 6, vertical: 2),
+                          decoration: BoxDecoration(
+                            color: hasEnabledFallback
+                                ? Colors.amber.withValues(alpha: 0.18)
+                                : Colors.redAccent.withValues(alpha: 0.18),
+                            borderRadius: BorderRadius.circular(4),
+                            border: Border.all(
+                              color: hasEnabledFallback
+                                  ? Colors.amber.withValues(alpha: 0.5)
+                                  : Colors.redAccent.withValues(alpha: 0.5),
+                            ),
+                          ),
+                          child: Text(
+                            hasEnabledFallback ? '🛡️ 已設代理' : '🚫 代理已停用',
+                            style: TextStyle(
+                              color: hasEnabledFallback
+                                  ? Colors.amberAccent
+                                  : Colors.redAccent,
+                              fontSize: 9,
+                              fontWeight: FontWeight.w700,
+                            ),
+                          ),
+                        ),
+                      ],
                       if (source.borrowed) ...[
                         const SizedBox(width: 6),
                         Container(
@@ -882,8 +1430,8 @@ class _SourceCard extends ConsumerWidget {
                     '${source.type.name.toUpperCase()} · ${source.hostLabel}',
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                      color: Colors.grey.shade500,
+                    style: const TextStyle(
+                      color: Colors.white70,
                       fontSize: 11,
                       fontFamily: 'monospace',
                     ),
@@ -891,8 +1439,8 @@ class _SourceCard extends ConsumerWidget {
                   const SizedBox(height: 4),
                   Row(
                     children: [
-                      Icon(Icons.games,
-                          size: 11, color: Colors.grey.shade500),
+                      const Icon(Icons.games,
+                          size: 11, color: Colors.white70),
                       const SizedBox(width: 3),
                       Text(
                         entryCount == 0
@@ -901,8 +1449,8 @@ class _SourceCard extends ConsumerWidget {
                                 : 'No mappings — [A] to add')
                             : '$entryCount '
                                 '${entryCount == 1 ? entryNoun : "${entryNoun}s"}',
-                        style: TextStyle(
-                          color: Colors.grey.shade500,
+                        style: const TextStyle(
+                          color: Colors.white70,
                           fontSize: 11,
                         ),
                       ),
@@ -982,6 +1530,10 @@ class _SourceActionsOverlay extends ConsumerStatefulWidget {
     required this.onRemove,
     required this.onRepair,
     required this.onEditMappings,
+    required this.onEditFallback,
+    required this.onToggleActive,
+    required this.isActive,
+    required this.hasOtherSources,
   });
 
   final Source source;
@@ -990,6 +1542,10 @@ class _SourceActionsOverlay extends ConsumerStatefulWidget {
   final VoidCallback onRemove;
   final VoidCallback onRepair;
   final VoidCallback onEditMappings;
+  final VoidCallback onEditFallback;
+  final VoidCallback onToggleActive;
+  final bool isActive;
+  final bool hasOtherSources;
 
   @override
   ConsumerState<_SourceActionsOverlay> createState() =>
@@ -1019,6 +1575,11 @@ class _SourceActionsOverlayState extends ConsumerState<_SourceActionsOverlay> {
           label: l.sources_editMappings,
           onActivate: widget.onEditMappings,
         ),
+      _OverlayAction(
+        icon: Icons.alt_route,
+        label: '代理設定',
+        onActivate: widget.onEditFallback,
+      ),
       _OverlayAction(
         icon: src.enabled ? Icons.toggle_off : Icons.toggle_on,
         label: src.enabled ? l.sources_disable : l.sources_enable,
@@ -1079,6 +1640,13 @@ class _SourceActionsOverlayState extends ConsumerState<_SourceActionsOverlay> {
       widget.onClose();
       return KeyEventResult.handled;
     }
+    // The gamepad half of the eye in the header. Without it that toggle would
+    // be reachable by finger only.
+    if (key == LogicalKeyboardKey.gameButtonX) {
+      ref.read(feedbackServiceProvider).confirm();
+      widget.onToggleActive();
+      return KeyEventResult.handled;
+    }
     return KeyEventResult.ignored;
   }
 
@@ -1095,6 +1663,7 @@ class _SourceActionsOverlayState extends ConsumerState<_SourceActionsOverlay> {
   @override
   Widget build(BuildContext context) {
     final src = widget.source;
+    final l = L.of(context);
     final actions = _actions(context);
     return OverlayFocusScope(
       priority: OverlayPriority.dialog,
@@ -1116,9 +1685,14 @@ class _SourceActionsOverlayState extends ConsumerState<_SourceActionsOverlay> {
                   decoration: BoxDecoration(
                     color: const Color(0xFF1C1C1C),
                     borderRadius: BorderRadius.circular(12),
-                    border: Border.all(color: Colors.white12),
+                    border: Border.all(color: Colors.white, width: 1.5),
                   ),
-                  child: Column(
+                  // Scrollable so the menu can outgrow a 3.92" screen without
+                  // painting Flutter's yellow overflow stripe, which looks
+                  // like a feature nobody can explain. It already overflowed
+                  // by 39px once the routes and backup entries were added.
+                  child: SingleChildScrollView(
+                    child: Column(
                     mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
@@ -1131,13 +1705,49 @@ class _SourceActionsOverlayState extends ConsumerState<_SourceActionsOverlay> {
                         ),
                       ),
                       const SizedBox(height: 4),
-                      Text(
-                        src.hostLabel,
-                        style: const TextStyle(
-                          color: Colors.white54,
-                          fontSize: 12,
-                          fontFamily: 'monospace',
-                        ),
+                      Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              src.hostLabel,
+                              overflow: TextOverflow.ellipsis,
+                              style: const TextStyle(
+                                color: Colors.white54,
+                                fontSize: 12,
+                                fontFamily: 'monospace',
+                              ),
+                            ),
+                          ),
+                          // Second entry for "show this source": the row eye
+                          // is touch-only, this one answers [X] as well. A
+                          // corner icon rather than another row — the menu
+                          // already outgrew a 3.92" screen once.
+                          GestureDetector(
+                            behavior: HitTestBehavior.opaque,
+                            onTap: widget.onToggleActive,
+                            child: Padding(
+                              padding: const EdgeInsets.only(left: 8),
+                              // Icon only. A bare "X" beside it read as a
+                              // close button, and spelling out a button name
+                              // here would go stale against the user's
+                              // controller layout anyway — the footer hint
+                              // is where the key belongs.
+                              //
+                              // A tick, not an eye: this marks the source in
+                              // use. The eye means what is on screen, and the
+                              // two must not wear the same icon.
+                              child: Icon(
+                                widget.isActive
+                                    ? Icons.check_circle
+                                    : Icons.radio_button_unchecked,
+                                size: 18,
+                                color: widget.isActive
+                                    ? const Color(0xFF7BC67B)
+                                    : Colors.white38,
+                              ),
+                            ),
+                          ),
+                        ],
                       ),
                       const SizedBox(height: 20),
                       for (int i = 0; i < actions.length; i++) ...[
@@ -1148,21 +1758,35 @@ class _SourceActionsOverlayState extends ConsumerState<_SourceActionsOverlay> {
                           selected: _selectedIndex == i,
                           destructive: actions[i].destructive,
                           subdued: actions[i].cancelStyle,
+                          // Tapping runs the action outright rather than just
+                          // moving the cursor to it — a second tap to confirm
+                          // what you already touched is pure friction.
+                          onTap: () {
+                            setState(() => _selectedIndex = i);
+                            _activate();
+                          },
                         ),
                       ],
                       const SizedBox(height: 12),
-                      const Center(
-                        child: Text(
-                          '↑↓ navigate · [A] select · [B] back',
-                          style: TextStyle(
-                            color: Colors.white30,
-                            fontSize: 10,
-                            letterSpacing: 0.5,
-                          ),
+                      // Real buttons, not a typed-out line. The old one was a
+                      // hardcoded Chinese string that named [A]/[X]/[B] — wrong
+                      // on two of the three controller layouts, untranslated in
+                      // the other six languages, and dead under a finger.
+                      ConsoleHud(
+                        embedded: true,
+                        dpad: (label: '↑↓', action: l.common_navigate),
+                        a: HudAction(l.common_select, onTap: _activate),
+                        b: HudAction(l.common_back, onTap: widget.onClose),
+                        x: HudAction(
+                          widget.isActive
+                              ? l.sources_stopUsingShort
+                              : l.sources_useThisShort,
+                          onTap: widget.onToggleActive,
                         ),
                       ),
                     ],
                   ),
+                  ),
                 ),
               ),
             ),
@@ -1196,11 +1820,17 @@ class _OverlayButton extends StatelessWidget {
     required this.selected,
     this.destructive = false,
     this.subdued = false,
+    this.onTap,
   });
 
   final IconData icon;
   final String label;
   final bool selected;
+
+  /// The overlay is driven by the gamepad, but the device has a touchscreen
+  /// and the cards behind it are tappable — so an overlay that only answers to
+  /// buttons reads as frozen.
+  final VoidCallback? onTap;
   final bool destructive;
   final bool subdued;
 
@@ -1211,39 +1841,43 @@ class _OverlayButton extends StatelessWidget {
         : subdued
             ? Colors.white70
             : AppTheme.primaryColor;
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 120),
-      width: double.infinity,
-      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
-      decoration: BoxDecoration(
-        color: color.withValues(alpha: selected ? 0.25 : 0.10),
-        borderRadius: BorderRadius.circular(8),
-        border: Border.all(
-          color: selected ? color : color.withValues(alpha: 0.3),
-          width: selected ? 2 : 1,
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: onTap,
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 120),
+        width: double.infinity,
+        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+        decoration: BoxDecoration(
+          color: color.withValues(alpha: selected ? 0.25 : 0.10),
+          borderRadius: BorderRadius.circular(8),
+          border: Border.all(
+            color: selected ? color : color.withValues(alpha: 0.3),
+            width: selected ? 2 : 1,
+          ),
+          boxShadow: selected
+              ? [
+                  BoxShadow(
+                    color: color.withValues(alpha: 0.35),
+                    blurRadius: 12,
+                  ),
+                ]
+              : null,
         ),
-        boxShadow: selected
-            ? [
-                BoxShadow(
-                  color: color.withValues(alpha: 0.35),
-                  blurRadius: 12,
-                ),
-              ]
-            : null,
-      ),
-      child: Row(
-        children: [
-          Icon(icon, color: color, size: 18),
-          const SizedBox(width: 10),
-          Text(
-            label,
-            style: TextStyle(
-              color: color,
-              fontWeight: FontWeight.w600,
-              fontSize: 14,
+        child: Row(
+          children: [
+            Icon(icon, color: color, size: 18),
+            const SizedBox(width: 10),
+            Text(
+              label,
+              style: const TextStyle(
+                color: Colors.white,
+                fontWeight: FontWeight.w600,
+                fontSize: 14,
+              ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }
@@ -1315,6 +1949,13 @@ class _SourceTypePickerOverlayState
     super.dispose();
   }
 
+  /// Single path for choosing an option, so [A] and a tap cannot drift apart
+  /// as one of them later gains a step the other does not.
+  void _pickSelected() {
+    ref.read(feedbackServiceProvider).confirm();
+    widget.onPick(_options[_selectedIndex]);
+  }
+
   KeyEventResult _onKeyEvent(FocusNode node, KeyEvent event) {
     if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
       return KeyEventResult.ignored;
@@ -1335,8 +1976,7 @@ class _SourceTypePickerOverlayState
     if (key == LogicalKeyboardKey.gameButtonA ||
         key == LogicalKeyboardKey.enter ||
         key == LogicalKeyboardKey.select) {
-      ref.read(feedbackServiceProvider).confirm();
-      widget.onPick(_options[_selectedIndex]);
+      _pickSelected();
       return KeyEventResult.handled;
     }
     if (key == LogicalKeyboardKey.gameButtonB ||
@@ -1373,7 +2013,7 @@ class _SourceTypePickerOverlayState
                   decoration: BoxDecoration(
                     color: const Color(0xFF1C1C1C),
                     borderRadius: BorderRadius.circular(12),
-                    border: Border.all(color: Colors.white12),
+                    border: Border.all(color: Colors.white, width: 1.5),
                   ),
                   child: SingleChildScrollView(
                     child: Column(
@@ -1402,18 +2042,20 @@ class _SourceTypePickerOverlayState
                         _TypeOptionTile(
                           option: _options[i],
                           selected: _selectedIndex == i,
+                          onTap: () {
+                            setState(() => _selectedIndex = i);
+                            _pickSelected();
+                          },
                         ),
                       ],
                       const SizedBox(height: 14),
-                      const Center(
-                        child: Text(
-                          '↑↓ navigate · [A] select · [B] back',
-                          style: TextStyle(
-                            color: Colors.white30,
-                            fontSize: 10,
-                            letterSpacing: 0.5,
-                          ),
-                        ),
+                      // Same line was pasted here, and here it also promised
+                      // an [X] this overlay does not answer.
+                      ConsoleHud(
+                        embedded: true,
+                        dpad: (label: '↑↓', action: l.common_navigate),
+                        a: HudAction(l.common_select, onTap: _pickSelected),
+                        b: HudAction(l.common_back, onTap: widget.onClose),
                       ),
                     ],
                   ),
@@ -1444,56 +2086,69 @@ class _TypeOption {
 }
 
 class _TypeOptionTile extends StatelessWidget {
-  const _TypeOptionTile({required this.option, required this.selected});
+  const _TypeOptionTile({
+    required this.option,
+    required this.selected,
+    this.onTap,
+  });
   final _TypeOption option;
   final bool selected;
 
+  /// This overlay is reached with [Y] and driven by the gamepad, but the
+  /// device has a touchscreen and the list behind it answers to taps — a row
+  /// that ignores a finger reads as frozen.
+  final VoidCallback? onTap;
+
   @override
   Widget build(BuildContext context) {
     final color = AppTheme.primaryColor;
-    return AnimatedContainer(
-      duration: const Duration(milliseconds: 120),
-      width: double.infinity,
-      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
-      decoration: BoxDecoration(
-        color: color.withValues(alpha: selected ? 0.22 : 0.08),
-        borderRadius: BorderRadius.circular(10),
-        border: Border.all(
-          color: selected ? color : color.withValues(alpha: 0.3),
-          width: selected ? 2 : 1,
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: onTap,
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 120),
+        width: double.infinity,
+        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+        decoration: BoxDecoration(
+          color: color.withValues(alpha: selected ? 0.22 : 0.08),
+          borderRadius: BorderRadius.circular(10),
+          border: Border.all(
+            color: selected ? color : color.withValues(alpha: 0.3),
+            width: selected ? 2 : 1,
+          ),
+          boxShadow: selected
+              ? [BoxShadow(color: color.withValues(alpha: 0.35), blurRadius: 12)]
+              : null,
         ),
-        boxShadow: selected
-            ? [BoxShadow(color: color.withValues(alpha: 0.35), blurRadius: 12)]
-            : null,
-      ),
-      child: Row(
-        children: [
-          Icon(option.icon, color: color, size: 22),
-          const SizedBox(width: 12),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  option.label,
-                  style: TextStyle(
-                    color: color,
-                    fontWeight: FontWeight.w600,
-                    fontSize: 14,
+        child: Row(
+          children: [
+            Icon(option.icon, color: color, size: 22),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    option.label,
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontWeight: FontWeight.w600,
+                      fontSize: 14,
+                    ),
                   ),
-                ),
-                const SizedBox(height: 2),
-                Text(
-                  option.hint,
-                  style: TextStyle(
-                    color: Colors.grey.shade500,
-                    fontSize: 11,
+                  const SizedBox(height: 2),
+                  Text(
+                    option.hint,
+                    style: const TextStyle(
+                      color: Colors.white70,
+                      fontSize: 11,
+                    ),
                   ),
-                ),
-              ],
+                ],
+              ),
             ),
-          ),
-        ],
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/features/settings/widgets/general_tab.dart b/lib/features/settings/widgets/general_tab.dart
index 9a255ab..68bd80e 100644
--- a/lib/features/settings/widgets/general_tab.dart
+++ b/lib/features/settings/widgets/general_tab.dart
@@ -12,10 +12,11 @@ import 'settings_list_view.dart';
 const _localeNames = <String, String>{
   'en': 'English',
   'de': 'Deutsch',
-  'es': 'Espa\u00f1ol',
-  'fr': 'Fran\u00e7ais',
-  'pt': 'Portugu\u00eas',
-  'ja': '\u65e5\u672c\u8a9e',
+  'es': 'Español',
+  'fr': 'Français',
+  'pt': 'Português',
+  'ja': '日本語',
+  'zh': '繁體中文',
 };
 
 class SettingsGeneralTab extends ConsumerWidget {
@@ -32,7 +33,9 @@ class SettingsGeneralTab extends ConsumerWidget {
     final localeOverride = ref.watch(localeProvider);
     final localeName = localeOverride == null
         ? l.settings_languageSystem
-        : _localeNames[localeOverride.languageCode] ?? localeOverride.languageCode;
+        : _localeNames[localeOverride.toLanguageTag()] ??
+            _localeNames[localeOverride.languageCode] ??
+            localeOverride.languageCode;
     final localeShort = localeOverride == null
         ? 'AUTO'
         : localeOverride.languageCode.toUpperCase();
diff --git a/lib/features/sources/fallback_picker_overlay.dart b/lib/features/sources/fallback_picker_overlay.dart
new file mode 100644
index 0000000..6bc06d3
--- /dev/null
+++ b/lib/features/sources/fallback_picker_overlay.dart
@@ -0,0 +1,886 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../core/input/overlay_scope.dart';
+import '../../models/config/source.dart';
+import '../../providers/app_providers.dart';
+import '../../core/theme/app_theme.dart';
+import '../../widgets/console_dialog.dart';
+import '../../widgets/console_hud.dart';
+
+/// Overlay for managing a source's multi-fallback chain.
+///
+/// Built matching the exact SourcesScreen Overlay Architecture (_SourceActionOverlay).
+class FallbackPickerOverlay extends ConsumerStatefulWidget {
+  const FallbackPickerOverlay({
+    super.key,
+    required this.sourceId,
+    required this.onClose,
+    this.onAddFreshSource,
+  });
+
+  final String sourceId;
+  final VoidCallback onClose;
+  final VoidCallback? onAddFreshSource;
+
+  @override
+  ConsumerState<FallbackPickerOverlay> createState() =>
+      _FallbackPickerOverlayState();
+}
+
+class _FallbackPickerOverlayState
+    extends ConsumerState<FallbackPickerOverlay> {
+  final _scopeFocus = FocusNode(debugLabel: 'fallback_picker_overlay_scope');
+  int _selectedIndex = 0;
+  int? _sortingIndex;
+  bool _isDeleteFocused = false;
+
+  @override
+  void dispose() {
+    _scopeFocus.dispose();
+    super.dispose();
+  }
+
+  KeyEventResult _onKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+    final key = event.logicalKey;
+
+    final state = ref.read(sourcesProvider);
+    final source =
+        state.sources.where((s) => s.id == widget.sourceId).firstOrNull;
+    if (source == null) return KeyEventResult.ignored;
+
+    final fallbacks = [
+      for (final fbId in source.fallbackSourceIds)
+        ...state.sources.where((s) => s.id == fbId),
+    ];
+    final isSorting = _sortingIndex != null;
+    final totalRows = 1 + fallbacks.length + 2; // Auto, fallbacks, AddFresh, PickExisting
+
+    if (key == LogicalKeyboardKey.gameButtonB ||
+        key == LogicalKeyboardKey.escape) {
+      if (isSorting) {
+        setState(() => _sortingIndex = null);
+        return KeyEventResult.handled;
+      }
+      if (_isDeleteFocused) {
+        setState(() => _isDeleteFocused = false);
+        return KeyEventResult.handled;
+      }
+      widget.onClose();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowRight &&
+        !isSorting &&
+        _selectedIndex >= 1 &&
+        _selectedIndex <= fallbacks.length) {
+      setState(() => _isDeleteFocused = true);
+      ref.read(feedbackServiceProvider).tick();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowLeft && _isDeleteFocused) {
+      setState(() => _isDeleteFocused = false);
+      ref.read(feedbackServiceProvider).tick();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowUp) {
+      if (isSorting) {
+        _moveFallback(source, fallbacks, _selectedIndex - 1, -1);
+        return KeyEventResult.handled;
+      }
+      setState(() {
+        _isDeleteFocused = false;
+        _selectedIndex = (_selectedIndex - 1 + totalRows) % totalRows;
+      });
+      ref.read(feedbackServiceProvider).tick();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowDown) {
+      if (isSorting) {
+        _moveFallback(source, fallbacks, _selectedIndex - 1, 1);
+        return KeyEventResult.handled;
+      }
+      setState(() {
+        _isDeleteFocused = false;
+        _selectedIndex = (_selectedIndex + 1) % totalRows;
+      });
+      ref.read(feedbackServiceProvider).tick();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.gameButtonA ||
+        key == LogicalKeyboardKey.enter ||
+        key == LogicalKeyboardKey.space) {
+      if (_isDeleteFocused &&
+          _selectedIndex >= 1 &&
+          _selectedIndex <= fallbacks.length) {
+        final targetFb = fallbacks[_selectedIndex - 1];
+        ref.read(sourcesProvider.notifier).removeFallbackSource(
+              source.id,
+              targetFb.id,
+            );
+        ref.read(feedbackServiceProvider).confirm();
+        setState(() => _isDeleteFocused = false);
+        return KeyEventResult.handled;
+      }
+      _activateRow(source, fallbacks, _selectedIndex);
+      return KeyEventResult.handled;
+    }
+
+    if ((key == LogicalKeyboardKey.gameButtonX ||
+            key == LogicalKeyboardKey.keyX) &&
+        !isSorting) {
+      if (_selectedIndex >= 1 && _selectedIndex <= fallbacks.length) {
+        final targetFb = fallbacks[_selectedIndex - 1];
+        ref.read(sourcesProvider.notifier).removeFallbackSource(
+              source.id,
+              targetFb.id,
+            );
+        ref.read(feedbackServiceProvider).confirm();
+        return KeyEventResult.handled;
+      }
+    }
+
+    if ((key == LogicalKeyboardKey.gameButtonY ||
+            key == LogicalKeyboardKey.keyY) &&
+        _selectedIndex >= 1 &&
+        _selectedIndex <= fallbacks.length) {
+      setState(() {
+        _sortingIndex = isSorting ? null : _selectedIndex - 1;
+      });
+      ref.read(feedbackServiceProvider).tick();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  void _activateRow(Source source, List<Source> fallbacks, int rowIndex) {
+    if (rowIndex == 0) {
+      ref.read(sourcesProvider.notifier).setFallbackAutoSelect(
+            source.id,
+            !source.fallbackAutoSelect,
+          );
+      ref.read(feedbackServiceProvider).confirm();
+    } else if (rowIndex >= 1 && rowIndex <= fallbacks.length) {
+      setState(() {
+        _sortingIndex = (_sortingIndex == rowIndex - 1) ? null : rowIndex - 1;
+      });
+      ref.read(feedbackServiceProvider).tick();
+    } else if (rowIndex == fallbacks.length + 1) {
+      ref.read(feedbackServiceProvider).confirm();
+      widget.onClose();
+      widget.onAddFreshSource?.call();
+    } else if (rowIndex == fallbacks.length + 2) {
+      ref.read(feedbackServiceProvider).confirm();
+      _showPickExistingDialog(source, ref.read(sourcesProvider).sources);
+    }
+  }
+
+  void _moveFallback(
+    Source source,
+    List<Source> fallbacks,
+    int fromIndex,
+    int delta,
+  ) {
+    final toIndex = fromIndex + delta;
+    if (fromIndex < 0 || fromIndex >= fallbacks.length) return;
+    if (toIndex < 0 || toIndex >= fallbacks.length) return;
+
+    final updatedIds = fallbacks.map((s) => s.id).toList();
+    final item = updatedIds.removeAt(fromIndex);
+    updatedIds.insert(toIndex, item);
+
+    ref.read(sourcesProvider.notifier).reorderFallbackSources(
+          source.id,
+          updatedIds,
+        );
+    setState(() {
+      _selectedIndex = toIndex + 1;
+      _sortingIndex = toIndex;
+    });
+    ref.read(feedbackServiceProvider).tick();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final state = ref.watch(sourcesProvider);
+    final source =
+        state.sources.where((s) => s.id == widget.sourceId).firstOrNull;
+
+    if (source == null) {
+      WidgetsBinding.instance.addPostFrameCallback((_) => widget.onClose());
+      return const SizedBox.shrink();
+    }
+
+    final fallbacks = [
+      for (final fbId in source.fallbackSourceIds)
+        ...state.sources.where((s) => s.id == fbId),
+    ];
+
+    final isSorting = _sortingIndex != null;
+
+    return OverlayFocusScope(
+      priority: OverlayPriority.dialog,
+      isVisible: true,
+      onClose: widget.onClose,
+      child: Focus(
+        focusNode: _scopeFocus,
+        autofocus: true,
+        onKeyEvent: _onKeyEvent,
+        child: Container(
+          color: Colors.black.withValues(alpha: 0.75),
+          child: Center(
+            child: Material(
+              type: MaterialType.transparency,
+              child: ConstrainedBox(
+                constraints: const BoxConstraints(maxWidth: 440),
+                child: Container(
+                  padding: const EdgeInsets.all(20),
+                  decoration: BoxDecoration(
+                    color: const Color(0xFF1C1C1C),
+                    borderRadius: BorderRadius.circular(12),
+                    border: Border.all(color: Colors.white, width: 1.5),
+                  ),
+                  child: SingleChildScrollView(
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        // Title Bar
+                        Row(
+                          children: [
+                            Expanded(
+                              child: Text(
+                                '${source.name} - 代理設定',
+                                style: const TextStyle(
+                                  color: Colors.white,
+                                  fontSize: 18,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                            ),
+                            IconButton(
+                              icon: const Icon(Icons.close,
+                                  color: Colors.white54, size: 20),
+                              onPressed: widget.onClose,
+                            ),
+                          ],
+                        ),
+                        const SizedBox(height: 12),
+
+                        if (!source.enabled)
+                          Container(
+                            margin: const EdgeInsets.only(bottom: 12),
+                            padding: const EdgeInsets.symmetric(
+                                horizontal: 12, vertical: 8),
+                            decoration: BoxDecoration(
+                              color: Colors.redAccent.withValues(alpha: 0.2),
+                              borderRadius: BorderRadius.circular(8),
+                              border: Border.all(
+                                  color: Colors.redAccent.withValues(alpha: 0.6)),
+                            ),
+                            child: const Row(
+                              children: [
+                                Icon(Icons.block,
+                                    color: Colors.redAccent, size: 16),
+                                SizedBox(width: 8),
+                                Expanded(
+                                  child: Text(
+                                    '來源已停用，代理功能暫停',
+                                    style: TextStyle(
+                                      color: Colors.redAccent,
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+
+                        // Row 0: Auto Select Toggle
+                        _buildRow(
+                          index: 0,
+                          isSelected: _selectedIndex == 0,
+                          child: Row(
+                            children: [
+                              Icon(
+                                source.fallbackAutoSelect
+                                    ? Icons.check_box
+                                    : Icons.check_box_outline_blank,
+                                color: Colors.white,
+                                size: 20,
+                              ),
+                              const SizedBox(width: 12),
+                              Expanded(
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    const Text(
+                                      '自動選擇',
+                                      style: TextStyle(
+                                        color: Colors.white,
+                                        fontSize: 15,
+                                        fontWeight: FontWeight.bold,
+                                      ),
+                                    ),
+                                    Text(
+                                      source.fallbackAutoSelect
+                                          ? '自動探測並優先使用回應最快的代理'
+                                          : '未勾選：依下方順序依次嘗試代理',
+                                      style: const TextStyle(
+                                          color: Colors.white70, fontSize: 12),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          ),
+                          onTap: () => _activateRow(source, fallbacks, 0),
+                        ),
+
+                        const SizedBox(height: 16),
+                        const Text(
+                          '代理來源清單（優先順序）',
+                          style: TextStyle(
+                            color: Colors.white,
+                            fontSize: 13,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        const SizedBox(height: 6),
+
+                        if (fallbacks.isEmpty)
+                          Container(
+                            padding: const EdgeInsets.symmetric(vertical: 16),
+                            alignment: Alignment.center,
+                            child: const Text(
+                              '尚未設定任何代理來源',
+                              style: TextStyle(color: Colors.white70, fontSize: 14),
+                            ),
+                          )
+                        else
+                          for (int i = 0; i < fallbacks.length; i++)
+                            _buildFallbackRow(
+                              source: source,
+                              fallback: fallbacks[i],
+                              index: i,
+                              fallbacks: fallbacks,
+                              isSelected: _selectedIndex == i + 1,
+                              isSorting: _sortingIndex == i,
+                            ),
+
+                        const SizedBox(height: 16),
+
+                        // Action 1: Add Fresh Source
+                        _buildRow(
+                          index: fallbacks.length + 1,
+                          isSelected: _selectedIndex == fallbacks.length + 1,
+                          child: const Center(
+                            child: Text(
+                              '+ 新建全新代理來源',
+                              style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 14,
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ),
+                          onTap: () =>
+                              _activateRow(source, fallbacks, fallbacks.length + 1),
+                        ),
+                        const SizedBox(height: 8),
+
+                        // Action 2: Pick Existing Source
+                        _buildRow(
+                          index: fallbacks.length + 2,
+                          isSelected: _selectedIndex == fallbacks.length + 2,
+                          child: const Center(
+                            child: Text(
+                              '+ 從既有來源選擇代理',
+                              style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 14,
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                          ),
+                          onTap: () =>
+                              _activateRow(source, fallbacks, fallbacks.length + 2),
+                        ),
+
+                        const SizedBox(height: 16),
+
+                        // HUD Hints embedded
+                        ConsoleHud(
+                          embedded: true,
+                          dpad: (
+                            label: (_selectedIndex >= 1 &&
+                                    _selectedIndex <= fallbacks.length &&
+                                    !isSorting)
+                                ? '↑↓/→'
+                                : '↑↓',
+                            action: '導覽',
+                          ),
+                          a: HudAction(
+                            isSorting
+                                ? '完成'
+                                : (_isDeleteFocused
+                                    ? '刪除'
+                                    : (_selectedIndex == 0
+                                        ? '切換'
+                                        : (_selectedIndex >= 1 &&
+                                                _selectedIndex <=
+                                                    fallbacks.length
+                                            ? '排序'
+                                            : '確定'))),
+                            onTap: () {
+                              if (_isDeleteFocused &&
+                                  _selectedIndex >= 1 &&
+                                  _selectedIndex <= fallbacks.length) {
+                                final targetFb = fallbacks[_selectedIndex - 1];
+                                ref
+                                    .read(sourcesProvider.notifier)
+                                    .removeFallbackSource(
+                                      source.id,
+                                      targetFb.id,
+                                    );
+                                ref.read(feedbackServiceProvider).confirm();
+                                setState(() => _isDeleteFocused = false);
+                                return;
+                              }
+                              _activateRow(source, fallbacks, _selectedIndex);
+                            },
+                          ),
+                          b: HudAction(
+                            isSorting ? '取消' : '關閉',
+                            onTap: () {
+                              if (isSorting) {
+                                setState(() => _sortingIndex = null);
+                              } else {
+                                widget.onClose();
+                              }
+                            },
+                          ),
+                          x: (!isSorting &&
+                                  _selectedIndex >= 1 &&
+                                  _selectedIndex <= fallbacks.length)
+                              ? HudAction('刪除', onTap: () {
+                                  final targetFb = fallbacks[_selectedIndex - 1];
+                                  ref
+                                      .read(sourcesProvider.notifier)
+                                      .removeFallbackSource(
+                                        source.id,
+                                        targetFb.id,
+                                      );
+                                  ref.read(feedbackServiceProvider).confirm();
+                                })
+                              : null,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildRow({
+    required int index,
+    required bool isSelected,
+    required Widget child,
+    required VoidCallback onTap,
+  }) {
+    final color = AppTheme.primaryColor;
+    return InkWell(
+      onTap: onTap,
+      child: AnimatedContainer(
+        duration: const Duration(milliseconds: 120),
+        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
+        decoration: BoxDecoration(
+          color: color.withValues(alpha: isSelected ? 0.25 : 0.08),
+          borderRadius: BorderRadius.circular(10),
+          border: Border.all(
+            color: isSelected ? color : color.withValues(alpha: 0.3),
+            width: isSelected ? 2 : 1,
+          ),
+          boxShadow: isSelected
+              ? [BoxShadow(color: color.withValues(alpha: 0.35), blurRadius: 12)]
+              : null,
+        ),
+        child: child,
+      ),
+    );
+  }
+
+  Widget _buildFallbackRow({
+    required Source source,
+    required Source fallback,
+    required int index,
+    required List<Source> fallbacks,
+    required bool isSelected,
+    required bool isSorting,
+  }) {
+    final color = AppTheme.primaryColor;
+    final isDeleteActive = isSelected && _isDeleteFocused;
+    final bgColor = isSorting
+        ? Colors.amber[900]!.withValues(alpha: 0.7)
+        : color.withValues(alpha: isSelected ? 0.25 : 0.08);
+
+    return Container(
+      margin: const EdgeInsets.only(bottom: 6),
+      child: InkWell(
+        onTap: () => _activateRow(source, fallbacks, index + 1),
+        child: AnimatedContainer(
+          duration: const Duration(milliseconds: 120),
+          padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
+          decoration: BoxDecoration(
+            color: bgColor,
+            borderRadius: BorderRadius.circular(10),
+            border: Border.all(
+              color: isSorting
+                  ? Colors.amber
+                  : (isSelected ? color : color.withValues(alpha: 0.3)),
+              width: isSelected || isSorting ? 2 : 1,
+            ),
+            boxShadow: (isSelected || isSorting)
+                ? [
+                    BoxShadow(
+                      color: (isSorting ? Colors.amber : color)
+                          .withValues(alpha: 0.35),
+                      blurRadius: 12,
+                    )
+                  ]
+                : null,
+          ),
+          child: Row(
+            children: [
+              Text(
+                '#${index + 1}',
+                style: const TextStyle(
+                  color: Colors.amber,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+              const SizedBox(width: 12),
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Flexible(
+                          child: Text(
+                            fallback.name,
+                            style: TextStyle(
+                              color: fallback.enabled
+                                  ? Colors.white
+                                  : Colors.white54,
+                              fontSize: 15,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
+                        ),
+                        if (!fallback.enabled) ...[
+                          const SizedBox(width: 6),
+                          Container(
+                            padding: const EdgeInsets.symmetric(
+                                horizontal: 6, vertical: 2),
+                            decoration: BoxDecoration(
+                              color: Colors.white12,
+                              borderRadius: BorderRadius.circular(4),
+                            ),
+                            child: const Text(
+                              '已停用',
+                              style: TextStyle(
+                                color: Colors.white54,
+                                fontSize: 9,
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ],
+                    ),
+                    Text(
+                      '${fallback.type.shortLabel} - ${fallback.hostLabel}',
+                      style: const TextStyle(color: Colors.white70, fontSize: 12),
+                    ),
+                  ],
+                ),
+              ),
+              if (isSorting)
+                const Icon(Icons.swap_vert, color: Colors.amber)
+              else
+                AnimatedContainer(
+                  duration: const Duration(milliseconds: 120),
+                  decoration: BoxDecoration(
+                    color: isDeleteActive
+                        ? const Color(0xFFE50914)
+                        : Colors.transparent,
+                    borderRadius: BorderRadius.circular(6),
+                    border: isDeleteActive
+                        ? Border.all(color: Colors.white, width: 2)
+                        : null,
+                  ),
+                  child: IconButton(
+                    icon: Icon(
+                      Icons.delete_outline,
+                      color: isDeleteActive ? Colors.white : Colors.white70,
+                      size: 20,
+                    ),
+                    onPressed: () {
+                      ref
+                          .read(sourcesProvider.notifier)
+                          .removeFallbackSource(
+                            source.id,
+                            fallback.id,
+                          );
+                    },
+                  ),
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _showPickExistingDialog(Source source, List<Source> allSources) {
+    final candidates = allSources
+        .where(
+            (s) => s.id != source.id && !source.fallbackSourceIds.contains(s.id))
+        .toList();
+
+    if (candidates.isEmpty) {
+      showDialog(
+        context: context,
+        builder: (ctx) => const ConsoleDialog(
+          title: '沒有可用的來源',
+          message: '目前沒有其他未綁定的既有來源可供選擇。請選擇「新建全新代理來源」。',
+          primaryLabel: '確定',
+        ),
+      );
+      return;
+    }
+
+    showDialog(
+      context: context,
+      builder: (ctx) => _PickExistingDialog(
+        source: source,
+        candidates: candidates,
+      ),
+    );
+  }
+}
+
+class _PickExistingDialog extends ConsumerStatefulWidget {
+  const _PickExistingDialog({
+    required this.source,
+    required this.candidates,
+  });
+
+  final Source source;
+  final List<Source> candidates;
+
+  @override
+  ConsumerState<_PickExistingDialog> createState() =>
+      _PickExistingDialogState();
+}
+
+class _PickExistingDialogState extends ConsumerState<_PickExistingDialog> {
+  final FocusNode _scopeFocus = FocusNode(debugLabel: 'pick_existing_dialog');
+  int _selectedIndex = 0;
+
+  @override
+  void dispose() {
+    _scopeFocus.dispose();
+    super.dispose();
+  }
+
+  void _confirmSelection() {
+    if (widget.candidates.isEmpty) return;
+    final cand = widget.candidates[_selectedIndex];
+    Navigator.of(context).pop();
+    ref.read(sourcesProvider.notifier).addFallbackSource(
+          widget.source.id,
+          cand.id,
+        );
+    ref.read(feedbackServiceProvider).confirm();
+  }
+
+  KeyEventResult _onKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+    final key = event.logicalKey;
+    final count = widget.candidates.length;
+
+    if (key == LogicalKeyboardKey.arrowUp) {
+      setState(() {
+        _selectedIndex = (_selectedIndex - 1 + count) % count;
+      });
+      ref.read(feedbackServiceProvider).tick();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowDown) {
+      setState(() {
+        _selectedIndex = (_selectedIndex + 1) % count;
+      });
+      ref.read(feedbackServiceProvider).tick();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.gameButtonA ||
+        key == LogicalKeyboardKey.enter ||
+        key == LogicalKeyboardKey.space) {
+      _confirmSelection();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.gameButtonB ||
+        key == LogicalKeyboardKey.escape) {
+      ref.read(feedbackServiceProvider).cancel();
+      Navigator.of(context).pop();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final color = AppTheme.primaryColor;
+    return OverlayFocusScope(
+      priority: OverlayPriority.dialog,
+      isVisible: true,
+      onClose: () => Navigator.of(context).pop(),
+      child: Focus(
+        focusNode: _scopeFocus,
+        autofocus: true,
+        onKeyEvent: _onKeyEvent,
+        child: Container(
+          color: Colors.black.withValues(alpha: 0.75),
+          child: Center(
+            child: Material(
+              type: MaterialType.transparency,
+              child: ConstrainedBox(
+                constraints: const BoxConstraints(maxWidth: 380),
+                child: Container(
+                  padding: const EdgeInsets.all(20),
+                  decoration: BoxDecoration(
+                    color: const Color(0xFF1C1C1C),
+                    borderRadius: BorderRadius.circular(12),
+                    border: Border.all(color: Colors.white, width: 1.5),
+                  ),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const Text(
+                        '選擇既有來源作為代理',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 16,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                      const SizedBox(height: 14),
+                      ConstrainedBox(
+                        constraints: const BoxConstraints(maxHeight: 240),
+                        child: ListView.builder(
+                          shrinkWrap: true,
+                          itemCount: widget.candidates.length,
+                          itemBuilder: (context, index) {
+                            final cand = widget.candidates[index];
+                            final isSelected = _selectedIndex == index;
+                            return Container(
+                              margin: const EdgeInsets.only(bottom: 6),
+                              child: InkWell(
+                                onTap: () {
+                                  setState(() => _selectedIndex = index);
+                                  _confirmSelection();
+                                },
+                                child: AnimatedContainer(
+                                  duration: const Duration(milliseconds: 120),
+                                  padding: const EdgeInsets.symmetric(
+                                      horizontal: 14, vertical: 10),
+                                  decoration: BoxDecoration(
+                                    color: color.withValues(
+                                        alpha: isSelected ? 0.35 : 0.08),
+                                    borderRadius: BorderRadius.circular(8),
+                                    border: Border.all(
+                                      color: isSelected
+                                          ? color
+                                          : color.withValues(alpha: 0.3),
+                                      width: isSelected ? 2.0 : 1.0,
+                                    ),
+                                    boxShadow: isSelected
+                                        ? [
+                                            BoxShadow(
+                                              color: color.withValues(
+                                                  alpha: 0.35),
+                                              blurRadius: 12,
+                                            )
+                                          ]
+                                        : null,
+                                  ),
+                                  child: Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: [
+                                      Text(
+                                        cand.name,
+                                        style: const TextStyle(
+                                          color: Colors.white,
+                                          fontSize: 14,
+                                          fontWeight: FontWeight.bold,
+                                        ),
+                                      ),
+                                      Text(
+                                        '${cand.type.shortLabel} - ${cand.hostLabel}',
+                                        style: const TextStyle(
+                                          color: Colors.white70,
+                                          fontSize: 12,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      ),
+                      const SizedBox(height: 14),
+                      ConsoleHud(
+                        embedded: true,
+                        dpad: (label: '↑↓', action: '選擇'),
+                        a: HudAction('確定', onTap: _confirmSelection),
+                        b: HudAction('關閉',
+                            onTap: () => Navigator.of(context).pop()),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/sources/manual_source_add_screen.dart b/lib/features/sources/manual_source_add_screen.dart
index 6b5bd33..4b206b9 100644
--- a/lib/features/sources/manual_source_add_screen.dart
+++ b/lib/features/sources/manual_source_add_screen.dart
@@ -11,7 +11,6 @@ import '../../models/config/provider_config.dart';
 import '../../models/config/source.dart';
 import '../../providers/app_providers.dart';
 import '../../services/network_discovery_service.dart';
-import '../../widgets/console_hud.dart';
 
 /// Form to add a manual (non-RomM) [Source]: SMB, FTP, or Web.
 ///
@@ -47,6 +46,7 @@ class _ManualSourceAddScreenState
 
   // --- Wrapper focus nodes (controller traverses these) ---
   late List<_Field> _fields;
+  final _backFocus = FocusNode(debugLabel: 'manual_add_back');
   final _saveFocus = FocusNode(debugLabel: 'manual_add_save');
   final _screenFocus = FocusNode(debugLabel: 'manual_add_screen');
 
@@ -183,6 +183,7 @@ class _ManualSourceAddScreenState
     for (final n in _discoveredFocusNodes) {
       n.dispose();
     }
+    _backFocus.dispose();
     _saveFocus.dispose();
     _screenFocus.dispose();
     super.dispose();
@@ -232,7 +233,7 @@ class _ManualSourceAddScreenState
   }
 
   List<FocusNode> get _navOrder =>
-      [..._discoveredFocusNodes, ..._fields.map((f) => f.consoleFocus), _saveFocus];
+      [_backFocus, ..._discoveredFocusNodes, ..._fields.map((f) => f.consoleFocus), _saveFocus];
 
   void _moveFocus(int delta) {
     final order = _navOrder;
@@ -248,6 +249,10 @@ class _ManualSourceAddScreenState
   }
 
   void _activateFocused() {
+    if (_backFocus.hasFocus) {
+      Navigator.of(context).maybePop();
+      return;
+    }
     for (int i = 0; i < _discoveredFocusNodes.length; i++) {
       if (_discoveredFocusNodes[i].hasFocus) {
         _applyDiscovered(_discovered[i]);
@@ -333,7 +338,7 @@ class _ManualSourceAddScreenState
     try {
       await ref
           .read(sourcesProvider.notifier)
-          .addSourceWithMappings(source, const {});
+          .addSource(source, manualMappings: const {});
       if (!mounted) return;
       Navigator.of(context).pop<Source?>(source);
     } catch (e) {
@@ -349,110 +354,130 @@ class _ManualSourceAddScreenState
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: AppTheme.backgroundColor,
-      body: Stack(
-        children: [
-          SafeArea(
-            child: Focus(
-              focusNode: _screenFocus,
-              autofocus: true,
-              onKeyEvent: _handleScreenKey,
-              child: Center(
-                child: ConstrainedBox(
-                  constraints: const BoxConstraints(maxWidth: 560),
-                  child: Padding(
-                    padding: const EdgeInsets.all(24),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          'Add ${_typeLabel(widget.type)} source',
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 22,
-                            fontWeight: FontWeight.w600,
+      body: SafeArea(
+        child: Focus(
+          focusNode: _screenFocus,
+          autofocus: true,
+          onKeyEvent: _handleScreenKey,
+          child: Column(
+            children: [
+              // Fixed Header
+              Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 16, 8),
+                child: Row(
+                  children: [
+                    ConsoleFocusable(
+                      focusNode: _backFocus,
+                      onSelect: () => Navigator.of(context).maybePop(),
+                      child: const Padding(
+                        padding: EdgeInsets.all(8),
+                        child: Icon(Icons.arrow_back,
+                            color: Colors.white, size: 26),
+                      ),
+                    ),
+                    const SizedBox(width: 4),
+                    Text(
+                      'Add ${_typeLabel(widget.type)} source',
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 22,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              // Scrollable Content
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 24),
+                  child: Center(
+                    child: ConstrainedBox(
+                      constraints: const BoxConstraints(maxWidth: 560),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          const SizedBox(height: 8),
+                          Text(
+                            'Connection only — map systems to remote folders '
+                            'after saving from the source actions menu.',
+                            style: TextStyle(
+                                color: Colors.grey.shade500, fontSize: 12),
                           ),
-                        ),
-                        const SizedBox(height: 4),
-                        Text(
-                          'Connection only — map systems to remote folders '
-                          'after saving from the source actions menu.',
-                          style: TextStyle(
-                              color: Colors.grey.shade500, fontSize: 12),
-                        ),
-                        const SizedBox(height: 20),
-                        Expanded(
-                          child: SingleChildScrollView(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            if (widget.type != SourceType.web)
-                              _buildDiscoverySection(),
-                            for (final f in _fields) ...[
-                              _textBox(f),
-                              const SizedBox(height: 12),
-                            ],
-                            if (_error != null) ...[
-                              const SizedBox(height: 4),
-                              Text(_error!,
-                                  style: const TextStyle(
-                                      color: Colors.redAccent, fontSize: 13)),
-                            ],
-                            const SizedBox(height: 16),
-                            ConsoleFocusable(
-                              focusNode: _saveFocus,
-                              focusScale: 1.0,
-                              onSelect: _busy ? null : _save,
-                              child: Container(
-                                width: double.infinity,
-                                padding:
-                                    const EdgeInsets.symmetric(vertical: 14),
-                                alignment: Alignment.center,
-                                decoration: BoxDecoration(
-                                  color: AppTheme.primaryColor
-                                      .withValues(alpha: 0.18),
-                                  borderRadius: BorderRadius.circular(8),
-                                  border: Border.all(
-                                      color: AppTheme.primaryColor, width: 2),
-                                ),
-                                child: _busy
-                                    ? const SizedBox(
-                                        width: 18,
-                                        height: 18,
-                                        child: CircularProgressIndicator(
-                                          strokeWidth: 2,
-                                          color: AppTheme.primaryColor,
-                                        ),
-                                      )
-                                    : Text(
-                                        L.of(context).manualSource_saveSource,
-                                        style: const TextStyle(
-                                          color: AppTheme.primaryColor,
-                                          fontSize: 15,
-                                          fontWeight: FontWeight.w600,
-                                          letterSpacing: 1,
-                                        ),
-                                      ),
-                              ),
-                            ),
-                            // Extra bottom padding so content doesn't
-                            // hide behind the HUD.
-                            const SizedBox(height: 56),
+                          const SizedBox(height: 20),
+                          if (widget.type != SourceType.web)
+                            _buildDiscoverySection(),
+                          for (final f in _fields) ...[
+                            _textBox(f),
+                            const SizedBox(height: 12),
                           ],
-                        ),
+                          if (_error != null) ...[
+                            const SizedBox(height: 4),
+                            Text(_error!,
+                                style: const TextStyle(
+                                    color: Colors.redAccent, fontSize: 13)),
+                          ],
+                          const SizedBox(height: 16),
+                          ListenableBuilder(
+                            listenable: _saveFocus,
+                            builder: (context, _) {
+                              final isFocused = _saveFocus.hasFocus;
+                              final color = isFocused
+                                  ? Colors.white
+                                  : AppTheme.primaryColor;
+                              final bgColor = isFocused
+                                  ? AppTheme.primaryColor.withValues(alpha: 0.3)
+                                  : AppTheme.primaryColor.withValues(alpha: 0.18);
+
+                              return ConsoleFocusable(
+                                focusNode: _saveFocus,
+                                focusScale: 1.02,
+                                onSelect: _busy ? null : _save,
+                                focusBorderColor: Colors.white,
+                                child: Container(
+                                  width: double.infinity,
+                                  padding: const EdgeInsets.symmetric(
+                                      vertical: 14),
+                                  alignment: Alignment.center,
+                                  decoration: BoxDecoration(
+                                    color: bgColor,
+                                    borderRadius: BorderRadius.circular(8),
+                                  ),
+                                  child: _busy
+                                      ? SizedBox(
+                                          height: 18,
+                                          width: 18,
+                                          child: CircularProgressIndicator(
+                                            strokeWidth: 2,
+                                            color: color,
+                                          ),
+                                        )
+                                      : Text(
+                                          L.of(context).manualSource_saveSource,
+                                          style: TextStyle(
+                                            color: color,
+                                            fontSize: 15,
+                                            fontWeight: isFocused
+                                                ? FontWeight.w700
+                                                : FontWeight.w600,
+                                            letterSpacing: 1,
+                                          ),
+                                        ),
+                                ),
+                              );
+                            },
+                          ),
+                          const SizedBox(height: 60),
+                        ],
                       ),
                     ),
-                  ],
+                  ),
                 ),
               ),
-            ),
+            ],
           ),
         ),
       ),
-      ConsoleHud(
-        b: HudAction(L.of(context).common_back, onTap: () => Navigator.maybePop(context)),
-      ),
-        ],
-      ),
     );
   }
 
@@ -625,7 +650,7 @@ class _ManualSourceAddScreenState
                   borderRadius: BorderRadius.circular(8),
                   border: Border.all(
                     color: hasFocus
-                        ? AppTheme.primaryColor
+                        ? Colors.white
                         : AppTheme.primaryColor.withValues(alpha: 0.4),
                     width: 2,
                   ),
diff --git a/lib/features/sources/source_mappings_screen.dart b/lib/features/sources/source_mappings_screen.dart
index f6012ab..9dbcc27 100644
--- a/lib/features/sources/source_mappings_screen.dart
+++ b/lib/features/sources/source_mappings_screen.dart
@@ -34,6 +34,7 @@ class SourceMappingsScreen extends ConsumerStatefulWidget {
 class _SourceMappingsScreenState
     extends ConsumerState<SourceMappingsScreen> {
   final _screenFocus = FocusNode(debugLabel: 'mapping_screen');
+  final _backFocus = FocusNode(debugLabel: 'mapping_back');
   final _saveFocus = FocusNode(debugLabel: 'mapping_save');
   final ScrollController _scroll = ScrollController();
 
@@ -85,6 +86,7 @@ class _SourceMappingsScreenState
     for (final r in _rows) {
       r.dispose();
     }
+    _backFocus.dispose();
     _saveFocus.dispose();
     _screenFocus.dispose();
     _scroll.dispose();
@@ -94,7 +96,7 @@ class _SourceMappingsScreenState
   bool get _isEditing => _rows.any((r) => r.textFocus.hasFocus);
 
   List<FocusNode> get _navOrder =>
-      [..._rows.map((r) => r.consoleFocus), _saveFocus];
+      [_backFocus, ..._rows.map((r) => r.consoleFocus), _saveFocus];
 
   KeyEventResult _handleScreenKey(FocusNode node, KeyEvent event) {
     if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
@@ -151,6 +153,10 @@ class _SourceMappingsScreenState
   }
 
   void _activateFocused() {
+    if (_backFocus.hasFocus) {
+      Navigator.of(context).maybePop();
+      return;
+    }
     for (final r in _rows) {
       if (r.consoleFocus.hasFocus) {
         r.textFocus.requestFocus();
@@ -171,7 +177,7 @@ class _SourceMappingsScreenState
     try {
       await ref
           .read(sourcesProvider.notifier)
-          .setMappingsForSource(widget.source.id, mappings);
+          .setManualMappings(widget.source.id, mappings);
       ref.invalidate(bootstrappedConfigProvider);
       ref.invalidate(gamesProvider);
       if (!mounted) return;
@@ -194,14 +200,23 @@ class _SourceMappingsScreenState
           focusNode: _screenFocus,
           autofocus: true,
           onKeyEvent: _handleScreenKey,
-          child: Center(
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(maxWidth: 640),
-              child: Padding(
-                padding: const EdgeInsets.all(20),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+          child: Column(
+            children: [
+              // Fixed Header
+              Padding(
+                padding: const EdgeInsets.fromLTRB(8, 8, 16, 8),
+                child: Row(
                   children: [
+                    ConsoleFocusable(
+                      focusNode: _backFocus,
+                      onSelect: () => Navigator.of(context).maybePop(),
+                      child: const Padding(
+                        padding: EdgeInsets.all(8),
+                        child: Icon(Icons.arrow_back,
+                            color: Colors.white, size: 26),
+                      ),
+                    ),
+                    const SizedBox(width: 4),
                     Text(
                       L.of(context).sourceMappings_title,
                       style: const TextStyle(
@@ -210,87 +225,105 @@ class _SourceMappingsScreenState
                         fontWeight: FontWeight.w600,
                       ),
                     ),
-                    const SizedBox(height: 4),
-                    Text(
-                      '${widget.source.name} · ${widget.source.hostLabel}',
-                      style: TextStyle(
-                        color: Colors.grey.shade500,
-                        fontSize: 12,
-                        fontFamily: 'monospace',
-                      ),
-                    ),
-                    const SizedBox(height: 4),
-                    Text(
-                      L.of(context).sourceMappings_instruction,
-                      style: TextStyle(
-                          color: Colors.grey.shade500, fontSize: 12),
-                    ),
-                    const SizedBox(height: 16),
-                    Expanded(
-                      child: _rows.isEmpty
-                          ? const Center(
-                              child: Text(
-                                'No systems configured yet — add one '
-                                'from the home screen first.',
-                                style: TextStyle(
-                                    color: Colors.white54, fontSize: 13),
-                                textAlign: TextAlign.center,
-                              ),
-                            )
-                          : ListView.separated(
-                              controller: _scroll,
-                              itemCount: _rows.length,
-                              separatorBuilder: (_, __) =>
-                                  const SizedBox(height: 10),
-                              itemBuilder: (_, i) => _MappingRowWidget(
-                                row: _rows[i],
-                              ),
+                  ],
+                ),
+              ),
+              // Scrollable Content
+              Expanded(
+                child: Center(
+                  child: ConstrainedBox(
+                    constraints: const BoxConstraints(maxWidth: 640),
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 20),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          const SizedBox(height: 8),
+                          Text(
+                            '${widget.source.name} · ${widget.source.hostLabel}',
+                            style: TextStyle(
+                              color: Colors.grey.shade500,
+                              fontSize: 12,
+                              fontFamily: 'monospace',
                             ),
-                    ),
-                    if (_error != null) ...[
-                      const SizedBox(height: 8),
-                      Text(_error!,
-                          style: const TextStyle(
-                              color: Colors.redAccent, fontSize: 13)),
-                    ],
-                    const SizedBox(height: 14),
-                    ConsoleFocusable(
-                      focusNode: _saveFocus,
-                      onSelect: _busy ? null : _save,
-                      child: Container(
-                        width: double.infinity,
-                        padding: const EdgeInsets.symmetric(vertical: 14),
-                        alignment: Alignment.center,
-                        decoration: BoxDecoration(
-                          color: AppTheme.primaryColor.withValues(alpha: 0.18),
-                          borderRadius: BorderRadius.circular(8),
-                          border: Border.all(
-                              color: AppTheme.primaryColor, width: 2),
-                        ),
-                        child: _busy
-                            ? const SizedBox(
-                                width: 18,
-                                height: 18,
-                                child: CircularProgressIndicator(
-                                  strokeWidth: 2,
-                                  color: AppTheme.primaryColor,
-                                ),
-                              )
-                            : Text(
-                                L.of(context).sourceMappings_save,
+                          ),
+                          const SizedBox(height: 4),
+                          Text(
+                            L.of(context).sourceMappings_instruction,
+                            style: TextStyle(
+                                color: Colors.grey.shade500, fontSize: 12),
+                          ),
+                          const SizedBox(height: 16),
+                          Expanded(
+                            child: _rows.isEmpty
+                                ? const Center(
+                                    child: Text(
+                                      'No systems configured yet — add one '
+                                      'from the home screen first.',
+                                      style: TextStyle(
+                                          color: Colors.white54, fontSize: 13),
+                                      textAlign: TextAlign.center,
+                                    ),
+                                  )
+                                : ListView.separated(
+                                    controller: _scroll,
+                                    itemCount: _rows.length,
+                                    separatorBuilder: (_, __) =>
+                                        const SizedBox(height: 10),
+                                    itemBuilder: (_, i) => _MappingRowWidget(
+                                      row: _rows[i],
+                                    ),
+                                  ),
+                          ),
+                          if (_error != null) ...[
+                            const SizedBox(height: 8),
+                            Text(_error!,
                                 style: const TextStyle(
-                                  color: AppTheme.primaryColor,
-                                  fontSize: 15,
-                                  fontWeight: FontWeight.w600,
-                                  letterSpacing: 1,
-                                ),
+                                    color: Colors.redAccent, fontSize: 13)),
+                          ],
+                          const SizedBox(height: 14),
+                          ConsoleFocusable(
+                            focusNode: _saveFocus,
+                            onSelect: _busy ? null : _save,
+                            child: Container(
+                              width: double.infinity,
+                              padding: const EdgeInsets.symmetric(vertical: 14),
+                              alignment: Alignment.center,
+                              decoration: BoxDecoration(
+                                color: AppTheme.primaryColor
+                                    .withValues(alpha: 0.18),
+                                borderRadius: BorderRadius.circular(8),
+                                border: Border.all(
+                                    color: AppTheme.primaryColor, width: 2),
                               ),
+                              child: _busy
+                                  ? const SizedBox(
+                                      width: 18,
+                                      height: 18,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 2,
+                                        color: AppTheme.primaryColor,
+                                      ),
+                                    )
+                                  : Text(
+                                      L.of(context).sourceMappings_save,
+                                      style: const TextStyle(
+                                        color: AppTheme.primaryColor,
+                                        fontSize: 15,
+                                        fontWeight: FontWeight.w600,
+                                        letterSpacing: 1,
+                                      ),
+                                    ),
+                            ),
+                          ),
+                          const SizedBox(height: 40),
+                        ],
                       ),
                     ),
-                  ],
+                  ),
                 ),
               ),
-            ),
+            ],
           ),
         ),
       ),
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index efe4b83..b931d84 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -417,6 +417,10 @@
   "onboarding_selectFolderPrompt": "Wähle den Ordner, in dem ROMs gespeichert werden sollen",
   "onboarding_serverType": "Servertyp",
 
+  "onboarding_folderExplanationTitle": "Bibliothekspfad einrichten",
+  "onboarding_folderExplanationMessage": "R-Shop braucht einen Basisordner, um deine heruntergeladenen Spiele zu speichern. Das hilft beim Ordnen deiner Dateien und ist für die Android-Ordnerberechtigungen erforderlich.\n\nWir empfehlen, einen Ordner namens 'ROMs' anzulegen und ihn auszuwählen.",
+  "onboarding_continueToPicker": "Ordner wählen",
+
   "onboarding_hangOn": "Moment, teste die Verbindung...",
   "onboarding_foundConsole": "Diese Konsole habe ich auf deinem RomM-Server gefunden! Bestätige oder wähle eine andere.",
   "onboarding_pickPlatform": "Wähle die passende Plattform von deinem RomM-Server.",
@@ -526,5 +530,77 @@
   "service_downloadComplete": "Downloads abgeschlossen",
   "service_downloading": "Laden: {details}",
   "service_activeCount": "{count} aktiv",
-  "service_queuedCount": "{count} in Warteschlange"
+  "service_queuedCount": "{count} in Warteschlange",
+  "sources_connectionRoute": "Verbindungsweg",
+  "sources_routeAuto": "Automatisch",
+  "sources_routeAutoHint": "Den schnellsten Weg nutzen, der antwortet – wird bei Netzwechsel neu geprüft",
+  "sources_routeInUse": "In Verwendung",
+  "sources_routePinned": "Gesperrt",
+  "sources_routeReachable": "Erreichbar",
+  "sources_routeNoAnswer": "Keine Antwort",
+  "sources_routeChecking": "Wird geprüft…",
+  "sources_routeLatencyMs": "{ms} ms",
+  "sources_routeAutoPicks": "Würde {route} nutzen",
+  "sources_routeAutoNoneReachable": "Nichts hat geantwortet",
+  "sources_routeFastest": "Am schnellsten",
+  "sources_routeReleasePin": "Hebt die Sperre auf und wählt wieder den schnellsten Weg",
+  "sources_routeOwnLogin": "Eigene Anmeldung",
+  "sources_routeAuthTitle": "Anmeldung für diesen Weg",
+  "sources_routeAuthHint": "Leer lassen, um die Anmeldung der Quelle zu nutzen. Nur ausfüllen, wenn diese Adresse eine andere verlangt.",
+  "sources_routeAuthInherited": "Nutzt die Anmeldung der Quelle",
+  "sources_routeAuthOwn": "Dieser Weg meldet sich selbst an",
+  "sources_routeOnlyOne": "Diese Quelle hat nur einen Weg",
+  "sources_addRoute": "Weg hinzufügen",
+  "sources_editRoute": "Weg bearbeiten",
+  "sources_removeRoute": "Weg entfernen",
+  "sources_routeDuplicate": "Diese Quelle hat bereits einen Weg zu dieser Adresse",
+  "sources_activeSource": "In Verwendung",
+  "sources_switchSource": "Quelle wechseln",
+  "sources_prevSource": "Vorherige Quelle",
+  "sources_nextSource": "Nächste Quelle",
+  "sources_setFallback": "Ersatzquelle",
+  "sources_fallbackNone": "Keine",
+  "sources_fallbackShort": "Ersatz",
+  "sources_routeSameServerHint": "Alle Wege erreichen denselben Server. Ein Weg kann eine eigene Anmeldung mitbringen, wenn diese Adresse eine andere verlangt.",
+  "sources_routeCannotRemoveLast": "Der letzte Weg kann nicht entfernt werden",
+  "sources_countLabel": "{count, plural, =1{1 Quelle} other{{count} Quellen}}",
+  "sources_useThisShort": "Diese nutzen",
+  "sources_stopUsingShort": "Nicht mehr nutzen",
+  "sources_removeConfirmTitle": "Quelle entfernen?",
+  "sources_removeConfirmMessage": "\"{name}\" entfernen? Ihre Liste verschwindet aus der Bibliothek, bereits heruntergeladene Spiele bleiben erhalten.",
+  "sources_groupBadge": "Gruppe",
+  "sources_groupCreate": "Mit einer anderen Quelle gruppieren…",
+  "sources_groupCreateHint": "Für zwei Adressen, die in Wirklichkeit derselbe Server sind",
+  "sources_groupPickMember": "Quelle zum Gruppieren wählen",
+  "sources_groupSameTypeOnly": "Nur Quellen desselben Typs lassen sich gruppieren",
+  "sources_groupNoCandidates": "Keine weitere Quelle dieses Typs",
+  "sources_groupManage": "Gruppeneinstellungen",
+  "sources_groupRename": "Gruppe umbenennen",
+  "sources_groupNameLabel": "Gruppenname",
+  "sources_groupModeTitle": "Welches Mitglied genutzt wird",
+  "sources_groupModeAuto": "Automatisch",
+  "sources_groupModeAutoHint": "Keine Reihenfolge zu pflegen – die Adresse, die zuerst antwortet, ist die zuerst nutzbare",
+  "sources_groupModeOrdered": "Meine Reihenfolge",
+  "sources_groupModeOrderedHint": "Nimmt die erste in deiner Reihenfolge, die antwortet",
+  "sources_groupPreferred": "Erste Wahl",
+  "sources_groupAddMember": "Quelle hinzufügen",
+  "sources_groupLeave": "Gruppe verlassen",
+  "sources_groupLeaveConfirm": "„{name}“ behält keine Spiele und muss neu synchronisieren. Die gemeinsame Liste bleibt bei der Gruppe.",
+  "sources_groupLeaveTitle": "Gruppe verlassen?",
+  "sources_groupDissolve": "Gruppe auflösen",
+  "sources_groupDissolveConfirm": "Die gemeinsame Liste bleibt bei „{name}“; die anderen synchronisieren neu.",
+  "sources_groupDissolveTitle": "Gruppe auflösen?",
+  "sources_groupMembersCount": "{count} Quellen",
+  "sources_groupUsing": "Nutzt „{name}“",
+  "sources_moveUp": "Nach oben",
+  "sources_moveDown": "Nach unten",
+  "sources_routeOrdered": "Meine Reihenfolge",
+  "sources_routeOrderedHint": "Den ersten Weg in deiner Reihenfolge nutzen, der antwortet",
+  "sources_reorderHint": "Mit Auf und Ab verschieben, dann nochmals drücken zum Beenden",
+  "sources_groupMemberHint": "▶ nimmt sie aus der Gruppe, [A] sortiert",
+  "sources_routeRowHint": "Zeile auswählen zum Umsortieren; ▶ für die Symbole: bearbeiten oder entfernen",
+  "sources_routeUse": "Diesen Weg nutzen",
+  "sources_routeLock": "Auf diese Route sperren",
+  "sources_routeUnlock": "Sperre aufheben",
+  "sources_removeRouteConfirm": "„{name}“ entfernen? Die zwischengespeicherten Spiele bleiben, nur die Adresse verschwindet."
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 0d11a8f..964ad3f 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -452,6 +452,10 @@
   "onboarding_selectFolderPrompt": "Pick the folder where ROMs should be saved",
   "onboarding_serverType": "Server type",
 
+  "onboarding_folderExplanationTitle": "Setup your Library Path",
+  "onboarding_folderExplanationMessage": "R-Shop needs a base folder to store your downloaded games. This helps organize your files and is required for Android folder permissions.\n\nWe recommend creating a folder named 'ROMs' and selecting it.",
+  "onboarding_continueToPicker": "Select Folder",
+
   "onboarding_hangOn": "Hang on, testing the connection...",
   "onboarding_foundConsole": "I found this console on your RomM server! Confirm or pick a different one.",
   "onboarding_pickPlatform": "Pick the matching platform from your RomM server.",
@@ -564,5 +568,86 @@
   "service_activeCount": "{count} active",
   "@service_activeCount": { "placeholders": { "count": { "type": "int" } } },
   "service_queuedCount": "{count} queued",
-  "@service_queuedCount": { "placeholders": { "count": { "type": "int" } } }
+  "@service_queuedCount": { "placeholders": { "count": { "type": "int" } } },
+  "sources_connectionRoute": "Connection route",
+  "sources_routeAuto": "Automatic",
+  "sources_routeAutoHint": "Use the fastest route that answers, re-checked as the network changes",
+  "sources_routeInUse": "In use",
+  "sources_routePinned": "Locked",
+  "sources_routeReachable": "Reachable",
+  "sources_routeNoAnswer": "No answer",
+  "sources_routeChecking": "Checking…",
+  "sources_routeLatencyMs": "{ms} ms",
+  "@sources_routeLatencyMs": { "placeholders": { "ms": { "type": "int" } } },
+  "sources_routeAutoPicks": "Would use {route}",
+  "@sources_routeAutoPicks": { "placeholders": { "route": { "type": "String" } } },
+  "sources_routeAutoNoneReachable": "Nothing answered",
+  "sources_routeFastest": "Fastest",
+  "sources_routeReleasePin": "Drops the lock and re-picks the fastest",
+  "sources_routeOwnLogin": "Own login",
+  "sources_routeAuthTitle": "Login for this route",
+  "sources_routeAuthHint": "Leave blank to use the source's login. Fill it in only when this address asks for a different one.",
+  "sources_routeAuthInherited": "Using the source's login",
+  "sources_routeAuthOwn": "This route logs in on its own",
+  "sources_routeOnlyOne": "This source has only one route",
+  "sources_addRoute": "Add route",
+  "sources_editRoute": "Edit route",
+  "sources_removeRoute": "Remove route",
+  "sources_routeDuplicate": "This source already has a route to that address",
+  "sources_activeSource": "In use",
+  "sources_switchSource": "Switch source",
+  "sources_prevSource": "Prev source",
+  "sources_nextSource": "Next source",
+  "sources_setFallback": "Backup source",
+  "sources_fallbackNone": "None",
+  "sources_fallbackShort": "Backup",
+  "sources_routeSameServerHint": "All routes reach the same server. A route can carry its own login when that address asks for a different one.",
+  "sources_routeCannotRemoveLast": "The last route cannot be removed",
+  "sources_countLabel": "{count, plural, =1{1 source} other{{count} sources}}",
+  "@sources_countLabel": { "placeholders": { "count": { "type": "num" } } },
+  "sources_useThisShort": "Use this",
+  "sources_stopUsingShort": "Stop using",
+  "sources_removeConfirmTitle": "Remove source?",
+  "sources_removeConfirmMessage": "Remove \"{name}\"? Its list disappears from the library, but games already downloaded to this device are kept.",
+  "@sources_removeConfirmMessage": { "placeholders": { "name": { "type": "String" } } },
+  "sources_groupBadge": "Group",
+  "sources_groupCreate": "Group with another source…",
+  "sources_groupCreateHint": "For two addresses that are really the same server",
+  "sources_groupPickMember": "Pick the source to group with",
+  "sources_groupSameTypeOnly": "Only sources of the same type can be grouped",
+  "sources_groupNoCandidates": "No other source of this type",
+  "sources_groupManage": "Group settings",
+  "sources_groupRename": "Rename group",
+  "sources_groupNameLabel": "Group name",
+  "sources_groupModeTitle": "Which member to use",
+  "sources_groupModeAuto": "Automatic",
+  "sources_groupModeAutoHint": "No order to keep — the address that replies first is the one you can use first",
+  "sources_groupModeOrdered": "My order",
+  "sources_groupModeOrderedHint": "Takes the first one in your order that answers",
+  "sources_groupPreferred": "First choice",
+  "sources_groupAddMember": "Add a source",
+  "sources_groupLeave": "Leave the group",
+  "sources_groupLeaveConfirm": "{name} keeps no games and has to sync again. The shared list stays with the group.",
+  "@sources_groupLeaveConfirm": {"placeholders": {"name": {"type": "String"}}},
+  "sources_groupLeaveTitle": "Leave the group?",
+  "sources_groupDissolve": "Dissolve the group",
+  "sources_groupDissolveConfirm": "{name} keeps the shared list; the others have to sync again.",
+  "@sources_groupDissolveConfirm": {"placeholders": {"name": {"type": "String"}}},
+  "sources_groupDissolveTitle": "Dissolve the group?",
+  "sources_groupMembersCount": "{count} sources",
+  "@sources_groupMembersCount": {"placeholders": {"count": {"type": "int"}}},
+  "sources_groupUsing": "Using {name}",
+  "@sources_groupUsing": {"placeholders": {"name": {"type": "String"}}},
+  "sources_moveUp": "Move up",
+  "sources_moveDown": "Move down",
+  "sources_routeOrdered": "My order",
+  "sources_routeOrderedHint": "Use the first route in your order that answers",
+  "sources_reorderHint": "Move it with up and down, then press again to finish",
+  "sources_groupMemberHint": "Press ▶ to send it out of the group; [A] reorders",
+  "sources_routeRowHint": "Select the row to reorder it; press ▶ for the icons: edit or remove",
+  "sources_routeUse": "Use this route",
+  "sources_routeLock": "Lock to this route",
+  "sources_routeUnlock": "Unlock",
+  "sources_removeRouteConfirm": "Remove “{name}”? The games cached for this source stay; only the address goes.",
+  "@sources_removeRouteConfirm": {"placeholders": {"name": {"type": "String"}}}
 }
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 6a03cbf..f3818a1 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -385,6 +385,9 @@
   "onboarding_failedToSave": "Error al guardar: {error}",
   "onboarding_selectFolderPrompt": "Elige la carpeta donde guardar las ROMs",
   "onboarding_serverType": "Tipo de servidor",
+  "onboarding_folderExplanationTitle": "Configura la ruta de tu biblioteca",
+  "onboarding_folderExplanationMessage": "R-Shop necesita una carpeta base para guardar los juegos que descargues. Esto ayuda a organizar tus archivos y es necesario para los permisos de carpetas de Android.\n\nTe recomendamos crear una carpeta llamada 'ROMs' y seleccionarla.",
+  "onboarding_continueToPicker": "Seleccionar carpeta",
   "onboarding_hangOn": "Un momento, probando la conexión...",
   "onboarding_foundConsole": "¡Encontré esta consola en tu servidor RomM! Confirma o elige otra.",
   "onboarding_pickPlatform": "Elige la plataforma correspondiente de tu servidor RomM.",
@@ -488,5 +491,77 @@
   "service_downloadComplete": "Descargas completas",
   "service_downloading": "Descargando: {details}",
   "service_activeCount": "{count} activas",
-  "service_queuedCount": "{count} en cola"
+  "service_queuedCount": "{count} en cola",
+  "sources_connectionRoute": "Ruta de conexión",
+  "sources_routeAuto": "Automático",
+  "sources_routeAutoHint": "Usar la ruta más rápida que responda; se comprueba de nuevo cuando cambia la red",
+  "sources_routeInUse": "En uso",
+  "sources_routePinned": "Bloqueada",
+  "sources_routeReachable": "Accesible",
+  "sources_routeNoAnswer": "Sin respuesta",
+  "sources_routeChecking": "Comprobando…",
+  "sources_routeLatencyMs": "{ms} ms",
+  "sources_routeAutoPicks": "Usaría {route}",
+  "sources_routeAutoNoneReachable": "No respondió ninguna",
+  "sources_routeFastest": "La más rápida",
+  "sources_routeReleasePin": "Quita el bloqueo y vuelve a elegir la más rápida",
+  "sources_routeOwnLogin": "Inicio de sesión propio",
+  "sources_routeAuthTitle": "Inicio de sesión de esta ruta",
+  "sources_routeAuthHint": "Déjalo en blanco para usar el inicio de sesión de la fuente. Rellénalo solo si esta dirección pide otro.",
+  "sources_routeAuthInherited": "Usa el inicio de sesión de la fuente",
+  "sources_routeAuthOwn": "Esta ruta inicia sesión por su cuenta",
+  "sources_routeOnlyOne": "Esta fuente solo tiene una ruta",
+  "sources_addRoute": "Añadir ruta",
+  "sources_editRoute": "Editar ruta",
+  "sources_removeRoute": "Eliminar ruta",
+  "sources_routeDuplicate": "Esta fuente ya tiene una ruta a esa dirección",
+  "sources_activeSource": "En uso",
+  "sources_switchSource": "Cambiar fuente",
+  "sources_prevSource": "Fuente anterior",
+  "sources_nextSource": "Fuente siguiente",
+  "sources_setFallback": "Fuente de respaldo",
+  "sources_fallbackNone": "Ninguna",
+  "sources_fallbackShort": "Respaldo",
+  "sources_routeSameServerHint": "Todas las rutas llegan al mismo servidor. Una ruta puede llevar su propio inicio de sesión si esa dirección pide otro.",
+  "sources_routeCannotRemoveLast": "No se puede eliminar la última ruta",
+  "sources_countLabel": "{count, plural, =1{1 fuente} other{{count} fuentes}}",
+  "sources_useThisShort": "Usar esta",
+  "sources_stopUsingShort": "Dejar de usar",
+  "sources_removeConfirmTitle": "¿Eliminar la fuente?",
+  "sources_removeConfirmMessage": "¿Eliminar \"{name}\"? Su lista desaparece de la biblioteca, pero los juegos ya descargados en este dispositivo se conservan.",
+  "sources_groupBadge": "Grupo",
+  "sources_groupCreate": "Agrupar con otra fuente…",
+  "sources_groupCreateHint": "Para dos direcciones que en realidad son el mismo servidor",
+  "sources_groupPickMember": "Elige la fuente con la que agrupar",
+  "sources_groupSameTypeOnly": "Solo se pueden agrupar fuentes del mismo tipo",
+  "sources_groupNoCandidates": "No hay otra fuente de este tipo",
+  "sources_groupManage": "Ajustes del grupo",
+  "sources_groupRename": "Renombrar grupo",
+  "sources_groupNameLabel": "Nombre del grupo",
+  "sources_groupModeTitle": "Qué miembro se usa",
+  "sources_groupModeAuto": "Automático",
+  "sources_groupModeAutoHint": "Sin orden que mantener: la dirección que responde antes es la que puedes usar antes",
+  "sources_groupModeOrdered": "Mi orden",
+  "sources_groupModeOrderedHint": "Usa la primera de tu orden que responda",
+  "sources_groupPreferred": "Primera opción",
+  "sources_groupAddMember": "Añadir una fuente",
+  "sources_groupLeave": "Salir del grupo",
+  "sources_groupLeaveConfirm": "«{name}» no conserva ningún juego y tendrá que sincronizar de nuevo. La lista compartida se queda en el grupo.",
+  "sources_groupLeaveTitle": "¿Salir del grupo?",
+  "sources_groupDissolve": "Deshacer el grupo",
+  "sources_groupDissolveConfirm": "La lista compartida se queda con «{name}»; las demás tendrán que sincronizar de nuevo.",
+  "sources_groupDissolveTitle": "¿Deshacer el grupo?",
+  "sources_groupMembersCount": "{count} fuentes",
+  "sources_groupUsing": "Usando «{name}»",
+  "sources_moveUp": "Subir",
+  "sources_moveDown": "Bajar",
+  "sources_routeOrdered": "Mi orden",
+  "sources_routeOrderedHint": "Usar la primera ruta de tu orden que responda",
+  "sources_reorderHint": "Muévelo con arriba y abajo, y pulsa otra vez para terminar",
+  "sources_groupMemberHint": "▶ la saca del grupo; [A] reordena",
+  "sources_routeRowHint": "Selecciona la fila para reordenarla; pulsa ▶ para los iconos: editar o quitar",
+  "sources_routeUse": "Usar esta ruta",
+  "sources_routeLock": "Bloquear en esta ruta",
+  "sources_routeUnlock": "Desbloquear",
+  "sources_removeRouteConfirm": "¿Quitar «{name}»? Los juegos en caché de esta fuente se quedan; solo desaparece la dirección."
 }
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 302b172..07dc396 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -385,6 +385,9 @@
   "onboarding_failedToSave": "Erreur de sauvegarde : {error}",
   "onboarding_selectFolderPrompt": "Choisis le dossier où enregistrer les ROMs",
   "onboarding_serverType": "Type de serveur",
+  "onboarding_folderExplanationTitle": "Configure le chemin de ta bibliothèque",
+  "onboarding_folderExplanationMessage": "R-Shop a besoin d'un dossier de base pour stocker les jeux que tu télécharges. Cela aide à organiser tes fichiers et c'est indispensable pour les autorisations de dossier d'Android.\n\nNous te conseillons de créer un dossier nommé 'ROMs' et de le sélectionner.",
+  "onboarding_continueToPicker": "Choisir le dossier",
   "onboarding_hangOn": "Un instant, test de la connexion...",
   "onboarding_foundConsole": "J'ai trouvé cette console sur ton serveur RomM ! Confirme ou choisis-en une autre.",
   "onboarding_pickPlatform": "Choisis la plateforme correspondante sur ton serveur RomM.",
@@ -488,5 +491,77 @@
   "service_downloadComplete": "Téléchargements terminés",
   "service_downloading": "Téléchargement : {details}",
   "service_activeCount": "{count} actifs",
-  "service_queuedCount": "{count} en attente"
+  "service_queuedCount": "{count} en attente",
+  "sources_connectionRoute": "Voie de connexion",
+  "sources_routeAuto": "Automatique",
+  "sources_routeAutoHint": "Utiliser la voie la plus rapide qui répond, revérifiée quand le réseau change",
+  "sources_routeInUse": "Utilisée",
+  "sources_routePinned": "Verrouillée",
+  "sources_routeReachable": "Joignable",
+  "sources_routeNoAnswer": "Sans réponse",
+  "sources_routeChecking": "Vérification…",
+  "sources_routeLatencyMs": "{ms} ms",
+  "sources_routeAutoPicks": "Utiliserait {route}",
+  "sources_routeAutoNoneReachable": "Rien n'a répondu",
+  "sources_routeFastest": "La plus rapide",
+  "sources_routeReleasePin": "Déverrouille et resélectionne la plus rapide",
+  "sources_routeOwnLogin": "Connexion dédiée",
+  "sources_routeAuthTitle": "Connexion pour cette voie",
+  "sources_routeAuthHint": "Laisser vide pour utiliser la connexion de la source. À remplir uniquement si cette adresse en demande une autre.",
+  "sources_routeAuthInherited": "Utilise la connexion de la source",
+  "sources_routeAuthOwn": "Cette voie se connecte avec ses propres identifiants",
+  "sources_routeOnlyOne": "Cette source n'a qu'une seule voie",
+  "sources_addRoute": "Ajouter une voie",
+  "sources_editRoute": "Modifier la voie",
+  "sources_removeRoute": "Supprimer la voie",
+  "sources_routeDuplicate": "Cette source a déjà une voie vers cette adresse",
+  "sources_activeSource": "En cours d'utilisation",
+  "sources_switchSource": "Changer de source",
+  "sources_prevSource": "Source préc.",
+  "sources_nextSource": "Source suiv.",
+  "sources_setFallback": "Source de secours",
+  "sources_fallbackNone": "Aucune",
+  "sources_fallbackShort": "Secours",
+  "sources_routeSameServerHint": "Toutes les voies mènent au même serveur. Une voie peut avoir sa propre connexion si cette adresse en demande une autre.",
+  "sources_routeCannotRemoveLast": "La dernière voie ne peut pas être supprimée",
+  "sources_countLabel": "{count, plural, =1{1 source} other{{count} sources}}",
+  "sources_useThisShort": "Utiliser celle-ci",
+  "sources_stopUsingShort": "Ne plus utiliser",
+  "sources_removeConfirmTitle": "Supprimer la source ?",
+  "sources_removeConfirmMessage": "Supprimer « {name} » ? Sa liste disparaît de la bibliothèque, mais les jeux déjà téléchargés sur cet appareil sont conservés.",
+  "sources_groupBadge": "Groupe",
+  "sources_groupCreate": "Grouper avec une autre source…",
+  "sources_groupCreateHint": "Pour deux adresses qui sont en réalité le même serveur",
+  "sources_groupPickMember": "Choisissez la source à grouper",
+  "sources_groupSameTypeOnly": "Seules des sources du même type peuvent être groupées",
+  "sources_groupNoCandidates": "Aucune autre source de ce type",
+  "sources_groupManage": "Réglages du groupe",
+  "sources_groupRename": "Renommer le groupe",
+  "sources_groupNameLabel": "Nom du groupe",
+  "sources_groupModeTitle": "Quel membre utiliser",
+  "sources_groupModeAuto": "Automatique",
+  "sources_groupModeAutoHint": "Aucun ordre à tenir : l'adresse qui répond en premier est la première utilisable",
+  "sources_groupModeOrdered": "Mon ordre",
+  "sources_groupModeOrderedHint": "Prend le premier de votre ordre qui répond",
+  "sources_groupPreferred": "Premier choix",
+  "sources_groupAddMember": "Ajouter une source",
+  "sources_groupLeave": "Quitter le groupe",
+  "sources_groupLeaveConfirm": "« {name} » ne garde aucun jeu et devra se synchroniser à nouveau. La liste partagée reste au groupe.",
+  "sources_groupLeaveTitle": "Quitter le groupe ?",
+  "sources_groupDissolve": "Dissoudre le groupe",
+  "sources_groupDissolveConfirm": "La liste partagée reste à « {name} » ; les autres devront se synchroniser à nouveau.",
+  "sources_groupDissolveTitle": "Dissoudre le groupe ?",
+  "sources_groupMembersCount": "{count} sources",
+  "sources_groupUsing": "Utilise « {name} »",
+  "sources_moveUp": "Monter",
+  "sources_moveDown": "Descendre",
+  "sources_routeOrdered": "Mon ordre",
+  "sources_routeOrderedHint": "Utiliser la première route de votre ordre qui répond",
+  "sources_reorderHint": "Déplacez-le avec haut et bas, puis appuyez à nouveau pour terminer",
+  "sources_groupMemberHint": "▶ la sort du groupe ; [A] réordonne",
+  "sources_routeRowHint": "Sélectionnez la ligne pour la déplacer ; ▶ pour les icônes : modifier ou supprimer",
+  "sources_routeUse": "Utiliser cette route",
+  "sources_routeLock": "Verrouiller sur cette route",
+  "sources_routeUnlock": "Déverrouiller",
+  "sources_removeRouteConfirm": "Supprimer « {name} » ? La liste en cache de cette source reste ; seule l'adresse disparaît."
 }
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 7c77c8f..8812023 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -417,6 +417,10 @@
   "onboarding_selectFolderPrompt": "ROM\u3092\u4fdd\u5b58\u3059\u308b\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u3093\u3067\u304f\u3060\u3055\u3044",
   "onboarding_serverType": "\u30b5\u30fc\u30d0\u30fc\u30bf\u30a4\u30d7",
 
+  "onboarding_folderExplanationTitle": "\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u30d1\u30b9\u3092\u8a2d\u5b9a",
+  "onboarding_folderExplanationMessage": "R-Shop \u306f\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u305f\u30b2\u30fc\u30e0\u3092\u4fdd\u5b58\u3059\u308b\u30d9\u30fc\u30b9\u30d5\u30a9\u30eb\u30c0\u304c\u5fc5\u8981\u3067\u3059\u3002\u30d5\u30a1\u30a4\u30eb\u306e\u6574\u7406\u306b\u5f79\u7acb\u3061\u3001Android \u306e\u30d5\u30a9\u30eb\u30c0\u6a29\u9650\u306b\u3082\u5fc5\u8981\u3067\u3059\u3002\n\n\u300cROMs\u300d\u3068\u3044\u3046\u540d\u524d\u306e\u30d5\u30a9\u30eb\u30c0\u3092\u4f5c\u6210\u3057\u3066\u9078\u629e\u3059\u308b\u3053\u3068\u3092\u304a\u3059\u3059\u3081\u3057\u307e\u3059\u3002",
+  "onboarding_continueToPicker": "\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u629e",
+
   "onboarding_hangOn": "\u3061\u3087\u3063\u3068\u5f85\u3063\u3066\u306d\u3001\u63a5\u7d9a\u30c6\u30b9\u30c8\u4e2d...",
   "onboarding_foundConsole": "RomM\u30b5\u30fc\u30d0\u30fc\u3067\u3053\u306e\u30b3\u30f3\u30bd\u30fc\u30eb\u3092\u898b\u3064\u3051\u307e\u3057\u305f\uff01\u78ba\u8a8d\u3059\u308b\u304b\u3001\u5225\u306e\u3082\u306e\u3092\u9078\u3093\u3067\u304f\u3060\u3055\u3044\u3002",
   "onboarding_pickPlatform": "RomM\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u5bfe\u5fdc\u3059\u308b\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3092\u9078\u3093\u3067\u304f\u3060\u3055\u3044\u3002",
@@ -526,5 +530,77 @@
   "service_downloadComplete": "\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u5b8c\u4e86",
   "service_downloading": "\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u4e2d: {details}",
   "service_activeCount": "{count}\u4ef6\u30a2\u30af\u30c6\u30a3\u30d6",
-  "service_queuedCount": "{count}\u4ef6\u30ad\u30e5\u30fc\u4e2d"
+  "service_queuedCount": "{count}\u4ef6\u30ad\u30e5\u30fc\u4e2d",
+  "sources_connectionRoute": "接続経路",
+  "sources_routeAuto": "自動選択",
+  "sources_routeAutoHint": "\u5fdc\u7b54\u304c\u6700\u3082\u901f\u3044\u7d4c\u8def\u3092\u4f7f\u7528\uff08\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304c\u5909\u308f\u308b\u3068\u9078\u3073\u76f4\u3057\u307e\u3059\uff09",
+  "sources_routeInUse": "使用中",
+  "sources_routePinned": "\u30ed\u30c3\u30af\u4e2d",
+  "sources_routeReachable": "接続可能",
+  "sources_routeNoAnswer": "応答なし",
+  "sources_routeChecking": "確認中…",
+  "sources_routeLatencyMs": "{ms} ms",
+  "sources_routeAutoPicks": "\u300c{route}\u300d\u3092\u4f7f\u7528\u3057\u307e\u3059",
+  "sources_routeAutoNoneReachable": "\u5fdc\u7b54\u3057\u305f\u7d4c\u8def\u304c\u3042\u308a\u307e\u305b\u3093",
+  "sources_routeFastest": "\u6700\u901f",
+  "sources_routeReleasePin": "\u30ed\u30c3\u30af\u3092\u89e3\u9664\u3057\u3066\u6700\u901f\u306e\u7d4c\u8def\u3092\u9078\u3073\u76f4\u3057\u307e\u3059",
+  "sources_routeOwnLogin": "\u5c02\u7528\u30ed\u30b0\u30a4\u30f3",
+  "sources_routeAuthTitle": "\u3053\u306e\u7d4c\u8def\u306e\u30ed\u30b0\u30a4\u30f3\u60c5\u5831",
+  "sources_routeAuthHint": "\u7a7a\u6b04\u306b\u3059\u308b\u3068\u63d0\u4f9b\u5143\u306e\u30ed\u30b0\u30a4\u30f3\u60c5\u5831\u3092\u4f7f\u3044\u307e\u3059\u3002\u3053\u306e\u30a2\u30c9\u30ec\u30b9\u304c\u5225\u306e\u30ed\u30b0\u30a4\u30f3\u3092\u6c42\u3081\u308b\u5834\u5408\u306e\u307f\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002",
+  "sources_routeAuthInherited": "\u63d0\u4f9b\u5143\u306e\u30ed\u30b0\u30a4\u30f3\u60c5\u5831\u3092\u4f7f\u7528\u4e2d",
+  "sources_routeAuthOwn": "\u3053\u306e\u7d4c\u8def\u306f\u72ec\u81ea\u306e\u30ed\u30b0\u30a4\u30f3\u60c5\u5831\u3092\u4f7f\u7528\u3057\u307e\u3059",
+  "sources_routeOnlyOne": "この提供元の経路は1つだけです",
+  "sources_addRoute": "経路を追加",
+  "sources_editRoute": "経路を編集",
+  "sources_removeRoute": "この経路を削除",
+  "sources_routeDuplicate": "この提供元には同じアドレスの経路がすでにあります",
+  "sources_activeSource": "使用中",
+  "sources_switchSource": "提供元切替",
+  "sources_prevSource": "前の提供元",
+  "sources_nextSource": "次の提供元",
+  "sources_setFallback": "バックアップ提供元",
+  "sources_fallbackNone": "なし",
+  "sources_fallbackShort": "バックアップ",
+  "sources_routeSameServerHint": "\u3059\u3079\u3066\u306e\u7d4c\u8def\u306f\u540c\u3058\u30b5\u30fc\u30d0\u30fc\u306b\u3064\u306a\u304c\u308a\u307e\u3059\u3002\u305d\u306e\u30a2\u30c9\u30ec\u30b9\u304c\u5225\u306e\u30ed\u30b0\u30a4\u30f3\u3092\u6c42\u3081\u308b\u5834\u5408\u3001\u7d4c\u8def\u3054\u3068\u306b\u5c02\u7528\u306e\u30ed\u30b0\u30a4\u30f3\u60c5\u5831\u3092\u6301\u305f\u305b\u3089\u308c\u307e\u3059\u3002",
+  "sources_routeCannotRemoveLast": "最後の経路は削除できません",
+  "sources_countLabel": "{count} 件のソース",
+  "sources_useThisShort": "この提供元を使用",
+  "sources_stopUsingShort": "使用をやめる",
+  "sources_removeConfirmTitle": "ソースを削除しますか？",
+  "sources_removeConfirmMessage": "「{name}」を削除しますか？このソースの一覧はライブラリから消えますが、すでに端末にダウンロードしたゲームは残ります。",
+  "sources_groupBadge": "グループ",
+  "sources_groupCreate": "他のソースとグループにする…",
+  "sources_groupCreateHint": "実際には同じサーバーである 2 つのアドレス向け",
+  "sources_groupPickMember": "グループにするソースを選択",
+  "sources_groupSameTypeOnly": "同じ種類のソースだけをグループにできます",
+  "sources_groupNoCandidates": "同じ種類のソースが他にありません",
+  "sources_groupManage": "グループ設定",
+  "sources_groupRename": "グループ名を変更",
+  "sources_groupNameLabel": "グループ名",
+  "sources_groupModeTitle": "どれを使うか",
+  "sources_groupModeAuto": "自動選択",
+  "sources_groupModeAutoHint": "順序を管理する必要はありません。先に応答したアドレスが最も早く使えます",
+  "sources_groupModeOrdered": "自分の順序",
+  "sources_groupModeOrderedHint": "順序どおりに、最初に応答したものを使用",
+  "sources_groupPreferred": "第 1 候補",
+  "sources_groupAddMember": "ソースを追加",
+  "sources_groupLeave": "グループから外す",
+  "sources_groupLeaveConfirm": "「{name}」の一覧は残らず、同期し直す必要があります。共有の一覧はグループに残ります。",
+  "sources_groupLeaveTitle": "グループから外しますか？",
+  "sources_groupDissolve": "グループを解散",
+  "sources_groupDissolveConfirm": "共有の一覧は「{name}」に残り、他のソースは同期し直します。",
+  "sources_groupDissolveTitle": "グループを解散しますか？",
+  "sources_groupMembersCount": "{count} 個のソース",
+  "sources_groupUsing": "「{name}」を使用中",
+  "sources_moveUp": "上へ移動",
+  "sources_moveDown": "下へ移動",
+  "sources_routeOrdered": "自分の順序",
+  "sources_routeOrderedHint": "順序どおりに、最初に応答した経路を使用",
+  "sources_reorderHint": "上下キーで位置を移動し、もう一度押すと完了",
+  "sources_groupMemberHint": "▶ でグループから除外、[A] で並べ替え",
+  "sources_routeRowHint": "この行を選ぶと並べ替え。▶ で右のアイコン：編集・削除",
+  "sources_routeUse": "この経路を使用",
+  "sources_routeLock": "\u3053\u306e\u7d4c\u8def\u306b\u30ed\u30c3\u30af",
+  "sources_routeUnlock": "\u30ed\u30c3\u30af\u3092\u89e3\u9664",
+  "sources_removeRouteConfirm": "「{name}」を削除しますか？このソースのゲーム一覧は残り、消えるのはアドレスだけです。"
 }
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index a2e13c8..744c54a 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -11,6 +11,7 @@ import 'app_localizations_es.dart';
 import 'app_localizations_fr.dart';
 import 'app_localizations_ja.dart';
 import 'app_localizations_pt.dart';
+import 'app_localizations_zh.dart';
 
 // ignore_for_file: type=lint
 
@@ -102,7 +103,8 @@ abstract class L {
     Locale('es'),
     Locale('fr'),
     Locale('ja'),
-    Locale('pt')
+    Locale('pt'),
+    Locale('zh')
   ];
 
   /// No description provided for @appTitle.
@@ -2415,6 +2417,24 @@ abstract class L {
   /// **'Server type'**
   String get onboarding_serverType;
 
+  /// No description provided for @onboarding_folderExplanationTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Setup your Library Path'**
+  String get onboarding_folderExplanationTitle;
+
+  /// No description provided for @onboarding_folderExplanationMessage.
+  ///
+  /// In en, this message translates to:
+  /// **'R-Shop needs a base folder to store your downloaded games. This helps organize your files and is required for Android folder permissions.\n\nWe recommend creating a folder named \'ROMs\' and selecting it.'**
+  String get onboarding_folderExplanationMessage;
+
+  /// No description provided for @onboarding_continueToPicker.
+  ///
+  /// In en, this message translates to:
+  /// **'Select Folder'**
+  String get onboarding_continueToPicker;
+
   /// No description provided for @onboarding_hangOn.
   ///
   /// In en, this message translates to:
@@ -3038,6 +3058,438 @@ abstract class L {
   /// In en, this message translates to:
   /// **'{count} queued'**
   String service_queuedCount(int count);
+
+  /// No description provided for @sources_connectionRoute.
+  ///
+  /// In en, this message translates to:
+  /// **'Connection route'**
+  String get sources_connectionRoute;
+
+  /// No description provided for @sources_routeAuto.
+  ///
+  /// In en, this message translates to:
+  /// **'Automatic'**
+  String get sources_routeAuto;
+
+  /// No description provided for @sources_routeAutoHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Use the fastest route that answers, re-checked as the network changes'**
+  String get sources_routeAutoHint;
+
+  /// No description provided for @sources_routeInUse.
+  ///
+  /// In en, this message translates to:
+  /// **'In use'**
+  String get sources_routeInUse;
+
+  /// No description provided for @sources_routePinned.
+  ///
+  /// In en, this message translates to:
+  /// **'Locked'**
+  String get sources_routePinned;
+
+  /// No description provided for @sources_routeReachable.
+  ///
+  /// In en, this message translates to:
+  /// **'Reachable'**
+  String get sources_routeReachable;
+
+  /// No description provided for @sources_routeNoAnswer.
+  ///
+  /// In en, this message translates to:
+  /// **'No answer'**
+  String get sources_routeNoAnswer;
+
+  /// No description provided for @sources_routeChecking.
+  ///
+  /// In en, this message translates to:
+  /// **'Checking…'**
+  String get sources_routeChecking;
+
+  /// No description provided for @sources_routeLatencyMs.
+  ///
+  /// In en, this message translates to:
+  /// **'{ms} ms'**
+  String sources_routeLatencyMs(int ms);
+
+  /// No description provided for @sources_routeAutoPicks.
+  ///
+  /// In en, this message translates to:
+  /// **'Would use {route}'**
+  String sources_routeAutoPicks(String route);
+
+  /// No description provided for @sources_routeAutoNoneReachable.
+  ///
+  /// In en, this message translates to:
+  /// **'Nothing answered'**
+  String get sources_routeAutoNoneReachable;
+
+  /// No description provided for @sources_routeFastest.
+  ///
+  /// In en, this message translates to:
+  /// **'Fastest'**
+  String get sources_routeFastest;
+
+  /// No description provided for @sources_routeReleasePin.
+  ///
+  /// In en, this message translates to:
+  /// **'Drops the lock and re-picks the fastest'**
+  String get sources_routeReleasePin;
+
+  /// No description provided for @sources_routeOwnLogin.
+  ///
+  /// In en, this message translates to:
+  /// **'Own login'**
+  String get sources_routeOwnLogin;
+
+  /// No description provided for @sources_routeAuthTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Login for this route'**
+  String get sources_routeAuthTitle;
+
+  /// No description provided for @sources_routeAuthHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Leave blank to use the source\'s login. Fill it in only when this address asks for a different one.'**
+  String get sources_routeAuthHint;
+
+  /// No description provided for @sources_routeAuthInherited.
+  ///
+  /// In en, this message translates to:
+  /// **'Using the source\'s login'**
+  String get sources_routeAuthInherited;
+
+  /// No description provided for @sources_routeAuthOwn.
+  ///
+  /// In en, this message translates to:
+  /// **'This route logs in on its own'**
+  String get sources_routeAuthOwn;
+
+  /// No description provided for @sources_routeOnlyOne.
+  ///
+  /// In en, this message translates to:
+  /// **'This source has only one route'**
+  String get sources_routeOnlyOne;
+
+  /// No description provided for @sources_addRoute.
+  ///
+  /// In en, this message translates to:
+  /// **'Add route'**
+  String get sources_addRoute;
+
+  /// No description provided for @sources_editRoute.
+  ///
+  /// In en, this message translates to:
+  /// **'Edit route'**
+  String get sources_editRoute;
+
+  /// No description provided for @sources_removeRoute.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove route'**
+  String get sources_removeRoute;
+
+  /// No description provided for @sources_routeDuplicate.
+  ///
+  /// In en, this message translates to:
+  /// **'This source already has a route to that address'**
+  String get sources_routeDuplicate;
+
+  /// No description provided for @sources_activeSource.
+  ///
+  /// In en, this message translates to:
+  /// **'In use'**
+  String get sources_activeSource;
+
+  /// No description provided for @sources_switchSource.
+  ///
+  /// In en, this message translates to:
+  /// **'Switch source'**
+  String get sources_switchSource;
+
+  /// No description provided for @sources_prevSource.
+  ///
+  /// In en, this message translates to:
+  /// **'Prev source'**
+  String get sources_prevSource;
+
+  /// No description provided for @sources_nextSource.
+  ///
+  /// In en, this message translates to:
+  /// **'Next source'**
+  String get sources_nextSource;
+
+  /// No description provided for @sources_setFallback.
+  ///
+  /// In en, this message translates to:
+  /// **'Backup source'**
+  String get sources_setFallback;
+
+  /// No description provided for @sources_fallbackNone.
+  ///
+  /// In en, this message translates to:
+  /// **'None'**
+  String get sources_fallbackNone;
+
+  /// No description provided for @sources_fallbackShort.
+  ///
+  /// In en, this message translates to:
+  /// **'Backup'**
+  String get sources_fallbackShort;
+
+  /// No description provided for @sources_routeSameServerHint.
+  ///
+  /// In en, this message translates to:
+  /// **'All routes reach the same server. A route can carry its own login when that address asks for a different one.'**
+  String get sources_routeSameServerHint;
+
+  /// No description provided for @sources_routeCannotRemoveLast.
+  ///
+  /// In en, this message translates to:
+  /// **'The last route cannot be removed'**
+  String get sources_routeCannotRemoveLast;
+
+  /// No description provided for @sources_countLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =1{1 source} other{{count} sources}}'**
+  String sources_countLabel(num count);
+
+  /// No description provided for @sources_useThisShort.
+  ///
+  /// In en, this message translates to:
+  /// **'Use this'**
+  String get sources_useThisShort;
+
+  /// No description provided for @sources_stopUsingShort.
+  ///
+  /// In en, this message translates to:
+  /// **'Stop using'**
+  String get sources_stopUsingShort;
+
+  /// No description provided for @sources_removeConfirmTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove source?'**
+  String get sources_removeConfirmTitle;
+
+  /// No description provided for @sources_removeConfirmMessage.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove \"{name}\"? Its list disappears from the library, but games already downloaded to this device are kept.'**
+  String sources_removeConfirmMessage(String name);
+
+  /// No description provided for @sources_groupBadge.
+  ///
+  /// In en, this message translates to:
+  /// **'Group'**
+  String get sources_groupBadge;
+
+  /// No description provided for @sources_groupCreate.
+  ///
+  /// In en, this message translates to:
+  /// **'Group with another source…'**
+  String get sources_groupCreate;
+
+  /// No description provided for @sources_groupCreateHint.
+  ///
+  /// In en, this message translates to:
+  /// **'For two addresses that are really the same server'**
+  String get sources_groupCreateHint;
+
+  /// No description provided for @sources_groupPickMember.
+  ///
+  /// In en, this message translates to:
+  /// **'Pick the source to group with'**
+  String get sources_groupPickMember;
+
+  /// No description provided for @sources_groupSameTypeOnly.
+  ///
+  /// In en, this message translates to:
+  /// **'Only sources of the same type can be grouped'**
+  String get sources_groupSameTypeOnly;
+
+  /// No description provided for @sources_groupNoCandidates.
+  ///
+  /// In en, this message translates to:
+  /// **'No other source of this type'**
+  String get sources_groupNoCandidates;
+
+  /// No description provided for @sources_groupManage.
+  ///
+  /// In en, this message translates to:
+  /// **'Group settings'**
+  String get sources_groupManage;
+
+  /// No description provided for @sources_groupRename.
+  ///
+  /// In en, this message translates to:
+  /// **'Rename group'**
+  String get sources_groupRename;
+
+  /// No description provided for @sources_groupNameLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Group name'**
+  String get sources_groupNameLabel;
+
+  /// No description provided for @sources_groupModeTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Which member to use'**
+  String get sources_groupModeTitle;
+
+  /// No description provided for @sources_groupModeAuto.
+  ///
+  /// In en, this message translates to:
+  /// **'Automatic'**
+  String get sources_groupModeAuto;
+
+  /// No description provided for @sources_groupModeAutoHint.
+  ///
+  /// In en, this message translates to:
+  /// **'No order to keep — the address that replies first is the one you can use first'**
+  String get sources_groupModeAutoHint;
+
+  /// No description provided for @sources_groupModeOrdered.
+  ///
+  /// In en, this message translates to:
+  /// **'My order'**
+  String get sources_groupModeOrdered;
+
+  /// No description provided for @sources_groupModeOrderedHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Takes the first one in your order that answers'**
+  String get sources_groupModeOrderedHint;
+
+  /// No description provided for @sources_groupPreferred.
+  ///
+  /// In en, this message translates to:
+  /// **'First choice'**
+  String get sources_groupPreferred;
+
+  /// No description provided for @sources_groupAddMember.
+  ///
+  /// In en, this message translates to:
+  /// **'Add a source'**
+  String get sources_groupAddMember;
+
+  /// No description provided for @sources_groupLeave.
+  ///
+  /// In en, this message translates to:
+  /// **'Leave the group'**
+  String get sources_groupLeave;
+
+  /// No description provided for @sources_groupLeaveConfirm.
+  ///
+  /// In en, this message translates to:
+  /// **'{name} keeps no games and has to sync again. The shared list stays with the group.'**
+  String sources_groupLeaveConfirm(String name);
+
+  /// No description provided for @sources_groupLeaveTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Leave the group?'**
+  String get sources_groupLeaveTitle;
+
+  /// No description provided for @sources_groupDissolve.
+  ///
+  /// In en, this message translates to:
+  /// **'Dissolve the group'**
+  String get sources_groupDissolve;
+
+  /// No description provided for @sources_groupDissolveConfirm.
+  ///
+  /// In en, this message translates to:
+  /// **'{name} keeps the shared list; the others have to sync again.'**
+  String sources_groupDissolveConfirm(String name);
+
+  /// No description provided for @sources_groupDissolveTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Dissolve the group?'**
+  String get sources_groupDissolveTitle;
+
+  /// No description provided for @sources_groupMembersCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} sources'**
+  String sources_groupMembersCount(int count);
+
+  /// No description provided for @sources_groupUsing.
+  ///
+  /// In en, this message translates to:
+  /// **'Using {name}'**
+  String sources_groupUsing(String name);
+
+  /// No description provided for @sources_moveUp.
+  ///
+  /// In en, this message translates to:
+  /// **'Move up'**
+  String get sources_moveUp;
+
+  /// No description provided for @sources_moveDown.
+  ///
+  /// In en, this message translates to:
+  /// **'Move down'**
+  String get sources_moveDown;
+
+  /// No description provided for @sources_routeOrdered.
+  ///
+  /// In en, this message translates to:
+  /// **'My order'**
+  String get sources_routeOrdered;
+
+  /// No description provided for @sources_routeOrderedHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Use the first route in your order that answers'**
+  String get sources_routeOrderedHint;
+
+  /// No description provided for @sources_reorderHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Move it with up and down, then press again to finish'**
+  String get sources_reorderHint;
+
+  /// No description provided for @sources_groupMemberHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Press ▶ to send it out of the group; [A] reorders'**
+  String get sources_groupMemberHint;
+
+  /// No description provided for @sources_routeRowHint.
+  ///
+  /// In en, this message translates to:
+  /// **'Select the row to reorder it; press ▶ for the icons: edit or remove'**
+  String get sources_routeRowHint;
+
+  /// No description provided for @sources_routeUse.
+  ///
+  /// In en, this message translates to:
+  /// **'Use this route'**
+  String get sources_routeUse;
+
+  /// No description provided for @sources_routeLock.
+  ///
+  /// In en, this message translates to:
+  /// **'Lock to this route'**
+  String get sources_routeLock;
+
+  /// No description provided for @sources_routeUnlock.
+  ///
+  /// In en, this message translates to:
+  /// **'Unlock'**
+  String get sources_routeUnlock;
+
+  /// No description provided for @sources_removeRouteConfirm.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove “{name}”? The games cached for this source stay; only the address goes.'**
+  String sources_removeRouteConfirm(String name);
 }
 
 class _LDelegate extends LocalizationsDelegate<L> {
@@ -3055,7 +3507,8 @@ class _LDelegate extends LocalizationsDelegate<L> {
         'es',
         'fr',
         'ja',
-        'pt'
+        'pt',
+        'zh'
       ].contains(locale.languageCode);
 
   @override
@@ -3077,6 +3530,8 @@ L lookupL(Locale locale) {
       return LJa();
     case 'pt':
       return LPt();
+    case 'zh':
+      return LZh();
   }
 
   throw FlutterError(
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index cb8f22e..4511186 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -1284,6 +1284,16 @@ class LDe extends L {
   @override
   String get onboarding_serverType => 'Servertyp';
 
+  @override
+  String get onboarding_folderExplanationTitle => 'Bibliothekspfad einrichten';
+
+  @override
+  String get onboarding_folderExplanationMessage =>
+      'R-Shop braucht einen Basisordner, um deine heruntergeladenen Spiele zu speichern. Das hilft beim Ordnen deiner Dateien und ist für die Android-Ordnerberechtigungen erforderlich.\n\nWir empfehlen, einen Ordner namens \'ROMs\' anzulegen und ihn auszuwählen.';
+
+  @override
+  String get onboarding_continueToPicker => 'Ordner wählen';
+
   @override
   String get onboarding_hangOn => 'Moment, teste die Verbindung...';
 
@@ -1622,4 +1632,258 @@ class LDe extends L {
   String service_queuedCount(int count) {
     return '$count in Warteschlange';
   }
+
+  @override
+  String get sources_connectionRoute => 'Verbindungsweg';
+
+  @override
+  String get sources_routeAuto => 'Automatisch';
+
+  @override
+  String get sources_routeAutoHint =>
+      'Den schnellsten Weg nutzen, der antwortet – wird bei Netzwechsel neu geprüft';
+
+  @override
+  String get sources_routeInUse => 'In Verwendung';
+
+  @override
+  String get sources_routePinned => 'Gesperrt';
+
+  @override
+  String get sources_routeReachable => 'Erreichbar';
+
+  @override
+  String get sources_routeNoAnswer => 'Keine Antwort';
+
+  @override
+  String get sources_routeChecking => 'Wird geprüft…';
+
+  @override
+  String sources_routeLatencyMs(int ms) {
+    return '$ms ms';
+  }
+
+  @override
+  String sources_routeAutoPicks(String route) {
+    return 'Würde $route nutzen';
+  }
+
+  @override
+  String get sources_routeAutoNoneReachable => 'Nichts hat geantwortet';
+
+  @override
+  String get sources_routeFastest => 'Am schnellsten';
+
+  @override
+  String get sources_routeReleasePin =>
+      'Hebt die Sperre auf und wählt wieder den schnellsten Weg';
+
+  @override
+  String get sources_routeOwnLogin => 'Eigene Anmeldung';
+
+  @override
+  String get sources_routeAuthTitle => 'Anmeldung für diesen Weg';
+
+  @override
+  String get sources_routeAuthHint =>
+      'Leer lassen, um die Anmeldung der Quelle zu nutzen. Nur ausfüllen, wenn diese Adresse eine andere verlangt.';
+
+  @override
+  String get sources_routeAuthInherited => 'Nutzt die Anmeldung der Quelle';
+
+  @override
+  String get sources_routeAuthOwn => 'Dieser Weg meldet sich selbst an';
+
+  @override
+  String get sources_routeOnlyOne => 'Diese Quelle hat nur einen Weg';
+
+  @override
+  String get sources_addRoute => 'Weg hinzufügen';
+
+  @override
+  String get sources_editRoute => 'Weg bearbeiten';
+
+  @override
+  String get sources_removeRoute => 'Weg entfernen';
+
+  @override
+  String get sources_routeDuplicate =>
+      'Diese Quelle hat bereits einen Weg zu dieser Adresse';
+
+  @override
+  String get sources_activeSource => 'In Verwendung';
+
+  @override
+  String get sources_switchSource => 'Quelle wechseln';
+
+  @override
+  String get sources_prevSource => 'Vorherige Quelle';
+
+  @override
+  String get sources_nextSource => 'Nächste Quelle';
+
+  @override
+  String get sources_setFallback => 'Ersatzquelle';
+
+  @override
+  String get sources_fallbackNone => 'Keine';
+
+  @override
+  String get sources_fallbackShort => 'Ersatz';
+
+  @override
+  String get sources_routeSameServerHint =>
+      'Alle Wege erreichen denselben Server. Ein Weg kann eine eigene Anmeldung mitbringen, wenn diese Adresse eine andere verlangt.';
+
+  @override
+  String get sources_routeCannotRemoveLast =>
+      'Der letzte Weg kann nicht entfernt werden';
+
+  @override
+  String sources_countLabel(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count Quellen',
+      one: '1 Quelle',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get sources_useThisShort => 'Diese nutzen';
+
+  @override
+  String get sources_stopUsingShort => 'Nicht mehr nutzen';
+
+  @override
+  String get sources_removeConfirmTitle => 'Quelle entfernen?';
+
+  @override
+  String sources_removeConfirmMessage(String name) {
+    return '\"$name\" entfernen? Ihre Liste verschwindet aus der Bibliothek, bereits heruntergeladene Spiele bleiben erhalten.';
+  }
+
+  @override
+  String get sources_groupBadge => 'Gruppe';
+
+  @override
+  String get sources_groupCreate => 'Mit einer anderen Quelle gruppieren…';
+
+  @override
+  String get sources_groupCreateHint =>
+      'Für zwei Adressen, die in Wirklichkeit derselbe Server sind';
+
+  @override
+  String get sources_groupPickMember => 'Quelle zum Gruppieren wählen';
+
+  @override
+  String get sources_groupSameTypeOnly =>
+      'Nur Quellen desselben Typs lassen sich gruppieren';
+
+  @override
+  String get sources_groupNoCandidates => 'Keine weitere Quelle dieses Typs';
+
+  @override
+  String get sources_groupManage => 'Gruppeneinstellungen';
+
+  @override
+  String get sources_groupRename => 'Gruppe umbenennen';
+
+  @override
+  String get sources_groupNameLabel => 'Gruppenname';
+
+  @override
+  String get sources_groupModeTitle => 'Welches Mitglied genutzt wird';
+
+  @override
+  String get sources_groupModeAuto => 'Automatisch';
+
+  @override
+  String get sources_groupModeAutoHint =>
+      'Keine Reihenfolge zu pflegen – die Adresse, die zuerst antwortet, ist die zuerst nutzbare';
+
+  @override
+  String get sources_groupModeOrdered => 'Meine Reihenfolge';
+
+  @override
+  String get sources_groupModeOrderedHint =>
+      'Nimmt die erste in deiner Reihenfolge, die antwortet';
+
+  @override
+  String get sources_groupPreferred => 'Erste Wahl';
+
+  @override
+  String get sources_groupAddMember => 'Quelle hinzufügen';
+
+  @override
+  String get sources_groupLeave => 'Gruppe verlassen';
+
+  @override
+  String sources_groupLeaveConfirm(String name) {
+    return '„$name“ behält keine Spiele und muss neu synchronisieren. Die gemeinsame Liste bleibt bei der Gruppe.';
+  }
+
+  @override
+  String get sources_groupLeaveTitle => 'Gruppe verlassen?';
+
+  @override
+  String get sources_groupDissolve => 'Gruppe auflösen';
+
+  @override
+  String sources_groupDissolveConfirm(String name) {
+    return 'Die gemeinsame Liste bleibt bei „$name“; die anderen synchronisieren neu.';
+  }
+
+  @override
+  String get sources_groupDissolveTitle => 'Gruppe auflösen?';
+
+  @override
+  String sources_groupMembersCount(int count) {
+    return '$count Quellen';
+  }
+
+  @override
+  String sources_groupUsing(String name) {
+    return 'Nutzt „$name“';
+  }
+
+  @override
+  String get sources_moveUp => 'Nach oben';
+
+  @override
+  String get sources_moveDown => 'Nach unten';
+
+  @override
+  String get sources_routeOrdered => 'Meine Reihenfolge';
+
+  @override
+  String get sources_routeOrderedHint =>
+      'Den ersten Weg in deiner Reihenfolge nutzen, der antwortet';
+
+  @override
+  String get sources_reorderHint =>
+      'Mit Auf und Ab verschieben, dann nochmals drücken zum Beenden';
+
+  @override
+  String get sources_groupMemberHint =>
+      '▶ nimmt sie aus der Gruppe, [A] sortiert';
+
+  @override
+  String get sources_routeRowHint =>
+      'Zeile auswählen zum Umsortieren; ▶ für die Symbole: bearbeiten oder entfernen';
+
+  @override
+  String get sources_routeUse => 'Diesen Weg nutzen';
+
+  @override
+  String get sources_routeLock => 'Auf diese Route sperren';
+
+  @override
+  String get sources_routeUnlock => 'Sperre aufheben';
+
+  @override
+  String sources_removeRouteConfirm(String name) {
+    return '„$name“ entfernen? Die zwischengespeicherten Spiele bleiben, nur die Adresse verschwindet.';
+  }
 }
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 20b4fff..21271ef 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -1276,6 +1276,16 @@ class LEn extends L {
   @override
   String get onboarding_serverType => 'Server type';
 
+  @override
+  String get onboarding_folderExplanationTitle => 'Setup your Library Path';
+
+  @override
+  String get onboarding_folderExplanationMessage =>
+      'R-Shop needs a base folder to store your downloaded games. This helps organize your files and is required for Android folder permissions.\n\nWe recommend creating a folder named \'ROMs\' and selecting it.';
+
+  @override
+  String get onboarding_continueToPicker => 'Select Folder';
+
   @override
   String get onboarding_hangOn => 'Hang on, testing the connection...';
 
@@ -1611,4 +1621,258 @@ class LEn extends L {
   String service_queuedCount(int count) {
     return '$count queued';
   }
+
+  @override
+  String get sources_connectionRoute => 'Connection route';
+
+  @override
+  String get sources_routeAuto => 'Automatic';
+
+  @override
+  String get sources_routeAutoHint =>
+      'Use the fastest route that answers, re-checked as the network changes';
+
+  @override
+  String get sources_routeInUse => 'In use';
+
+  @override
+  String get sources_routePinned => 'Locked';
+
+  @override
+  String get sources_routeReachable => 'Reachable';
+
+  @override
+  String get sources_routeNoAnswer => 'No answer';
+
+  @override
+  String get sources_routeChecking => 'Checking…';
+
+  @override
+  String sources_routeLatencyMs(int ms) {
+    return '$ms ms';
+  }
+
+  @override
+  String sources_routeAutoPicks(String route) {
+    return 'Would use $route';
+  }
+
+  @override
+  String get sources_routeAutoNoneReachable => 'Nothing answered';
+
+  @override
+  String get sources_routeFastest => 'Fastest';
+
+  @override
+  String get sources_routeReleasePin =>
+      'Drops the lock and re-picks the fastest';
+
+  @override
+  String get sources_routeOwnLogin => 'Own login';
+
+  @override
+  String get sources_routeAuthTitle => 'Login for this route';
+
+  @override
+  String get sources_routeAuthHint =>
+      'Leave blank to use the source\'s login. Fill it in only when this address asks for a different one.';
+
+  @override
+  String get sources_routeAuthInherited => 'Using the source\'s login';
+
+  @override
+  String get sources_routeAuthOwn => 'This route logs in on its own';
+
+  @override
+  String get sources_routeOnlyOne => 'This source has only one route';
+
+  @override
+  String get sources_addRoute => 'Add route';
+
+  @override
+  String get sources_editRoute => 'Edit route';
+
+  @override
+  String get sources_removeRoute => 'Remove route';
+
+  @override
+  String get sources_routeDuplicate =>
+      'This source already has a route to that address';
+
+  @override
+  String get sources_activeSource => 'In use';
+
+  @override
+  String get sources_switchSource => 'Switch source';
+
+  @override
+  String get sources_prevSource => 'Prev source';
+
+  @override
+  String get sources_nextSource => 'Next source';
+
+  @override
+  String get sources_setFallback => 'Backup source';
+
+  @override
+  String get sources_fallbackNone => 'None';
+
+  @override
+  String get sources_fallbackShort => 'Backup';
+
+  @override
+  String get sources_routeSameServerHint =>
+      'All routes reach the same server. A route can carry its own login when that address asks for a different one.';
+
+  @override
+  String get sources_routeCannotRemoveLast =>
+      'The last route cannot be removed';
+
+  @override
+  String sources_countLabel(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count sources',
+      one: '1 source',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get sources_useThisShort => 'Use this';
+
+  @override
+  String get sources_stopUsingShort => 'Stop using';
+
+  @override
+  String get sources_removeConfirmTitle => 'Remove source?';
+
+  @override
+  String sources_removeConfirmMessage(String name) {
+    return 'Remove \"$name\"? Its list disappears from the library, but games already downloaded to this device are kept.';
+  }
+
+  @override
+  String get sources_groupBadge => 'Group';
+
+  @override
+  String get sources_groupCreate => 'Group with another source…';
+
+  @override
+  String get sources_groupCreateHint =>
+      'For two addresses that are really the same server';
+
+  @override
+  String get sources_groupPickMember => 'Pick the source to group with';
+
+  @override
+  String get sources_groupSameTypeOnly =>
+      'Only sources of the same type can be grouped';
+
+  @override
+  String get sources_groupNoCandidates => 'No other source of this type';
+
+  @override
+  String get sources_groupManage => 'Group settings';
+
+  @override
+  String get sources_groupRename => 'Rename group';
+
+  @override
+  String get sources_groupNameLabel => 'Group name';
+
+  @override
+  String get sources_groupModeTitle => 'Which member to use';
+
+  @override
+  String get sources_groupModeAuto => 'Automatic';
+
+  @override
+  String get sources_groupModeAutoHint =>
+      'No order to keep — the address that replies first is the one you can use first';
+
+  @override
+  String get sources_groupModeOrdered => 'My order';
+
+  @override
+  String get sources_groupModeOrderedHint =>
+      'Takes the first one in your order that answers';
+
+  @override
+  String get sources_groupPreferred => 'First choice';
+
+  @override
+  String get sources_groupAddMember => 'Add a source';
+
+  @override
+  String get sources_groupLeave => 'Leave the group';
+
+  @override
+  String sources_groupLeaveConfirm(String name) {
+    return '$name keeps no games and has to sync again. The shared list stays with the group.';
+  }
+
+  @override
+  String get sources_groupLeaveTitle => 'Leave the group?';
+
+  @override
+  String get sources_groupDissolve => 'Dissolve the group';
+
+  @override
+  String sources_groupDissolveConfirm(String name) {
+    return '$name keeps the shared list; the others have to sync again.';
+  }
+
+  @override
+  String get sources_groupDissolveTitle => 'Dissolve the group?';
+
+  @override
+  String sources_groupMembersCount(int count) {
+    return '$count sources';
+  }
+
+  @override
+  String sources_groupUsing(String name) {
+    return 'Using $name';
+  }
+
+  @override
+  String get sources_moveUp => 'Move up';
+
+  @override
+  String get sources_moveDown => 'Move down';
+
+  @override
+  String get sources_routeOrdered => 'My order';
+
+  @override
+  String get sources_routeOrderedHint =>
+      'Use the first route in your order that answers';
+
+  @override
+  String get sources_reorderHint =>
+      'Move it with up and down, then press again to finish';
+
+  @override
+  String get sources_groupMemberHint =>
+      'Press ▶ to send it out of the group; [A] reorders';
+
+  @override
+  String get sources_routeRowHint =>
+      'Select the row to reorder it; press ▶ for the icons: edit or remove';
+
+  @override
+  String get sources_routeUse => 'Use this route';
+
+  @override
+  String get sources_routeLock => 'Lock to this route';
+
+  @override
+  String get sources_routeUnlock => 'Unlock';
+
+  @override
+  String sources_removeRouteConfirm(String name) {
+    return 'Remove “$name”? The games cached for this source stay; only the address goes.';
+  }
 }
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 2e6cd7e..a939113 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -1284,6 +1284,17 @@ class LEs extends L {
   @override
   String get onboarding_serverType => 'Tipo de servidor';
 
+  @override
+  String get onboarding_folderExplanationTitle =>
+      'Configura la ruta de tu biblioteca';
+
+  @override
+  String get onboarding_folderExplanationMessage =>
+      'R-Shop necesita una carpeta base para guardar los juegos que descargues. Esto ayuda a organizar tus archivos y es necesario para los permisos de carpetas de Android.\n\nTe recomendamos crear una carpeta llamada \'ROMs\' y seleccionarla.';
+
+  @override
+  String get onboarding_continueToPicker => 'Seleccionar carpeta';
+
   @override
   String get onboarding_hangOn => 'Un momento, probando la conexión...';
 
@@ -1621,4 +1632,258 @@ class LEs extends L {
   String service_queuedCount(int count) {
     return '$count en cola';
   }
+
+  @override
+  String get sources_connectionRoute => 'Ruta de conexión';
+
+  @override
+  String get sources_routeAuto => 'Automático';
+
+  @override
+  String get sources_routeAutoHint =>
+      'Usar la ruta más rápida que responda; se comprueba de nuevo cuando cambia la red';
+
+  @override
+  String get sources_routeInUse => 'En uso';
+
+  @override
+  String get sources_routePinned => 'Bloqueada';
+
+  @override
+  String get sources_routeReachable => 'Accesible';
+
+  @override
+  String get sources_routeNoAnswer => 'Sin respuesta';
+
+  @override
+  String get sources_routeChecking => 'Comprobando…';
+
+  @override
+  String sources_routeLatencyMs(int ms) {
+    return '$ms ms';
+  }
+
+  @override
+  String sources_routeAutoPicks(String route) {
+    return 'Usaría $route';
+  }
+
+  @override
+  String get sources_routeAutoNoneReachable => 'No respondió ninguna';
+
+  @override
+  String get sources_routeFastest => 'La más rápida';
+
+  @override
+  String get sources_routeReleasePin =>
+      'Quita el bloqueo y vuelve a elegir la más rápida';
+
+  @override
+  String get sources_routeOwnLogin => 'Inicio de sesión propio';
+
+  @override
+  String get sources_routeAuthTitle => 'Inicio de sesión de esta ruta';
+
+  @override
+  String get sources_routeAuthHint =>
+      'Déjalo en blanco para usar el inicio de sesión de la fuente. Rellénalo solo si esta dirección pide otro.';
+
+  @override
+  String get sources_routeAuthInherited =>
+      'Usa el inicio de sesión de la fuente';
+
+  @override
+  String get sources_routeAuthOwn => 'Esta ruta inicia sesión por su cuenta';
+
+  @override
+  String get sources_routeOnlyOne => 'Esta fuente solo tiene una ruta';
+
+  @override
+  String get sources_addRoute => 'Añadir ruta';
+
+  @override
+  String get sources_editRoute => 'Editar ruta';
+
+  @override
+  String get sources_removeRoute => 'Eliminar ruta';
+
+  @override
+  String get sources_routeDuplicate =>
+      'Esta fuente ya tiene una ruta a esa dirección';
+
+  @override
+  String get sources_activeSource => 'En uso';
+
+  @override
+  String get sources_switchSource => 'Cambiar fuente';
+
+  @override
+  String get sources_prevSource => 'Fuente anterior';
+
+  @override
+  String get sources_nextSource => 'Fuente siguiente';
+
+  @override
+  String get sources_setFallback => 'Fuente de respaldo';
+
+  @override
+  String get sources_fallbackNone => 'Ninguna';
+
+  @override
+  String get sources_fallbackShort => 'Respaldo';
+
+  @override
+  String get sources_routeSameServerHint =>
+      'Todas las rutas llegan al mismo servidor. Una ruta puede llevar su propio inicio de sesión si esa dirección pide otro.';
+
+  @override
+  String get sources_routeCannotRemoveLast =>
+      'No se puede eliminar la última ruta';
+
+  @override
+  String sources_countLabel(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count fuentes',
+      one: '1 fuente',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get sources_useThisShort => 'Usar esta';
+
+  @override
+  String get sources_stopUsingShort => 'Dejar de usar';
+
+  @override
+  String get sources_removeConfirmTitle => '¿Eliminar la fuente?';
+
+  @override
+  String sources_removeConfirmMessage(String name) {
+    return '¿Eliminar \"$name\"? Su lista desaparece de la biblioteca, pero los juegos ya descargados en este dispositivo se conservan.';
+  }
+
+  @override
+  String get sources_groupBadge => 'Grupo';
+
+  @override
+  String get sources_groupCreate => 'Agrupar con otra fuente…';
+
+  @override
+  String get sources_groupCreateHint =>
+      'Para dos direcciones que en realidad son el mismo servidor';
+
+  @override
+  String get sources_groupPickMember => 'Elige la fuente con la que agrupar';
+
+  @override
+  String get sources_groupSameTypeOnly =>
+      'Solo se pueden agrupar fuentes del mismo tipo';
+
+  @override
+  String get sources_groupNoCandidates => 'No hay otra fuente de este tipo';
+
+  @override
+  String get sources_groupManage => 'Ajustes del grupo';
+
+  @override
+  String get sources_groupRename => 'Renombrar grupo';
+
+  @override
+  String get sources_groupNameLabel => 'Nombre del grupo';
+
+  @override
+  String get sources_groupModeTitle => 'Qué miembro se usa';
+
+  @override
+  String get sources_groupModeAuto => 'Automático';
+
+  @override
+  String get sources_groupModeAutoHint =>
+      'Sin orden que mantener: la dirección que responde antes es la que puedes usar antes';
+
+  @override
+  String get sources_groupModeOrdered => 'Mi orden';
+
+  @override
+  String get sources_groupModeOrderedHint =>
+      'Usa la primera de tu orden que responda';
+
+  @override
+  String get sources_groupPreferred => 'Primera opción';
+
+  @override
+  String get sources_groupAddMember => 'Añadir una fuente';
+
+  @override
+  String get sources_groupLeave => 'Salir del grupo';
+
+  @override
+  String sources_groupLeaveConfirm(String name) {
+    return '«$name» no conserva ningún juego y tendrá que sincronizar de nuevo. La lista compartida se queda en el grupo.';
+  }
+
+  @override
+  String get sources_groupLeaveTitle => '¿Salir del grupo?';
+
+  @override
+  String get sources_groupDissolve => 'Deshacer el grupo';
+
+  @override
+  String sources_groupDissolveConfirm(String name) {
+    return 'La lista compartida se queda con «$name»; las demás tendrán que sincronizar de nuevo.';
+  }
+
+  @override
+  String get sources_groupDissolveTitle => '¿Deshacer el grupo?';
+
+  @override
+  String sources_groupMembersCount(int count) {
+    return '$count fuentes';
+  }
+
+  @override
+  String sources_groupUsing(String name) {
+    return 'Usando «$name»';
+  }
+
+  @override
+  String get sources_moveUp => 'Subir';
+
+  @override
+  String get sources_moveDown => 'Bajar';
+
+  @override
+  String get sources_routeOrdered => 'Mi orden';
+
+  @override
+  String get sources_routeOrderedHint =>
+      'Usar la primera ruta de tu orden que responda';
+
+  @override
+  String get sources_reorderHint =>
+      'Muévelo con arriba y abajo, y pulsa otra vez para terminar';
+
+  @override
+  String get sources_groupMemberHint => '▶ la saca del grupo; [A] reordena';
+
+  @override
+  String get sources_routeRowHint =>
+      'Selecciona la fila para reordenarla; pulsa ▶ para los iconos: editar o quitar';
+
+  @override
+  String get sources_routeUse => 'Usar esta ruta';
+
+  @override
+  String get sources_routeLock => 'Bloquear en esta ruta';
+
+  @override
+  String get sources_routeUnlock => 'Desbloquear';
+
+  @override
+  String sources_removeRouteConfirm(String name) {
+    return '¿Quitar «$name»? Los juegos en caché de esta fuente se quedan; solo desaparece la dirección.';
+  }
 }
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index 7366cef..7bf3277 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -1285,6 +1285,17 @@ class LFr extends L {
   @override
   String get onboarding_serverType => 'Type de serveur';
 
+  @override
+  String get onboarding_folderExplanationTitle =>
+      'Configure le chemin de ta bibliothèque';
+
+  @override
+  String get onboarding_folderExplanationMessage =>
+      'R-Shop a besoin d\'un dossier de base pour stocker les jeux que tu télécharges. Cela aide à organiser tes fichiers et c\'est indispensable pour les autorisations de dossier d\'Android.\n\nNous te conseillons de créer un dossier nommé \'ROMs\' et de le sélectionner.';
+
+  @override
+  String get onboarding_continueToPicker => 'Choisir le dossier';
+
   @override
   String get onboarding_hangOn => 'Un instant, test de la connexion...';
 
@@ -1623,4 +1634,258 @@ class LFr extends L {
   String service_queuedCount(int count) {
     return '$count en attente';
   }
+
+  @override
+  String get sources_connectionRoute => 'Voie de connexion';
+
+  @override
+  String get sources_routeAuto => 'Automatique';
+
+  @override
+  String get sources_routeAutoHint =>
+      'Utiliser la voie la plus rapide qui répond, revérifiée quand le réseau change';
+
+  @override
+  String get sources_routeInUse => 'Utilisée';
+
+  @override
+  String get sources_routePinned => 'Verrouillée';
+
+  @override
+  String get sources_routeReachable => 'Joignable';
+
+  @override
+  String get sources_routeNoAnswer => 'Sans réponse';
+
+  @override
+  String get sources_routeChecking => 'Vérification…';
+
+  @override
+  String sources_routeLatencyMs(int ms) {
+    return '$ms ms';
+  }
+
+  @override
+  String sources_routeAutoPicks(String route) {
+    return 'Utiliserait $route';
+  }
+
+  @override
+  String get sources_routeAutoNoneReachable => 'Rien n\'a répondu';
+
+  @override
+  String get sources_routeFastest => 'La plus rapide';
+
+  @override
+  String get sources_routeReleasePin =>
+      'Déverrouille et resélectionne la plus rapide';
+
+  @override
+  String get sources_routeOwnLogin => 'Connexion dédiée';
+
+  @override
+  String get sources_routeAuthTitle => 'Connexion pour cette voie';
+
+  @override
+  String get sources_routeAuthHint =>
+      'Laisser vide pour utiliser la connexion de la source. À remplir uniquement si cette adresse en demande une autre.';
+
+  @override
+  String get sources_routeAuthInherited => 'Utilise la connexion de la source';
+
+  @override
+  String get sources_routeAuthOwn =>
+      'Cette voie se connecte avec ses propres identifiants';
+
+  @override
+  String get sources_routeOnlyOne => 'Cette source n\'a qu\'une seule voie';
+
+  @override
+  String get sources_addRoute => 'Ajouter une voie';
+
+  @override
+  String get sources_editRoute => 'Modifier la voie';
+
+  @override
+  String get sources_removeRoute => 'Supprimer la voie';
+
+  @override
+  String get sources_routeDuplicate =>
+      'Cette source a déjà une voie vers cette adresse';
+
+  @override
+  String get sources_activeSource => 'En cours d\'utilisation';
+
+  @override
+  String get sources_switchSource => 'Changer de source';
+
+  @override
+  String get sources_prevSource => 'Source préc.';
+
+  @override
+  String get sources_nextSource => 'Source suiv.';
+
+  @override
+  String get sources_setFallback => 'Source de secours';
+
+  @override
+  String get sources_fallbackNone => 'Aucune';
+
+  @override
+  String get sources_fallbackShort => 'Secours';
+
+  @override
+  String get sources_routeSameServerHint =>
+      'Toutes les voies mènent au même serveur. Une voie peut avoir sa propre connexion si cette adresse en demande une autre.';
+
+  @override
+  String get sources_routeCannotRemoveLast =>
+      'La dernière voie ne peut pas être supprimée';
+
+  @override
+  String sources_countLabel(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count sources',
+      one: '1 source',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get sources_useThisShort => 'Utiliser celle-ci';
+
+  @override
+  String get sources_stopUsingShort => 'Ne plus utiliser';
+
+  @override
+  String get sources_removeConfirmTitle => 'Supprimer la source ?';
+
+  @override
+  String sources_removeConfirmMessage(String name) {
+    return 'Supprimer « $name » ? Sa liste disparaît de la bibliothèque, mais les jeux déjà téléchargés sur cet appareil sont conservés.';
+  }
+
+  @override
+  String get sources_groupBadge => 'Groupe';
+
+  @override
+  String get sources_groupCreate => 'Grouper avec une autre source…';
+
+  @override
+  String get sources_groupCreateHint =>
+      'Pour deux adresses qui sont en réalité le même serveur';
+
+  @override
+  String get sources_groupPickMember => 'Choisissez la source à grouper';
+
+  @override
+  String get sources_groupSameTypeOnly =>
+      'Seules des sources du même type peuvent être groupées';
+
+  @override
+  String get sources_groupNoCandidates => 'Aucune autre source de ce type';
+
+  @override
+  String get sources_groupManage => 'Réglages du groupe';
+
+  @override
+  String get sources_groupRename => 'Renommer le groupe';
+
+  @override
+  String get sources_groupNameLabel => 'Nom du groupe';
+
+  @override
+  String get sources_groupModeTitle => 'Quel membre utiliser';
+
+  @override
+  String get sources_groupModeAuto => 'Automatique';
+
+  @override
+  String get sources_groupModeAutoHint =>
+      'Aucun ordre à tenir : l\'adresse qui répond en premier est la première utilisable';
+
+  @override
+  String get sources_groupModeOrdered => 'Mon ordre';
+
+  @override
+  String get sources_groupModeOrderedHint =>
+      'Prend le premier de votre ordre qui répond';
+
+  @override
+  String get sources_groupPreferred => 'Premier choix';
+
+  @override
+  String get sources_groupAddMember => 'Ajouter une source';
+
+  @override
+  String get sources_groupLeave => 'Quitter le groupe';
+
+  @override
+  String sources_groupLeaveConfirm(String name) {
+    return '« $name » ne garde aucun jeu et devra se synchroniser à nouveau. La liste partagée reste au groupe.';
+  }
+
+  @override
+  String get sources_groupLeaveTitle => 'Quitter le groupe ?';
+
+  @override
+  String get sources_groupDissolve => 'Dissoudre le groupe';
+
+  @override
+  String sources_groupDissolveConfirm(String name) {
+    return 'La liste partagée reste à « $name » ; les autres devront se synchroniser à nouveau.';
+  }
+
+  @override
+  String get sources_groupDissolveTitle => 'Dissoudre le groupe ?';
+
+  @override
+  String sources_groupMembersCount(int count) {
+    return '$count sources';
+  }
+
+  @override
+  String sources_groupUsing(String name) {
+    return 'Utilise « $name »';
+  }
+
+  @override
+  String get sources_moveUp => 'Monter';
+
+  @override
+  String get sources_moveDown => 'Descendre';
+
+  @override
+  String get sources_routeOrdered => 'Mon ordre';
+
+  @override
+  String get sources_routeOrderedHint =>
+      'Utiliser la première route de votre ordre qui répond';
+
+  @override
+  String get sources_reorderHint =>
+      'Déplacez-le avec haut et bas, puis appuyez à nouveau pour terminer';
+
+  @override
+  String get sources_groupMemberHint => '▶ la sort du groupe ; [A] réordonne';
+
+  @override
+  String get sources_routeRowHint =>
+      'Sélectionnez la ligne pour la déplacer ; ▶ pour les icônes : modifier ou supprimer';
+
+  @override
+  String get sources_routeUse => 'Utiliser cette route';
+
+  @override
+  String get sources_routeLock => 'Verrouiller sur cette route';
+
+  @override
+  String get sources_routeUnlock => 'Déverrouiller';
+
+  @override
+  String sources_removeRouteConfirm(String name) {
+    return 'Supprimer « $name » ? La liste en cache de cette source reste ; seule l\'adresse disparaît.';
+  }
 }
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 549f14f..c3de743 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -1253,6 +1253,16 @@ class LJa extends L {
   @override
   String get onboarding_serverType => 'サーバータイプ';
 
+  @override
+  String get onboarding_folderExplanationTitle => 'ライブラリのパスを設定';
+
+  @override
+  String get onboarding_folderExplanationMessage =>
+      'R-Shop はダウンロードしたゲームを保存するベースフォルダが必要です。ファイルの整理に役立ち、Android のフォルダ権限にも必要です。\n\n「ROMs」という名前のフォルダを作成して選択することをおすすめします。';
+
+  @override
+  String get onboarding_continueToPicker => 'フォルダを選択';
+
   @override
   String get onboarding_hangOn => 'ちょっと待ってね、接続テスト中...';
 
@@ -1574,4 +1584,240 @@ class LJa extends L {
   String service_queuedCount(int count) {
     return '$count件キュー中';
   }
+
+  @override
+  String get sources_connectionRoute => '接続経路';
+
+  @override
+  String get sources_routeAuto => '自動選択';
+
+  @override
+  String get sources_routeAutoHint => '応答が最も速い経路を使用（ネットワークが変わると選び直します）';
+
+  @override
+  String get sources_routeInUse => '使用中';
+
+  @override
+  String get sources_routePinned => 'ロック中';
+
+  @override
+  String get sources_routeReachable => '接続可能';
+
+  @override
+  String get sources_routeNoAnswer => '応答なし';
+
+  @override
+  String get sources_routeChecking => '確認中…';
+
+  @override
+  String sources_routeLatencyMs(int ms) {
+    return '$ms ms';
+  }
+
+  @override
+  String sources_routeAutoPicks(String route) {
+    return '「$route」を使用します';
+  }
+
+  @override
+  String get sources_routeAutoNoneReachable => '応答した経路がありません';
+
+  @override
+  String get sources_routeFastest => '最速';
+
+  @override
+  String get sources_routeReleasePin => 'ロックを解除して最速の経路を選び直します';
+
+  @override
+  String get sources_routeOwnLogin => '専用ログイン';
+
+  @override
+  String get sources_routeAuthTitle => 'この経路のログイン情報';
+
+  @override
+  String get sources_routeAuthHint =>
+      '空欄にすると提供元のログイン情報を使います。このアドレスが別のログインを求める場合のみ入力してください。';
+
+  @override
+  String get sources_routeAuthInherited => '提供元のログイン情報を使用中';
+
+  @override
+  String get sources_routeAuthOwn => 'この経路は独自のログイン情報を使用します';
+
+  @override
+  String get sources_routeOnlyOne => 'この提供元の経路は1つだけです';
+
+  @override
+  String get sources_addRoute => '経路を追加';
+
+  @override
+  String get sources_editRoute => '経路を編集';
+
+  @override
+  String get sources_removeRoute => 'この経路を削除';
+
+  @override
+  String get sources_routeDuplicate => 'この提供元には同じアドレスの経路がすでにあります';
+
+  @override
+  String get sources_activeSource => '使用中';
+
+  @override
+  String get sources_switchSource => '提供元切替';
+
+  @override
+  String get sources_prevSource => '前の提供元';
+
+  @override
+  String get sources_nextSource => '次の提供元';
+
+  @override
+  String get sources_setFallback => 'バックアップ提供元';
+
+  @override
+  String get sources_fallbackNone => 'なし';
+
+  @override
+  String get sources_fallbackShort => 'バックアップ';
+
+  @override
+  String get sources_routeSameServerHint =>
+      'すべての経路は同じサーバーにつながります。そのアドレスが別のログインを求める場合、経路ごとに専用のログイン情報を持たせられます。';
+
+  @override
+  String get sources_routeCannotRemoveLast => '最後の経路は削除できません';
+
+  @override
+  String sources_countLabel(num count) {
+    return '$count 件のソース';
+  }
+
+  @override
+  String get sources_useThisShort => 'この提供元を使用';
+
+  @override
+  String get sources_stopUsingShort => '使用をやめる';
+
+  @override
+  String get sources_removeConfirmTitle => 'ソースを削除しますか？';
+
+  @override
+  String sources_removeConfirmMessage(String name) {
+    return '「$name」を削除しますか？このソースの一覧はライブラリから消えますが、すでに端末にダウンロードしたゲームは残ります。';
+  }
+
+  @override
+  String get sources_groupBadge => 'グループ';
+
+  @override
+  String get sources_groupCreate => '他のソースとグループにする…';
+
+  @override
+  String get sources_groupCreateHint => '実際には同じサーバーである 2 つのアドレス向け';
+
+  @override
+  String get sources_groupPickMember => 'グループにするソースを選択';
+
+  @override
+  String get sources_groupSameTypeOnly => '同じ種類のソースだけをグループにできます';
+
+  @override
+  String get sources_groupNoCandidates => '同じ種類のソースが他にありません';
+
+  @override
+  String get sources_groupManage => 'グループ設定';
+
+  @override
+  String get sources_groupRename => 'グループ名を変更';
+
+  @override
+  String get sources_groupNameLabel => 'グループ名';
+
+  @override
+  String get sources_groupModeTitle => 'どれを使うか';
+
+  @override
+  String get sources_groupModeAuto => '自動選択';
+
+  @override
+  String get sources_groupModeAutoHint => '順序を管理する必要はありません。先に応答したアドレスが最も早く使えます';
+
+  @override
+  String get sources_groupModeOrdered => '自分の順序';
+
+  @override
+  String get sources_groupModeOrderedHint => '順序どおりに、最初に応答したものを使用';
+
+  @override
+  String get sources_groupPreferred => '第 1 候補';
+
+  @override
+  String get sources_groupAddMember => 'ソースを追加';
+
+  @override
+  String get sources_groupLeave => 'グループから外す';
+
+  @override
+  String sources_groupLeaveConfirm(String name) {
+    return '「$name」の一覧は残らず、同期し直す必要があります。共有の一覧はグループに残ります。';
+  }
+
+  @override
+  String get sources_groupLeaveTitle => 'グループから外しますか？';
+
+  @override
+  String get sources_groupDissolve => 'グループを解散';
+
+  @override
+  String sources_groupDissolveConfirm(String name) {
+    return '共有の一覧は「$name」に残り、他のソースは同期し直します。';
+  }
+
+  @override
+  String get sources_groupDissolveTitle => 'グループを解散しますか？';
+
+  @override
+  String sources_groupMembersCount(int count) {
+    return '$count 個のソース';
+  }
+
+  @override
+  String sources_groupUsing(String name) {
+    return '「$name」を使用中';
+  }
+
+  @override
+  String get sources_moveUp => '上へ移動';
+
+  @override
+  String get sources_moveDown => '下へ移動';
+
+  @override
+  String get sources_routeOrdered => '自分の順序';
+
+  @override
+  String get sources_routeOrderedHint => '順序どおりに、最初に応答した経路を使用';
+
+  @override
+  String get sources_reorderHint => '上下キーで位置を移動し、もう一度押すと完了';
+
+  @override
+  String get sources_groupMemberHint => '▶ でグループから除外、[A] で並べ替え';
+
+  @override
+  String get sources_routeRowHint => 'この行を選ぶと並べ替え。▶ で右のアイコン：編集・削除';
+
+  @override
+  String get sources_routeUse => 'この経路を使用';
+
+  @override
+  String get sources_routeLock => 'この経路にロック';
+
+  @override
+  String get sources_routeUnlock => 'ロックを解除';
+
+  @override
+  String sources_removeRouteConfirm(String name) {
+    return '「$name」を削除しますか？このソースのゲーム一覧は残り、消えるのはアドレスだけです。';
+  }
 }
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index 4f8ae66..c90894f 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -1285,6 +1285,17 @@ class LPt extends L {
   @override
   String get onboarding_serverType => 'Tipo de servidor';
 
+  @override
+  String get onboarding_folderExplanationTitle =>
+      'Configure o caminho da sua biblioteca';
+
+  @override
+  String get onboarding_folderExplanationMessage =>
+      'O R-Shop precisa de uma pasta base para guardar os jogos baixados. Isso ajuda a organizar seus arquivos e é necessário para as permissões de pasta do Android.\n\nRecomendamos criar uma pasta chamada \'ROMs\' e selecioná-la.';
+
+  @override
+  String get onboarding_continueToPicker => 'Selecionar pasta';
+
   @override
   String get onboarding_hangOn => 'Um momento, testando a conexão...';
 
@@ -1621,4 +1632,257 @@ class LPt extends L {
   String service_queuedCount(int count) {
     return '$count na fila';
   }
+
+  @override
+  String get sources_connectionRoute => 'Rota de ligação';
+
+  @override
+  String get sources_routeAuto => 'Automático';
+
+  @override
+  String get sources_routeAutoHint =>
+      'Usar a rota mais rápida que responder; volta a verificar quando a rede muda';
+
+  @override
+  String get sources_routeInUse => 'Em uso';
+
+  @override
+  String get sources_routePinned => 'Bloqueada';
+
+  @override
+  String get sources_routeReachable => 'Acessível';
+
+  @override
+  String get sources_routeNoAnswer => 'Sem resposta';
+
+  @override
+  String get sources_routeChecking => 'A verificar…';
+
+  @override
+  String sources_routeLatencyMs(int ms) {
+    return '$ms ms';
+  }
+
+  @override
+  String sources_routeAutoPicks(String route) {
+    return 'Usaria $route';
+  }
+
+  @override
+  String get sources_routeAutoNoneReachable => 'Nada respondeu';
+
+  @override
+  String get sources_routeFastest => 'Mais rápida';
+
+  @override
+  String get sources_routeReleasePin =>
+      'Remove o bloqueio e volta a escolher a mais rápida';
+
+  @override
+  String get sources_routeOwnLogin => 'Início de sessão próprio';
+
+  @override
+  String get sources_routeAuthTitle => 'Início de sessão desta rota';
+
+  @override
+  String get sources_routeAuthHint =>
+      'Deixe em branco para usar o início de sessão da fonte. Preencha apenas se este endereço pedir outro.';
+
+  @override
+  String get sources_routeAuthInherited => 'A usar o início de sessão da fonte';
+
+  @override
+  String get sources_routeAuthOwn => 'Esta rota inicia sessão por si própria';
+
+  @override
+  String get sources_routeOnlyOne => 'Esta fonte só tem uma rota';
+
+  @override
+  String get sources_addRoute => 'Adicionar rota';
+
+  @override
+  String get sources_editRoute => 'Editar rota';
+
+  @override
+  String get sources_removeRoute => 'Remover rota';
+
+  @override
+  String get sources_routeDuplicate =>
+      'Esta fonte já tem uma rota para esse endereço';
+
+  @override
+  String get sources_activeSource => 'Em uso';
+
+  @override
+  String get sources_switchSource => 'Mudar fonte';
+
+  @override
+  String get sources_prevSource => 'Fonte anterior';
+
+  @override
+  String get sources_nextSource => 'Fonte seguinte';
+
+  @override
+  String get sources_setFallback => 'Fonte de reserva';
+
+  @override
+  String get sources_fallbackNone => 'Nenhuma';
+
+  @override
+  String get sources_fallbackShort => 'Reserva';
+
+  @override
+  String get sources_routeSameServerHint =>
+      'Todas as rotas chegam ao mesmo servidor. Uma rota pode ter o seu próprio início de sessão se esse endereço pedir outro.';
+
+  @override
+  String get sources_routeCannotRemoveLast =>
+      'Não é possível remover a última rota';
+
+  @override
+  String sources_countLabel(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count fontes',
+      one: '1 fonte',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get sources_useThisShort => 'Usar esta';
+
+  @override
+  String get sources_stopUsingShort => 'Parar de usar';
+
+  @override
+  String get sources_removeConfirmTitle => 'Remover a fonte?';
+
+  @override
+  String sources_removeConfirmMessage(String name) {
+    return 'Remover \"$name\"? A lista dela desaparece da biblioteca, mas os jogos já baixados neste aparelho são mantidos.';
+  }
+
+  @override
+  String get sources_groupBadge => 'Grupo';
+
+  @override
+  String get sources_groupCreate => 'Agrupar com outra fonte…';
+
+  @override
+  String get sources_groupCreateHint =>
+      'Para dois endereços que são, na verdade, o mesmo servidor';
+
+  @override
+  String get sources_groupPickMember => 'Escolha a fonte para agrupar';
+
+  @override
+  String get sources_groupSameTypeOnly =>
+      'Só é possível agrupar fontes do mesmo tipo';
+
+  @override
+  String get sources_groupNoCandidates => 'Não há outra fonte deste tipo';
+
+  @override
+  String get sources_groupManage => 'Definições do grupo';
+
+  @override
+  String get sources_groupRename => 'Mudar o nome do grupo';
+
+  @override
+  String get sources_groupNameLabel => 'Nome do grupo';
+
+  @override
+  String get sources_groupModeTitle => 'Qual membro usar';
+
+  @override
+  String get sources_groupModeAuto => 'Automático';
+
+  @override
+  String get sources_groupModeAutoHint =>
+      'Sem ordem a manter — o endereço que responde primeiro é o que dá para usar primeiro';
+
+  @override
+  String get sources_groupModeOrdered => 'A minha ordem';
+
+  @override
+  String get sources_groupModeOrderedHint =>
+      'Usa o primeiro da tua ordem que responder';
+
+  @override
+  String get sources_groupPreferred => 'Primeira escolha';
+
+  @override
+  String get sources_groupAddMember => 'Adicionar uma fonte';
+
+  @override
+  String get sources_groupLeave => 'Sair do grupo';
+
+  @override
+  String sources_groupLeaveConfirm(String name) {
+    return '«$name» não fica com jogos nenhuns e terá de sincronizar de novo. A lista partilhada fica com o grupo.';
+  }
+
+  @override
+  String get sources_groupLeaveTitle => 'Sair do grupo?';
+
+  @override
+  String get sources_groupDissolve => 'Dissolver o grupo';
+
+  @override
+  String sources_groupDissolveConfirm(String name) {
+    return 'A lista partilhada fica com «$name»; as outras terão de sincronizar de novo.';
+  }
+
+  @override
+  String get sources_groupDissolveTitle => 'Dissolver o grupo?';
+
+  @override
+  String sources_groupMembersCount(int count) {
+    return '$count fontes';
+  }
+
+  @override
+  String sources_groupUsing(String name) {
+    return 'A usar «$name»';
+  }
+
+  @override
+  String get sources_moveUp => 'Mover para cima';
+
+  @override
+  String get sources_moveDown => 'Mover para baixo';
+
+  @override
+  String get sources_routeOrdered => 'A minha ordem';
+
+  @override
+  String get sources_routeOrderedHint =>
+      'Usar a primeira rota da tua ordem que responder';
+
+  @override
+  String get sources_reorderHint =>
+      'Move com cima e baixo e carrega outra vez para terminar';
+
+  @override
+  String get sources_groupMemberHint => '▶ tira-a do grupo; [A] reordena';
+
+  @override
+  String get sources_routeRowHint =>
+      'Seleciona a linha para reordenar; ▶ para os ícones: editar ou remover';
+
+  @override
+  String get sources_routeUse => 'Usar esta rota';
+
+  @override
+  String get sources_routeLock => 'Bloquear nesta rota';
+
+  @override
+  String get sources_routeUnlock => 'Desbloquear';
+
+  @override
+  String sources_removeRouteConfirm(String name) {
+    return 'Remover «$name»? A lista guardada desta fonte fica; só desaparece o endereço.';
+  }
 }
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
new file mode 100644
index 0000000..4ef6a43
--- /dev/null
+++ b/lib/l10n/app_localizations_zh.dart
@@ -0,0 +1,1817 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for Chinese (`zh`).
+class LZh extends L {
+  LZh([String locale = 'zh']) : super(locale);
+
+  @override
+  String get appTitle => 'R-Shop';
+
+  @override
+  String get settings_language => '語言';
+
+  @override
+  String get settings_languageSystem => '系統預設';
+
+  @override
+  String get common_back => '返回';
+
+  @override
+  String get common_close => '關閉';
+
+  @override
+  String get common_cancel => '取消';
+
+  @override
+  String get common_cancelUpper => '取消';
+
+  @override
+  String get common_select => '選擇';
+
+  @override
+  String get common_search => '搜尋';
+
+  @override
+  String get common_searchEllipsis => '搜尋...';
+
+  @override
+  String get common_menu => '選單';
+
+  @override
+  String get common_navigate => '導航';
+
+  @override
+  String get common_toggle => '切換';
+
+  @override
+  String get common_clear => '清除';
+
+  @override
+  String get common_done => '完成';
+
+  @override
+  String get common_save => '儲存';
+
+  @override
+  String get common_connect => '連線';
+
+  @override
+  String get common_retry => '重試';
+
+  @override
+  String get common_remove => '移除';
+
+  @override
+  String get common_favorite => '收藏';
+
+  @override
+  String get common_unfavorite => '取消收藏';
+
+  @override
+  String get common_downloads => '下載項目';
+
+  @override
+  String get common_installed => '已安裝';
+
+  @override
+  String get common_move => '移動';
+
+  @override
+  String get common_drop => '放下';
+
+  @override
+  String get common_grab => '抓取';
+
+  @override
+  String get confirm_deleteTitle => '刪除 ROM？';
+
+  @override
+  String confirm_deleteMessage(String gameTitle) {
+    return '您真的要刪除 $gameTitle 的這個版本嗎？';
+  }
+
+  @override
+  String get confirm_exitTitle => '結束應用程式？';
+
+  @override
+  String get confirm_exitMessage => '您真的要結束 Retro eShop 嗎？';
+
+  @override
+  String get confirm_resetTitle => '重設應用程式？';
+
+  @override
+  String get confirm_resetMessage => '這將返回初始設定畫面。';
+
+  @override
+  String get confirm_deleteButton => '刪除';
+
+  @override
+  String get confirm_exitButton => '結束';
+
+  @override
+  String get confirm_resetButton => '重設';
+
+  @override
+  String get confirm_gamepadHint => '← → 選擇   A 確認   B 取消';
+
+  @override
+  String get exit_title => '離開 R-Shop';
+
+  @override
+  String get exit_message => '確定要退出嗎？';
+
+  @override
+  String get exit_confirmButton => '結束';
+
+  @override
+  String get exit_cancelButton => '留在這裡';
+
+  @override
+  String get downloads_title => '下載項目';
+
+  @override
+  String downloads_activeCount(int count) {
+    return '$count 個進行中';
+  }
+
+  @override
+  String get downloads_noDownloads => '無下載項目';
+
+  @override
+  String get downloads_sectionDownloading => '正在下載';
+
+  @override
+  String get downloads_sectionQueued => '等待中';
+
+  @override
+  String get downloads_sectionComplete => '已完成';
+
+  @override
+  String get downloads_actionCancel => '取消';
+
+  @override
+  String get downloads_actionRetry => '重試';
+
+  @override
+  String get downloads_actionRemove => '移除';
+
+  @override
+  String get downloads_actionClear => '清除';
+
+  @override
+  String get downloads_clearDone => '清除已完成項目';
+
+  @override
+  String get downloadStatus_downloading => '正在下載...';
+
+  @override
+  String get downloadStatus_extracting => '正在解壓縮...';
+
+  @override
+  String get downloadStatus_installing => '正在安裝...';
+
+  @override
+  String get downloadStatus_waiting => '等待中...';
+
+  @override
+  String get downloadStatus_complete => '已完成';
+
+  @override
+  String get downloadStatus_cancelled => '已取消';
+
+  @override
+  String get downloadStatus_failed => '失敗';
+
+  @override
+  String storage_free(String size) {
+    return '剩餘 $size';
+  }
+
+  @override
+  String storage_veryLow(String freeSpace) {
+    return '儲存空間極低：$freeSpace';
+  }
+
+  @override
+  String storage_gettingLow(String freeSpace) {
+    return '儲存空間不足：$freeSpace';
+  }
+
+  @override
+  String sync_progress(int completed, int total) {
+    return '同步中 $completed/$total';
+  }
+
+  @override
+  String sync_singleSystemFailed(String system) {
+    return '$system 同步失敗';
+  }
+
+  @override
+  String sync_multipleSystemsFailed(int count) {
+    return '$count 個系統同步失敗';
+  }
+
+  @override
+  String sync_raProgress(int completed, int total) {
+    return '成就同步中 $completed/$total';
+  }
+
+  @override
+  String get sync_raFailed => 'RA 同步失敗';
+
+  @override
+  String get toast_addedToQueue => '已加入下載佇列';
+
+  @override
+  String get toast_configRecovered => '已從備份復原設定';
+
+  @override
+  String gameCard_variantCount(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count 個版本',
+      one: '1 個版本',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get gameDetail_achievements => '成就';
+
+  @override
+  String get gameDetail_mastered => '已達成';
+
+  @override
+  String get gameDetail_noAchievementsFound => '找不到成就';
+
+  @override
+  String get gameDetail_retroachievements => 'RETROACHIEVEMENTS';
+
+  @override
+  String get gameDetail_romVerified => 'ROM 已驗證';
+
+  @override
+  String get gameDetail_incompatibleRom => '不相容的 ROM';
+
+  @override
+  String get gameDetail_gameHasAchievements => '此遊戲支援成就';
+
+  @override
+  String get gameDetail_viewAchievements => '查看成就';
+
+  @override
+  String get gameDetail_versions => '版本';
+
+  @override
+  String get gameDetail_download => '下載';
+
+  @override
+  String get gameDetail_adding => '正在加入...';
+
+  @override
+  String get gameDetail_queued => '等待中';
+
+  @override
+  String get gameDetail_extracting => '正在解壓縮...';
+
+  @override
+  String get gameDetail_delete => '刪除';
+
+  @override
+  String get gameDetail_manageFiles => '檔案管理';
+
+  @override
+  String get gameDetail_unavailable => '不可用';
+
+  @override
+  String get gameDetail_installedLabel => '已安裝';
+
+  @override
+  String get gameDetail_notFound => '找不到';
+
+  @override
+  String get gameDetail_details => '詳情';
+
+  @override
+  String get gameDetail_screenshots => '螢幕截圖';
+
+  @override
+  String get gameDetail_otherVersions => '其他版本';
+
+  @override
+  String get gameDetail_readMore => '閱讀更多...';
+
+  @override
+  String get gameDetail_showLess => '收起內容';
+
+  @override
+  String get gameDetail_standard => '標準';
+
+  @override
+  String get gameDetail_franchise => '系列';
+
+  @override
+  String get gameDetail_gameModes => '遊戲模式';
+
+  @override
+  String get gameDetail_perspective => '視角';
+
+  @override
+  String get gameDetail_ageRating => '分級';
+
+  @override
+  String get gameDetail_themes => '主題';
+
+  @override
+  String get gameDetail_fileTags => '檔案標籤';
+
+  @override
+  String get gameDetail_tagVersion => '版本';
+
+  @override
+  String get gameDetail_tagBuild => '組建';
+
+  @override
+  String get gameDetail_tagDisc => '光碟';
+
+  @override
+  String get gameDetail_tagQuality => '品質';
+
+  @override
+  String get gameDetail_tagInfo => '資訊';
+
+  @override
+  String get gameDetail_tagTechnical => '技術資訊';
+
+  @override
+  String get gameDetail_gameInfo => '遊戲資訊';
+
+  @override
+  String get gameDetail_showTitle => '顯示標題';
+
+  @override
+  String get gameDetail_showFilename => '顯示檔案名稱';
+
+  @override
+  String gameDetail_fromProvider(String provider) {
+    return '來自 $provider';
+  }
+
+  @override
+  String get gameDetail_addToShelf => '加入收藏架';
+
+  @override
+  String get gameDetail_removeFromShelf => '從收藏架移除';
+
+  @override
+  String get gameDetail_removeFromShelfTitle => '從收藏架移除';
+
+  @override
+  String get gameDetail_gameNotInstalled => '遊戲尚未安裝';
+
+  @override
+  String get gameDetail_couldNotShare => '無法分享遊戲檔案';
+
+  @override
+  String get gameDetail_pressAPickVersion => '按 A 選擇版本';
+
+  @override
+  String get gameDetail_pressAManage => '按 A 進行管理';
+
+  @override
+  String get gameDetail_pressADownload => '按 A 下載';
+
+  @override
+  String gameDetail_errorPrefix(String error) {
+    return '錯誤：$error';
+  }
+
+  @override
+  String get settings_title => '設定';
+
+  @override
+  String get settings_tabGeneral => '一般';
+
+  @override
+  String get settings_tabAudio => '音效';
+
+  @override
+  String get settings_tabAdvanced => '進階';
+
+  @override
+  String get settings_tabAbout => '關於';
+
+  @override
+  String get settings_previousTab => '上一個分頁';
+
+  @override
+  String get settings_nextTab => '下一個分頁';
+
+  @override
+  String get settings_resetApp => '重設應用程式';
+
+  @override
+  String get settings_resetDialogTitle => '重設應用程式';
+
+  @override
+  String get settings_resetDialogMessage => '這將刪除所有設定並重新開始設定流程。';
+
+  @override
+  String get settings_resetDialogConfirm => '重設';
+
+  @override
+  String get settings_resetDialogCancel => '取消';
+
+  @override
+  String get settings_sectionLibrary => '媒體庫';
+
+  @override
+  String get settings_sectionDisplay => '顯示';
+
+  @override
+  String get settings_mySources => '我的來源';
+
+  @override
+  String get settings_mySourcesSubtitle => '新增或管理 RomM, SMB, FTP 伺服器';
+
+  @override
+  String get settings_consoleSettings => '主機設定';
+
+  @override
+  String get settings_consoleSettingsSubtitle => '資料夾路徑、解壓縮、各系統選項';
+
+  @override
+  String get settings_retroAchievements => 'RetroAchievements';
+
+  @override
+  String get settings_retroAchievementsSubtitle => '成就追蹤與 ROM 驗證';
+
+  @override
+  String get settings_homeLayout => '主畫面佈局';
+
+  @override
+  String get settings_homeLayoutGrid => '網格檢視';
+
+  @override
+  String get settings_homeLayoutCarousel => '橫向輪播';
+
+  @override
+  String get settings_hideEmptyConsoles => '隱藏空的主機';
+
+  @override
+  String get settings_hideEmptyConsolesSubtitle => '僅顯示含有遊戲的系統';
+
+  @override
+  String get settings_controllerButtons => '控制器按鈕';
+
+  @override
+  String get settings_controllerNintendo => 'Nintendo (預設)';
+
+  @override
+  String get settings_controllerXbox => 'XBOX';
+
+  @override
+  String get settings_controllerPs => 'PS';
+
+  @override
+  String get settings_controllerNin => 'NIN';
+
+  @override
+  String get settings_sectionFeedback => '回饋';
+
+  @override
+  String get settings_vibration => '震動';
+
+  @override
+  String get settings_vibrationSubtitle => '按鈕按下時震動';
+
+  @override
+  String get settings_soundEffects => '音效';
+
+  @override
+  String get settings_soundEffectsSubtitle => '選單操作時播放音效';
+
+  @override
+  String get settings_sectionVolume => '音量';
+
+  @override
+  String get settings_music => '音樂';
+
+  @override
+  String get settings_musicSubtitle => '環境背景音樂';
+
+  @override
+  String get settings_effects => '音效';
+
+  @override
+  String get settings_effectsSubtitle => '介面音效';
+
+  @override
+  String get settings_sectionDownloads => '下載';
+
+  @override
+  String get settings_simultaneousDownloads => '同時下載數';
+
+  @override
+  String get settings_simultaneousDownloadsSubtitle => '可同時下載的檔案數量';
+
+  @override
+  String get settings_downloadAllCovers => '下載所有封面';
+
+  @override
+  String get settings_downloadingCovers => '正在下載封面...';
+
+  @override
+  String get settings_sectionSync => '同步';
+
+  @override
+  String get settings_syncTimeout => '同步逾時';
+
+  @override
+  String get settings_syncTimeoutSubtitle => '等待每個伺服器的最長時間';
+
+  @override
+  String get settings_autoSyncInterval => '自動同步間隔';
+
+  @override
+  String get settings_autoSyncIntervalSubtitle => '自動同步之間的最小間隔時間';
+
+  @override
+  String get settings_sectionDebug => '除錯';
+
+  @override
+  String get settings_allowInsecure => '允許不安全連線';
+
+  @override
+  String get settings_allowInsecureSubtitle => '為不支援 HTTPS 的伺服器啟用 HTTP';
+
+  @override
+  String get settings_exportErrorLog => '匯出錯誤日誌';
+
+  @override
+  String get settings_exportErrorLogSubtitle => '分享當機日誌以供排錯';
+
+  @override
+  String get settings_sectionInfo => '資訊';
+
+  @override
+  String get settings_sectionLinks => '連結';
+
+  @override
+  String get settings_github => 'GitHub';
+
+  @override
+  String get settings_githubSubtitle => '在 GitHub 上查看原始碼';
+
+  @override
+  String get settings_issues => '問題回報';
+
+  @override
+  String get settings_issuesSubtitle => '回報 Bug 或要求新功能';
+
+  @override
+  String get settings_tagline => 'INTENSIV, AGGRESSIV, MUTIG';
+
+  @override
+  String get settings_deviceMemoryLow => '低';
+
+  @override
+  String get settings_deviceMemoryStandard => '標準';
+
+  @override
+  String get settings_deviceMemoryHigh => '高';
+
+  @override
+  String get settings_fetchingCovers => '正在擷取封面...';
+
+  @override
+  String settings_coversResult(int ok, int failed) {
+    return '封面：$ok 成功, $failed 失敗';
+  }
+
+  @override
+  String settings_coversLoaded(int count) {
+    return '已載入 $count 張封面！';
+  }
+
+  @override
+  String get settings_noErrorLog => '無可用錯誤日誌';
+
+  @override
+  String get settings_configImported => '設定已匯入！';
+
+  @override
+  String get settings_controllerXboxFull => 'Xbox (A/B 與 X/Y 反轉)';
+
+  @override
+  String get settings_controllerPlaystationFull => 'PlayStation (✕ ○ □ △)';
+
+  @override
+  String get settings_allCoversCached => '所有封面皆已快取';
+
+  @override
+  String get settings_downloadCoverArt => '下載所有遊戲的封面圖';
+
+  @override
+  String settings_coverCacheInfo(String size, int count) {
+    return '$size ($count 個已快取)';
+  }
+
+  @override
+  String settings_coversRemaining(int count, String size) {
+    return '剩餘 $count 個 (~$size MB)';
+  }
+
+  @override
+  String settings_coversProgress(int completed, int total) {
+    return '$completed / $total 款遊戲';
+  }
+
+  @override
+  String get configMode_title => '主機設定';
+
+  @override
+  String get configMode_globalTitle => '全域設定';
+
+  @override
+  String get configMode_noFolderSet => '尚未設定資料夾';
+
+  @override
+  String get configMode_notConfigured => '未配置';
+
+  @override
+  String get configMode_export => '匯出';
+
+  @override
+  String get configMode_import => '匯入';
+
+  @override
+  String get systemDetail_sectionStorage => '儲存空間';
+
+  @override
+  String get systemDetail_selectRomFolder => '選擇 ROM 資料夾';
+
+  @override
+  String get systemDetail_tapToChangeFolder => '點擊以變更資料夾';
+
+  @override
+  String get systemDetail_sectionBehavior => '行為';
+
+  @override
+  String get systemDetail_autoExtractZips => '自動解壓縮 ZIP';
+
+  @override
+  String get systemDetail_autoExtractEnabled => '下載後自動解壓縮 ZIP 格式的 ROM';
+
+  @override
+  String get systemDetail_autoExtractDisabled => '下載後保持 ZIP 格式';
+
+  @override
+  String get systemDetail_autoSyncOnLaunch => '啟動時自動同步';
+
+  @override
+  String get systemDetail_autoSyncEnabled => '自動同步（遵循冷卻時間）';
+
+  @override
+  String get systemDetail_autoSyncDisabled => '僅透過 Start 選單手動同步';
+
+  @override
+  String get systemDetail_sectionSources => '來源';
+
+  @override
+  String get sources_title => '來源清單';
+
+  @override
+  String get sources_noSourcesConfigured => '尚未配置來源';
+
+  @override
+  String get sources_noSourcesYet => '目前無來源';
+
+  @override
+  String get sources_noSourcesDescription => '配對 RomM 伺服器以開始下載遊戲。';
+
+  @override
+  String get sources_addSource => '新增來源';
+
+  @override
+  String get sources_whereDoGamesComeFrom => '您的遊戲來自哪裡？';
+
+  @override
+  String get sources_sourceTypeRomm => 'RomM 伺服器';
+
+  @override
+  String get sources_sourceTypeRommHint => '透過 QR 或 8 位代碼配對';
+
+  @override
+  String get sources_sourceTypeRommLegacy => 'RomM 登入（舊版伺服器）';
+
+  @override
+  String get sources_sourceTypeSmb => 'SMB 分享';
+
+  @override
+  String get sources_sourceTypeFtp => 'FTP 伺服器';
+
+  @override
+  String get sources_sourceTypeWeb => 'Web 鏡像';
+
+  @override
+  String get sources_sourceTypeWebHint => 'HTTPS 目錄列表';
+
+  @override
+  String get sources_expired => '已過期';
+
+  @override
+  String get sources_borrowed => '已借用';
+
+  @override
+  String get sources_off => '關閉';
+
+  @override
+  String get sources_noPlatforms => '無平台';
+
+  @override
+  String get sources_rePair => '重新配對';
+
+  @override
+  String get sources_editMappings => '編輯對應';
+
+  @override
+  String get sources_disable => '停用';
+
+  @override
+  String get sources_enable => '啟用';
+
+  @override
+  String get manualSource_defaultNameSmb => '我的 NAS';
+
+  @override
+  String get manualSource_defaultNameFtp => '我的 FTP';
+
+  @override
+  String get manualSource_defaultNameWeb => 'Web 鏡像';
+
+  @override
+  String get manualSource_defaultNameOther => '來源';
+
+  @override
+  String get manualSource_name => '名稱';
+
+  @override
+  String get manualSource_url => 'URL';
+
+  @override
+  String get manualSource_urlHint => 'https://example.com/roms';
+
+  @override
+  String get manualSource_host => '主機';
+
+  @override
+  String get manualSource_hostHint => 'nas.local 或 192.168.1.10';
+
+  @override
+  String get manualSource_port => '連接埠';
+
+  @override
+  String get manualSource_share => '分享名稱';
+
+  @override
+  String get manualSource_shareHint => 'roms';
+
+  @override
+  String get manualSource_usernameOptional => '使用者名稱 (選填)';
+
+  @override
+  String get manualSource_usernameHint => '訪客請保持空白';
+
+  @override
+  String get manualSource_passwordOptional => '密碼 (選填)';
+
+  @override
+  String get manualSource_nameRequired => '名稱為必填';
+
+  @override
+  String get manualSource_urlRequired => 'URL 為必填';
+
+  @override
+  String get manualSource_hostRequired => '主機為必填';
+
+  @override
+  String get manualSource_shareRequired => '分享名稱為必填';
+
+  @override
+  String get manualSource_saveSource => '儲存來源';
+
+  @override
+  String get manualSource_smb => 'SMB';
+
+  @override
+  String get manualSource_ftp => 'FTP';
+
+  @override
+  String get manualSource_web => 'Web';
+
+  @override
+  String get manualSource_searchingNetwork => '正在搜尋網路...';
+
+  @override
+  String get manualSource_foundOnNetwork => '在您的網路中找到';
+
+  @override
+  String get sourceMappings_title => '系統對應';
+
+  @override
+  String get sourceMappings_instruction => '輸入每個系統對應的遠端資料夾。留空則跳過。';
+
+  @override
+  String get sourceMappings_save => '儲存對應';
+
+  @override
+  String get library_title => '媒體庫';
+
+  @override
+  String get library_tabAll => '全部';
+
+  @override
+  String get library_tabInstalled => '已安裝';
+
+  @override
+  String get library_tabFavorites => '我的收藏';
+
+  @override
+  String get library_sortSystem => '按系統排序';
+
+  @override
+  String get library_sortManual => '手動排序';
+
+  @override
+  String get library_sortAZ => '按 A-Z 排序';
+
+  @override
+  String get library_sortIndicatorAZ => 'A-Z';
+
+  @override
+  String get library_sortIndicatorBySystem => '按系統';
+
+  @override
+  String get library_sortIndicatorManual => '手動';
+
+  @override
+  String get library_searchHint => '搜尋媒體庫...';
+
+  @override
+  String get library_zoomIn => '放大';
+
+  @override
+  String get library_zoomOut => '縮小';
+
+  @override
+  String get library_newShelf => '新增收藏架';
+
+  @override
+  String get library_editShelf => '編輯收藏架';
+
+  @override
+  String get library_addToShelf => '加入收藏架';
+
+  @override
+  String get library_removeFromShelf => '從收藏架移除';
+
+  @override
+  String get library_reorderGames => '重新排列遊戲';
+
+  @override
+  String library_noResults(String query) {
+    return '找不到與「$query」相關的結果';
+  }
+
+  @override
+  String get library_tryShorterSearch => '請嘗試更短的搜尋詞';
+
+  @override
+  String get library_noInstalledGames => '目前無已安裝的遊戲';
+
+  @override
+  String get library_downloadGamesToSee => '下載遊戲後會顯示在這裡';
+
+  @override
+  String get library_noFavoritesYet => '尚未收藏任何遊戲';
+
+  @override
+  String get library_pressFavoriteHint => '對著遊戲按 SELECT 即可加入收藏';
+
+  @override
+  String get library_noGamesInShelf => '此收藏架內無遊戲';
+
+  @override
+  String get library_addGamesViaEditor => '透過收藏架編輯器新增遊戲';
+
+  @override
+  String get library_noGamesInLibrary => '媒體庫中無遊戲';
+
+  @override
+  String get library_gamesAfterSync => '同步完成後遊戲將會出現';
+
+  @override
+  String get shelfEdit_title => '編輯收藏架';
+
+  @override
+  String get shelfEdit_titleNew => '新增收藏架';
+
+  @override
+  String get shelfEdit_nameSection => '名稱';
+
+  @override
+  String get shelfEdit_shelfName => '收藏架名稱';
+
+  @override
+  String get shelfEdit_filterText => '過濾文字';
+
+  @override
+  String get shelfEdit_tapToSet => '點擊以設定...';
+
+  @override
+  String get shelfEdit_filterRules => '過濾規則';
+
+  @override
+  String get shelfEdit_resetManualOrder => '重設手動排序';
+
+  @override
+  String get shelfEdit_saveButton => '儲存';
+
+  @override
+  String get shelfEdit_deleteShelf => '刪除收藏架';
+
+  @override
+  String get shelfEdit_anyText => '任何文字';
+
+  @override
+  String get shelfEdit_allSystems => '所有系統';
+
+  @override
+  String get shelfPicker_title => '加入收藏架';
+
+  @override
+  String get systemSelector_title => '選擇系統';
+
+  @override
+  String get textInput_hint => '輸入文字...';
+
+  @override
+  String get textInput_ok => '確定';
+
+  @override
+  String get gameListOverlay_hiddenGames => '隱藏的遊戲';
+
+  @override
+  String get gameListOverlay_addedGames => '已新增的遊戲';
+
+  @override
+  String get gameListOverlay_restore => '還原';
+
+  @override
+  String get gameListOverlay_noGames => '無遊戲';
+
+  @override
+  String get gameListOverlay_clearAll => '全部清除';
+
+  @override
+  String get home_allGames => '所有遊戲';
+
+  @override
+  String get home_library => '媒體庫';
+
+  @override
+  String get home_noConsoles => '尚未配置主機';
+
+  @override
+  String get home_pressStartForMenu => '按 Start 開啟選單';
+
+  @override
+  String get home_settings => '設定';
+
+  @override
+  String home_syncSystem(String system) {
+    return '同步 $system';
+  }
+
+  @override
+  String get home_syncAll => '同步全部';
+
+  @override
+  String get home_lastSyncNever => '從未同步';
+
+  @override
+  String get home_lastSyncJustNow => '剛剛同步';
+
+  @override
+  String home_lastSyncMinutes(int minutes) {
+    return '$minutes 分鐘前同步';
+  }
+
+  @override
+  String home_lastSyncHours(int hours) {
+    return '$hours 小時前同步';
+  }
+
+  @override
+  String home_lastSyncDays(int days) {
+    return '$days 天前同步';
+  }
+
+  @override
+  String get common_exit => '結束';
+
+  @override
+  String gameList_gamesCount(int count) {
+    return '$count 款遊戲';
+  }
+
+  @override
+  String get gameList_offline => '離線';
+
+  @override
+  String get gameList_zoomIn => '放大';
+
+  @override
+  String get gameList_zoomOut => '縮小';
+
+  @override
+  String get gameList_filterActive => '過濾器 (啟用中)';
+
+  @override
+  String get gameList_filter => '過濾器';
+
+  @override
+  String gameList_noGamesMatchSearch(String query) {
+    return '找不到符合「$query」的遊戲';
+  }
+
+  @override
+  String get gameList_tryShorterSearch => '請嘗試更短的搜尋詞';
+
+  @override
+  String get gameList_noGamesMatchFilters => '沒有符合當前過濾條件的遊戲';
+
+  @override
+  String get gameList_changeFilters => '請在選單中更改或重設過濾器';
+
+  @override
+  String gameList_noRomsFound(String folder) {
+    return '在 $folder 中找不到 ROM';
+  }
+
+  @override
+  String get gameList_addRomFiles => '請將 ROM 檔案加入此資料夾並重新整理';
+
+  @override
+  String get gameList_couldNotLoadGames => '無法載入遊戲';
+
+  @override
+  String get gameList_checkConnection => '請檢查您的連線並再試一次';
+
+  @override
+  String get gameList_errorLoadingGames => '載入遊戲時發生錯誤';
+
+  @override
+  String get gameList_gamesAppearShortly => '遊戲很快就會出現';
+
+  @override
+  String get gameList_syncingLibrary => '正在同步媒體庫...';
+
+  @override
+  String get gameList_localFilesOnly => '僅限本地檔案 · 新增來源以獲得更多';
+
+  @override
+  String get gameList_pressMenuHint => '按 + 開啟選單';
+
+  @override
+  String filter_activeCount(int count) {
+    return '$count 個已啟用';
+  }
+
+  @override
+  String get shelfEdit_addFilter => '+ 新增過濾器';
+
+  @override
+  String shelfEdit_hiddenGamesCount(int count) {
+    return '隱藏的遊戲 ($count)';
+  }
+
+  @override
+  String shelfEdit_addedGamesCount(int count) {
+    return '已新增的遊戲 ($count)';
+  }
+
+  @override
+  String get shelfEdit_textHint => '← 文字  系統 →';
+
+  @override
+  String gameListOverlay_gameCount(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count 款遊戲',
+      one: '1 款遊戲',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String gameListOverlay_actionHint(String action) {
+    return 'A: $action';
+  }
+
+  @override
+  String systemSelector_selectedCount(int count) {
+    return '已選擇 $count 個';
+  }
+
+  @override
+  String get filter_favoritesOnly => '僅收藏項目';
+
+  @override
+  String get filter_installedOnly => '僅已安裝項目';
+
+  @override
+  String get filter_regions => '地區';
+
+  @override
+  String get filter_languages => '語言';
+
+  @override
+  String get filter_title => '過濾器';
+
+  @override
+  String get onboarding_welcomeTitle => '歡迎使用 R-Shop';
+
+  @override
+  String get onboarding_welcomeSubtitle => '您的遊戲來自哪裡？';
+
+  @override
+  String get onboarding_pairQrTitle => '透過 QR 配對 RomM';
+
+  @override
+  String get onboarding_pairQrSubtitle => '掃描 RomM 伺服器提供的 QR Code';
+
+  @override
+  String get onboarding_legacyLoginTitle => 'RomM 登入（舊版伺服器）';
+
+  @override
+  String get onboarding_legacyLoginSubtitle => 'RomM < 4.8 版的使用者名稱與密碼';
+
+  @override
+  String get onboarding_addServerTitle => '新增我自己的伺服器';
+
+  @override
+  String get onboarding_addServerSubtitle => 'SMB, FTP 或 Web 鏡像 — 手動對應系統';
+
+  @override
+  String get onboarding_localOnlyTitle => '僅限本地遊戲';
+
+  @override
+  String get onboarding_localOnlySubtitle => '已在此設備上的 ROM';
+
+  @override
+  String get onboarding_working => '運作中...';
+
+  @override
+  String get onboarding_scanningFolders => '正在掃描本地 ROM 資料夾...';
+
+  @override
+  String get onboarding_discoveringPlatforms => '正在搜尋平台...';
+
+  @override
+  String get onboarding_savingSource => '正在儲存來源...';
+
+  @override
+  String get onboarding_allSet => '一切就緒';
+
+  @override
+  String get onboarding_noSystems => '尚未配置系統 — 您稍後可以從「設定」新增來源。';
+
+  @override
+  String onboarding_systemsReady(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count 個系統已可瀏覽',
+      one: '1 個系統已可瀏覽',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get onboarding_jumpIn => '開始使用';
+
+  @override
+  String get onboarding_jumpInSubtitle => '開啟主畫面並開始同步';
+
+  @override
+  String get onboarding_retroachievements => 'RetroAchievements';
+
+  @override
+  String get onboarding_retroachievementsSubtitle => '追蹤您的復古遊戲成就';
+
+  @override
+  String get onboarding_exportConfig => '匯出設定';
+
+  @override
+  String get onboarding_exportConfigSubtitle => '在另一台設備上重複使用此設定';
+
+  @override
+  String get onboarding_importConfig => '匯入設定';
+
+  @override
+  String get onboarding_configImported => '設定已匯入！';
+
+  @override
+  String onboarding_exportFailed(String error) {
+    return '匯出失敗：$error';
+  }
+
+  @override
+  String onboarding_invalidConfig(String error) {
+    return '無效設定：$error';
+  }
+
+  @override
+  String onboarding_failedToSave(String error) {
+    return '儲存失敗：$error';
+  }
+
+  @override
+  String get onboarding_selectFolderPrompt => '選擇儲存 ROM 的資料夾';
+
+  @override
+  String get onboarding_serverType => '伺服器類型';
+
+  @override
+  String get onboarding_folderExplanationTitle => '設定您的遊戲庫路徑';
+
+  @override
+  String get onboarding_folderExplanationMessage =>
+      'R-Shop 需要您選擇一個資料夾來存放下載的遊戲。這能幫助 App 整理您的遊戲檔案，並獲得 Android 的存取權限。\n\n建議您可以建立一個名為「ROMs」的資料夾並選擇它。';
+
+  @override
+  String get onboarding_continueToPicker => '開始選擇';
+
+  @override
+  String get onboarding_hangOn => '請稍候，正在測試連線...';
+
+  @override
+  String get onboarding_foundConsole => '我在您的 RomM 伺服器上找到了這個主機！請確認或選擇另一個。';
+
+  @override
+  String get onboarding_pickPlatform => '從您的 RomM 伺服器選擇對應的平台。';
+
+  @override
+  String get onboarding_couldNotReach => '無法連線至您的 RomM 伺服器。請檢查 URL 並再試一次。';
+
+  @override
+  String get onboarding_connectionGood => '連線狀況良好！您可以儲存此來源了。';
+
+  @override
+  String get onboarding_couldNotConnect => '嗯... 無法連線。請再次確認網址與認證資訊。';
+
+  @override
+  String get onboarding_whatKindOfSource => '這是哪種類型的來源？請選擇連線類型。';
+
+  @override
+  String get onboarding_lookingGood => '看起來不錯！您可以新增更多來源，或者在就緒後按「完成」。';
+
+  @override
+  String get onboarding_localCollection => '這是本地收藏。您可以新增來源來下載更多遊戲，或直接按「完成」！';
+
+  @override
+  String get onboarding_addMoreSources => '現在請至少新增一個來源，好讓我知道去哪裡找 ROM。';
+
+  @override
+  String get onboarding_letsSetUp => '讓我們來設定您的主機！選擇任一系統即可開始。';
+
+  @override
+  String get onboarding_romFolder => 'ROM 資料夾';
+
+  @override
+  String get onboarding_options => '選項';
+
+  @override
+  String get onboarding_autoExtractZips => '自動解壓縮 ZIP 格式 ROM';
+
+  @override
+  String get onboarding_autoSyncLabel => '啟動時自動同步';
+
+  @override
+  String get onboarding_autoSyncEnabled => '自動同步（遵循冷卻時間）';
+
+  @override
+  String get onboarding_autoSyncDisabled => '僅透過 Start 選單手動同步';
+
+  @override
+  String get onboarding_selectFolder => '選擇資料夾...';
+
+  @override
+  String get providerForm_addSource => '新增來源';
+
+  @override
+  String get providerForm_editSource => '編輯來源';
+
+  @override
+  String get providerForm_url => 'URL';
+
+  @override
+  String get providerForm_urlPlaceholder => 'https://...';
+
+  @override
+  String get providerForm_path => '路徑';
+
+  @override
+  String get providerForm_pathPlaceholder => '/roms/nes/ (選填)';
+
+  @override
+  String get providerForm_username => '使用者名稱';
+
+  @override
+  String get providerForm_usernameOptional => '(選填)';
+
+  @override
+  String get providerForm_password => '密碼';
+
+  @override
+  String get providerForm_host => '主機';
+
+  @override
+  String get providerForm_hostPlaceholder => '192.168.1.100';
+
+  @override
+  String get providerForm_port => '連接埠';
+
+  @override
+  String get providerForm_share => '分享名稱';
+
+  @override
+  String get providerForm_sharePlaceholder => 'roms';
+
+  @override
+  String get providerForm_domain => '網域';
+
+  @override
+  String get providerForm_domainOptional => '(選填)';
+
+  @override
+  String get providerForm_rommUrl => 'URL';
+
+  @override
+  String get providerForm_rommUrlPlaceholder => 'https://romm.example.com';
+
+  @override
+  String get providerForm_apiKey => 'API Key';
+
+  @override
+  String get providerForm_apiKeyOptional => '(選填)';
+
+  @override
+  String get providerForm_httpBlocked =>
+      '非本地伺服器的 HTTP 已被封鎖。請使用 HTTPS，或稍後在「設定」中啟用。';
+
+  @override
+  String get providerForm_httpWarning => '認證資訊將透過未加密的 HTTP 傳送';
+
+  @override
+  String get providerForm_testingConnection => '正在測試連線...';
+
+  @override
+  String get providerForm_connectionSuccessful => '連線成功！';
+
+  @override
+  String get providerForm_fetchingPlatforms => '正在擷取平台...';
+
+  @override
+  String get providerForm_noPlatformsFound => '在此 RomM 伺服器上找不到任何平台。';
+
+  @override
+  String get providerForm_platform => '平台';
+
+  @override
+  String get providerForm_pickPlatform => '選擇平台...';
+
+  @override
+  String get providerForm_testAndSave => '測試並儲存';
+
+  @override
+  String get providerForm_connectionFailed => '連線失敗';
+
+  @override
+  String get providerForm_hostMissing => '主機';
+
+  @override
+  String get providerForm_portMissing => '連接埠';
+
+  @override
+  String get providerForm_pathMissing => '路徑';
+
+  @override
+  String get providerForm_shareMissing => '分享名稱';
+
+  @override
+  String get providerForm_urlMissing => 'URL';
+
+  @override
+  String get rommLogin_title => '登入 RomM';
+
+  @override
+  String get rommLogin_name => '名稱';
+
+  @override
+  String get rommLogin_nameDefault => '我的 RomM';
+
+  @override
+  String get rommLogin_serverUrl => '伺服器 URL';
+
+  @override
+  String get rommLogin_username => '使用者名稱';
+
+  @override
+  String get rommLogin_usernameHint => 'admin';
+
+  @override
+  String get rommLogin_password => '密碼';
+
+  @override
+  String get rommLogin_passwordHint => '••••••••';
+
+  @override
+  String get rommLogin_nameRequired => '名稱為必填';
+
+  @override
+  String get rommLogin_serverUrlRequired => '伺服器 URL 為必填';
+
+  @override
+  String get rommLogin_credentialsRequired => '使用者名稱或密碼為必填';
+
+  @override
+  String get ra_title => 'RetroAchievements';
+
+  @override
+  String get ra_subtitle => '追蹤您的復古遊戲成就。';
+
+  @override
+  String get ra_usernameLabel => '使用者名稱';
+
+  @override
+  String get ra_usernameHint => '您的 RA 使用者名稱';
+
+  @override
+  String get ra_apiKeyLabel => 'API Key';
+
+  @override
+  String get ra_apiKeyHint => '從 retroachievements.org 貼上';
+
+  @override
+  String get ra_usernameRequired => '使用者名稱為必填';
+
+  @override
+  String get ra_apiKeyRequired => 'API Key 為必填';
+
+  @override
+  String get ra_connectionFailed => '連線失敗';
+
+  @override
+  String get ra_disconnect => '斷開連線';
+
+  @override
+  String get ra_syncNow => '立即同步成就';
+
+  @override
+  String get ra_skipForNow => '暫時跳過';
+
+  @override
+  String get pairing_scanQrTitle => '掃描 QR Code';
+
+  @override
+  String get pairing_scanQrHint => '將 QR Code 置於框架內';
+
+  @override
+  String get pairing_enterManually => '手動輸入代碼';
+
+  @override
+  String get pairing_invalidQr => '此 QR Code 不是有效的 RomM 配對連結';
+
+  @override
+  String get pairing_manualTitle => '手動配對';
+
+  @override
+  String get pairing_manualInstructions => '請在 RomM 網頁版 UI 的設定中產生代碼';
+
+  @override
+  String get pairing_serverUrl => '伺服器 URL';
+
+  @override
+  String get pairing_pairingCode => '配對代碼';
+
+  @override
+  String get pairing_pairingCodeHint => 'ABCD-1234';
+
+  @override
+  String get pairing_probingServer => '正在測試伺服器...';
+
+  @override
+  String get pairing_serverNotReachable => '伺服器無法連線或非 RomM 執行個體';
+
+  @override
+  String get pairing_serverUrlRequired => '伺服器 URL 與代碼均為必填';
+
+  @override
+  String get pairing_successTitle => '配對成功';
+
+  @override
+  String get pairing_server => '伺服器';
+
+  @override
+  String get pairing_token => 'Token';
+
+  @override
+  String get pairing_userId => '使用者 ID';
+
+  @override
+  String get pairing_expiry => '有效期限';
+
+  @override
+  String get pairing_neverExpires => '永久有效';
+
+  @override
+  String get pairing_alreadyExpired => '已過期';
+
+  @override
+  String get pairing_permissions => '權限';
+
+  @override
+  String get pairing_addServer => '新增伺服器';
+
+  @override
+  String get service_notificationTitle => 'R-Shop';
+
+  @override
+  String get service_channelName => '下載項目';
+
+  @override
+  String get service_channelDescription => '顯示下載遊戲的進度';
+
+  @override
+  String get service_downloadComplete => '下載完成';
+
+  @override
+  String service_downloading(String details) {
+    return '正在下載：$details';
+  }
+
+  @override
+  String service_activeCount(int count) {
+    return '$count 個下載中';
+  }
+
+  @override
+  String service_queuedCount(int count) {
+    return '$count 個等待中';
+  }
+
+  @override
+  String get sources_connectionRoute => '連線方式';
+
+  @override
+  String get sources_routeAuto => '自動選擇';
+
+  @override
+  String get sources_routeAutoHint => '用回應最快的那條，網路變了會重新選';
+
+  @override
+  String get sources_routeInUse => '使用中';
+
+  @override
+  String get sources_routePinned => '已鎖定';
+
+  @override
+  String get sources_routeReachable => '連得上';
+
+  @override
+  String get sources_routeNoAnswer => '沒有回應';
+
+  @override
+  String get sources_routeChecking => '檢查中…';
+
+  @override
+  String sources_routeLatencyMs(int ms) {
+    return '$ms ms';
+  }
+
+  @override
+  String sources_routeAutoPicks(String route) {
+    return '會選「$route」';
+  }
+
+  @override
+  String get sources_routeAutoNoneReachable => '沒有任何連線方式有回應';
+
+  @override
+  String get sources_routeFastest => '最快';
+
+  @override
+  String get sources_routeReleasePin => '解除鎖定，重新選最快的那條';
+
+  @override
+  String get sources_routeOwnLogin => '專屬登入';
+
+  @override
+  String get sources_routeAuthTitle => '這條連線方式的登入資訊';
+
+  @override
+  String get sources_routeAuthHint => '留空就沿用來源的登入資訊；只有這個位址要求另一組登入時才填。';
+
+  @override
+  String get sources_routeAuthInherited => '沿用來源的登入資訊';
+
+  @override
+  String get sources_routeAuthOwn => '這條連線方式用自己的登入資訊';
+
+  @override
+  String get sources_routeOnlyOne => '這個來源只有一條連線方式';
+
+  @override
+  String get sources_addRoute => '新增連線方式';
+
+  @override
+  String get sources_editRoute => '編輯連線方式';
+
+  @override
+  String get sources_removeRoute => '刪除這條連線方式';
+
+  @override
+  String get sources_routeDuplicate => '這個來源已經有一條指向同一個位址的連線方式';
+
+  @override
+  String get sources_activeSource => '使用中';
+
+  @override
+  String get sources_switchSource => '切換來源';
+
+  @override
+  String get sources_prevSource => '上一個來源';
+
+  @override
+  String get sources_nextSource => '下一個來源';
+
+  @override
+  String get sources_setFallback => '代理來源';
+
+  @override
+  String get sources_fallbackNone => '不設定';
+
+  @override
+  String get sources_fallbackShort => '代理';
+
+  @override
+  String get sources_routeSameServerHint =>
+      '這些都是通往同一台伺服器的路。某個位址要求另一組登入時，可以只幫那一條設定登入資訊。';
+
+  @override
+  String get sources_routeCannotRemoveLast => '最後一條連線方式不能移除';
+
+  @override
+  String sources_countLabel(num count) {
+    return '$count 個來源';
+  }
+
+  @override
+  String get sources_useThisShort => '目前使用這個';
+
+  @override
+  String get sources_stopUsingShort => '取消使用';
+
+  @override
+  String get sources_removeConfirmTitle => '移除來源？';
+
+  @override
+  String sources_removeConfirmMessage(String name) {
+    return '確定要移除「$name」嗎？這個來源的清單會從圖書館消失，但已經下載到裝置上的遊戲會保留。';
+  }
+
+  @override
+  String get sources_groupBadge => '群組';
+
+  @override
+  String get sources_groupCreate => '與其他來源設成群組…';
+
+  @override
+  String get sources_groupCreateHint => '適用於實際上是同一台伺服器的兩個位址';
+
+  @override
+  String get sources_groupPickMember => '選擇要一起設成群組的來源';
+
+  @override
+  String get sources_groupSameTypeOnly => '只能和同類型的來源設成群組';
+
+  @override
+  String get sources_groupNoCandidates => '沒有其他同類型的來源';
+
+  @override
+  String get sources_groupManage => '群組設定';
+
+  @override
+  String get sources_groupRename => '重新命名群組';
+
+  @override
+  String get sources_groupNameLabel => '群組名稱';
+
+  @override
+  String get sources_groupModeTitle => '要用哪一台';
+
+  @override
+  String get sources_groupModeAuto => '自動選擇';
+
+  @override
+  String get sources_groupModeAutoHint => '不用維護順序——先回應的那台就是你最快能用的那台';
+
+  @override
+  String get sources_groupModeOrdered => '照我排的順序';
+
+  @override
+  String get sources_groupModeOrderedHint => '照你排的順序，用第一個通的';
+
+  @override
+  String get sources_groupPreferred => '第一順位';
+
+  @override
+  String get sources_groupAddMember => '加入來源';
+
+  @override
+  String get sources_groupLeave => '退出群組';
+
+  @override
+  String sources_groupLeaveConfirm(String name) {
+    return '「$name」不會留下任何遊戲清單，要重新同步。共用的清單留在群組裡。';
+  }
+
+  @override
+  String get sources_groupLeaveTitle => '要退出群組嗎？';
+
+  @override
+  String get sources_groupDissolve => '解散群組';
+
+  @override
+  String sources_groupDissolveConfirm(String name) {
+    return '共用的清單留給「$name」，其他來源要重新同步。';
+  }
+
+  @override
+  String get sources_groupDissolveTitle => '要解散群組嗎？';
+
+  @override
+  String sources_groupMembersCount(int count) {
+    return '$count 個來源';
+  }
+
+  @override
+  String sources_groupUsing(String name) {
+    return '目前使用「$name」';
+  }
+
+  @override
+  String get sources_moveUp => '往上移';
+
+  @override
+  String get sources_moveDown => '往下移';
+
+  @override
+  String get sources_routeOrdered => '照我排的順序';
+
+  @override
+  String get sources_routeOrderedHint => '照你排的順序，用第一條通的';
+
+  @override
+  String get sources_reorderHint => '用上下鍵移動位置，再按一次完成';
+
+  @override
+  String get sources_groupMemberHint => '按 ▶ 可以讓它退出群組；按 [A] 調整順序';
+
+  @override
+  String get sources_routeRowHint => '選這一列排順序；按 ▶ 移到右邊的圖示：修改或移除';
+
+  @override
+  String get sources_routeUse => '使用這條路線';
+
+  @override
+  String get sources_routeLock => '鎖定這條路線';
+
+  @override
+  String get sources_routeUnlock => '解除鎖定';
+
+  @override
+  String sources_removeRouteConfirm(String name) {
+    return '確定要移除「$name」嗎？這個來源的遊戲清單會留著，消失的只有這個位址。';
+  }
+}
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 077d742..e9b53a7 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -417,6 +417,10 @@
   "onboarding_selectFolderPrompt": "Escolha a pasta onde as ROMs devem ser salvas",
   "onboarding_serverType": "Tipo de servidor",
 
+  "onboarding_folderExplanationTitle": "Configure o caminho da sua biblioteca",
+  "onboarding_folderExplanationMessage": "O R-Shop precisa de uma pasta base para guardar os jogos baixados. Isso ajuda a organizar seus arquivos e \u00e9 necess\u00e1rio para as permiss\u00f5es de pasta do Android.\n\nRecomendamos criar uma pasta chamada 'ROMs' e selecion\u00e1-la.",
+  "onboarding_continueToPicker": "Selecionar pasta",
+
   "onboarding_hangOn": "Um momento, testando a conex\u00e3o...",
   "onboarding_foundConsole": "Achei esse console no seu servidor RomM! Confirme ou escolha outro.",
   "onboarding_pickPlatform": "Escolha a plataforma correspondente no seu servidor RomM.",
@@ -526,5 +530,77 @@
   "service_downloadComplete": "Downloads conclu\u00eddos",
   "service_downloading": "Baixando: {details}",
   "service_activeCount": "{count} ativos",
-  "service_queuedCount": "{count} na fila"
+  "service_queuedCount": "{count} na fila",
+  "sources_connectionRoute": "Rota de ligação",
+  "sources_routeAuto": "Automático",
+  "sources_routeAutoHint": "Usar a rota mais r\u00e1pida que responder; volta a verificar quando a rede muda",
+  "sources_routeInUse": "Em uso",
+  "sources_routePinned": "Bloqueada",
+  "sources_routeReachable": "Acessível",
+  "sources_routeNoAnswer": "Sem resposta",
+  "sources_routeChecking": "A verificar…",
+  "sources_routeLatencyMs": "{ms} ms",
+  "sources_routeAutoPicks": "Usaria {route}",
+  "sources_routeAutoNoneReachable": "Nada respondeu",
+  "sources_routeFastest": "Mais r\u00e1pida",
+  "sources_routeReleasePin": "Remove o bloqueio e volta a escolher a mais r\u00e1pida",
+  "sources_routeOwnLogin": "In\u00edcio de sess\u00e3o pr\u00f3prio",
+  "sources_routeAuthTitle": "In\u00edcio de sess\u00e3o desta rota",
+  "sources_routeAuthHint": "Deixe em branco para usar o in\u00edcio de sess\u00e3o da fonte. Preencha apenas se este endere\u00e7o pedir outro.",
+  "sources_routeAuthInherited": "A usar o in\u00edcio de sess\u00e3o da fonte",
+  "sources_routeAuthOwn": "Esta rota inicia sess\u00e3o por si pr\u00f3pria",
+  "sources_routeOnlyOne": "Esta fonte só tem uma rota",
+  "sources_addRoute": "Adicionar rota",
+  "sources_editRoute": "Editar rota",
+  "sources_removeRoute": "Remover rota",
+  "sources_routeDuplicate": "Esta fonte já tem uma rota para esse endereço",
+  "sources_activeSource": "Em uso",
+  "sources_switchSource": "Mudar fonte",
+  "sources_prevSource": "Fonte anterior",
+  "sources_nextSource": "Fonte seguinte",
+  "sources_setFallback": "Fonte de reserva",
+  "sources_fallbackNone": "Nenhuma",
+  "sources_fallbackShort": "Reserva",
+  "sources_routeSameServerHint": "Todas as rotas chegam ao mesmo servidor. Uma rota pode ter o seu pr\u00f3prio in\u00edcio de sess\u00e3o se esse endere\u00e7o pedir outro.",
+  "sources_routeCannotRemoveLast": "Não é possível remover a última rota",
+  "sources_countLabel": "{count, plural, =1{1 fonte} other{{count} fontes}}",
+  "sources_useThisShort": "Usar esta",
+  "sources_stopUsingShort": "Parar de usar",
+  "sources_removeConfirmTitle": "Remover a fonte?",
+  "sources_removeConfirmMessage": "Remover \"{name}\"? A lista dela desaparece da biblioteca, mas os jogos já baixados neste aparelho são mantidos.",
+  "sources_groupBadge": "Grupo",
+  "sources_groupCreate": "Agrupar com outra fonte…",
+  "sources_groupCreateHint": "Para dois endereços que são, na verdade, o mesmo servidor",
+  "sources_groupPickMember": "Escolha a fonte para agrupar",
+  "sources_groupSameTypeOnly": "Só é possível agrupar fontes do mesmo tipo",
+  "sources_groupNoCandidates": "Não há outra fonte deste tipo",
+  "sources_groupManage": "Definições do grupo",
+  "sources_groupRename": "Mudar o nome do grupo",
+  "sources_groupNameLabel": "Nome do grupo",
+  "sources_groupModeTitle": "Qual membro usar",
+  "sources_groupModeAuto": "Automático",
+  "sources_groupModeAutoHint": "Sem ordem a manter — o endereço que responde primeiro é o que dá para usar primeiro",
+  "sources_groupModeOrdered": "A minha ordem",
+  "sources_groupModeOrderedHint": "Usa o primeiro da tua ordem que responder",
+  "sources_groupPreferred": "Primeira escolha",
+  "sources_groupAddMember": "Adicionar uma fonte",
+  "sources_groupLeave": "Sair do grupo",
+  "sources_groupLeaveConfirm": "«{name}» não fica com jogos nenhuns e terá de sincronizar de novo. A lista partilhada fica com o grupo.",
+  "sources_groupLeaveTitle": "Sair do grupo?",
+  "sources_groupDissolve": "Dissolver o grupo",
+  "sources_groupDissolveConfirm": "A lista partilhada fica com «{name}»; as outras terão de sincronizar de novo.",
+  "sources_groupDissolveTitle": "Dissolver o grupo?",
+  "sources_groupMembersCount": "{count} fontes",
+  "sources_groupUsing": "A usar «{name}»",
+  "sources_moveUp": "Mover para cima",
+  "sources_moveDown": "Mover para baixo",
+  "sources_routeOrdered": "A minha ordem",
+  "sources_routeOrderedHint": "Usar a primeira rota da tua ordem que responder",
+  "sources_reorderHint": "Move com cima e baixo e carrega outra vez para terminar",
+  "sources_groupMemberHint": "▶ tira-a do grupo; [A] reordena",
+  "sources_routeRowHint": "Seleciona a linha para reordenar; ▶ para os ícones: editar ou remover",
+  "sources_routeUse": "Usar esta rota",
+  "sources_routeLock": "Bloquear nesta rota",
+  "sources_routeUnlock": "Desbloquear",
+  "sources_removeRouteConfirm": "Remover «{name}»? A lista guardada desta fonte fica; só desaparece o endereço."
 }
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
new file mode 100644
index 0000000..8ca4d78
--- /dev/null
+++ b/lib/l10n/app_zh.arb
@@ -0,0 +1,646 @@
+{
+  "@@locale": "zh",
+
+  "appTitle": "R-Shop",
+
+  "settings_language": "語言",
+  "settings_languageSystem": "系統預設",
+
+  "common_back": "返回",
+  "common_close": "關閉",
+  "common_cancel": "取消",
+  "common_cancelUpper": "取消",
+  "common_select": "選擇",
+  "common_search": "搜尋",
+  "common_searchEllipsis": "搜尋...",
+  "common_menu": "選單",
+  "common_navigate": "導航",
+  "common_toggle": "切換",
+  "common_clear": "清除",
+  "common_done": "完成",
+  "common_save": "儲存",
+  "common_connect": "連線",
+  "common_retry": "重試",
+  "common_remove": "移除",
+  "common_favorite": "收藏",
+  "common_unfavorite": "取消收藏",
+  "common_downloads": "下載項目",
+  "common_installed": "已安裝",
+  "common_move": "移動",
+  "common_drop": "放下",
+  "common_grab": "抓取",
+
+  "confirm_deleteTitle": "刪除 ROM？",
+  "confirm_deleteMessage": "您真的要刪除 {gameTitle} 的這個版本嗎？",
+  "@confirm_deleteMessage": { "placeholders": { "gameTitle": { "type": "String" } } },
+  "confirm_exitTitle": "結束應用程式？",
+  "confirm_exitMessage": "您真的要結束 Retro eShop 嗎？",
+  "confirm_resetTitle": "重設應用程式？",
+  "confirm_resetMessage": "這將返回初始設定畫面。",
+  "confirm_deleteButton": "刪除",
+  "confirm_exitButton": "結束",
+  "confirm_resetButton": "重設",
+  "confirm_gamepadHint": "\u2190 \u2192 選擇   A 確認   B 取消",
+
+  "exit_title": "離開 R-Shop",
+  "exit_message": "確定要退出嗎？",
+  "exit_confirmButton": "結束",
+  "exit_cancelButton": "留在這裡",
+
+  "downloads_title": "下載項目",
+  "downloads_activeCount": "{count} 個進行中",
+  "@downloads_activeCount": { "placeholders": { "count": { "type": "int" } } },
+  "downloads_noDownloads": "無下載項目",
+  "downloads_sectionDownloading": "正在下載",
+  "downloads_sectionQueued": "等待中",
+  "downloads_sectionComplete": "已完成",
+  "downloads_actionCancel": "取消",
+  "downloads_actionRetry": "重試",
+  "downloads_actionRemove": "移除",
+  "downloads_actionClear": "清除",
+  "downloads_clearDone": "清除已完成項目",
+
+  "downloadStatus_downloading": "正在下載...",
+  "downloadStatus_extracting": "正在解壓縮...",
+  "downloadStatus_installing": "正在安裝...",
+  "downloadStatus_waiting": "等待中...",
+  "downloadStatus_complete": "已完成",
+  "downloadStatus_cancelled": "已取消",
+  "downloadStatus_failed": "失敗",
+
+  "storage_free": "剩餘 {size}",
+  "@storage_free": { "placeholders": { "size": { "type": "String" } } },
+  "storage_veryLow": "儲存空間極低：{freeSpace}",
+  "@storage_veryLow": { "placeholders": { "freeSpace": { "type": "String" } } },
+  "storage_gettingLow": "儲存空間不足：{freeSpace}",
+  "@storage_gettingLow": { "placeholders": { "freeSpace": { "type": "String" } } },
+
+  "sync_progress": "同步中 {completed}/{total}",
+  "@sync_progress": { "placeholders": { "completed": { "type": "int" }, "total": { "type": "int" } } },
+  "sync_singleSystemFailed": "{system} 同步失敗",
+  "@sync_singleSystemFailed": { "placeholders": { "system": { "type": "String" } } },
+  "sync_multipleSystemsFailed": "{count} 個系統同步失敗",
+  "@sync_multipleSystemsFailed": { "placeholders": { "count": { "type": "int" } } },
+  "sync_raProgress": "成就同步中 {completed}/{total}",
+  "@sync_raProgress": { "placeholders": { "completed": { "type": "int" }, "total": { "type": "int" } } },
+  "sync_raFailed": "RA 同步失敗",
+
+  "toast_addedToQueue": "已加入下載佇列",
+  "toast_configRecovered": "已從備份復原設定",
+
+  "gameCard_variantCount": "{count, plural, =1{1 個版本} other{{count} 個版本}}",
+  "@gameCard_variantCount": { "placeholders": { "count": { "type": "int" } } },
+
+  "gameDetail_achievements": "成就",
+  "gameDetail_mastered": "已達成",
+  "gameDetail_noAchievementsFound": "找不到成就",
+  "gameDetail_retroachievements": "RETROACHIEVEMENTS",
+  "gameDetail_romVerified": "ROM 已驗證",
+  "gameDetail_incompatibleRom": "不相容的 ROM",
+  "gameDetail_gameHasAchievements": "此遊戲支援成就",
+  "gameDetail_viewAchievements": "查看成就",
+  "gameDetail_versions": "版本",
+  "gameDetail_download": "下載",
+  "gameDetail_adding": "正在加入...",
+  "gameDetail_queued": "等待中",
+  "gameDetail_extracting": "正在解壓縮...",
+  "gameDetail_delete": "刪除",
+  "gameDetail_manageFiles": "檔案管理",
+  "gameDetail_unavailable": "不可用",
+  "gameDetail_installedLabel": "已安裝",
+  "gameDetail_notFound": "找不到",
+  "gameDetail_details": "詳情",
+  "gameDetail_screenshots": "螢幕截圖",
+  "gameDetail_otherVersions": "其他版本",
+  "gameDetail_readMore": "閱讀更多...",
+  "gameDetail_showLess": "收起內容",
+  "gameDetail_standard": "標準",
+  "gameDetail_franchise": "系列",
+  "gameDetail_gameModes": "遊戲模式",
+  "gameDetail_perspective": "視角",
+  "gameDetail_ageRating": "分級",
+  "gameDetail_themes": "主題",
+  "gameDetail_fileTags": "檔案標籤",
+  "gameDetail_tagVersion": "版本",
+  "gameDetail_tagBuild": "組建",
+  "gameDetail_tagDisc": "光碟",
+  "gameDetail_tagQuality": "品質",
+  "gameDetail_tagInfo": "資訊",
+  "gameDetail_tagTechnical": "技術資訊",
+  "gameDetail_gameInfo": "遊戲資訊",
+  "gameDetail_showTitle": "顯示標題",
+  "gameDetail_showFilename": "顯示檔案名稱",
+  "gameDetail_fromProvider": "來自 {provider}",
+  "@gameDetail_fromProvider": { "placeholders": { "provider": { "type": "String" } } },
+  "gameDetail_addToShelf": "加入收藏架",
+  "gameDetail_removeFromShelf": "從收藏架移除",
+  "gameDetail_removeFromShelfTitle": "從收藏架移除",
+  "gameDetail_gameNotInstalled": "遊戲尚未安裝",
+  "gameDetail_couldNotShare": "無法分享遊戲檔案",
+  "gameDetail_pressAPickVersion": "按 A 選擇版本",
+  "gameDetail_pressAManage": "按 A 進行管理",
+  "gameDetail_pressADownload": "按 A 下載",
+  "gameDetail_errorPrefix": "錯誤：{error}",
+  "@gameDetail_errorPrefix": { "placeholders": { "error": { "type": "String" } } },
+
+  "settings_title": "設定",
+  "settings_tabGeneral": "一般",
+  "settings_tabAudio": "音效",
+  "settings_tabAdvanced": "進階",
+  "settings_tabAbout": "關於",
+  "settings_previousTab": "上一個分頁",
+  "settings_nextTab": "下一個分頁",
+  "settings_resetApp": "重設應用程式",
+  "settings_resetDialogTitle": "重設應用程式",
+  "settings_resetDialogMessage": "這將刪除所有設定並重新開始設定流程。",
+  "settings_resetDialogConfirm": "重設",
+  "settings_resetDialogCancel": "取消",
+  "settings_sectionLibrary": "媒體庫",
+  "settings_sectionDisplay": "顯示",
+  "settings_mySources": "我的來源",
+  "settings_mySourcesSubtitle": "新增或管理 RomM, SMB, FTP 伺服器",
+  "settings_consoleSettings": "主機設定",
+  "settings_consoleSettingsSubtitle": "資料夾路徑、解壓縮、各系統選項",
+  "settings_retroAchievements": "RetroAchievements",
+  "settings_retroAchievementsSubtitle": "成就追蹤與 ROM 驗證",
+  "settings_homeLayout": "主畫面佈局",
+  "settings_homeLayoutGrid": "網格檢視",
+  "settings_homeLayoutCarousel": "橫向輪播",
+  "settings_hideEmptyConsoles": "隱藏空的主機",
+  "settings_hideEmptyConsolesSubtitle": "僅顯示含有遊戲的系統",
+  "settings_controllerButtons": "控制器按鈕",
+  "settings_controllerNintendo": "Nintendo (預設)",
+  "settings_controllerXbox": "XBOX",
+  "settings_controllerPs": "PS",
+  "settings_controllerNin": "NIN",
+  "settings_sectionFeedback": "回饋",
+  "settings_vibration": "震動",
+  "settings_vibrationSubtitle": "按鈕按下時震動",
+  "settings_soundEffects": "音效",
+  "settings_soundEffectsSubtitle": "選單操作時播放音效",
+  "settings_sectionVolume": "音量",
+  "settings_music": "音樂",
+  "settings_musicSubtitle": "環境背景音樂",
+  "settings_effects": "音效",
+  "settings_effectsSubtitle": "介面音效",
+  "settings_sectionDownloads": "下載",
+  "settings_simultaneousDownloads": "同時下載數",
+  "settings_simultaneousDownloadsSubtitle": "可同時下載的檔案數量",
+  "settings_downloadAllCovers": "下載所有封面",
+  "settings_downloadingCovers": "正在下載封面...",
+  "settings_sectionSync": "同步",
+  "settings_syncTimeout": "同步逾時",
+  "settings_syncTimeoutSubtitle": "等待每個伺服器的最長時間",
+  "settings_autoSyncInterval": "自動同步間隔",
+  "settings_autoSyncIntervalSubtitle": "自動同步之間的最小間隔時間",
+  "settings_sectionDebug": "除錯",
+  "settings_allowInsecure": "允許不安全連線",
+  "settings_allowInsecureSubtitle": "為不支援 HTTPS 的伺服器啟用 HTTP",
+  "settings_exportErrorLog": "匯出錯誤日誌",
+  "settings_exportErrorLogSubtitle": "分享當機日誌以供排錯",
+  "settings_sectionInfo": "資訊",
+  "settings_sectionLinks": "連結",
+  "settings_github": "GitHub",
+  "settings_githubSubtitle": "在 GitHub 上查看原始碼",
+  "settings_issues": "問題回報",
+  "settings_issuesSubtitle": "回報 Bug 或要求新功能",
+  "settings_tagline": "INTENSIV, AGGRESSIV, MUTIG",
+  "settings_deviceMemoryLow": "低",
+  "settings_deviceMemoryStandard": "標準",
+  "settings_deviceMemoryHigh": "高",
+  "settings_fetchingCovers": "正在擷取封面...",
+  "settings_coversResult": "封面：{ok} 成功, {failed} 失敗",
+  "@settings_coversResult": { "placeholders": { "ok": { "type": "int" }, "failed": { "type": "int" } } },
+  "settings_coversLoaded": "已載入 {count} 張封面！",
+  "@settings_coversLoaded": { "placeholders": { "count": { "type": "int" } } },
+  "settings_noErrorLog": "無可用錯誤日誌",
+  "settings_configImported": "設定已匯入！",
+  "settings_controllerXboxFull": "Xbox (A/B 與 X/Y 反轉)",
+  "settings_controllerPlaystationFull": "PlayStation (\u2715 \u25CB \u25A1 \u25B3)",
+  "settings_allCoversCached": "所有封面皆已快取",
+  "settings_downloadCoverArt": "下載所有遊戲的封面圖",
+  "settings_coverCacheInfo": "{size} ({count} 個已快取)",
+  "@settings_coverCacheInfo": { "placeholders": { "size": { "type": "String" }, "count": { "type": "int" } } },
+  "settings_coversRemaining": "剩餘 {count} 個 (~{size} MB)",
+  "@settings_coversRemaining": { "placeholders": { "count": { "type": "int" }, "size": { "type": "String" } } },
+  "settings_coversProgress": "{completed} / {total} 款遊戲",
+  "@settings_coversProgress": { "placeholders": { "completed": { "type": "int" }, "total": { "type": "int" } } },
+
+  "configMode_title": "主機設定",
+  "configMode_globalTitle": "全域設定",
+  "configMode_noFolderSet": "尚未設定資料夾",
+  "configMode_notConfigured": "未配置",
+  "configMode_export": "匯出",
+  "configMode_import": "匯入",
+
+  "systemDetail_sectionStorage": "儲存空間",
+  "systemDetail_selectRomFolder": "選擇 ROM 資料夾",
+  "systemDetail_tapToChangeFolder": "點擊以變更資料夾",
+  "systemDetail_sectionBehavior": "行為",
+  "systemDetail_autoExtractZips": "自動解壓縮 ZIP",
+  "systemDetail_autoExtractEnabled": "下載後自動解壓縮 ZIP 格式的 ROM",
+  "systemDetail_autoExtractDisabled": "下載後保持 ZIP 格式",
+  "systemDetail_autoSyncOnLaunch": "啟動時自動同步",
+  "systemDetail_autoSyncEnabled": "自動同步（遵循冷卻時間）",
+  "systemDetail_autoSyncDisabled": "僅透過 Start 選單手動同步",
+  "systemDetail_sectionSources": "來源",
+
+  "sources_title": "來源清單",
+  "sources_noSourcesConfigured": "尚未配置來源",
+  "sources_noSourcesYet": "目前無來源",
+  "sources_noSourcesDescription": "配對 RomM 伺服器以開始下載遊戲。",
+  "sources_addSource": "新增來源",
+  "sources_whereDoGamesComeFrom": "您的遊戲來自哪裡？",
+  "sources_sourceTypeRomm": "RomM 伺服器",
+  "sources_sourceTypeRommHint": "透過 QR 或 8 位代碼配對",
+  "sources_sourceTypeRommLegacy": "RomM 登入（舊版伺服器）",
+  "sources_sourceTypeSmb": "SMB 分享",
+  "sources_sourceTypeFtp": "FTP 伺服器",
+  "sources_sourceTypeWeb": "Web 鏡像",
+  "sources_sourceTypeWebHint": "HTTPS 目錄列表",
+  "sources_expired": "已過期",
+  "sources_borrowed": "已借用",
+  "sources_off": "關閉",
+  "sources_noPlatforms": "無平台",
+  "sources_rePair": "重新配對",
+  "sources_editMappings": "編輯對應",
+  "sources_disable": "停用",
+  "sources_enable": "啟用",
+
+  "manualSource_defaultNameSmb": "我的 NAS",
+  "manualSource_defaultNameFtp": "我的 FTP",
+  "manualSource_defaultNameWeb": "Web 鏡像",
+  "manualSource_defaultNameOther": "來源",
+  "manualSource_name": "名稱",
+  "manualSource_url": "URL",
+  "manualSource_urlHint": "https://example.com/roms",
+  "manualSource_host": "主機",
+  "manualSource_hostHint": "nas.local 或 192.168.1.10",
+  "manualSource_port": "連接埠",
+  "manualSource_share": "分享名稱",
+  "manualSource_shareHint": "roms",
+  "manualSource_usernameOptional": "使用者名稱 (選填)",
+  "manualSource_usernameHint": "訪客請保持空白",
+  "manualSource_passwordOptional": "密碼 (選填)",
+  "manualSource_nameRequired": "名稱為必填",
+  "manualSource_urlRequired": "URL 為必填",
+  "manualSource_hostRequired": "主機為必填",
+  "manualSource_shareRequired": "分享名稱為必填",
+  "manualSource_saveSource": "儲存來源",
+  "manualSource_smb": "SMB",
+  "manualSource_ftp": "FTP",
+  "manualSource_web": "Web",
+  "manualSource_searchingNetwork": "正在搜尋網路...",
+  "manualSource_foundOnNetwork": "在您的網路中找到",
+
+  "sourceMappings_title": "系統對應",
+  "sourceMappings_instruction": "輸入每個系統對應的遠端資料夾。留空則跳過。",
+  "sourceMappings_save": "儲存對應",
+
+  "library_title": "媒體庫",
+  "library_tabAll": "全部",
+  "library_tabInstalled": "已安裝",
+  "library_tabFavorites": "我的收藏",
+  "library_sortSystem": "按系統排序",
+  "library_sortManual": "手動排序",
+  "library_sortAZ": "按 A-Z 排序",
+  "library_sortIndicatorAZ": "A-Z",
+  "library_sortIndicatorBySystem": "按系統",
+  "library_sortIndicatorManual": "手動",
+  "library_searchHint": "搜尋媒體庫...",
+  "library_zoomIn": "放大",
+  "library_zoomOut": "縮小",
+  "library_newShelf": "新增收藏架",
+  "library_editShelf": "編輯收藏架",
+  "library_addToShelf": "加入收藏架",
+  "library_removeFromShelf": "從收藏架移除",
+  "library_reorderGames": "重新排列遊戲",
+  "library_noResults": "找不到與「{query}」相關的結果",
+  "@library_noResults": { "placeholders": { "query": { "type": "String" } } },
+  "library_tryShorterSearch": "請嘗試更短的搜尋詞",
+  "library_noInstalledGames": "目前無已安裝的遊戲",
+  "library_downloadGamesToSee": "下載遊戲後會顯示在這裡",
+  "library_noFavoritesYet": "尚未收藏任何遊戲",
+  "library_pressFavoriteHint": "對著遊戲按 SELECT 即可加入收藏",
+  "library_noGamesInShelf": "此收藏架內無遊戲",
+  "library_addGamesViaEditor": "透過收藏架編輯器新增遊戲",
+  "library_noGamesInLibrary": "媒體庫中無遊戲",
+  "library_gamesAfterSync": "同步完成後遊戲將會出現",
+
+  "shelfEdit_title": "編輯收藏架",
+  "shelfEdit_titleNew": "新增收藏架",
+  "shelfEdit_nameSection": "名稱",
+  "shelfEdit_shelfName": "收藏架名稱",
+  "shelfEdit_filterText": "過濾文字",
+  "shelfEdit_tapToSet": "點擊以設定...",
+  "shelfEdit_filterRules": "過濾規則",
+  "shelfEdit_resetManualOrder": "重設手動排序",
+  "shelfEdit_saveButton": "儲存",
+  "shelfEdit_deleteShelf": "刪除收藏架",
+  "shelfEdit_anyText": "任何文字",
+  "shelfEdit_allSystems": "所有系統",
+
+  "shelfPicker_title": "加入收藏架",
+  "systemSelector_title": "選擇系統",
+  "textInput_hint": "輸入文字...",
+  "textInput_ok": "確定",
+
+  "gameListOverlay_hiddenGames": "隱藏的遊戲",
+  "gameListOverlay_addedGames": "已新增的遊戲",
+  "gameListOverlay_restore": "還原",
+  "gameListOverlay_noGames": "無遊戲",
+  "gameListOverlay_clearAll": "全部清除",
+
+  "home_allGames": "所有遊戲",
+  "home_library": "媒體庫",
+  "home_noConsoles": "尚未配置主機",
+  "home_pressStartForMenu": "按 Start 開啟選單",
+  "home_settings": "設定",
+  "home_syncSystem": "同步 {system}",
+  "@home_syncSystem": { "placeholders": { "system": { "type": "String" } } },
+  "home_syncAll": "同步全部",
+  "home_lastSyncNever": "從未同步",
+  "home_lastSyncJustNow": "剛剛同步",
+  "home_lastSyncMinutes": "{minutes} 分鐘前同步",
+  "@home_lastSyncMinutes": { "placeholders": { "minutes": { "type": "int" } } },
+  "home_lastSyncHours": "{hours} 小時前同步",
+  "@home_lastSyncHours": { "placeholders": { "hours": { "type": "int" } } },
+  "home_lastSyncDays": "{days} 天前同步",
+  "@home_lastSyncDays": { "placeholders": { "days": { "type": "int" } } },
+
+  "common_exit": "結束",
+
+  "gameList_gamesCount": "{count} 款遊戲",
+  "@gameList_gamesCount": { "placeholders": { "count": { "type": "int" } } },
+  "gameList_offline": "離線",
+  "gameList_zoomIn": "放大",
+  "gameList_zoomOut": "縮小",
+  "gameList_filterActive": "過濾器 (啟用中)",
+  "gameList_filter": "過濾器",
+  "gameList_noGamesMatchSearch": "找不到符合「{query}」的遊戲",
+  "@gameList_noGamesMatchSearch": { "placeholders": { "query": { "type": "String" } } },
+  "gameList_tryShorterSearch": "請嘗試更短的搜尋詞",
+  "gameList_noGamesMatchFilters": "沒有符合當前過濾條件的遊戲",
+  "gameList_changeFilters": "請在選單中更改或重設過濾器",
+  "gameList_noRomsFound": "在 {folder} 中找不到 ROM",
+  "@gameList_noRomsFound": { "placeholders": { "folder": { "type": "String" } } },
+  "gameList_addRomFiles": "請將 ROM 檔案加入此資料夾並重新整理",
+  "gameList_couldNotLoadGames": "無法載入遊戲",
+  "gameList_checkConnection": "請檢查您的連線並再試一次",
+  "gameList_errorLoadingGames": "載入遊戲時發生錯誤",
+  "gameList_gamesAppearShortly": "遊戲很快就會出現",
+  "gameList_syncingLibrary": "正在同步媒體庫...",
+  "gameList_localFilesOnly": "僅限本地檔案 \u00B7 新增來源以獲得更多",
+  "gameList_pressMenuHint": "按 + 開啟選單",
+
+  "filter_activeCount": "{count} 個已啟用",
+  "@filter_activeCount": { "placeholders": { "count": { "type": "int" } } },
+
+  "shelfEdit_addFilter": "+ 新增過濾器",
+  "shelfEdit_hiddenGamesCount": "隱藏的遊戲 ({count})",
+  "@shelfEdit_hiddenGamesCount": { "placeholders": { "count": { "type": "int" } } },
+  "shelfEdit_addedGamesCount": "已新增的遊戲 ({count})",
+  "@shelfEdit_addedGamesCount": { "placeholders": { "count": { "type": "int" } } },
+  "shelfEdit_textHint": "\u2190 文字  系統 \u2192",
+
+  "gameListOverlay_gameCount": "{count, plural, =1{1 款遊戲} other{{count} 款遊戲}}",
+  "@gameListOverlay_gameCount": { "placeholders": { "count": { "type": "int" } } },
+  "gameListOverlay_actionHint": "A: {action}",
+  "@gameListOverlay_actionHint": { "placeholders": { "action": { "type": "String" } } },
+
+  "systemSelector_selectedCount": "已選擇 {count} 個",
+  "@systemSelector_selectedCount": { "placeholders": { "count": { "type": "int" } } },
+
+  "filter_favoritesOnly": "僅收藏項目",
+  "filter_installedOnly": "僅已安裝項目",
+  "filter_regions": "地區",
+  "filter_languages": "語言",
+  "filter_title": "過濾器",
+
+  "onboarding_welcomeTitle": "歡迎使用 R-Shop",
+  "onboarding_welcomeSubtitle": "您的遊戲來自哪裡？",
+  "onboarding_pairQrTitle": "透過 QR 配對 RomM",
+  "onboarding_pairQrSubtitle": "掃描 RomM 伺服器提供的 QR Code",
+  "onboarding_legacyLoginTitle": "RomM 登入（舊版伺服器）",
+  "onboarding_legacyLoginSubtitle": "RomM < 4.8 版的使用者名稱與密碼",
+  "onboarding_addServerTitle": "新增我自己的伺服器",
+  "onboarding_addServerSubtitle": "SMB, FTP 或 Web 鏡像 \u2014 手動對應系統",
+  "onboarding_localOnlyTitle": "僅限本地遊戲",
+  "onboarding_localOnlySubtitle": "已在此設備上的 ROM",
+  "onboarding_working": "運作中...",
+  "onboarding_scanningFolders": "正在掃描本地 ROM 資料夾...",
+  "onboarding_discoveringPlatforms": "正在搜尋平台...",
+  "onboarding_savingSource": "正在儲存來源...",
+  "onboarding_allSet": "一切就緒",
+  "onboarding_noSystems": "尚未配置系統 \u2014 您稍後可以從「設定」新增來源。",
+  "onboarding_systemsReady": "{count, plural, =1{1 個系統已可瀏覽} other{{count} 個系統已可瀏覽}}",
+  "@onboarding_systemsReady": { "placeholders": { "count": { "type": "int" } } },
+  "onboarding_jumpIn": "開始使用",
+  "onboarding_jumpInSubtitle": "開啟主畫面並開始同步",
+  "onboarding_retroachievements": "RetroAchievements",
+  "onboarding_retroachievementsSubtitle": "追蹤您的復古遊戲成就",
+  "onboarding_exportConfig": "匯出設定",
+  "onboarding_exportConfigSubtitle": "在另一台設備上重複使用此設定",
+  "onboarding_importConfig": "匯入設定",
+  "onboarding_configImported": "設定已匯入！",
+  "onboarding_exportFailed": "匯出失敗：{error}",
+  "@onboarding_exportFailed": { "placeholders": { "error": { "type": "String" } } },
+  "onboarding_invalidConfig": "無效設定：{error}",
+  "@onboarding_invalidConfig": { "placeholders": { "error": { "type": "String" } } },
+  "onboarding_failedToSave": "儲存失敗：{error}",
+  "@onboarding_failedToSave": { "placeholders": { "error": { "type": "String" } } },
+  "onboarding_selectFolderPrompt": "選擇儲存 ROM 的資料夾",
+  "onboarding_serverType": "伺服器類型",
+
+  "onboarding_folderExplanationTitle": "設定您的遊戲庫路徑",
+  "onboarding_folderExplanationMessage": "R-Shop 需要您選擇一個資料夾來存放下載的遊戲。這能幫助 App 整理您的遊戲檔案，並獲得 Android 的存取權限。\n\n建議您可以建立一個名為「ROMs」的資料夾並選擇它。",
+  "onboarding_continueToPicker": "開始選擇",
+
+  "onboarding_hangOn": "請稍候，正在測試連線...",
+  "onboarding_foundConsole": "我在您的 RomM 伺服器上找到了這個主機！請確認或選擇另一個。",
+  "onboarding_pickPlatform": "從您的 RomM 伺服器選擇對應的平台。",
+  "onboarding_couldNotReach": "無法連線至您的 RomM 伺服器。請檢查 URL 並再試一次。",
+  "onboarding_connectionGood": "連線狀況良好！您可以儲存此來源了。",
+  "onboarding_couldNotConnect": "嗯... 無法連線。請再次確認網址與認證資訊。",
+  "onboarding_whatKindOfSource": "這是哪種類型的來源？請選擇連線類型。",
+  "onboarding_lookingGood": "看起來不錯！您可以新增更多來源，或者在就緒後按「完成」。",
+  "onboarding_localCollection": "這是本地收藏。您可以新增來源來下載更多遊戲，或直接按「完成」！",
+  "onboarding_addMoreSources": "現在請至少新增一個來源，好讓我知道去哪裡找 ROM。",
+  "onboarding_letsSetUp": "讓我們來設定您的主機！選擇任一系統即可開始。",
+
+  "onboarding_romFolder": "ROM 資料夾",
+  "onboarding_options": "選項",
+  "onboarding_autoExtractZips": "自動解壓縮 ZIP 格式 ROM",
+  "onboarding_autoSyncLabel": "啟動時自動同步",
+  "onboarding_autoSyncEnabled": "自動同步（遵循冷卻時間）",
+  "onboarding_autoSyncDisabled": "僅透過 Start 選單手動同步",
+  "onboarding_selectFolder": "選擇資料夾...",
+
+  "providerForm_addSource": "新增來源",
+  "providerForm_editSource": "編輯來源",
+  "providerForm_url": "URL",
+  "providerForm_urlPlaceholder": "https://...",
+  "providerForm_path": "路徑",
+  "providerForm_pathPlaceholder": "/roms/nes/ (選填)",
+  "providerForm_username": "使用者名稱",
+  "providerForm_usernameOptional": "(選填)",
+  "providerForm_password": "密碼",
+  "providerForm_host": "主機",
+  "providerForm_hostPlaceholder": "192.168.1.100",
+  "providerForm_port": "連接埠",
+  "providerForm_share": "分享名稱",
+  "providerForm_sharePlaceholder": "roms",
+  "providerForm_domain": "網域",
+  "providerForm_domainOptional": "(選填)",
+  "providerForm_rommUrl": "URL",
+  "providerForm_rommUrlPlaceholder": "https://romm.example.com",
+  "providerForm_apiKey": "API Key",
+  "providerForm_apiKeyOptional": "(選填)",
+  "providerForm_httpBlocked": "非本地伺服器的 HTTP 已被封鎖。請使用 HTTPS，或稍後在「設定」中啟用。",
+  "providerForm_httpWarning": "認證資訊將透過未加密的 HTTP 傳送",
+  "providerForm_testingConnection": "正在測試連線...",
+  "providerForm_connectionSuccessful": "連線成功！",
+  "providerForm_fetchingPlatforms": "正在擷取平台...",
+  "providerForm_noPlatformsFound": "在此 RomM 伺服器上找不到任何平台。",
+  "providerForm_platform": "平台",
+  "providerForm_pickPlatform": "選擇平台...",
+  "providerForm_testAndSave": "測試並儲存",
+  "providerForm_connectionFailed": "連線失敗",
+  "providerForm_hostMissing": "主機",
+  "providerForm_portMissing": "連接埠",
+  "providerForm_pathMissing": "路徑",
+  "providerForm_shareMissing": "分享名稱",
+  "providerForm_urlMissing": "URL",
+
+  "rommLogin_title": "登入 RomM",
+  "rommLogin_name": "名稱",
+  "rommLogin_nameDefault": "我的 RomM",
+  "rommLogin_serverUrl": "伺服器 URL",
+  "rommLogin_username": "使用者名稱",
+  "rommLogin_usernameHint": "admin",
+  "rommLogin_password": "密碼",
+  "rommLogin_passwordHint": "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022",
+  "rommLogin_nameRequired": "名稱為必填",
+  "rommLogin_serverUrlRequired": "伺服器 URL 為必填",
+  "rommLogin_credentialsRequired": "使用者名稱或密碼為必填",
+
+  "ra_title": "RetroAchievements",
+  "ra_subtitle": "追蹤您的復古遊戲成就。",
+  "ra_usernameLabel": "使用者名稱",
+  "ra_usernameHint": "您的 RA 使用者名稱",
+  "ra_apiKeyLabel": "API Key",
+  "ra_apiKeyHint": "從 retroachievements.org 貼上",
+  "ra_usernameRequired": "使用者名稱為必填",
+  "ra_apiKeyRequired": "API Key 為必填",
+  "ra_connectionFailed": "連線失敗",
+  "ra_disconnect": "斷開連線",
+  "ra_syncNow": "立即同步成就",
+  "ra_skipForNow": "暫時跳過",
+
+  "pairing_scanQrTitle": "掃描 QR Code",
+  "pairing_scanQrHint": "將 QR Code 置於框架內",
+  "pairing_enterManually": "手動輸入代碼",
+  "pairing_invalidQr": "此 QR Code 不是有效的 RomM 配對連結",
+  "pairing_manualTitle": "手動配對",
+  "pairing_manualInstructions": "請在 RomM 網頁版 UI 的設定中產生代碼",
+  "pairing_serverUrl": "伺服器 URL",
+  "pairing_pairingCode": "配對代碼",
+  "pairing_pairingCodeHint": "ABCD-1234",
+  "pairing_probingServer": "正在測試伺服器...",
+  "pairing_serverNotReachable": "伺服器無法連線或非 RomM 執行個體",
+  "pairing_serverUrlRequired": "伺服器 URL 與代碼均為必填",
+  "pairing_successTitle": "配對成功",
+  "pairing_server": "伺服器",
+  "pairing_token": "Token",
+  "pairing_userId": "使用者 ID",
+  "pairing_expiry": "有效期限",
+  "pairing_neverExpires": "永久有效",
+  "pairing_alreadyExpired": "已過期",
+  "pairing_permissions": "權限",
+  "pairing_addServer": "新增伺服器",
+
+  "service_notificationTitle": "R-Shop",
+  "service_channelName": "下載項目",
+  "service_channelDescription": "顯示下載遊戲的進度",
+  "service_downloadComplete": "下載完成",
+  "service_downloading": "正在下載：{details}",
+  "@service_downloading": { "placeholders": { "details": { "type": "String" } } },
+  "service_activeCount": "{count} 個下載中",
+  "@service_activeCount": { "placeholders": { "count": { "type": "int" } } },
+  "service_queuedCount": "{count} 個等待中",
+  "@service_queuedCount": { "placeholders": { "count": { "type": "int" } } },
+  "sources_connectionRoute": "連線方式",
+  "sources_routeAuto": "自動選擇",
+  "sources_routeAutoHint": "用回應最快的那條，網路變了會重新選",
+  "sources_routeInUse": "使用中",
+  "sources_routePinned": "已鎖定",
+  "sources_routeReachable": "連得上",
+  "sources_routeNoAnswer": "沒有回應",
+  "sources_routeChecking": "檢查中…",
+  "sources_routeLatencyMs": "{ms} ms",
+  "@sources_routeLatencyMs": { "placeholders": { "ms": { "type": "int" } } },
+  "sources_routeAutoPicks": "會選「{route}」",
+  "@sources_routeAutoPicks": { "placeholders": { "route": { "type": "String" } } },
+  "sources_routeAutoNoneReachable": "沒有任何連線方式有回應",
+  "sources_routeFastest": "最快",
+  "sources_routeReleasePin": "解除鎖定，重新選最快的那條",
+  "sources_routeOwnLogin": "專屬登入",
+  "sources_routeAuthTitle": "這條連線方式的登入資訊",
+  "sources_routeAuthHint": "留空就沿用來源的登入資訊；只有這個位址要求另一組登入時才填。",
+  "sources_routeAuthInherited": "沿用來源的登入資訊",
+  "sources_routeAuthOwn": "這條連線方式用自己的登入資訊",
+  "sources_routeOnlyOne": "這個來源只有一條連線方式",
+  "sources_addRoute": "新增連線方式",
+  "sources_editRoute": "編輯連線方式",
+  "sources_removeRoute": "刪除這條連線方式",
+  "sources_routeDuplicate": "這個來源已經有一條指向同一個位址的連線方式",
+  "sources_activeSource": "使用中",
+  "sources_switchSource": "切換來源",
+  "sources_prevSource": "上一個來源",
+  "sources_nextSource": "下一個來源",
+  "sources_setFallback": "代理來源",
+  "sources_fallbackNone": "不設定",
+  "sources_fallbackShort": "代理",
+  "sources_routeSameServerHint": "這些都是通往同一台伺服器的路。某個位址要求另一組登入時，可以只幫那一條設定登入資訊。",
+  "sources_routeCannotRemoveLast": "最後一條連線方式不能移除",
+  "sources_countLabel": "{count} 個來源",
+  "sources_useThisShort": "目前使用這個",
+  "sources_stopUsingShort": "取消使用",
+  "sources_removeConfirmTitle": "移除來源？",
+  "sources_removeConfirmMessage": "確定要移除「{name}」嗎？這個來源的清單會從圖書館消失，但已經下載到裝置上的遊戲會保留。",
+  "sources_groupBadge": "群組",
+  "sources_groupCreate": "與其他來源設成群組…",
+  "sources_groupCreateHint": "適用於實際上是同一台伺服器的兩個位址",
+  "sources_groupPickMember": "選擇要一起設成群組的來源",
+  "sources_groupSameTypeOnly": "只能和同類型的來源設成群組",
+  "sources_groupNoCandidates": "沒有其他同類型的來源",
+  "sources_groupManage": "群組設定",
+  "sources_groupRename": "重新命名群組",
+  "sources_groupNameLabel": "群組名稱",
+  "sources_groupModeTitle": "要用哪一台",
+  "sources_groupModeAuto": "自動選擇",
+  "sources_groupModeAutoHint": "不用維護順序——先回應的那台就是你最快能用的那台",
+  "sources_groupModeOrdered": "照我排的順序",
+  "sources_groupModeOrderedHint": "照你排的順序，用第一個通的",
+  "sources_groupPreferred": "第一順位",
+  "sources_groupAddMember": "加入來源",
+  "sources_groupLeave": "退出群組",
+  "sources_groupLeaveConfirm": "「{name}」不會留下任何遊戲清單，要重新同步。共用的清單留在群組裡。",
+  "sources_groupLeaveTitle": "要退出群組嗎？",
+  "sources_groupDissolve": "解散群組",
+  "sources_groupDissolveConfirm": "共用的清單留給「{name}」，其他來源要重新同步。",
+  "sources_groupDissolveTitle": "要解散群組嗎？",
+  "sources_groupMembersCount": "{count} 個來源",
+  "sources_groupUsing": "目前使用「{name}」",
+  "sources_moveUp": "往上移",
+  "sources_moveDown": "往下移",
+  "sources_routeOrdered": "照我排的順序",
+  "sources_routeOrderedHint": "照你排的順序，用第一條通的",
+  "sources_reorderHint": "用上下鍵移動位置，再按一次完成",
+  "sources_groupMemberHint": "按 ▶ 可以讓它退出群組；按 [A] 調整順序",
+  "sources_routeRowHint": "選這一列排順序；按 ▶ 移到右邊的圖示：修改或移除",
+  "sources_routeUse": "使用這條路線",
+  "sources_routeLock": "鎖定這條路線",
+  "sources_routeUnlock": "解除鎖定",
+  "sources_removeRouteConfirm": "確定要移除「{name}」嗎？這個來源的遊戲清單會留著，消失的只有這個位址。"
+}
diff --git a/lib/main.dart b/lib/main.dart
index b7a6fdd..a4c426b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -197,7 +197,6 @@ class _RShopAppState extends ConsumerState<RShopApp> with WidgetsBindingObserver
           );
           if (result.names.isNotEmpty) {
             totalNew += result.names.length;
-            allNewIds.addAll(result.ids);
             allNewNames.addAll(result.names);
           }
         }
diff --git a/lib/models/config/app_config.dart b/lib/models/config/app_config.dart
index f960aaa..69c5447 100644
--- a/lib/models/config/app_config.dart
+++ b/lib/models/config/app_config.dart
@@ -6,15 +6,8 @@ import 'system_config.dart';
 ///
 /// Schema versions:
 /// - **v1/v2**: each [SystemConfig] embedded its own list of
-///   [ProviderConfig]. Sources were duplicated across systems and there
-///   was no way to share a single RomM instance between consoles cleanly.
-/// - **v3**: top-level [sources] list. Each [SystemConfig] still carries
-///   its legacy `providers` list during the transition, plus optional
-///   per-system overrides via `enabledSourceIds` / `manualMappings`. The
-///   migration from v2 → v3 happens transparently inside [fromJson] and
-///   yields a config that is byte-for-byte equivalent at the resolver
-///   level — old code paths keep reading `providers`, new code paths read
-///   `sources`.
+///   [ProviderConfig].
+/// - **v3**: top-level [sources] list with multi-entry fallback chains.
 class AppConfig {
   static const int currentVersion = 3;
 
@@ -22,10 +15,19 @@ class AppConfig {
   final List<SystemConfig> systems;
   final List<Source> sources;
 
+  /// The one source the library is currently **showing**, or null to show
+  /// every enabled source at once.
+  final String? activeSourceId;
+
+  /// The source in use: what syncs, and what the home screen shows by default.
+  final String? primarySourceId;
+
   const AppConfig({
     this.version = currentVersion,
     required this.systems,
     this.sources = const [],
+    this.activeSourceId,
+    this.primarySourceId,
   });
 
   static const empty = AppConfig(systems: []);
@@ -52,19 +54,26 @@ class AppConfig {
 
     final rawSources = json['sources'] as List<dynamic>?;
     if (rawSources != null) {
-      // Already v3+. Trust the persisted sources list verbatim.
-      final sources = rawSources
+      var sources = rawSources
           .map((e) => Source.fromJson(e as Map<String, dynamic>))
           .toList();
+
+      // Migrate legacy `source_groups` into `fallbackSourceIds` if present
+      final rawGroups = json['source_groups'] as List<dynamic>?;
+      if (rawGroups != null && rawGroups.isNotEmpty) {
+        sources = _migrateGroupsToFallbacks(sources, rawGroups);
+      }
+
       return AppConfig(
         version: rawVersion,
         systems: systems,
         sources: sources,
+        activeSourceId: json['active_source_id'] as String?,
+        primarySourceId: json['primary_source_id'] as String? ??
+            json['active_source_id'] as String?,
       );
     }
 
-    // v2 (or older) → derive sources from per-system providers and rewrite
-    // both halves so callers see a consistent v3 shape going forward.
     return _migrateLegacyToV3(systems);
   }
 
@@ -73,16 +82,18 @@ class AppConfig {
       'version': version,
       'systems': systems.map((s) => s.toJson()).toList(),
       'sources': sources.map((s) => s.toJson()).toList(),
+      if (activeSourceId != null) 'active_source_id': activeSourceId,
+      if (primarySourceId != null) 'primary_source_id': primarySourceId,
     };
   }
 
-  /// Like [toJson] but strips all auth credentials (passwords, API keys).
-  /// Used for config export to prevent accidental credential sharing.
   Map<String, dynamic> toJsonWithoutAuth() {
     return {
       'version': version,
       'systems': systems.map((s) => s.toJsonWithoutAuth()).toList(),
       'sources': sources.map((s) => s.toJsonWithoutAuth()).toList(),
+      if (activeSourceId != null) 'active_source_id': activeSourceId,
+      if (primarySourceId != null) 'primary_source_id': primarySourceId,
     };
   }
 
@@ -90,29 +101,88 @@ class AppConfig {
     int? version,
     List<SystemConfig>? systems,
     List<Source>? sources,
+    String? activeSourceId,
+    bool clearActiveSource = false,
+    String? primarySourceId,
+    bool clearPrimarySource = false,
   }) {
     return AppConfig(
       version: version ?? this.version,
       systems: systems ?? this.systems,
       sources: sources ?? this.sources,
+      activeSourceId:
+          clearActiveSource ? null : (activeSourceId ?? this.activeSourceId),
+      primarySourceId:
+          clearPrimarySource ? null : (primarySourceId ?? this.primarySourceId),
     );
   }
+
+  /// The source currently in view, or null when every enabled source is used.
+  Source? get activeSource {
+    final id = activeSourceId;
+    if (id == null) return null;
+    for (final s in sources) {
+      if (s.id == id) return s;
+    }
+    return null;
+  }
+
+  /// The source in use, or null when none is designated.
+  Source? get primarySource {
+    final id = primarySourceId;
+    if (id == null) return null;
+    for (final s in sources) {
+      if (s.id == id) return s;
+    }
+    return null;
+  }
+
+  /// Which id owns the cached games for [sourceId].
+  /// Each source owns its own library cache.
+  String cacheOwnerIdFor(String sourceId) => sourceId;
+
+  /// Returns the sources available for display on the home screen.
+  List<Source> collapsedSources({
+    Map<String, String> effectiveMemberByGroupId = const {},
+    bool enabledOnly = true,
+  }) {
+    return sources.where((s) => !enabledOnly || s.enabled).toList();
+  }
+
+  static List<Source> _migrateGroupsToFallbacks(
+    List<Source> sources,
+    List<dynamic> rawGroups,
+  ) {
+    final map = {for (final s in sources) s.id: s};
+    for (final raw in rawGroups) {
+      if (raw is! Map<String, dynamic>) continue;
+      final members = (raw['member_ids'] as List<dynamic>?)
+              ?.map((e) => e as String)
+              .toList() ??
+          const <String>[];
+      final mode = raw['mode'] as String? ?? 'ordered';
+      final isAuto = mode == 'auto';
+      if (members.length >= 2) {
+        final headId = members.first;
+        final fallbacks = members.sublist(1);
+        final head = map[headId];
+        if (head != null) {
+          final mergedFallbacks = [
+            ...head.fallbackSourceIds,
+            for (final f in fallbacks)
+              if (!head.fallbackSourceIds.contains(f)) f,
+          ];
+          map[headId] = head.copyWith(
+            fallbackSourceIds: mergedFallbacks,
+            fallbackAutoSelect: isAuto || head.fallbackAutoSelect,
+          );
+        }
+      }
+    }
+    return map.values.toList();
+  }
 }
 
-/// Walks every legacy [ProviderConfig] and folds them into a deduplicated
-/// [Source] list.
-///
-/// Behaviour:
-/// - Two providers with the same connection identity (URL/host+share)
-///   collapse into a single [Source]; the first one's metadata wins.
-/// - RomM providers become `autoMap: true` sources and contribute their
-///   system slug to the source's `knownPlatforms` cache so the resolver
-///   doesn't have to round-trip on the next launch.
-/// - SMB/FTP/Web providers become `autoMap: false` sources and a
-///   [SystemSourceMapping] is added to the owning system carrying the
-///   remote path that the legacy provider used.
-/// - The original `providers` lists are kept intact on each system so
-///   nothing in the read path breaks during the transition window.
 AppConfig _migrateLegacyToV3(List<SystemConfig> legacySystems) {
   final sourcesByKey = <String, Source>{};
   final migratedSystems = <SystemConfig>[];
@@ -171,8 +241,6 @@ AppConfig _migrateLegacyToV3(List<SystemConfig> legacySystems) {
         );
       }
 
-      // Manual sources need a per-system path mapping; auto-map sources
-      // (RomM today) advertise their own platforms so they don't.
       if (!probe.type.supportsAutoMap) {
         final remotePath = _legacyRemotePath(provider);
         if (remotePath.isNotEmpty) {
@@ -186,10 +254,6 @@ AppConfig _migrateLegacyToV3(List<SystemConfig> legacySystems) {
         }
       }
 
-      // Tag the legacy provider so the SourcesNotifier rebuild recognises
-      // it as belonging to a source. Without this the provider would be
-      // treated as unmanaged forever and survive a source disable/remove,
-      // which is exactly the "sync still hits the disabled RomM" bug.
       taggedProviders.add(
         provider.copyWith(
           managedBySource: true,
diff --git a/lib/models/config/provider_config.dart b/lib/models/config/provider_config.dart
index a8bb85a..73ad1ed 100644
--- a/lib/models/config/provider_config.dart
+++ b/lib/models/config/provider_config.dart
@@ -102,6 +102,11 @@ class ProviderConfig {
   /// back to their owner source for diffing.
   final String? sourceId;
 
+  /// Which [SourceEndpoint] of that source produced this config — the route
+  /// currently live on the source. Games are cached per route, so this is what
+  /// keeps the LAN list and the internet list apart.
+  final String? endpointId;
+
   const ProviderConfig({
     required this.type,
     required this.priority,
@@ -115,6 +120,7 @@ class ProviderConfig {
     this.platformName,
     this.managedBySource = false,
     this.sourceId,
+    this.endpointId,
   });
 
   factory ProviderConfig.fromJson(Map<String, dynamic> json) {
@@ -133,6 +139,7 @@ class ProviderConfig {
       platformName: json['platform_name'] as String?,
       managedBySource: json['managed_by_source'] as bool? ?? false,
       sourceId: json['source_id'] as String?,
+      endpointId: json['endpoint_id'] as String?,
     );
   }
 
@@ -150,6 +157,7 @@ class ProviderConfig {
       if (platformName != null) 'platform_name': platformName,
       if (managedBySource) 'managed_by_source': true,
       if (sourceId != null) 'source_id': sourceId,
+      if (endpointId != null) 'endpoint_id': endpointId,
     };
   }
 
@@ -171,6 +179,7 @@ class ProviderConfig {
       // loaded back from the SQLite cache.
       if (managedBySource) 'managed_by_source': true,
       if (sourceId != null) 'source_id': sourceId,
+      if (endpointId != null) 'endpoint_id': endpointId,
     };
   }
 
@@ -316,6 +325,7 @@ class ProviderConfig {
     String? platformName,
     bool? managedBySource,
     String? sourceId,
+    String? endpointId,
   }) {
     return ProviderConfig(
       type: type ?? this.type,
@@ -330,6 +340,7 @@ class ProviderConfig {
       platformName: platformName ?? this.platformName,
       managedBySource: managedBySource ?? this.managedBySource,
       sourceId: sourceId ?? this.sourceId,
+      endpointId: endpointId ?? this.endpointId,
     );
   }
 }
diff --git a/lib/models/config/source.dart b/lib/models/config/source.dart
index 565344c..ba01aa6 100644
--- a/lib/models/config/source.dart
+++ b/lib/models/config/source.dart
@@ -103,7 +103,10 @@ class Source {
   final int? port; // smb/ftp
   final String? share; // smb
   final String? path; // local
-  final AuthConfig? auth;
+
+  /// Credentials for this source.
+  AuthConfig? get auth => _auth;
+  final AuthConfig? _auth;
 
   // --- Behaviour ---
 
@@ -121,23 +124,29 @@ class Source {
   /// or losing its credentials.
   final bool enabled;
 
+  // --- Multi-entry Fallback Chain ---
+
+  /// Other sources to fall back on when this one does not answer, in order of
+  /// preference.
+  final List<String> fallbackSourceIds;
+
+  /// Optional: whether to automatically probe all fallback sources concurrently
+  /// and pick whichever answers first (`true`), or follow [fallbackSourceIds] list
+  /// order (`false`, default).
+  final bool fallbackAutoSelect;
+
+  /// Backwards compatibility getter returning the first fallback source ID.
+  String? get fallbackSourceId => fallbackSourceIds.isNotEmpty ? fallbackSourceIds.first : null;
+
   // --- Borrow / sharing ---
 
-  /// True when this source was paired from somebody else's RomM (the
-  /// token role/scopes determine that). Surfaced as a "borrowed" badge
-  /// in the Sources screen.
+  /// True when this source was paired from somebody else's RomM.
   final bool borrowed;
 
-  /// RomM Client API Token expiry, mirrored from `auth.clientTokenExpiresAt`
-  /// for convenience so the Sources screen doesn't have to dive into auth.
+  /// RomM Client API Token expiry.
   final DateTime? tokenExpiresAt;
 
   /// Cached map of system slug → RomM numeric platform id (RomM only).
-  ///
-  /// Populated on the first successful sync; used by the resolver to
-  /// answer "does this source even know about NDS, and if so what is its
-  /// numeric id?" without a network round-trip. For non-RomM sources
-  /// this is always empty.
   final Map<String, int> knownPlatforms;
 
   const Source({
@@ -149,14 +158,16 @@ class Source {
     this.port,
     this.share,
     this.path,
-    this.auth,
+    AuthConfig? auth,
     this.autoMap = false,
     this.priority = 100,
     this.enabled = true,
+    this.fallbackSourceIds = const [],
+    this.fallbackAutoSelect = false,
     this.borrowed = false,
     this.tokenExpiresAt,
     this.knownPlatforms = const {},
-  });
+  }) : _auth = auth;
 
   factory Source.fromJson(Map<String, dynamic> json) {
     DateTime? exp;
@@ -164,12 +175,22 @@ class Source {
     if (raw is String && raw.isNotEmpty) {
       exp = DateTime.tryParse(raw);
     }
+    final type = SourceType.values
+            .asNameMap()[json['type'] as String? ?? 'romm'] ??
+        SourceType.romm;
+
+    // Parse fallback source IDs, maintaining backwards compatibility with `fallback_source_id`
+    var fallbacks = <String>[];
+    if (json['fallback_source_ids'] is List) {
+      fallbacks = (json['fallback_source_ids'] as List).cast<String>();
+    } else if (json['fallback_source_id'] is String && (json['fallback_source_id'] as String).isNotEmpty) {
+      fallbacks = [json['fallback_source_id'] as String];
+    }
+
     return Source(
       id: json['id'] as String,
       name: json['name'] as String,
-      type: SourceType.values
-              .asNameMap()[json['type'] as String? ?? 'romm'] ??
-          SourceType.romm,
+      type: type,
       url: json['url'] as String?,
       host: json['host'] as String?,
       port: json['port'] as int?,
@@ -181,6 +202,8 @@ class Source {
       autoMap: json['auto_map'] as bool? ?? false,
       priority: json['priority'] as int? ?? 100,
       enabled: json['enabled'] as bool? ?? true,
+      fallbackSourceIds: fallbacks,
+      fallbackAutoSelect: json['fallback_auto_select'] as bool? ?? false,
       borrowed: json['borrowed'] as bool? ?? false,
       tokenExpiresAt: exp,
       knownPlatforms: (json['known_platforms'] as Map<String, dynamic>?)
@@ -199,10 +222,12 @@ class Source {
       if (port != null) 'port': port,
       if (share != null) 'share': share,
       if (path != null) 'path': path,
-      if (auth != null) 'auth': auth!.toJson(),
+      if (_auth != null) 'auth': _auth!.toJson(),
       'auto_map': autoMap,
       'priority': priority,
       'enabled': enabled,
+      if (fallbackSourceIds.isNotEmpty) 'fallback_source_ids': fallbackSourceIds,
+      if (fallbackAutoSelect) 'fallback_auto_select': fallbackAutoSelect,
       'borrowed': borrowed,
       if (tokenExpiresAt != null)
         'token_expires_at': tokenExpiresAt!.toIso8601String(),
@@ -225,12 +250,6 @@ class Source {
   }
 
   /// Stable identity used for deduplication during legacy migration.
-  ///
-  /// Two providers from the old `SystemConfig.providers` list that share
-  /// the same connection details should collapse into a single [Source]
-  /// even if they were attached to different systems. This identity is
-  /// per-type so that an SMB and a Web source with the same hostname stay
-  /// separate.
   String get connectionKey {
     switch (type) {
       case SourceType.romm:
@@ -257,8 +276,7 @@ class Source {
         '${uri.hasPort ? ':${uri.port}' : ''}$path';
   }
 
-  /// Short label suitable for the Sources screen (e.g. "tim.duckdns.org"
-  /// or "192.168.1.50:8090"). Falls back to [name] if no host is known.
+  /// Short label suitable for the Sources screen.
   String get hostLabel {
     switch (type) {
       case SourceType.romm:
@@ -288,6 +306,9 @@ class Source {
     bool? autoMap,
     int? priority,
     bool? enabled,
+    List<String>? fallbackSourceIds,
+    bool? fallbackAutoSelect,
+    bool clearFallbacks = false,
     bool? borrowed,
     DateTime? tokenExpiresAt,
     Map<String, int>? knownPlatforms,
@@ -301,10 +322,14 @@ class Source {
       port: port ?? this.port,
       share: share ?? this.share,
       path: path ?? this.path,
-      auth: auth ?? this.auth,
+      auth: auth ?? _auth,
       autoMap: autoMap ?? this.autoMap,
       priority: priority ?? this.priority,
       enabled: enabled ?? this.enabled,
+      fallbackSourceIds: clearFallbacks
+          ? const []
+          : (fallbackSourceIds ?? this.fallbackSourceIds),
+      fallbackAutoSelect: fallbackAutoSelect ?? this.fallbackAutoSelect,
       borrowed: borrowed ?? this.borrowed,
       tokenExpiresAt: tokenExpiresAt ?? this.tokenExpiresAt,
       knownPlatforms: knownPlatforms ?? this.knownPlatforms,
diff --git a/lib/providers/app_providers.dart b/lib/providers/app_providers.dart
index 6a2a316..20c999a 100644
--- a/lib/providers/app_providers.dart
+++ b/lib/providers/app_providers.dart
@@ -1,4 +1,5 @@
 import 'dart:ui';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../services/storage_service.dart';
@@ -13,6 +14,8 @@ import '../services/disk_space_service.dart';
 import '../services/native_smb_service.dart';
 import '../services/romm_pairing_service.dart';
 import '../services/sources_notifier.dart';
+import '../services/source_failover.dart';
+import '../services/endpoint_probe_service.dart';
 import '../models/game_item.dart';
 import '../models/sound_settings.dart';
 
@@ -43,6 +46,10 @@ final sourcesProvider =
   return SourcesNotifier(ref.read(configStorageServiceProvider));
 });
 
+final endpointProbeServiceProvider = Provider<EndpointProbeService>((ref) {
+  return EndpointProbeService();
+});
+
 final configStorageServiceProvider = Provider<ConfigStorageService>((ref) {
   return ConfigStorageService();
 });
@@ -302,16 +309,27 @@ class LocaleNotifier extends StateNotifier<Locale?> {
   LocaleNotifier(this._storage) : super(_initLocale(_storage));
 
   static Locale? _initLocale(StorageService s) {
-    final code = s.getLocaleOverride();
-    return code == null ? null : Locale(code);
+    final tag = s.getLocaleOverride();
+    if (tag == null) return null;
+    final parts = tag.split('-');
+    if (parts.length > 1) {
+      return Locale(parts[0], parts[1]);
+    }
+    return Locale(tag);
   }
 
   Future<void> cycle(List<Locale> supported) async {
-    final codes = [null, ...supported.map((l) => l.languageCode)];
-    final current = state?.languageCode;
-    final idx = codes.indexOf(current);
-    final next = codes[(idx + 1) % codes.length];
-    state = next == null ? null : Locale(next);
+    final tags = [null, ...supported.map((l) => l.toLanguageTag())];
+    final current = state?.toLanguageTag();
+    final idx = tags.indexOf(current);
+    final next = tags[(idx + 1) % tags.length];
+
+    if (next == null) {
+      state = null;
+    } else {
+      final parts = next.split('-');
+      state = parts.length > 1 ? Locale(parts[0], parts[1]) : Locale(next);
+    }
     await _storage.setLocaleOverride(next);
   }
 }
@@ -447,3 +465,52 @@ final storageInfoProvider =
   (ref, path) => DiskSpaceService.getFreeSpace(path),
 );
 
+
+/// Which source the running (or most recent) sync is actually talking to.
+///
+/// Set when a sync resolves its source, so both the home header and the sync
+/// badge can name the server — with two sources configured, "syncing 3/8" on
+/// its own does not say *whose* library is being fetched.
+///
+/// [isFallback] is true when the selected source was unreachable and its
+/// partner stood in. Null means no single answer applies: every source is in
+/// view, or nothing has resolved yet.
+final syncingSourceProvider =
+    StateProvider<({String name, bool isFallback})?>((ref) => null);
+
+class ActiveFailoverChoiceNotifier extends StateNotifier<SourceChoice?> {
+  final Ref _ref;
+
+  ActiveFailoverChoiceNotifier(this._ref) : super(null) {
+    _ref.listen<SourcesState>(sourcesProvider, (previous, next) async {
+      if (previous != null && !next.loading) {
+        await refresh();
+      }
+    });
+  }
+
+  set choice(SourceChoice? value) => state = value;
+
+  Future<void> refresh() async {
+    try {
+      final probe = _ref.read(endpointProbeServiceProvider);
+      probe.invalidate();
+      final configStorage = _ref.read(configStorageServiceProvider);
+      final config = await configStorage.loadConfig();
+      if (config != null) {
+        final resolved = await resolveForSync(config: config, probe: probe);
+        state = resolved.choice;
+      }
+    } catch (e) {
+      debugPrint('Auto failover sync failed: $e');
+    }
+  }
+}
+
+/// Represents current failover choice state across the app.
+/// When non-null and choice.isFallback is true, primary source failed to connect
+/// and a fallback source is in active use.
+final activeFailoverChoiceProvider =
+    StateNotifierProvider<ActiveFailoverChoiceNotifier, SourceChoice?>((ref) {
+  return ActiveFailoverChoiceNotifier(ref);
+});
diff --git a/lib/services/database_service.dart b/lib/services/database_service.dart
index d71f95d..a33f8b3 100644
--- a/lib/services/database_service.dart
+++ b/lib/services/database_service.dart
@@ -14,7 +14,7 @@ import '../utils/ra_name_matcher.dart';
 class DatabaseService {
   static Future<Database>? _initFuture;
   static const String _tableName = 'games';
-  static const int _dbVersion = 13;
+  static const int _dbVersion = 16;
 
   @visibleForTesting
   static Database? testDatabase;
@@ -30,6 +30,19 @@ class DatabaseService {
     testDatabase = null;
   }
 
+  /// The version the app opens its database with. Exposed so a migration test
+  /// can prove the upgrade it exercises is the one users will actually run.
+  @visibleForTesting
+  static int get schemaVersion => _dbVersion;
+
+  /// Runs the real upgrade path against a caller-supplied [db].
+  ///
+  /// Migration tests use this instead of opening the app's own file: test
+  /// files run in parallel, and several of them touch that one file.
+  @visibleForTesting
+  Future<void> upgradeForTesting(Database db, int fromVersion) =>
+      _onUpgrade(db, fromVersion, _dbVersion);
+
   Future<Database> _initDatabase() async {
     final dbPath = await getDatabasesPath();
     final path = join(dbPath, 'rshop.db');
@@ -56,7 +69,10 @@ class DatabaseService {
         thumb_hash TEXT,
         has_thumbnail INTEGER NOT NULL DEFAULT 0,
         is_folder INTEGER NOT NULL DEFAULT 0,
-        alternative_sources TEXT
+        alternative_sources TEXT,
+        source_id TEXT NOT NULL DEFAULT '',
+        endpoint_id TEXT NOT NULL DEFAULT '',
+        cache_owner_id TEXT NOT NULL DEFAULT ''
       )
     ''');
 
@@ -72,8 +88,34 @@ class DatabaseService {
       CREATE INDEX idx_filename ON $_tableName (filename)
     ''');
 
+    // Uniqueness is per *cache owner*. The owner is the group when the source
+    // belongs to one, otherwise the source itself — the user declaring "these
+    // sources are the same server" is the same declaration as "these routes
+    // are the same server", one level up, and it has the same consequence:
+    // one list, not one copy per member.
+    //
+    // source_id and endpoint_id both stay as plain columns. They record who
+    // last fetched a row, which is useful for attribution and for re-stamping
+    // when a member leaves — but neither is in the key. Keying on them stored
+    // the same list once per member and nothing could tell whether those
+    // copies were supposed to agree.
+    //
+    // cache_owner_id is NOT NULL DEFAULT '' on purpose — SQLite treats NULLs
+    // as distinct inside a UNIQUE index, so a nullable column here would
+    // silently stop deduplicating local scans (which belong to no owner).
+    await db.execute('''
+      CREATE UNIQUE INDEX idx_games_system_filename_owner
+        ON $_tableName (systemSlug, filename, cache_owner_id)
+    ''');
+
+    await db.execute('''
+      CREATE INDEX idx_games_owner ON $_tableName (cache_owner_id)
+    ''');
+
+    // Still indexed even though it left the key: re-stamping a departing
+    // member and purgeOrDetachSource both look rows up by source.
     await db.execute('''
-      CREATE UNIQUE INDEX idx_games_system_filename ON $_tableName (systemSlug, filename)
+      CREATE INDEX idx_games_source ON $_tableName (source_id)
     ''');
 
     // RetroAchievements tables
@@ -291,14 +333,373 @@ class DatabaseService {
             'ALTER TABLE $_tableName ADD COLUMN alternative_sources TEXT');
       });
     }
+    if (oldVersion < 14) {
+      // Per-route game lists. Until now a game was unique per (system,
+      // filename), so the same server reached two ways overwrote itself and
+      // switching routes meant a full re-sync. Promoting source_id out of the
+      // provider_config JSON blob and adding endpoint_id lets each route keep
+      // its own list — and makes "by source" queries an indexed lookup instead
+      // of a LIKE scan over serialised JSON.
+      await db.transaction((txn) async {
+        await txn.execute(
+          "ALTER TABLE $_tableName ADD COLUMN source_id TEXT NOT NULL DEFAULT ''",
+        );
+        await txn.execute(
+          "ALTER TABLE $_tableName ADD COLUMN endpoint_id TEXT NOT NULL DEFAULT ''",
+        );
+
+        // Backfill from the JSON blob that has carried source_id all along.
+        // json_extract is available in the SQLite bundled with sqflite; fall
+        // back to leaving '' rather than failing the whole migration, because
+        // an empty route still works — it just starts a fresh list.
+        try {
+          await txn.rawUpdate(
+            "UPDATE $_tableName SET source_id = "
+            "COALESCE(json_extract(provider_config, '\$.source_id'), '') "
+            'WHERE provider_config IS NOT NULL',
+          );
+        } catch (e) {
+          debugPrint('migration v14: json_extract backfill skipped: $e');
+        }
+
+        // Everything that pre-dates routes belongs to the endpoint that
+        // Source.fromJson synthesises from the legacy connection fields.
+        await txn.rawUpdate(
+          "UPDATE $_tableName SET endpoint_id = 'primary' WHERE source_id != ''",
+        );
+
+        await txn.execute('DROP INDEX IF EXISTS idx_games_system_filename');
+        await txn.execute(
+          'CREATE UNIQUE INDEX idx_games_system_filename_route '
+          'ON $_tableName (systemSlug, filename, source_id, endpoint_id)',
+        );
+        await txn.execute(
+          'CREATE INDEX IF NOT EXISTS idx_games_route '
+          'ON $_tableName (source_id, endpoint_id)',
+        );
+      });
+    }
+    if (oldVersion < 15) {
+      // One list per *source*, not per route. v14 gave every route its own
+      // copy of the list, but the routes of one source are the same server by
+      // another address — so those copies were duplicates of one another that
+      // nothing could reconcile. Collapse them back to a single row per
+      // (system, filename, source) and re-key the unique index without
+      // endpoint_id. endpoint_id survives as a plain column: it still records
+      // which route last fetched the row.
+      await db.transaction((txn) async {
+        // The dedupe join below is a self-join over the whole games table;
+        // without an index on the group key it degrades to a scan per row.
+        // Dropped again once the real unique index is in place.
+        await txn.execute(
+          'CREATE INDEX IF NOT EXISTS idx_games_dedupe_tmp '
+          'ON $_tableName (source_id, systemSlug, filename)',
+        );
+
+        final collapsed = await _collapseDuplicates(txn, keyColumn: 'source_id');
+        if (collapsed > 0) {
+          debugPrint('migration v15: collapsed $collapsed duplicate rows');
+        }
+
+        // Safety net. The pass above provably leaves one row per group, but a
+        // leftover duplicate here would make CREATE UNIQUE INDEX throw, and a
+        // migration that throws on every launch is an unopenable database.
+        final swept = await txn.rawDelete('''
+          DELETE FROM $_tableName WHERE id NOT IN (
+            SELECT MIN(id) FROM $_tableName
+            GROUP BY systemSlug, filename, source_id
+          )
+        ''');
+        if (swept > 0) {
+          debugPrint('migration v15: safety sweep removed $swept rows');
+        }
+
+        await txn.execute(
+            'DROP INDEX IF EXISTS idx_games_system_filename_route');
+        await txn.execute(
+          'CREATE UNIQUE INDEX idx_games_system_filename_source '
+          'ON $_tableName (systemSlug, filename, source_id)',
+        );
+        await txn.execute('DROP INDEX IF EXISTS idx_games_route');
+        await txn.execute('DROP INDEX IF EXISTS idx_games_dedupe_tmp');
+        await txn.execute(
+          'CREATE INDEX IF NOT EXISTS idx_games_source '
+          'ON $_tableName (source_id)',
+        );
+      });
+    }
+    if (oldVersion < 16) {
+      // One list per *cache owner*. A source owns its own list until the user
+      // puts it in a group; then the group owns it, because a group is the
+      // user declaring that its members are one server — the same declaration
+      // that collapsed a source's routes in v15, one level up.
+      //
+      // **This step deletes nothing.** The backfill is one-to-one
+      // (`cache_owner_id = source_id`), so the new unique key holds exactly the
+      // rows the old one did and no duplicate can appear. The merging — and
+      // therefore the only de-duplication groups need — happens later, in
+      // [adoptCacheInto], when the config layer tells us which sources the user
+      // actually grouped. That split is deliberate: groups live in the config
+      // file, which this layer cannot read, and a migration that guesses at
+      // them would be a migration that deletes rows on a guess.
+      await db.transaction((txn) async {
+        await txn.execute(
+          "ALTER TABLE $_tableName ADD COLUMN cache_owner_id TEXT NOT NULL DEFAULT ''",
+        );
+        await txn.rawUpdate('UPDATE $_tableName SET cache_owner_id = source_id');
+
+        await txn.execute(
+            'DROP INDEX IF EXISTS idx_games_system_filename_source');
+        await txn.execute(
+          'CREATE UNIQUE INDEX idx_games_system_filename_owner '
+          'ON $_tableName (systemSlug, filename, cache_owner_id)',
+        );
+        await txn.execute(
+          'CREATE INDEX IF NOT EXISTS idx_games_owner '
+          'ON $_tableName (cache_owner_id)',
+        );
+        // idx_games_source stays even though source_id left the key:
+        // re-stamping a departing member and purgeOrDetachSource both look
+        // rows up by the source that fetched them.
+      });
+    }
+  }
+
+  /// 0 for rows that are only in the table because the file is on the device
+  /// (`purgeOrDetachSource` nulls `provider_config`/`url` for those), 1 for
+  /// rows that still point at a server. Lower wins de-duplication.
+  ///
+  /// Named for v15, which introduced it, but it is now the single de-dup
+  /// criterion for groups as well: dropping an on-device row makes the library
+  /// forget a game the user has actually downloaded, while a row that still
+  /// carries a remote url can always be re-fetched. Change the signal here and
+  /// every collapse changes with it.
+  static String _onDeviceRank(String alias) =>
+      'CASE WHEN $alias.provider_config IS NULL '
+      "OR $alias.url IS NULL OR $alias.url = '' THEN 0 ELSE 1 END";
+
+  /// Collapses rows that are the same game under the same [keyColumn] down to
+  /// one, salvaging the expensive fields onto the survivor. Returns how many
+  /// rows it deleted.
+  ///
+  /// One shape, three callers: v15 collapsed a source's per-route copies, and
+  /// [adoptCacheInto]/[moveCacheOwnership] collapse a group's per-member ones.
+  ///
+  /// The caller must make sure no unique index is in the way — a duplicate
+  /// cannot exist while one is enforced, so every caller either has not created
+  /// it yet (migration) or drops it for the duration ([_rekeyOwnership]).
+  static Future<int> _collapseDuplicates(
+    DatabaseExecutor txn, {
+    required String keyColumn,
+  }) async {
+    // Pick the survivor of each duplicate group by a *total* order, so exactly
+    // one row can survive: on-device copies first, then the oldest id. Finding
+    // the losers rather than the winners is what makes that guarantee hold —
+    // "keep the winner" leaves ties alive.
+    final rankA = _onDeviceRank('a');
+    final rankB = _onDeviceRank('b');
+    final loserRows = await txn.rawQuery('''
+      SELECT DISTINCT a.id AS id
+      FROM $_tableName a
+      JOIN $_tableName b
+        ON b.$keyColumn = a.$keyColumn
+       AND b.systemSlug = a.systemSlug
+       AND b.filename = a.filename
+       AND b.id <> a.id
+      WHERE ($rankB) < ($rankA)
+         OR (($rankB) = ($rankA) AND b.id < a.id)
+    ''');
+    final losers = loserRows.map((r) => r['id'] as int).toList();
+    if (losers.isEmpty) return 0;
+
+    // Salvage before deleting: covers and thumbnails are expensive to rebuild,
+    // and the survivor may be the copy that never had them. Every value
+    // written here already existed inside the same group.
+    final group = 'c.$keyColumn = $_tableName.$keyColumn '
+        'AND c.systemSlug = $_tableName.systemSlug '
+        'AND c.filename = $_tableName.filename';
+    await txn.rawUpdate('''
+      UPDATE $_tableName SET
+        cover_url = COALESCE(cover_url, (
+          SELECT c.cover_url FROM $_tableName c
+          WHERE $group AND c.cover_url IS NOT NULL
+          ORDER BY c.id LIMIT 1)),
+        has_thumbnail = COALESCE((
+          SELECT MAX(c.has_thumbnail) FROM $_tableName c
+          WHERE $group), has_thumbnail),
+        alternative_sources = COALESCE(alternative_sources, (
+          SELECT c.alternative_sources FROM $_tableName c
+          WHERE $group AND c.alternative_sources IS NOT NULL
+          ORDER BY c.id LIMIT 1))
+      WHERE EXISTS (
+        SELECT 1 FROM $_tableName c WHERE $group AND c.id <> $_tableName.id)
+    ''');
+
+    for (var i = 0; i < losers.length; i += 200) {
+      final chunk = losers.skip(i).take(200).toList();
+      final placeholders = List.filled(chunk.length, '?').join(',');
+      await txn.rawDelete(
+        'DELETE FROM $_tableName WHERE id IN ($placeholders)',
+        chunk,
+      );
+    }
+    return losers.length;
+  }
+
+  /// Moves every row owned by [fromOwners] under [toOwner] and collapses what
+  /// that makes duplicate. Returns the number of rows dropped as duplicates.
+  ///
+  /// The unique index is dropped for the duration and rebuilt inside the same
+  /// transaction. It has to be: re-stamping the owner column is exactly the
+  /// operation the index forbids, so the alternative is reconciling row by row
+  /// in Dart — a second de-dup rule that would drift from [_collapseDuplicates]
+  /// the first time either changed. Rebuilding it also *proves* the collapse
+  /// worked; if a duplicate survived, `CREATE UNIQUE INDEX` throws and the
+  /// whole transaction rolls back rather than leaving the user a half-merged
+  /// library.
+  static Future<int> _rekeyOwnership(
+    DatabaseExecutor txn, {
+    required String toOwner,
+    required List<String> fromOwners,
+  }) async {
+    if (fromOwners.isEmpty) return 0;
+    final placeholders = List.filled(fromOwners.length, '?').join(',');
+
+    await txn.execute('DROP INDEX IF EXISTS idx_games_system_filename_owner');
+    await txn.rawUpdate(
+      'UPDATE $_tableName SET cache_owner_id = ? '
+      'WHERE cache_owner_id IN ($placeholders)',
+      [toOwner, ...fromOwners],
+    );
+
+    // Dropping the unique index above also drops the only thing backing the
+    // de-dup self-join, so it has to be replaced for the duration. Without it
+    // the join degrades to a scan per row: **65k rows took over ten minutes**
+    // and the app looked frozen — the tap that started it appeared to do
+    // nothing at all. v15's migration knew to do this; this path was written
+    // without it.
+    await txn.execute(
+      'CREATE INDEX IF NOT EXISTS idx_games_dedupe_tmp '
+      'ON $_tableName (cache_owner_id, systemSlug, filename)',
+    );
+
+    final collapsed =
+        await _collapseDuplicates(txn, keyColumn: 'cache_owner_id');
+
+    // Safety net, same as v15: the pass above provably leaves one row per
+    // group, but a leftover here would make the index rebuild throw.
+    final swept = await txn.rawDelete('''
+      DELETE FROM $_tableName WHERE id NOT IN (
+        SELECT MIN(id) FROM $_tableName
+        GROUP BY systemSlug, filename, cache_owner_id
+      )
+    ''');
+    if (swept > 0) {
+      debugPrint('_rekeyOwnership: safety sweep removed $swept rows');
+    }
+
+    await txn.execute('DROP INDEX IF EXISTS idx_games_dedupe_tmp');
+    await txn.execute(
+      'CREATE UNIQUE INDEX idx_games_system_filename_owner '
+      'ON $_tableName (systemSlug, filename, cache_owner_id)',
+    );
+    return collapsed + swept;
+  }
+
+  /// Folds the cached libraries of [memberIds] into the one owned by
+  /// [ownerId] — what joining a group means for the database.
+  ///
+  /// A group is one server, so it has one list. Merging is not optional
+  /// bookkeeping: leaving each member its own copy would show the user the
+  /// same games twice on the home screen and let the copies drift apart with
+  /// nothing able to reconcile them.
+  ///
+  /// De-duplication uses [_onDeviceRank] — the copy the user has downloaded
+  /// survives. Everything happens in one transaction, so a failure leaves the
+  /// libraries exactly as they were.
+  Future<int> adoptCacheInto({
+    required String ownerId,
+    required Iterable<String> memberIds,
+  }) async {
+    if (ownerId.isEmpty) return 0;
+    final from = memberIds.where((id) => id.isNotEmpty && id != ownerId).toSet();
+    if (from.isEmpty) return 0;
+    final db = await database;
+    return db.transaction(
+      (txn) => _rekeyOwnership(txn, toOwner: ownerId, fromOwners: from.toList()),
+    );
   }
 
+  /// Hands a group's cached library from [fromOwnerId] to [toOwnerId] — what
+  /// the *owner itself* leaving a group means for the database.
+  ///
+  /// `SourceGroup.withoutMember` re-points ownership to the first remaining
+  /// member; without this the rows would stay behind under the departed id and
+  /// the group would look freshly empty. Call both in the same step.
+  Future<int> moveCacheOwnership({
+    required String fromOwnerId,
+    required String toOwnerId,
+  }) async {
+    if (fromOwnerId.isEmpty || toOwnerId.isEmpty) return 0;
+    if (fromOwnerId == toOwnerId) return 0;
+    final db = await database;
+    return db.transaction(
+      (txn) =>
+          _rekeyOwnership(txn, toOwner: toOwnerId, fromOwners: [fromOwnerId]),
+    );
+  }
+
+  /// Cuts [sourceId] loose from the library owned by [ownerId] — what a
+  /// *non-owning* member leaving a group means for the database.
+  ///
+  /// **The leaver keeps nothing.** The rows are the group's, and there is no
+  /// honest way to split them: after a merge nothing records which member first
+  /// saw a given game, and the whole point of the group was that the answer did
+  /// not matter. So the source leaves with an empty library and re-syncs —
+  /// which is why the UI has to confirm this before calling it.
+  ///
+  /// What this does do is re-stamp `source_id` to the owner, so that removing
+  /// the departed source later cannot take the group's rows with it as
+  /// collateral. Returns the number of rows re-stamped.
+  Future<int> releaseCacheFrom({
+    required String sourceId,
+    required String ownerId,
+  }) async {
+    if (sourceId.isEmpty || ownerId.isEmpty || sourceId == ownerId) return 0;
+    final db = await database;
+    return db.rawUpdate(
+      'UPDATE $_tableName SET source_id = ? '
+      'WHERE source_id = ? AND cache_owner_id = ?',
+      [ownerId, sourceId, ownerId],
+    );
+  }
+
+  /// Persists [games] for one system **within one cached library**.
+  ///
+  /// [sourceId] says which source fetched them; it defaults to `''`, the bucket
+  /// local filesystem scans live in — local files belong to no source.
+  /// [endpointId] is recorded, not keyed on: it remembers which route last
+  /// fetched these rows.
+  ///
+  /// [cacheOwnerId] says whose list they go into, and defaults to [sourceId] —
+  /// a source owns its own library until the user puts it in a group. Pass
+  /// `AppConfig.cacheOwnerIdFor(sourceId)` and grouped members write into the
+  /// group's single list, so re-syncing over any member updates it in place
+  /// exactly the way re-syncing over another route already did.
+  ///
+  /// Orphan deletion is scoped to that library. The scoping is what stops a
+  /// sync of one source deleting another's rows as "orphans" — and, within a
+  /// group, what lets one member's sync prune games the server no longer has.
   Future<void> saveGames(
     String systemSlug,
     List<GameItem> games, {
     bool deleteOrphans = false,
     bool forceDeleteOrphans = false,
+    String sourceId = '',
+    String endpointId = '',
+    String? cacheOwnerId,
   }) async {
+    final owner = cacheOwnerId ?? sourceId;
     final db = await database;
     await db.transaction((txn) async {
       // 1. Delete orphans when requested.
@@ -308,8 +709,8 @@ class DatabaseService {
         final existing = await txn.query(
           _tableName,
           columns: ['filename'],
-          where: 'systemSlug = ?',
-          whereArgs: [systemSlug],
+          where: 'systemSlug = ? AND cache_owner_id = ?',
+          whereArgs: [systemSlug, owner],
         );
         final existingFiles =
             existing.map((r) => r['filename'] as String).toSet();
@@ -334,18 +735,38 @@ class DatabaseService {
               final chunk = orphanList.skip(i).take(100).toList();
               final placeholders = List.filled(chunk.length, '?').join(',');
               await txn.rawDelete(
-                'DELETE FROM $_tableName WHERE systemSlug = ? AND filename IN ($placeholders)',
-                [systemSlug, ...chunk],
+                'DELETE FROM $_tableName WHERE systemSlug = ? '
+                'AND cache_owner_id = ? '
+                'AND filename IN ($placeholders)',
+                [systemSlug, owner, ...chunk],
               );
-              // Cascade: remove orphaned metadata and RA matches
-              await txn.rawDelete(
-                'DELETE FROM game_metadata WHERE system_slug = ? AND filename IN ($placeholders)',
+              // Cascade: remove orphaned metadata and RA matches — but only
+              // once no source still lists the file. Metadata and achievement
+              // matches are keyed by (system, filename) with no source
+              // dimension, so deleting them while another source still shows
+              // the game would strip its cover and RA progress.
+              final stillReferenced = <String>{};
+              for (final row in await txn.rawQuery(
+                'SELECT DISTINCT filename FROM $_tableName '
+                'WHERE systemSlug = ? AND filename IN ($placeholders)',
                 [systemSlug, ...chunk],
-              );
-              await txn.rawDelete(
-                'DELETE FROM ra_matches WHERE system_slug = ? AND game_filename IN ($placeholders)',
-                [systemSlug, ...chunk],
-              );
+              )) {
+                stillReferenced.add(row['filename'] as String);
+              }
+              final droppable =
+                  chunk.where((f) => !stillReferenced.contains(f)).toList();
+              if (droppable.isNotEmpty) {
+                final dropPlaceholders =
+                    List.filled(droppable.length, '?').join(',');
+                await txn.rawDelete(
+                  'DELETE FROM game_metadata WHERE system_slug = ? AND filename IN ($dropPlaceholders)',
+                  [systemSlug, ...droppable],
+                );
+                await txn.rawDelete(
+                  'DELETE FROM ra_matches WHERE system_slug = ? AND game_filename IN ($dropPlaceholders)',
+                  [systemSlug, ...droppable],
+                );
+              }
             }
           }
         }
@@ -355,9 +776,9 @@ class DatabaseService {
       final batch = txn.batch();
       for (final game in games) {
         batch.rawInsert('''
-          INSERT INTO $_tableName (systemSlug, filename, displayName, url, region, cover_url, provider_config, has_thumbnail, is_folder, alternative_sources)
-          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-          ON CONFLICT(systemSlug, filename) DO UPDATE SET
+          INSERT INTO $_tableName (systemSlug, filename, displayName, url, region, cover_url, provider_config, has_thumbnail, is_folder, alternative_sources, source_id, endpoint_id, cache_owner_id)
+          VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+          ON CONFLICT(systemSlug, filename, cache_owner_id) DO UPDATE SET
             displayName = excluded.displayName,
             url = excluded.url,
             region = excluded.region,
@@ -365,7 +786,9 @@ class DatabaseService {
             provider_config = excluded.provider_config,
             has_thumbnail = MAX(has_thumbnail, excluded.has_thumbnail),
             is_folder = excluded.is_folder,
-            alternative_sources = excluded.alternative_sources
+            alternative_sources = excluded.alternative_sources,
+            endpoint_id = excluded.endpoint_id,
+            source_id = excluded.source_id
         ''', [
           systemSlug,
           game.filename,
@@ -382,6 +805,9 @@ class DatabaseService {
               ? null
               : jsonEncode(
                   game.alternativeSources.map((a) => a.toJson()).toList()),
+          sourceId,
+          endpointId,
+          owner,
         ]);
       }
       await batch.commit(noResult: true);
@@ -507,29 +933,208 @@ class DatabaseService {
     );
   }
 
-  Future<List<GameItem>> getGames(String systemSlug) async {
+  /// Games for one system.
+  ///
+  /// Pass [sourceId] to see just one source's list, or [cacheOwnerId] to see a
+  /// group's — they are the same thing for an ungrouped source, which is why
+  /// [sourceId] alone still works. Passing nothing returns every row, which is
+  /// what the global library and the thumbnail jobs want.
+  ///
+  /// [endpointId] is accepted so callers can hand over a whole route without
+  /// caring, but it does **not** narrow the result: the routes of one source
+  /// are the same server, so they share one list.
+  ///
+  /// Local filesystem entries live under the empty source (`''`); pass
+  /// [includeLocal] to fold them in alongside a specific source.
+  Future<List<GameItem>> getGames(
+    String systemSlug, {
+    String? sourceId,
+    String? endpointId,
+    bool includeLocal = false,
+    String? cacheOwnerId,
+  }) async {
     final db = await database;
+    var where = 'systemSlug = ?';
+    final args = <Object?>[systemSlug];
+    if (sourceId != null || endpointId != null || cacheOwnerId != null) {
+      const ownerClause = 'cache_owner_id = ?';
+      args.add(cacheOwnerId ?? sourceId ?? '');
+      where += includeLocal
+          ? " AND ($ownerClause OR cache_owner_id = '')"
+          : ' AND $ownerClause';
+    }
     final maps = await db.query(
       _tableName,
-      where: 'systemSlug = ?',
-      whereArgs: [systemSlug],
+      where: where,
+      whereArgs: args,
       orderBy: 'displayName ASC',
     );
 
-    return maps
-        .map((map) => GameItem(
-              filename: map['filename'] as String,
-              displayName: map['displayName'] as String,
-              url: map['url'] as String,
-              cachedCoverUrl: map['cover_url'] as String?,
-              providerConfig: _decodeProviderConfig(
-                  map['provider_config'] as String?),
-              hasThumbnail: (map['has_thumbnail'] as int?) == 1,
-              isFolder: (map['is_folder'] as int?) == 1,
-              alternativeSources: _decodeAlternativeSources(
-                  map['alternative_sources'] as String?),
-            ))
-        .toList();
+    return maps.map(_gameFromRow).toList();
+  }
+
+  static GameItem _gameFromRow(Map<String, Object?> map) => GameItem(
+        filename: map['filename'] as String,
+        displayName: map['displayName'] as String,
+        url: map['url'] as String,
+        cachedCoverUrl: map['cover_url'] as String?,
+        providerConfig:
+            _decodeProviderConfig(map['provider_config'] as String?),
+        hasThumbnail: (map['has_thumbnail'] as int?) == 1,
+        isFolder: (map['is_folder'] as int?) == 1,
+        alternativeSources:
+            _decodeAlternativeSources(map['alternative_sources'] as String?),
+      );
+
+  /// Games belonging to the sources behind any of [routes], optionally plus
+  /// the local bucket.
+  ///
+  /// Callers pass the routes their system's providers currently resolve to;
+  /// only the source half selects rows. Switching a source to another route
+  /// therefore keeps showing the same list instead of forcing a re-sync —
+  /// which is the point, since both routes reach the same server. Two routes
+  /// of one source collapse to a single term. An empty [routes] with
+  /// [includeLocal] gives just local files.
+  Future<List<GameItem>> getGamesForRoutes(
+    String systemSlug,
+    Iterable<({String source, String endpoint})> routes, {
+    bool includeLocal = true,
+    String Function(String sourceId)? cacheOwnerOf,
+  }) async {
+    final db = await database;
+    // Sources of one group resolve to the same owner and collapse to a single
+    // term, the same way two routes of one source already did. Without a
+    // resolver every source owns its own list, which is what an ungrouped
+    // install looks like.
+    final owners = <String>{
+      for (final r in routes) cacheOwnerOf?.call(r.source) ?? r.source,
+    };
+    if (includeLocal) owners.add('');
+    if (owners.isEmpty) return const [];
+
+    final placeholders = List.filled(owners.length, '?').join(',');
+    final maps = await db.query(
+      _tableName,
+      where: 'systemSlug = ? AND cache_owner_id IN ($placeholders)',
+      whereArgs: [systemSlug, ...owners],
+      orderBy: 'displayName ASC',
+    );
+    return maps.map(_gameFromRow).toList();
+  }
+
+  /// Saves [games] splitting them into one batch per source.
+  ///
+  /// Each [GameItem] already knows where it came from via its
+  /// `providerConfig`, so the grouping needs no extra plumbing from callers.
+  /// Items with no provider (local filesystem scans) land in the empty source.
+  ///
+  /// Use this rather than [saveGames] for anything that mixes sources: it is
+  /// what stops a sync writing every source's results into one shared bucket,
+  /// and it keeps orphan pruning inside the source that produced the list.
+  ///
+  /// The endpoint each game arrived over is carried through to the row so it
+  /// still records the last route used, but it never splits the batch — one
+  /// source, one list.
+  /// Pass [cacheOwnerOf] (`AppConfig.cacheOwnerIdFor`) so grouped members write
+  /// into the group's one list instead of each keeping a copy.
+  Future<void> saveGamesByRoute(
+    String systemSlug,
+    List<GameItem> games, {
+    bool deleteOrphans = false,
+    bool forceDeleteOrphans = false,
+    String Function(String sourceId)? cacheOwnerOf,
+  }) async {
+    final bySource = <String, List<GameItem>>{};
+    final endpointOf = <String, String>{};
+    for (final game in games) {
+      final source = game.providerConfig?.sourceId ?? '';
+      (bySource[source] ??= <GameItem>[]).add(game);
+      endpointOf[source] ??= game.providerConfig?.endpointId ?? '';
+    }
+
+    // An empty incoming list still has to reach saveGames, otherwise
+    // "the server now returns nothing" could never prune anything.
+    if (bySource.isEmpty) {
+      await saveGames(
+        systemSlug,
+        const [],
+        deleteOrphans: deleteOrphans,
+        forceDeleteOrphans: forceDeleteOrphans,
+      );
+      return;
+    }
+
+    // Two sources of one group in a single batch would prune each other's rows
+    // as orphans and then put them back — the second list is not the whole
+    // library it is being compared against. It should not happen (the home
+    // screen resolves a group to one member at a time), so the guard logs
+    // rather than hides it, and only the first batch of an owner prunes.
+    final prunedOwners = <String>{};
+    for (final entry in bySource.entries) {
+      final owner = cacheOwnerOf?.call(entry.key) ?? entry.key;
+      final firstForOwner = prunedOwners.add(owner);
+      if (!firstForOwner) {
+        debugPrint(
+          'saveGamesByRoute($systemSlug): two sources share cache owner '
+          '"$owner" in one batch — skipping orphan pruning for ${entry.key}',
+        );
+      }
+      await saveGames(
+        systemSlug,
+        entry.value,
+        deleteOrphans: deleteOrphans && firstForOwner,
+        forceDeleteOrphans: forceDeleteOrphans && firstForOwner,
+        sourceId: entry.key,
+        endpointId: endpointOf[entry.key] ?? '',
+        cacheOwnerId: owner,
+      );
+    }
+  }
+
+  /// How many games each cached library holds, keyed by cache owner id.
+  ///
+  /// This is the number the source list shows: look it up with
+  /// `AppConfig.cacheOwnerIdFor(source.id)`, so every member of a group reports
+  /// the group's one list rather than a share of it. The empty bucket (local
+  /// filesystem scans) is excluded — it belongs to no source and would
+  /// otherwise be attributed to whichever one you opened.
+  Future<Map<String, int>> getGameCountsPerCacheOwner() async {
+    final db = await database;
+    final rows = await db.rawQuery(
+      'SELECT cache_owner_id, COUNT(*) AS c FROM $_tableName '
+      "WHERE cache_owner_id != '' GROUP BY cache_owner_id",
+    );
+    return {
+      for (final r in rows)
+        r['cache_owner_id'] as String: (r['c'] as int?) ?? 0,
+    };
+  }
+
+  /// Games in one cached library, whichever source or route fetched them.
+  Future<int> getGameCountForOwner(String cacheOwnerId) async {
+    final db = await database;
+    final rows = await db.rawQuery(
+      'SELECT COUNT(*) AS c FROM $_tableName WHERE cache_owner_id = ?',
+      [cacheOwnerId],
+    );
+    return (rows.first['c'] as int?) ?? 0;
+  }
+
+  /// Drops one whole cached library, leaving every other one untouched.
+  ///
+  /// Deleting a *route* must not call this: the source's other routes still
+  /// reach the same server and the list they share is still valid. Nor may a
+  /// group member leaving — the list belongs to the group, and the leaver's
+  /// half of it does not exist as a separate thing ([releaseCacheFrom]). Only
+  /// the owner of the library going away justifies dropping it.
+  Future<int> deleteCacheOwnedBy(String cacheOwnerId) async {
+    if (cacheOwnerId.isEmpty) return 0;
+    final db = await database;
+    return db.delete(
+      _tableName,
+      where: 'cache_owner_id = ?',
+      whereArgs: [cacheOwnerId],
+    );
   }
 
   static List<AlternativeSource> _decodeAlternativeSources(String? raw) {
@@ -560,10 +1165,18 @@ class DatabaseService {
   ///
   /// The sourceId is validated against `[A-Za-z0-9_-]+` before it hits
   /// the LIKE pattern so it can't be hijacked into a wildcard.
+  ///
+  /// [protectedOwnerIds] names cached libraries the user still has — the groups
+  /// this source was a member of. Rows it fetched on the group's behalf are the
+  /// group's rows, and a member walking out must not take them along; without
+  /// this the remaining members would face a re-sync they never asked for.
+  /// Pass the ids **before** the source is dropped from the group.
+  ///
   /// Returns `(detached, deleted)` row counts for logging.
   Future<({int detached, int deleted})> purgeOrDetachSource(
     String sourceId, {
     required Map<String, String> systemTargetFolders,
+    Set<String> protectedOwnerIds = const {},
   }) async {
     if (!RegExp(r'^[A-Za-z0-9_-]+$').hasMatch(sourceId)) {
       debugPrint('purgeOrDetachSource: refusing unsafe id "$sourceId"');
@@ -571,11 +1184,19 @@ class DatabaseService {
     }
     final db = await database;
     final pattern = '%"source_id":"$sourceId"%';
+    var where = 'provider_config LIKE ?';
+    final whereArgs = <Object?>[pattern];
+    if (protectedOwnerIds.isNotEmpty) {
+      final placeholders =
+          List.filled(protectedOwnerIds.length, '?').join(',');
+      where += ' AND cache_owner_id NOT IN ($placeholders)';
+      whereArgs.addAll(protectedOwnerIds);
+    }
     final rows = await db.query(
       _tableName,
       columns: ['systemSlug', 'filename'],
-      where: 'provider_config LIKE ?',
-      whereArgs: [pattern],
+      where: where,
+      whereArgs: whereArgs,
     );
 
     final installedFilenames = <(String, String)>[];
@@ -594,18 +1215,22 @@ class DatabaseService {
     int detached = 0;
     int deleted = 0;
     await db.transaction((txn) async {
+      // Both statements repeat the selection predicate rather than matching on
+      // (system, filename) alone: that pair is not unique across cached
+      // libraries, so the bare version reached into every other source's rows
+      // for the same game — and, once groups exist, into the group's.
       for (final (slug, filename) in installedFilenames) {
         detached += await txn.rawUpdate(
           'UPDATE $_tableName SET provider_config = NULL, url = NULL '
-          'WHERE systemSlug = ? AND filename = ?',
-          [slug, filename],
+          'WHERE systemSlug = ? AND filename = ? AND $where',
+          [slug, filename, ...whereArgs],
         );
       }
       for (final (slug, filename) in orphanFilenames) {
         deleted += await txn.delete(
           _tableName,
-          where: 'systemSlug = ? AND filename = ?',
-          whereArgs: [slug, filename],
+          where: 'systemSlug = ? AND filename = ? AND $where',
+          whereArgs: [slug, filename, ...whereArgs],
         );
       }
     });
diff --git a/lib/services/device_info_service.dart b/lib/services/device_info_service.dart
index 72ab9fa..ac3fcd4 100644
--- a/lib/services/device_info_service.dart
+++ b/lib/services/device_info_service.dart
@@ -3,6 +3,8 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
+import 'platform_channels.dart';
+
 enum MemoryTier { low, standard, high }
 
 class DeviceMemoryInfo {
@@ -75,7 +77,7 @@ class DeviceMemoryInfo {
 }
 
 class DeviceInfoService {
-  static const _channel = MethodChannel('com.retro.rshop/storage');
+  static const _channel = MethodChannel(kStorageChannel);
   static DeviceMemoryInfo? _cached;
 
   /// Test hook: clears cached result so tests can re-query.
diff --git a/lib/services/disk_space_service.dart b/lib/services/disk_space_service.dart
index 375079a..19d5d64 100644
--- a/lib/services/disk_space_service.dart
+++ b/lib/services/disk_space_service.dart
@@ -3,6 +3,8 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
+import 'platform_channels.dart';
+
 class StorageInfo {
   final int freeBytes;
   final int totalBytes;
@@ -38,7 +40,7 @@ class StorageInfo {
 }
 
 class DiskSpaceService {
-  static const _channel = MethodChannel('com.retro.rshop/storage');
+  static const _channel = MethodChannel(kStorageChannel);
 
   static Future<StorageInfo?> getFreeSpace(String path) async {
     if (!Platform.isAndroid) return null;
diff --git a/lib/services/download_service.dart b/lib/services/download_service.dart
index 7fca687..ee3ab5d 100644
--- a/lib/services/download_service.dart
+++ b/lib/services/download_service.dart
@@ -13,6 +13,7 @@ import '../utils/friendly_error.dart';
 import '../utils/network_constants.dart';
 import 'download_handle.dart';
 import 'native_smb_service.dart';
+import 'platform_channels.dart';
 import 'provider_factory.dart';
 import 'rom_manager.dart';
 
@@ -66,8 +67,8 @@ class DownloadProgress {
 }
 
 class DownloadService {
-  static const _zipChannel = MethodChannel('com.retro.rshop/zip');
-  static const _zipProgressChannel = EventChannel('com.retro.rshop/zip_progress');
+  static const _zipChannel = MethodChannel(kZipChannel);
+  static const _zipProgressChannel = EventChannel(kZipProgressChannel);
 
   final NativeSmbService _smbService;
 
diff --git a/lib/services/endpoint_probe_service.dart b/lib/services/endpoint_probe_service.dart
new file mode 100644
index 0000000..6d230c5
--- /dev/null
+++ b/lib/services/endpoint_probe_service.dart
@@ -0,0 +1,126 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
+
+import '../models/config/source.dart';
+
+/// Where to knock to find out whether a source is alive.
+@immutable
+class ProbeTarget {
+  final String host;
+  final int port;
+
+  const ProbeTarget(this.host, this.port);
+
+  @override
+  bool operator ==(Object other) =>
+      other is ProbeTarget && other.host == host && other.port == port;
+
+  @override
+  int get hashCode => Object.hash(host, port);
+
+  @override
+  String toString() => '$host:$port';
+}
+
+/// Opens a connection and closes it again. Injected so tests never touch the
+/// network. Must complete normally on success and throw on failure.
+typedef SocketConnector = Future<void> Function(
+  String host,
+  int port,
+  Duration timeout,
+);
+
+const _defaultPorts = <String, int>{
+  'http': 80,
+  'https': 443,
+};
+
+/// Measures which sources answer right now and how fast.
+class EndpointProbeService {
+  EndpointProbeService({
+    SocketConnector? connect,
+    Duration timeout = const Duration(seconds: 1),
+    DateTime Function()? now,
+    Duration cacheTtl = const Duration(minutes: 2),
+  })  : _connect = connect ?? _realConnect,
+        _timeout = timeout,
+        _now = now ?? DateTime.now,
+        _cacheTtl = cacheTtl;
+
+  final SocketConnector _connect;
+  final Duration _timeout;
+  final DateTime Function() _now;
+  final Duration _cacheTtl;
+
+  final Map<String, ({DateTime at, Duration? latency})> _cache = {};
+
+  static Future<void> _realConnect(
+    String host,
+    int port,
+    Duration timeout,
+  ) async {
+    final socket = await Socket.connect(host, port, timeout: timeout);
+    socket.destroy();
+  }
+
+  /// The address to knock on for [source], or null when it carries no usable address (local source).
+  static ProbeTarget? targetFor(Source source) {
+    switch (source.type) {
+      case SourceType.romm:
+      case SourceType.web:
+        final raw = source.url;
+        if (raw == null || raw.trim().isEmpty) return null;
+        final uri = Uri.tryParse(raw.trim());
+        if (uri == null || uri.host.isEmpty) return null;
+        final port = uri.hasPort
+            ? uri.port
+            : _defaultPorts[uri.scheme.toLowerCase()];
+        if (port == null) return null;
+        return ProbeTarget(uri.host, port);
+      case SourceType.smb:
+        if (source.host == null || source.host!.isEmpty) return null;
+        return ProbeTarget(source.host!, source.port ?? 445);
+      case SourceType.ftp:
+        if (source.host == null || source.host!.isEmpty) return null;
+        return ProbeTarget(source.host!, source.port ?? 21);
+      case SourceType.local:
+        return null;
+    }
+  }
+
+  /// Probes [source] and returns a Set containing [source.id] if reachable, or empty set if unreachable.
+  Future<Set<String>> reachableFor(Source source) async {
+    if (source.type == SourceType.local) {
+      return {source.id};
+    }
+    final target = targetFor(source);
+    if (target == null) return const {};
+
+    final cached = _cache[source.id];
+    if (cached != null && _now().difference(cached.at) < _cacheTtl) {
+      return cached.latency != null ? {source.id} : const {};
+    }
+
+    final watch = Stopwatch()..start();
+    try {
+      await _connect(target.host, target.port, _timeout);
+      final latency = watch.elapsed;
+      _cache[source.id] = (at: _now(), latency: latency);
+      return {source.id};
+    } catch (_) {
+      _cache[source.id] = (at: _now(), latency: null);
+      return const {};
+    }
+  }
+
+  /// Drops cached results.
+  void invalidate([String? sourceId]) {
+    if (sourceId == null) {
+      _cache.clear();
+    } else {
+      _cache.remove(sourceId);
+    }
+  }
+}
diff --git a/lib/services/library_sync_service.dart b/lib/services/library_sync_service.dart
index 9870ada..0e7dc39 100644
--- a/lib/services/library_sync_service.dart
+++ b/lib/services/library_sync_service.dart
@@ -67,6 +67,9 @@ class LibrarySyncState {
 ///
 /// This service uses static [_lastSyncTimes] state and is designed for
 /// single-isolate use only. Do not instantiate across multiple isolates.
+/// The identity resolver: a source owns its own cached library.
+String _ownsItself(String sourceId) => sourceId;
+
 class LibrarySyncService extends StateNotifier<LibrarySyncState> {
   bool _isCancelled = false;
   Completer<void>? _syncCompleter;
@@ -144,7 +147,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
           if (systemModel != null) {
             final games = await RomManager.scanLocalGamesIsolate(
               systemModel, systemConfig.targetFolder);
-            await db.saveGames(systemConfig.id, games, forceDeleteOrphans: true);
+            await db.saveGamesByRoute(systemConfig.id, games,
+            forceDeleteOrphans: true, cacheOwnerOf: config.cacheOwnerIdFor);
             perSystem[systemConfig.id] = games.length;
             totalGames += games.length;
           }
@@ -160,8 +164,9 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
           } else {
             games = remoteGames;
           }
-          await db.saveGames(systemConfig.id, games,
-              deleteOrphans: true, forceDeleteOrphans: true);
+          await db.saveGamesByRoute(systemConfig.id, games,
+              deleteOrphans: true, forceDeleteOrphans: true,
+              cacheOwnerOf: config.cacheOwnerIdFor);
           perSystem[systemConfig.id] = games.length;
           totalGames += games.length;
         }
@@ -176,7 +181,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
             final localGames = await RomManager.scanLocalGamesIsolate(
               systemModel, systemConfig.targetFolder);
             if (localGames.isNotEmpty) {
-              await db.saveGames(systemConfig.id, localGames);
+              await db.saveGamesByRoute(systemConfig.id, localGames,
+                cacheOwnerOf: config.cacheOwnerIdFor);
               perSystem[systemConfig.id] = localGames.length;
               totalGames += localGames.length;
               debugPrint('LibrarySync: saved ${localGames.length} local fallback games for ${systemConfig.id}');
@@ -273,7 +279,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
           if (systemModel != null) {
             final games = await RomManager.scanLocalGamesIsolate(
               systemModel, systemConfig.targetFolder);
-            await db.saveGames(systemConfig.id, games, forceDeleteOrphans: true);
+            await db.saveGamesByRoute(systemConfig.id, games,
+            forceDeleteOrphans: true, cacheOwnerOf: config.cacheOwnerIdFor);
             perSystem[systemConfig.id] = games.length;
             totalGames += games.length;
           }
@@ -288,7 +295,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
           } else {
             games = remoteGames;
           }
-          await db.saveGames(systemConfig.id, games, deleteOrphans: true);
+          await db.saveGamesByRoute(systemConfig.id, games, deleteOrphans: true,
+              cacheOwnerOf: config.cacheOwnerIdFor);
           perSystem[systemConfig.id] = games.length;
           totalGames += games.length;
         }
@@ -302,7 +310,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
             final localGames = await RomManager.scanLocalGamesIsolate(
               systemModel, systemConfig.targetFolder);
             if (localGames.isNotEmpty) {
-              await db.saveGames(systemConfig.id, localGames);
+              await db.saveGamesByRoute(systemConfig.id, localGames,
+                cacheOwnerOf: config.cacheOwnerIdFor);
               perSystem[systemConfig.id] = localGames.length;
               totalGames += localGames.length;
               debugPrint('LibrarySync: saved ${localGames.length} local fallback games for ${systemConfig.id}');
@@ -383,7 +392,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
             systemModel,
             systemConfig.targetFolder,
           );
-          await db.saveGames(systemConfig.id, games, forceDeleteOrphans: true);
+          await db.saveGamesByRoute(systemConfig.id, games,
+            forceDeleteOrphans: true, cacheOwnerOf: config.cacheOwnerIdFor);
         } else {
           // Remote + local merge
           final remoteGames = await gameService.fetchGamesForSystem(
@@ -394,7 +404,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
             systemConfig.targetFolder,
           );
           games = GameMergeHelper.merge(remoteGames, localGames, systemModel);
-          await db.saveGames(systemConfig.id, games, deleteOrphans: true);
+          await db.saveGamesByRoute(systemConfig.id, games, deleteOrphans: true,
+              cacheOwnerOf: config.cacheOwnerIdFor);
         }
 
         perSystem[systemConfig.id] = games.length;
@@ -408,7 +419,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
             final localGames = await RomManager.scanLocalGamesIsolate(
               systemModel, systemConfig.targetFolder);
             if (localGames.isNotEmpty) {
-              await db.saveGames(systemConfig.id, localGames);
+              await db.saveGamesByRoute(systemConfig.id, localGames,
+                cacheOwnerOf: config.cacheOwnerIdFor);
               perSystem[systemConfig.id] = localGames.length;
               totalGames += localGames.length;
               debugPrint('LibrarySync: saved ${localGames.length} local fallback games for ${systemConfig.id}');
@@ -486,7 +498,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
     final db = DatabaseService();
     final gameService = UnifiedGameService(syncTimeout: syncTimeout);
 
-    await _syncOneSystem(systemConfig, systemId, db, gameService);
+    await _syncOneSystem(systemConfig, systemId, db, gameService,
+        cacheOwnerOf: config.cacheOwnerIdFor);
 
     // Process any systems that were queued while the first was syncing
     await _processQueue(config, db, gameService,
@@ -527,6 +540,7 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
         currentSystem: _displayName(nextId, systemConfig),
       );
       await _syncOneSystem(systemConfig, nextId, db, gameService,
+          cacheOwnerOf: config.cacheOwnerIdFor,
           storageService: storageService);
     }
   }
@@ -538,6 +552,10 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
     DatabaseService db,
     UnifiedGameService gameService, {
     StorageService? storageService,
+    // Sources the user grouped write into one shared library. Defaulting to
+    // "every source owns its own" keeps a caller that has no config working
+    // the way it always did.
+    String Function(String sourceId) cacheOwnerOf = _ownsItself,
   }) async {
     final systemModel = SystemModel.supportedSystems
         .where((s) => s.id == systemId)
@@ -554,7 +572,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
         } else {
           games = [];
         }
-        await db.saveGames(systemConfig.id, games, forceDeleteOrphans: true);
+        await db.saveGamesByRoute(systemConfig.id, games,
+            forceDeleteOrphans: true, cacheOwnerOf: cacheOwnerOf);
       } else {
         final remoteGames = await gameService.fetchGamesForSystem(
           systemConfig);
@@ -565,8 +584,10 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
         } else {
           games = remoteGames;
         }
-        await db.saveGames(systemConfig.id, games,
-            deleteOrphans: true, forceDeleteOrphans: true);
+        await db.saveGamesByRoute(systemConfig.id, games,
+            deleteOrphans: true,
+            forceDeleteOrphans: true,
+            cacheOwnerOf: cacheOwnerOf);
       }
 
       final perSystem = Map<String, int>.of(state.gamesPerSystem);
@@ -587,7 +608,8 @@ class LibrarySyncService extends StateNotifier<LibrarySyncState> {
           final localGames = await RomManager.scanLocalGamesIsolate(
             systemModel, systemConfig.targetFolder);
           if (localGames.isNotEmpty) {
-            await db.saveGames(systemConfig.id, localGames);
+            await db.saveGamesByRoute(systemConfig.id, localGames,
+                cacheOwnerOf: cacheOwnerOf);
             final perSystem = Map<String, int>.of(state.gamesPerSystem);
             perSystem[systemConfig.id] = localGames.length;
             state = state.copyWith(
diff --git a/lib/services/native_smb_service.dart b/lib/services/native_smb_service.dart
index b24a296..628101c 100644
--- a/lib/services/native_smb_service.dart
+++ b/lib/services/native_smb_service.dart
@@ -2,6 +2,8 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 
+import 'platform_channels.dart';
+
 class SmbFileEntry {
   final String name;
   final String path;
@@ -19,8 +21,8 @@ class SmbFileEntry {
 }
 
 class NativeSmbService {
-  static const _channel = MethodChannel('com.retro.rshop/smb');
-  static const _progressChannel = EventChannel('com.retro.rshop/smb_progress');
+  static const _channel = MethodChannel(kSmbChannel);
+  static const _progressChannel = EventChannel(kSmbProgressChannel);
 
   Stream<Map<String, dynamic>>? _progressStream;
 
diff --git a/lib/services/platform_channels.dart b/lib/services/platform_channels.dart
new file mode 100644
index 0000000..121e301
--- /dev/null
+++ b/lib/services/platform_channels.dart
@@ -0,0 +1,47 @@
+/// Single source of truth for every Android platform-channel name.
+///
+/// ## Why this file exists
+///
+/// The channel names are namespaced by the Android `applicationId`, which
+/// differs between branches: upstream `main` uses `com.retro.rshop`, this
+/// branch (`main-zh`) uses `com.retro.rshop.tw`. The names used to be
+/// hard-coded in 20 places across Kotlin, Dart and the tests. Merging upstream
+/// and picking only one side still compiled fine but blew up at runtime with
+/// `MissingPluginException` on every native call — and
+/// `NativeSmbService.testConnection` swallows `PlatformException` into a
+/// generic "connection failed", which makes it very hard to diagnose.
+///
+/// ## When merging upstream
+///
+/// [kChannelPrefix] below is the **only** place on the Dart side that needs
+/// adjusting. On the Kotlin side the prefix is derived from
+/// `BuildConfig.APPLICATION_ID`
+/// (`android/app/src/main/kotlin/com/retro/rshop/tw/MainActivity.kt`), which
+/// tracks `applicationId` in `android/app/build.gradle.kts` automatically.
+///
+/// **The two must stay identical.** If `applicationId` changes, change
+/// [kChannelPrefix] to match in the same commit, otherwise every native
+/// feature (zip extraction, storage/disk info, SMB) silently stops working.
+///
+/// The suffixes (`/zip`, `/storage`, `/zip_progress`, `/smb`, `/smb_progress`)
+/// must never change — they are the contract with `MainActivity.kt`.
+library;
+
+/// Must equal `applicationId` in `android/app/build.gradle.kts`.
+const String kChannelPrefix = 'com.retro.rshop.tw';
+
+/// MethodChannel — zip extraction (`DownloadService`).
+const String kZipChannel = '$kChannelPrefix/zip';
+
+/// EventChannel — zip extraction progress (`DownloadService`).
+const String kZipProgressChannel = '$kChannelPrefix/zip_progress';
+
+/// MethodChannel — free disk space & device memory
+/// (`DiskSpaceService`, `DeviceInfoService`).
+const String kStorageChannel = '$kChannelPrefix/storage';
+
+/// MethodChannel — native SMB client (`NativeSmbService`).
+const String kSmbChannel = '$kChannelPrefix/smb';
+
+/// EventChannel — native SMB transfer progress (`NativeSmbService`).
+const String kSmbProgressChannel = '$kChannelPrefix/smb_progress';
diff --git a/lib/services/provider_factory.dart b/lib/services/provider_factory.dart
index 91f5666..fef3e6f 100644
--- a/lib/services/provider_factory.dart
+++ b/lib/services/provider_factory.dart
@@ -1,3 +1,5 @@
+import 'package:flutter/foundation.dart';
+
 import '../models/config/provider_config.dart';
 import 'native_smb_service.dart';
 import 'providers/ftp_provider.dart';
@@ -13,12 +15,27 @@ class ProviderFactory {
     _smbService = smbService;
   }
 
+  /// 僅供測試使用：清除 [init] 設定的 static 狀態，讓測試能驗證未初始化的行為。
+  /// 正式程式碼不應呼叫。
+  @visibleForTesting
+  static void reset() {
+    _smbService = null;
+  }
+
   static SourceProvider getProvider(ProviderConfig config) {
     switch (config.type) {
       case ProviderType.web:
         return WebProvider(config);
       case ProviderType.smb:
-        return SmbProvider(config, _smbService!);
+        final smbService = _smbService;
+        if (smbService == null) {
+          throw StateError(
+            'ProviderFactory 尚未初始化：使用 SMB provider 前必須先呼叫 '
+            'ProviderFactory.init(smbService: ...)，'
+            '正常應在 main() 的 runApp() 之前完成。',
+          );
+        }
+        return SmbProvider(config, smbService);
       case ProviderType.ftp:
         return FtpProvider(config);
       case ProviderType.romm:
diff --git a/lib/services/source_failover.dart b/lib/services/source_failover.dart
new file mode 100644
index 0000000..0a89216
--- /dev/null
+++ b/lib/services/source_failover.dart
@@ -0,0 +1,182 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+
+import '../models/config/app_config.dart';
+import '../models/config/source.dart';
+import 'endpoint_probe_service.dart';
+import 'source_resolver.dart';
+
+/// Which source is actually going to be used, and whether that is the one the
+/// user picked or a fallback stand-in.
+@immutable
+class SourceChoice {
+  /// The source to sync from and show. Null when there is nothing usable.
+  final Source? source;
+
+  /// The primary source the user selected.
+  final Source? preferred;
+
+  const SourceChoice({this.source, this.preferred});
+
+  /// True when a fallback stand-in is covering for a preferred source that did not answer.
+  bool get isFallback =>
+      source != null &&
+      preferred != null &&
+      source!.id != preferred!.id &&
+      source!.enabled &&
+      preferred!.fallbackSourceIds.contains(source!.id);
+
+  static const none = SourceChoice();
+}
+
+/// Picks the source to use, substituting a fallback source when the preferred one is unreachable.
+SourceChoice chooseSource({
+  required List<Source> sources,
+  required String? activeSourceId,
+  required List<String> reachable,
+}) {
+  Source? byId(String? id) {
+    if (id == null) return null;
+    for (final s in sources) {
+      if (s.id == id) return s;
+    }
+    return null;
+  }
+
+  final selected = byId(activeSourceId);
+  if (selected == null || !selected.enabled) return SourceChoice.none;
+
+  final reachableSet = reachable.toSet();
+
+  // Primary source answered
+  if (reachableSet.contains(selected.id)) {
+    return SourceChoice(source: selected, preferred: selected);
+  }
+
+  // Primary source did not answer -> check fallback chain
+  if (selected.fallbackAutoSelect) {
+    for (final respondedId in reachable) {
+      if (selected.fallbackSourceIds.contains(respondedId)) {
+        final winner = byId(respondedId);
+        if (winner != null && winner.enabled) {
+          return SourceChoice(source: winner, preferred: selected);
+        }
+      }
+    }
+  } else {
+    for (final fbId in selected.fallbackSourceIds) {
+      if (reachableSet.contains(fbId)) {
+        final winner = byId(fbId);
+        if (winner != null && winner.enabled) {
+          return SourceChoice(source: winner, preferred: selected);
+        }
+      }
+    }
+  }
+
+  // Nothing answered: stay on preference so sync reports error against preferred server.
+  return SourceChoice(source: selected, preferred: selected);
+}
+
+/// The member of [sources] whose server answers **first**.
+Future<String?> firstRespondingSource(
+  List<Source> sources, {
+  required EndpointProbeService probe,
+}) async {
+  final entrants = sources.where((s) => s.enabled).toList(growable: false);
+  if (entrants.isEmpty) return null;
+  if (entrants.length == 1) {
+    final ok = (await probe.reachableFor(entrants.first)).isNotEmpty;
+    return ok ? entrants.first.id : null;
+  }
+
+  final winner = Completer<String?>();
+  var pending = entrants.length;
+  for (final source in entrants) {
+    unawaited(
+      probe.reachableFor(source).then(
+        (answer) {
+          if (answer.isNotEmpty && !winner.isCompleted) {
+            winner.complete(source.id);
+          }
+          if (--pending == 0 && !winner.isCompleted) winner.complete(null);
+        },
+        onError: (Object e) {
+          debugPrint('SourceFailover: probe failed for ${source.id}: $e');
+          if (--pending == 0 && !winner.isCompleted) winner.complete(null);
+        },
+      ),
+    );
+  }
+  return winner.future;
+}
+
+/// Probes the selected source and its fallback chain, returning the config to sync with.
+Future<({AppConfig config, SourceChoice choice})> resolveForSync({
+  required AppConfig config,
+  EndpointProbeService? probe,
+}) async {
+  final activeId = config.primarySourceId ?? config.activeSourceId;
+  if (activeId == null) {
+    return (config: config, choice: SourceChoice.none);
+  }
+
+  final svc = probe ?? EndpointProbeService();
+  svc.invalidate();
+  final selected = config.sourceById(activeId);
+  if (selected == null || !selected.enabled) {
+    return (config: config, choice: SourceChoice.none);
+  }
+
+  final reachable = <String>[];
+  if ((await svc.reachableFor(selected)).isNotEmpty) {
+    reachable.add(selected.id);
+  } else if (selected.fallbackSourceIds.isNotEmpty) {
+    final fallbackSources = [
+      for (final id in selected.fallbackSourceIds)
+        ...config.sources.where((s) => s.id == id && s.enabled),
+    ];
+    if (selected.fallbackAutoSelect) {
+      final winnerId = await firstRespondingSource(fallbackSources, probe: svc);
+      if (winnerId != null) reachable.add(winnerId);
+    } else {
+      for (final fb in fallbackSources) {
+        if ((await svc.reachableFor(fb)).isNotEmpty) {
+          reachable.add(fb.id);
+          break;
+        }
+      }
+    }
+  }
+
+  final choice = chooseSource(
+    sources: config.sources,
+    activeSourceId: activeId,
+    reachable: reachable,
+  );
+  final effective = choice.source?.id ?? activeId;
+
+  return (
+    config: withEffectiveSource(config, effective),
+    choice: choice,
+  );
+}
+
+/// Rebuilds every system's provider list as if [effectiveSourceId] were the
+/// selected source, without persisting anything.
+AppConfig withEffectiveSource(AppConfig config, String? effectiveSourceId) {
+  final systems = config.systems.map((s) {
+    final unmanaged =
+        s.providers.where((p) => !p.managedBySource).toList(growable: false);
+    final managed = SourceResolver.providersFor(
+      s,
+      config.sources,
+      activeSourceId: effectiveSourceId,
+    );
+    final combined = [...unmanaged, ...managed]
+      ..sort((a, b) => a.priority.compareTo(b.priority));
+    return s.copyWith(providers: combined);
+  }).toList(growable: false);
+  return config.copyWith(systems: systems);
+}
diff --git a/lib/services/source_resolver.dart b/lib/services/source_resolver.dart
index a0572f2..2a7bea3 100644
--- a/lib/services/source_resolver.dart
+++ b/lib/services/source_resolver.dart
@@ -25,19 +25,32 @@ class SourceResolver {
   const SourceResolver._();
 
   /// Returns the effective providers for [system].
+  /// [activeSourceId] narrows the result to a single source — the library is
+  /// showing and syncing that one alone. Null keeps every enabled source, which
+  /// is what a one-source setup gets and what the app did before switching
+  /// existed.
+  ///
+  /// An unknown id is ignored rather than yielding nothing: a source deleted
+  /// while selected should leave the user with a full library, not an empty one.
   static List<ProviderConfig> providersFor(
     SystemConfig system,
-    List<Source> allSources,
-  ) {
+    List<Source> allSources, {
+    String? activeSourceId,
+  }) {
     final allow = system.enabledSourceIds?.toSet();
     final mappingBySourceId = {
       for (final m in system.manualMappings) m.sourceId: m,
     };
+    final active = activeSourceId != null &&
+            allSources.any((s) => s.id == activeSourceId)
+        ? activeSourceId
+        : null;
 
     final entries = <_ResolvedEntry>[];
 
     for (final source in allSources) {
       if (!source.enabled) continue;
+      if (active != null && source.id != active) continue;
       if (allow != null && !allow.contains(source.id)) continue;
 
       final mapping = mappingBySourceId[source.id];
diff --git a/lib/services/sources_notifier.dart b/lib/services/sources_notifier.dart
index 67fd3cd..c8e5d20 100644
--- a/lib/services/sources_notifier.dart
+++ b/lib/services/sources_notifier.dart
@@ -14,15 +14,15 @@ import 'database_service.dart';
 import 'romm_pairing_service.dart';
 import 'source_resolver.dart';
 
-/// Snapshot exposed by [SourcesNotifier]. Loading and error states are
-/// modelled explicitly so the UI can show a spinner / retry without
-/// hand-rolling its own state machine.
+/// Snapshot exposed by [SourcesNotifier].
 @immutable
 class SourcesState {
   const SourcesState({
     required this.sources,
     this.loading = false,
     this.error,
+    this.primarySourceId,
+    this.activeSourceId,
   });
 
   static const initial = SourcesState(sources: [], loading: true);
@@ -31,31 +31,29 @@ class SourcesState {
   final bool loading;
   final String? error;
 
+  final String? primarySourceId;
+  final String? activeSourceId;
+
   SourcesState copyWith({
     List<Source>? sources,
     bool? loading,
     Object? error = _sentinel,
+    String? primarySourceId,
+    String? activeSourceId,
   }) {
     return SourcesState(
       sources: sources ?? this.sources,
       loading: loading ?? this.loading,
       error: identical(error, _sentinel) ? this.error : error as String?,
+      primarySourceId: primarySourceId ?? this.primarySourceId,
+      activeSourceId: activeSourceId ?? this.activeSourceId,
     );
   }
 
   static const _sentinel = Object();
 }
 
-/// Owns the user's [Source] list and persists every mutation to disk via
-/// [ConfigStorageService].
-///
-/// This notifier is the single write path for sources during the v3
-/// transition. It loads the full [AppConfig] on init, isolates the
-/// `sources` slice for state, and on every mutation re-serialises the
-/// whole config back through the existing atomic-write code (so the
-/// legacy `systems`/`providers` half stays consistent at the file
-/// level). Once the rest of the app moves off the legacy half, this
-/// notifier can become the sole owner of [AppConfig].
+/// Owns the user's [Source] list and persists every mutation to disk via [ConfigStorageService].
 class SourcesNotifier extends StateNotifier<SourcesState> {
   SourcesNotifier(this._storage, {DatabaseService? db})
       : _db = db ?? DatabaseService(),
@@ -76,11 +74,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
       final loaded = await _storage.loadConfig();
       _cachedConfig = loaded ?? AppConfig.empty;
 
-      // One-shot upgrade for users on a v3 config whose system.providers
-      // were never tagged with their source id. Without this fix-up the
-      // notifier treats them as unmanaged forever, and disabling/removing
-      // a source has no effect on what syncAll iterates over. Persist
-      // immediately so bootstrappedConfigProvider sees the same view.
       final retagged = _retagUnmanagedProviders(_cachedConfig);
       if (!identical(retagged, _cachedConfig)) {
         _cachedConfig = retagged;
@@ -91,27 +84,11 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
         }
       }
 
-      // Sync the in-memory snapshot's legacy providers lists with the
-      // current sources list using the same managed/unmanaged split as
-      // _writeAndPublish. Read-only — never writes back to disk.
-      if (_cachedConfig.systems.isNotEmpty) {
-        final rebuilt = _cachedConfig.systems.map((s) {
-          final unmanaged = s.providers
-              .where((p) => !p.managedBySource)
-              .toList(growable: false);
-          final managed =
-              SourceResolver.providersFor(s, _cachedConfig.sources);
-          if (unmanaged.isEmpty && managed.isEmpty) return s;
-          final combined = [...unmanaged, ...managed]
-            ..sort((a, b) => a.priority.compareTo(b.priority));
-          return s.copyWith(providers: combined);
-        }).toList(growable: false);
-        _cachedConfig = _cachedConfig.copyWith(systems: rebuilt);
-      }
-
       state = SourcesState(
         sources: List<Source>.unmodifiable(_cachedConfig.sources),
         loading: false,
+        primarySourceId: _cachedConfig.primarySourceId,
+        activeSourceId: _cachedConfig.activeSourceId,
       );
     } catch (e) {
       debugPrint('SourcesNotifier: bootstrap failed: $e');
@@ -121,137 +98,119 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
     }
   }
 
-  /// Adds a new source. If a source with the same id already exists this
-  /// is a no-op (use [updateSource] instead).
-  Future<void> addSource(Source source) async {
-    if (state.sources.any((s) => s.id == source.id)) return;
-    final next = [...state.sources, source];
-    await _writeAndPublish(next);
-  }
-
-  /// Creates [SystemConfig] entries for any platforms in [source.knownPlatforms]
-  /// that don't already have a config. Returns `(ids, names)` of newly
-  /// created systems so callers can queue syncs and notify the user.
-  ///
-  /// Uses [basePath] to build `<basePath>/<systemId>` as the target folder
-  /// for each new system (same convention as onboarding).
-  Future<({List<String> ids, List<String> names})> ensureSystemsForSource(
+  /// Creates SystemConfigs for platforms present on [source] that do not have
+  /// a system entry in [AppConfig] yet.
+  Future<({List<String> names})> ensureSystemsForSource(
     Source source, {
     required String basePath,
   }) async {
-    if (source.knownPlatforms.isEmpty) {
-      return (ids: const <String>[], names: const <String>[]);
+    if (source.type != SourceType.romm || source.knownPlatforms.isEmpty) {
+      return (names: const <String>[]);
     }
+    final existingIds = _cachedConfig.systems.map((s) => s.id).toSet();
+    final newSystems = <SystemConfig>[];
+    final names = <String>[];
 
-    AppConfig latest;
-    try {
-      latest = (await _storage.loadConfig()) ?? _cachedConfig;
-    } catch (e) {
-      debugPrint('SourcesNotifier: re-read failed: $e');
-      latest = _cachedConfig;
-    }
+    for (final entry in source.knownPlatforms.entries) {
+      final slug = entry.key;
+      if (existingIds.contains(slug)) continue;
+
+      final model =
+          SystemModel.supportedSystems.where((s) => s.id == slug).firstOrNull;
+      final name = model?.name ?? slug.toUpperCase();
+      final folderName = slug;
+      final folder = '$basePath/$folderName';
 
-    final existingIds = latest.systems.map((s) => s.id).toSet();
-    final newSystems = <SystemConfig>[];
-    final newIds = <String>[];
-    final newNames = <String>[];
-
-    for (final systemId in source.knownPlatforms.keys) {
-      if (existingIds.contains(systemId)) continue;
-      final model = SystemModel.supportedSystems
-          .where((s) => s.id == systemId)
-          .firstOrNull;
-      if (model == null) continue;
       newSystems.add(SystemConfig(
-        id: systemId,
-        name: model.name,
-        targetFolder: '$basePath/$systemId',
+        id: slug,
+        name: name,
+        targetFolder: folder,
         providers: const [],
-        autoExtract: model.isZipped,
       ));
-      newIds.add(systemId);
-      newNames.add(model.name);
+      names.add(name);
     }
 
-    if (newSystems.isEmpty) {
-      return (ids: const <String>[], names: const <String>[]);
+    if (newSystems.isNotEmpty) {
+      await _writeAndPublish(state.sources, addSystems: newSystems);
     }
-
-    // Use _writeAndPublish with the extra systems so SourceResolver
-    // builds provider lists for them in the same atomic write.
-    await _writeAndPublish(state.sources, addSystems: newSystems);
-
-    return (ids: newIds, names: newNames);
-  }
-
-  /// Adds a new manual source together with the per-system path mappings
-  /// the user picked in the add screen. Both halves land in the same
-  /// atomic write so the resolver immediately produces working providers
-  /// for every mapped system on the next rebuild.
-  ///
-  /// [mappingsBySystemId] is keyed by R-Shop system slug; the value is
-  /// the remote path (relative to the source's base) for that system.
-  /// Empty paths are dropped.
-  /// Replaces every [SystemSourceMapping] for [sourceId] across all
-  /// systems with the entries in [mappingsBySystemId]. Empty paths drop
-  /// the mapping. Used by the manual-source mapping editor.
-  Future<void> setMappingsForSource(
-    String sourceId,
-    Map<String, String> mappingsBySystemId,
-  ) async {
-    final cleaned = <String, String>{
-      for (final e in mappingsBySystemId.entries)
-        if (e.value.trim().isNotEmpty) e.key: e.value.trim(),
-    };
-    await _writeAndPublish(
-      state.sources,
-      replaceMappingsForSource: sourceId,
-      addMappings: {sourceId: cleaned},
-    );
+    return (names: names);
   }
 
-  Future<void> addSourceWithMappings(
-    Source source,
-    Map<String, String> mappingsBySystemId,
-  ) async {
+  /// Appends [source] to the sources list, optionally attaching per-system
+  /// remote paths via [manualMappings] (systemSlug → remotePath).
+  Future<void> addSource(
+    Source source, {
+    Map<String, String> manualMappings = const {},
+    List<SystemConfig> addSystems = const [],
+  }) async {
     if (state.sources.any((s) => s.id == source.id)) return;
     final next = [...state.sources, source];
-    final cleaned = <String, String>{
-      for (final e in mappingsBySystemId.entries)
-        if (e.value.trim().isNotEmpty) e.key: e.value.trim(),
-    };
-    await _writeAndPublish(
-      next,
-      addMappings: {source.id: cleaned},
-    );
+    final addMap = manualMappings.isNotEmpty
+        ? {
+            source.id: manualMappings,
+          }
+        : const <String, Map<String, String>>{};
+    await _writeAndPublish(next, addMappings: addMap, addSystems: addSystems);
   }
 
-  /// Replaces the source with the same id. Throws [StateError] if the id
-  /// is unknown.
+  /// Edits an existing source in place (id must match).
   Future<void> updateSource(Source source) async {
     final idx = state.sources.indexWhere((s) => s.id == source.id);
     if (idx < 0) {
-      throw StateError('Cannot update unknown source: ${source.id}');
+      throw StateError('Unknown source: ${source.id}');
     }
-    final next = [...state.sources];
-    next[idx] = source;
+    final next = [...state.sources]..[idx] = source;
     await _writeAndPublish(next);
   }
 
-  /// Removes the source with [id]. No-op if it doesn't exist. Also drops
-  /// every cached game whose providerConfig references the source so the
-  /// system grids stop showing stale entries.
+  /// Replaces [sourceId]'s per-system manual mappings with [mappings]
+  Future<void> setManualMappings(
+    String sourceId,
+    Map<String, String> mappings,
+  ) async {
+    if (!state.sources.any((s) => s.id == sourceId)) {
+      throw StateError('Unknown source: $sourceId');
+    }
+    final addMap = mappings.isNotEmpty
+        ? {sourceId: mappings}
+        : const <String, Map<String, String>>{};
+    await _writeAndPublish(
+      state.sources,
+      replaceMappingsForSource: sourceId,
+      addMappings: addMap,
+    );
+  }
+
+  /// Removes [id] from the sources list, drops its per-system mappings,
+  /// and purges its cached games from the database.
   Future<void> removeSource(String id) async {
     if (!state.sources.any((s) => s.id == id)) return;
-    final next = state.sources.where((s) => s.id != id).toList();
-    await _writeAndPublish(next);
     await _purgeCachedGamesFor(id);
+
+    final next = state.sources.where((s) => s.id != id).toList();
+
+    // Clean up references in other sources' fallback lists
+    final cleaned = next.map((s) {
+      if (s.fallbackSourceIds.contains(id)) {
+        return s.copyWith(
+          fallbackSourceIds: s.fallbackSourceIds.where((f) => f != id).toList(),
+        );
+      }
+      return s;
+    }).toList();
+
+    final activeWasMe = _cachedConfig.activeSourceId == id;
+    final primaryWasMe = _cachedConfig.primarySourceId == id;
+    await _writeAndPublish(
+      cleaned,
+      activeSourceId: activeWasMe ? null : _cachedConfig.activeSourceId,
+      setActive: activeWasMe,
+      primarySourceId: primaryWasMe ? null : _cachedConfig.primarySourceId,
+      setPrimary: primaryWasMe,
+    );
   }
 
-  /// Toggle helper for the off-switch in the Sources screen. When the
-  /// caller disables a source we also drop its cached games — otherwise
-  /// the system grids would keep displaying entries from a source the
-  /// user just turned off until the next manual rescan.
+  /// Toggles [id]'s enabled state.
   Future<void> setEnabled(String id, bool enabled) async {
     final src = state.sources.firstWhere(
       (s) => s.id == id,
@@ -259,12 +218,126 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
     );
     if (src.enabled == enabled) return;
     await updateSource(src.copyWith(enabled: enabled));
-    if (!enabled) {
-      await _purgeCachedGamesFor(id);
+  }
+
+  // --- Fallback Chain Management ---
+
+  /// Appends [fallbackSourceId] to [primarySourceId]'s fallback list.
+  Future<void> addFallbackSource(
+    String primarySourceId,
+    String fallbackSourceId,
+  ) async {
+    final src = state.sources.firstWhere(
+      (s) => s.id == primarySourceId,
+      orElse: () => throw StateError('Unknown source: $primarySourceId'),
+    );
+    if (primarySourceId == fallbackSourceId) return;
+    if (!state.sources.any((s) => s.id == fallbackSourceId)) return;
+    if (src.fallbackSourceIds.contains(fallbackSourceId)) return;
+
+    final updated = src.copyWith(
+      fallbackSourceIds: [...src.fallbackSourceIds, fallbackSourceId],
+    );
+    await updateSource(updated);
+  }
+
+  /// Removes [fallbackSourceId] from [primarySourceId]'s fallback list.
+  Future<void> removeFallbackSource(
+    String primarySourceId,
+    String fallbackSourceId,
+  ) async {
+    final src = state.sources.firstWhere(
+      (s) => s.id == primarySourceId,
+      orElse: () => throw StateError('Unknown source: $primarySourceId'),
+    );
+    if (!src.fallbackSourceIds.contains(fallbackSourceId)) return;
+
+    final updated = src.copyWith(
+      fallbackSourceIds:
+          src.fallbackSourceIds.where((f) => f != fallbackSourceId).toList(),
+    );
+    await updateSource(updated);
+  }
+
+  /// Reorders [primarySourceId]'s fallback list to match [orderedIds].
+  Future<void> reorderFallbackSources(
+    String primarySourceId,
+    List<String> orderedIds,
+  ) async {
+    final src = state.sources.firstWhere(
+      (s) => s.id == primarySourceId,
+      orElse: () => throw StateError('Unknown source: $primarySourceId'),
+    );
+    final validIds = orderedIds
+        .where((id) => id != primarySourceId && state.sources.any((s) => s.id == id))
+        .toList();
+    final updated = src.copyWith(fallbackSourceIds: validIds);
+    await updateSource(updated);
+  }
+
+  /// Sets or toggles [fallbackAutoSelect] mode for [primarySourceId].
+  Future<void> setFallbackAutoSelect(
+    String primarySourceId,
+    bool autoSelect,
+  ) async {
+    final src = state.sources.firstWhere(
+      (s) => s.id == primarySourceId,
+      orElse: () => throw StateError('Unknown source: $primarySourceId'),
+    );
+    if (src.fallbackAutoSelect == autoSelect) return;
+    final updated = src.copyWith(fallbackAutoSelect: autoSelect);
+    await updateSource(updated);
+  }
+
+  /// Legacy single fallback setter (maps to fallbackSourceIds).
+  Future<void> setFallbackSource(String sourceId, String? fallbackId) async {
+    if (fallbackId == null) {
+      final src = state.sources.firstWhere((s) => s.id == sourceId);
+      await updateSource(src.copyWith(clearFallbacks: true));
+    } else {
+      await addFallbackSource(sourceId, fallbackId);
+    }
+  }
+
+  /// Puts the library on one source, or on all of them when [id] is null.
+  Future<void> setActiveSource(String? id) async {
+    if (id != null && !state.sources.any((s) => s.id == id)) {
+      throw StateError('Unknown source: $id');
+    }
+    if (_cachedConfig.activeSourceId == id) return;
+    await _writeAndPublish(state.sources, activeSourceId: id, setActive: true);
+  }
+
+  /// Designates the source in use: the one that syncs, and the one the home
+  /// screen shows by default.
+  Future<void> setPrimarySource(String? id) async {
+    if (id != null && !state.sources.any((s) => s.id == id)) {
+      throw StateError('Unknown source: $id');
     }
+    final wasOff =
+        id != null && state.sources.any((s) => s.id == id && !s.enabled);
+    final next = wasOff
+        ? [
+            for (final s in state.sources)
+              if (s.id == id) s.copyWith(enabled: true) else s,
+          ]
+        : state.sources;
+    final alreadySet = _cachedConfig.primarySourceId == id &&
+        _cachedConfig.activeSourceId == id;
+    if (alreadySet && !wasOff) return;
+    await _writeAndPublish(
+      next,
+      activeSourceId: id,
+      setActive: true,
+      primarySourceId: id,
+      setPrimary: true,
+    );
   }
 
-  Future<void> _purgeCachedGamesFor(String sourceId) async {
+  Future<void> _purgeCachedGamesFor(
+    String sourceId, {
+    Set<String> protectedOwnerIds = const {},
+  }) async {
     try {
       final folders = <String, String>{
         for (final s in _cachedConfig.systems) s.id: s.targetFolder,
@@ -272,14 +345,14 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
       await _db.purgeOrDetachSource(
         sourceId,
         systemTargetFolders: folders,
+        protectedOwnerIds: protectedOwnerIds,
       );
     } catch (e) {
       debugPrint('SourcesNotifier: cache purge failed for $sourceId: $e');
     }
   }
 
-  /// Caches the platform map a RomM source advertises (slug → numeric
-  /// platform id). Called after a successful sync.
+  /// Caches the platform map a RomM source advertises (slug → numeric platform id).
   Future<void> updateKnownPlatforms(
     String id,
     Map<String, int> platforms,
@@ -292,11 +365,7 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
     await updateSource(src.copyWith(knownPlatforms: platforms));
   }
 
-  /// Refreshes an existing source's bearer token + expiry from a fresh
-  /// [RommPairResult]. Preserves id, name, manualMappings, priority,
-  /// autoMap, enabled, borrowed flag, and (unless [knownPlatforms] is
-  /// passed) the previously discovered platform map. Used by the
-  /// "Re-pair" action when a borrowed token is about to expire.
+  /// Refreshes an existing source's bearer token + expiry from a fresh [RommPairResult].
   Future<void> refreshTokenFromPair(
     String id,
     RommPairResult result, {
@@ -319,29 +388,22 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
     await updateSource(updated);
   }
 
-  /// Bulk replace — used by config import flows. Skips the diff and
-  /// just persists the new list verbatim.
+  /// Bulk replace — used by config import flows.
   Future<void> replaceAll(List<Source> next) async {
     await _writeAndPublish(next);
   }
 
   /// Persists [next] as the new sources list.
-  ///
-  /// [addMappings] (sourceId → systemSlug → remotePath) lets callers
-  /// inject SystemSourceMapping entries into the systems list as part of
-  /// the same atomic write. Used by [addSourceWithMappings] so a manual
-  /// source's per-system paths land alongside the source itself.
   Future<void> _writeAndPublish(
     List<Source> next, {
     Map<String, Map<String, String>> addMappings = const {},
     String? replaceMappingsForSource,
     List<SystemConfig> addSystems = const [],
+    String? activeSourceId,
+    bool setActive = false,
+    String? primarySourceId,
+    bool setPrimary = false,
   }) async {
-    // Re-read the config from disk so any writes that happened outside
-    // this notifier (e.g. the onboarding flow adding new systems) are
-    // picked up before we touch the file. This prevents the notifier's
-    // stale in-memory snapshot from clobbering work done by other code
-    // paths.
     AppConfig latest;
     try {
       latest = (await _storage.loadConfig()) ?? _cachedConfig;
@@ -350,9 +412,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
       latest = _cachedConfig;
     }
 
-    // Add any new systems (from ensureSystemsForSource) that don't
-    // already exist in the config. Must happen before the SourceResolver
-    // rebuild so the new systems get their provider lists populated.
     if (addSystems.isNotEmpty) {
       final existingIds = latest.systems.map((s) => s.id).toSet();
       final truly = addSystems.where((s) => !existingIds.contains(s.id));
@@ -363,8 +422,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
       }
     }
 
-    // Strip out every existing mapping for the targeted source so the
-    // mapping editor's "replace all" semantics work cleanly.
     if (replaceMappingsForSource != null) {
       latest = latest.copyWith(
         systems: latest.systems.map((s) {
@@ -378,8 +435,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
       );
     }
 
-    // Inject any caller-supplied SystemSourceMappings before the rebuild
-    // so the resolver picks them up in the same atomic write.
     if (addMappings.isNotEmpty) {
       latest = latest.copyWith(
         systems: latest.systems.map((s) {
@@ -388,7 +443,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
             final sourceId = entry.key;
             final path = entry.value[s.id];
             if (path != null && path.isNotEmpty) {
-              // Skip if a mapping for this source already exists.
               final exists =
                   s.manualMappings.any((m) => m.sourceId == sourceId);
               if (!exists) {
@@ -407,19 +461,13 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
       );
     }
 
-    // Tracked rebuild: drop every provider previously written by the
-    // notifier (managedBySource=true), then re-append the resolver's
-    // current output. Unmanaged providers (legacy onboarding entries,
-    // local folders, manually configured providers) survive untouched —
-    // they were not put there by us so we have no business removing them.
     final rebuiltSystems = latest.systems.map((s) {
       final unmanaged =
           s.providers.where((p) => !p.managedBySource).toList(growable: false);
-      final managed = SourceResolver.providersFor(s, next);
-      // NB: do NOT early-return when both lists are empty — that would
-      // leave the system's old providers in place after a disable, which
-      // is exactly the bug where syncAll keeps hitting a turned-off
-      // source. Always rewrite providers to the (possibly empty) combo.
+      final effectiveActive =
+          setActive ? activeSourceId : latest.activeSourceId;
+      final managed = SourceResolver.providersFor(s, next,
+          activeSourceId: effectiveActive);
       final combined = [...unmanaged, ...managed]
         ..sort((a, b) => a.priority.compareTo(b.priority));
       return s.copyWith(providers: combined);
@@ -428,6 +476,10 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
     final updated = latest.copyWith(
       version: AppConfig.currentVersion,
       sources: next,
+      activeSourceId: setActive ? activeSourceId : null,
+      clearActiveSource: setActive && activeSourceId == null,
+      primarySourceId: setPrimary ? primarySourceId : null,
+      clearPrimarySource: setPrimary && primarySourceId == null,
       systems: rebuiltSystems,
     );
     try {
@@ -436,6 +488,8 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
       state = SourcesState(
         sources: List<Source>.unmodifiable(next),
         loading: false,
+        primarySourceId: updated.primarySourceId,
+        activeSourceId: updated.activeSourceId,
       );
     } catch (e) {
       debugPrint('SourcesNotifier: persist failed: $e');
@@ -444,11 +498,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
     }
   }
 
-  /// Walks every system's provider list and tags any unmanaged provider
-  /// whose connection details match an existing [Source] as belonging to
-  /// that source. Used as a one-shot upgrade for v3 configs that were
-  /// written before the managedBySource tagging existed; without it, an
-  /// untagged provider would survive disable/remove forever.
   AppConfig _retagUnmanagedProviders(AppConfig config) {
     if (config.sources.isEmpty || config.systems.isEmpty) return config;
     var anyChange = false;
@@ -475,7 +524,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
   }
 
   static bool _providerMatchesSource(ProviderConfig p, Source s) {
-    // Reuse SourceResolver's matching rules.
     switch (s.type) {
       case SourceType.romm:
       case SourceType.web:
@@ -489,10 +537,6 @@ class SourcesNotifier extends StateNotifier<SourcesState> {
     }
   }
 
-  /// Visible for tests only — exposes the in-memory AppConfig snapshot so
-  /// the suite can verify that legacy `providers` lists are kept in sync
-  /// with the canonical sources state after each mutation.
   @visibleForTesting
   AppConfig get debugCachedConfig => _cachedConfig;
 }
-
diff --git a/lib/widgets/console_dialog.dart b/lib/widgets/console_dialog.dart
new file mode 100644
index 0000000..8d3dd8c
--- /dev/null
+++ b/lib/widgets/console_dialog.dart
@@ -0,0 +1,250 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../core/theme/app_theme.dart';
+import '../core/widgets/console_focusable.dart';
+import '../l10n/app_localizations.dart';
+
+/// A modal dialog designed for gamepad interaction.
+///
+/// Features:
+/// - Maps 'B' button/Escape to cancel.
+/// - Maps 'A' button/Enter to confirming the selected action.
+/// - Horizontal navigation between Primary and Secondary buttons.
+/// - Consistent visual style with the rest of the app.
+class ConsoleDialog extends ConsumerStatefulWidget {
+  final String title;
+  final String message;
+  final String? primaryLabel;
+  final String? secondaryLabel;
+  final bool isDestructive;
+
+  const ConsoleDialog({
+    super.key,
+    required this.title,
+    required this.message,
+    this.primaryLabel,
+    this.secondaryLabel,
+    this.isDestructive = false,
+  });
+
+  @override
+  ConsumerState<ConsoleDialog> createState() => _ConsoleDialogState();
+}
+
+class _ConsoleDialogState extends ConsumerState<ConsoleDialog> {
+  final FocusNode _primaryFocus = FocusNode(debugLabel: 'dialog_primary');
+  final FocusNode _secondaryFocus = FocusNode(debugLabel: 'dialog_secondary');
+  final FocusNode _screenFocus = FocusNode(debugLabel: 'dialog_screen');
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) _primaryFocus.requestFocus();
+    });
+  }
+
+  @override
+  void dispose() {
+    _primaryFocus.dispose();
+    _secondaryFocus.dispose();
+    _screenFocus.dispose();
+    super.dispose();
+  }
+
+  void _handleBack() {
+    Navigator.of(context).pop(false);
+  }
+
+  KeyEventResult _onKeyEvent(FocusNode node, KeyEvent event) {
+    if (event is! KeyDownEvent && event is! KeyRepeatEvent) {
+      return KeyEventResult.ignored;
+    }
+
+    final key = event.logicalKey;
+
+    if (key == LogicalKeyboardKey.gameButtonB ||
+        key == LogicalKeyboardKey.escape ||
+        key == LogicalKeyboardKey.goBack ||
+        key == LogicalKeyboardKey.backspace) {
+      _handleBack();
+      return KeyEventResult.handled;
+    }
+
+    if (key == LogicalKeyboardKey.arrowLeft) {
+      _secondaryFocus.requestFocus();
+      return KeyEventResult.handled;
+    }
+    if (key == LogicalKeyboardKey.arrowRight) {
+      _primaryFocus.requestFocus();
+      return KeyEventResult.handled;
+    }
+
+    return KeyEventResult.ignored;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l = L.of(context);
+
+    return Focus(
+      focusNode: _screenFocus,
+      onKeyEvent: _onKeyEvent,
+      autofocus: true,
+      child: Container(
+        color: Colors.black.withValues(alpha: 0.75),
+        child: Center(
+          child: Material(
+            type: MaterialType.transparency,
+            color: Colors.transparent,
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 420),
+              child: Container(
+                margin: const EdgeInsets.all(24),
+                padding: const EdgeInsets.all(24),
+                decoration: BoxDecoration(
+                  color: const Color(0xFF1C1C1C),
+                  borderRadius: BorderRadius.circular(16),
+                  border: Border.all(color: Colors.white12),
+                  boxShadow: [
+                    BoxShadow(
+                      color: Colors.black.withValues(alpha: 0.5),
+                      blurRadius: 30,
+                      offset: const Offset(0, 10),
+                    ),
+                  ],
+                ),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      widget.title,
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 18,
+                        fontWeight: FontWeight.w700,
+                        letterSpacing: 0.5,
+                      ),
+                    ),
+                    const SizedBox(height: 12),
+                    Text(
+                      widget.message,
+                      style: TextStyle(
+                        color: Colors.white.withValues(alpha: 0.5),
+                        fontSize: 14,
+                        height: 1.5,
+                      ),
+                    ),
+                    const SizedBox(height: 24),
+                    Row(
+                      children: [
+                        Expanded(
+                          child: _DialogButton(
+                            focusNode: _secondaryFocus,
+                            label: widget.secondaryLabel ?? l.common_cancel,
+                            onSelect: () => Navigator.of(context).pop(false),
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: _DialogButton(
+                            focusNode: _primaryFocus,
+                            label: widget.primaryLabel ?? l.common_done,
+                            isPrimary: true,
+                            isDestructive: widget.isDestructive,
+                            onSelect: () => Navigator.of(context).pop(true),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _DialogButton extends StatelessWidget {
+  final FocusNode focusNode;
+  final String label;
+  final VoidCallback onSelect;
+  final bool isPrimary;
+  final bool isDestructive;
+
+  const _DialogButton({
+    required this.focusNode,
+    required this.label,
+    required this.onSelect,
+    this.isPrimary = false,
+    this.isDestructive = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListenableBuilder(
+      listenable: focusNode,
+      builder: (context, child) {
+        final isFocused = focusNode.hasFocus;
+        final baseColor = isDestructive ? Colors.redAccent : AppTheme.primaryColor;
+
+        final textColor = isFocused ? Colors.white : (isPrimary ? baseColor : Colors.white60);
+        final bgColor = isFocused
+            ? baseColor.withValues(alpha: 0.35)
+            : baseColor.withValues(alpha: 0.08);
+
+        return ConsoleFocusable(
+          focusNode: focusNode,
+          onSelect: onSelect,
+          focusScale: 1.0,
+          focusBorderColor: Colors.white,
+          borderRadius: 10,
+          child: Container(
+            padding: const EdgeInsets.symmetric(vertical: 12),
+            alignment: Alignment.center,
+            decoration: BoxDecoration(
+              color: bgColor,
+              borderRadius: BorderRadius.circular(10),
+            ),
+            child: Text(
+              label,
+              style: TextStyle(
+                color: textColor,
+                fontSize: 14,
+                fontWeight: isFocused ? FontWeight.w700 : FontWeight.w600,
+              ),
+            ),
+          ),
+        );
+      },
+    );
+  }
+}
+
+/// Helper to show the gamepad-friendly dialog.
+Future<bool?> showConsoleDialog(
+  BuildContext context, {
+  required String title,
+  required String message,
+  String? primaryLabel,
+  String? secondaryLabel,
+  bool isDestructive = false,
+}) {
+  return showDialog<bool>(
+    context: context,
+    barrierDismissible: true,
+    builder: (context) => ConsoleDialog(
+      title: title,
+      message: message,
+      primaryLabel: primaryLabel,
+      secondaryLabel: secondaryLabel,
+      isDestructive: isDestructive,
+    ),
+  );
+}
diff --git a/lib/widgets/console_hud.dart b/lib/widgets/console_hud.dart
index da3a132..9714b6b 100644
--- a/lib/widgets/console_hud.dart
+++ b/lib/widgets/console_hud.dart
@@ -199,21 +199,21 @@ class ConsoleHud extends ConsumerWidget {
             color: Colors.white.withValues(alpha: 0.12),
           ),
         ),
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: _buildWithSpacing(rs, buttons),
+        // Wraps rather than a single row: five hints with localised labels are
+        // wider than a modal panel on a 3.92" screen. The callers used to fix
+        // that by scaling the whole HUD down, which left one screen's hints
+        // visibly smaller than every other screen's — and the same overflow
+        // paints the yellow stripe when nothing catches it. With one run this
+        // lays out identically to the row it replaces.
+        child: Wrap(
+          spacing: rs.isSmall ? rs.spacing.sm : rs.spacing.md,
+          runSpacing: rs.spacing.sm,
+          alignment:
+              rs.isPortrait ? WrapAlignment.center : WrapAlignment.end,
+          crossAxisAlignment: WrapCrossAlignment.center,
+          children: buttons,
         ),
       ),
     );
   }
-
-  List<Widget> _buildWithSpacing(Responsive rs, List<Widget> buttons) {
-    final spacing = rs.isSmall ? rs.spacing.sm : rs.spacing.md;
-    final result = <Widget>[];
-    for (var i = 0; i < buttons.length; i++) {
-      if (i > 0) result.add(SizedBox(width: spacing));
-      result.add(buttons[i]);
-    }
-    return result;
-  }
 }
diff --git a/lib/widgets/sync_badge.dart b/lib/widgets/sync_badge.dart
index 4cac66f..62ac6bc 100644
--- a/lib/widgets/sync_badge.dart
+++ b/lib/widgets/sync_badge.dart
@@ -55,6 +55,8 @@ class _LibrarySyncPillState extends ConsumerState<_LibrarySyncPill> {
   @override
   Widget build(BuildContext context) {
     final state = ref.watch(librarySyncServiceProvider);
+    final failoverChoice = ref.watch(activeFailoverChoiceProvider);
+    final isFailoverActive = failoverChoice != null && failoverChoice.isFallback;
 
     ref.listen<LibrarySyncState>(librarySyncServiceProvider, (prev, next) {
       if (next.isSyncing) {
@@ -75,25 +77,42 @@ class _LibrarySyncPillState extends ConsumerState<_LibrarySyncPill> {
     });
 
     final showSyncing = state.isSyncing;
-    if (!showSyncing && _failedSystems.isEmpty) return const SizedBox.shrink();
-
     final rs = context.rs;
     final iconSize = rs.isSmall ? 14.0 : 16.0;
 
     if (showSyncing) {
+      final accent = isFailoverActive ? Colors.amberAccent : Colors.cyanAccent;
+      final labelText = isFailoverActive
+          ? '⚡ 同步中 (代理) ${state.completedSystems}/${state.totalSystems}'
+          : L.of(context).sync_progress(state.completedSystems, state.totalSystems);
+
       return _SyncPillContent(
         key: const ValueKey('library-syncing'),
-        accentColor: Colors.cyanAccent,
+        accentColor: accent,
         leadingIcon: _SpinningIcon(
           size: iconSize,
           icon: Icons.sync,
-          color: Colors.cyanAccent,
+          color: accent,
         ),
-        label: L.of(context).sync_progress(state.completedSystems, state.totalSystems),
+        label: labelText,
         systemName: state.currentSystem,
       );
     }
 
+    if (isFailoverActive && _failedSystems.isEmpty) {
+      return _PulsingPill(
+        key: const ValueKey('library-failover-active'),
+        child: _SyncPillContent(
+          accentColor: Colors.amberAccent,
+          leadingIcon: Icon(Icons.bolt, size: iconSize, color: Colors.amberAccent),
+          label: '⚡ 代理中',
+          systemName: failoverChoice.source?.name,
+        ),
+      );
+    }
+
+    if (_failedSystems.isEmpty) return const SizedBox.shrink();
+
     final l = L.of(context);
     final label = _failedSystems.length == 1
         ? l.sync_singleSystemFailed(_failedSystems.keys.first)
@@ -262,24 +281,27 @@ class _SyncPillContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final rs = context.rs;
-    final fontSize = rs.isSmall ? 10.0 : 12.0;
+    final fontSize = rs.isSmall ? 11.0 : 12.5;
+    final fullText = (systemName != null && systemName!.isNotEmpty)
+        ? '$label · $systemName'
+        : label;
 
     return Container(
       padding: EdgeInsets.symmetric(
-        horizontal: rs.isSmall ? 10 : 12,
-        vertical: rs.isSmall ? 5 : 6,
+        horizontal: rs.isSmall ? 12 : 14,
+        vertical: rs.isSmall ? 5 : 7,
       ),
       decoration: BoxDecoration(
-        color: Colors.black.withValues(alpha: 0.8),
+        color: Colors.black.withValues(alpha: 0.88),
         borderRadius: BorderRadius.circular(20),
         border: Border.all(
-          color: accentColor.withValues(alpha: 0.3),
-          width: 1,
+          color: accentColor.withValues(alpha: 0.6),
+          width: 1.2,
         ),
         boxShadow: [
           BoxShadow(
-            color: accentColor.withValues(alpha: 0.1),
-            blurRadius: 8,
+            color: accentColor.withValues(alpha: 0.2),
+            blurRadius: 10,
           ),
         ],
       ),
@@ -289,35 +311,18 @@ class _SyncPillContent extends StatelessWidget {
           leadingIcon,
           const SizedBox(width: 6),
           ConstrainedBox(
-            constraints:
-                BoxConstraints(maxWidth: rs.isSmall ? 200 : 300),
+            constraints: BoxConstraints(maxWidth: rs.isSmall ? 360 : 480),
             child: Text(
-              label,
+              fullText,
               style: TextStyle(
                 fontSize: fontSize,
-                fontWeight: FontWeight.w600,
+                fontWeight: FontWeight.w700,
                 color: accentColor.forText,
               ),
-              maxLines: 2,
+              maxLines: 1,
               overflow: TextOverflow.ellipsis,
             ),
           ),
-          if (systemName != null) ...[
-            const SizedBox(width: 4),
-            ConstrainedBox(
-              constraints:
-                  BoxConstraints(maxWidth: rs.isSmall ? 100 : 150),
-              child: Text(
-                systemName!,
-                style: TextStyle(
-                  fontSize: fontSize - 1,
-                  color: Colors.grey[400],
-                ),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ),
-          ],
         ],
       ),
     );
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 9e70903..41f954a 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
   flutter_soloud
+  jni
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)
diff --git a/pubspec.yaml b/pubspec.yaml
index 90b2bb9..5d700fb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: retro_eshop
 description: "R-Shop — A retro game manager for Android with a console-style UI, controller support, and download queue."
 publish_to: 'none'
-version: 1.7.0+12
+version: 1.7.0-zh+13
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
diff --git a/scripts/build_fix_by_file.py b/scripts/build_fix_by_file.py
new file mode 100644
index 0000000..62d4fac
--- /dev/null
+++ b/scripts/build_fix_by_file.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+"""Builds docs/FIX_BY_FILE.md — a reverse index of docs/FIX_LOGS.md.
+
+Answers "I am about to change this file; what happened here before?", which the
+keyword index cannot: FIX_INDEX is organised by symptom, and you rarely know the
+symptom in advance — you know the file you just opened.
+
+Source of truth is each entry's `**檔案**` field, so this is regenerated rather
+than maintained. Re-run after adding entries:  python scripts/build_fix_by_file.py
+
+Entries written before the three-field format existed have no `**檔案**` field;
+they are listed at the bottom as pending rather than dropped, so the gap stays
+visible.
+"""
+import io, os, re, collections
+
+ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+LOGS = os.path.join(ROOT, 'docs', 'FIX_LOGS.md')
+OUT = os.path.join(ROOT, 'docs', 'FIX_BY_FILE.md')
+
+text = io.open(LOGS, encoding='utf-8').read()
+entries = re.split(r'^## \[', text, flags=re.M)[1:]
+
+by_file = collections.defaultdict(list)
+pending = []
+for e in entries:
+    key = e.split(']', 1)[0]
+    body = e.split('\n', 1)[1] if '\n' in e else ''
+    # The 檔案 field runs until the next bullet that is not a continuation line.
+    m = re.search(r'^- \*\*檔案\*\*：(.*?)(?=^\s*$|^- \*\*(?!檔案))', body, re.M | re.S)
+    if not m:
+        pending.append(key)
+        continue
+    block = m.group(1)
+    paths = re.findall(r'`([^`]+?)`', block)
+    paths = [p for p in paths if '/' in p or p.endswith('.sh') or p.endswith('.md')]
+    if not paths:
+        pending.append(key)
+    for p in paths:
+        p = p.split(':')[0].strip()
+        if key not in by_file[p]:
+            by_file[p].append(key)
+
+lines = [
+    '# R-Shop 檔案 → 紀錄 反查表',
+    '',
+    '> **自動產生，不要手改。** 來源是 [FIX_LOGS.md](FIX_LOGS.md) 每條的 `**檔案**` 欄。',
+    '> 新增紀錄後重跑：`python scripts/build_fix_by_file.py`',
+    '>',
+    '> 用途與 [FIX_INDEX.md](FIX_INDEX.md) 相反：索引是「症狀 → 條目」，這裡是',
+    '> **「我要改這個檔 → 它身上以前發生過什麼」**。改檔案前先查這裡，',
+    '> 命中的條目多半就是會再踩一次的坑。',
+    '',
+]
+for path in sorted(by_file):
+    keys = by_file[path]
+    lines.append('### `%s`' % path)
+    for k in keys:
+        lines.append('- [%s](FIX_LOGS.md)' % k)
+    lines.append('')
+
+if pending:
+    lines.append('---')
+    lines.append('')
+    lines.append('## 尚未指明檔案的條目')
+    lines.append('')
+    # 這一段常被讀成「有東西漏寫了」，但多數其實是環境診斷、部署作業、需求判定
+    # 這類本來就沒動到檔案的紀錄——它們在反查表上無處可去是正確的，不要為了讓
+    # 數字歸零去編假路徑。只有「待補」才是真的欠。見 FIX_LOGS 的 [R-Shop 反查不到]。
+    lines.append('這些條目沒有可反查的檔案。**多數是正確狀態**——環境診斷、部署作業、'
+                 '需求判定本來就沒有程式碼變更，`**檔案**` 欄寫的是「無程式碼變更」。')
+    lines.append('')
+    lines.append('只有標成「待補」的才是真的欠一份說明。')
+    lines.append('')
+    for k in pending:
+        lines.append('- %s' % k)
+    lines.append('')
+
+io.open(OUT, 'w', encoding='utf-8', newline='').write('\n'.join(lines))
+print('files: %d   entries without paths: %d' % (len(by_file), len(pending)))
diff --git a/scripts/check.ps1 b/scripts/check.ps1
new file mode 100644
index 0000000..6fd23bc
--- /dev/null
+++ b/scripts/check.ps1
@@ -0,0 +1,101 @@
+# check.ps1 — analyze + test，並且只回報「真正的回歸」。
+#
+# 為什麼有這支：`flutter test` 全跑本來就會有六個失敗（Windows 環境與需要真的
+# RomM 在跑的 smoke test），每次人工比對「這次的失敗和上次一樣嗎」既慢又容易
+# 看漏。基準清單收在 scripts/test_baseline.txt，這支只印出**不在清單上**的失敗，
+# 以及清單上**現在會過**的項目（那代表基準過期了，要更新）。
+#
+# 用法：
+#   powershell -ExecutionPolicy Bypass -File scripts/check.ps1
+#   ... -SkipAnalyze          只跑測試
+#   ... -Only test/foo_test.dart   只跑單一檔案（不比對基準）
+#
+# 注意：單檔測試是秒級的，全跑約 1.5 分鐘。改一個檔就全跑是這個專案最容易
+# 浪費掉的時間，開發中用 -Only，收尾再全跑一次。
+
+param(
+  [switch]$SkipAnalyze,
+  [string]$Only = ''
+)
+
+$ErrorActionPreference = 'Stop'
+# Windows PowerShell 5.1 prints this file's Chinese as mojibake unless the
+# console is told the output is UTF-8. The file itself needs the BOM for the
+# same reason — without it the parser reads it as ANSI and the strings break.
+[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+$flutter = 'D:\flutter\bin\flutter.bat'
+$root = Split-Path -Parent $PSScriptRoot
+Set-Location $root
+
+if (-not (Test-Path $flutter)) {
+  Write-Error "flutter not found at $flutter — 路徑會隨機器變，見 GLOBAL_DEV_NOTES.md"
+}
+
+if (-not $SkipAnalyze) {
+  Write-Host '== analyze =='
+  $analyze = & $flutter analyze 2>&1
+  $issues = $analyze | Select-String 'error -|warning -|info -'
+  if ($issues) {
+    $issues | ForEach-Object { Write-Host $_ }
+    Write-Host ('analyze: {0} issues' -f $issues.Count)
+  } else {
+    Write-Host 'analyze: clean'
+  }
+}
+
+Write-Host '== test =='
+if ($Only) {
+  & $flutter test $Only
+  exit $LASTEXITCODE
+}
+
+$out = & $flutter test -r expanded 2>&1
+
+# 總數：最後一行 "+N -M" 就是結果。
+$totals = ($out | Select-String -Pattern '\+\d+( -\d+)?: (Some tests failed|All tests passed)' |
+  Select-Object -Last 1)
+if ($totals) {
+  Write-Host ('totals: {0}' -f $totals.ToString().Trim())
+} else {
+  Write-Host 'totals: (not found — did the run crash?)'
+}
+
+# 失敗清單。PowerShell 的坑：$array -notmatch 'x' 是**過濾**不是判斷，
+# 所以這裡一律走 Where-Object，不要寫成 if ($fails -notmatch ...)。
+$fails = $out |
+  Select-String -Pattern '\[E\]$' |
+  ForEach-Object { $_.ToString() -replace '^\d\d:\d\d \+\d+ -\d+: ', '' -replace ' \[E\]$', '' } |
+  ForEach-Object { $_ -replace '^.*R-Shop[\\/]', '' } |
+  Sort-Object -Unique
+
+$baselineFile = Join-Path $PSScriptRoot 'test_baseline.txt'
+$baseline = @()
+if (Test-Path $baselineFile) {
+  $baseline = Get-Content $baselineFile | Where-Object { $_ -and -not $_.StartsWith('#') }
+}
+
+$new = $fails | Where-Object { $baseline -notcontains $_ }
+$fixed = $baseline | Where-Object { $fails -notcontains $_ }
+
+if ($new) {
+  Write-Host ''
+  Write-Host '!! 不在基準上的失敗（當成回歸看）:' -ForegroundColor Red
+  $new | ForEach-Object { Write-Host "   $_" }
+} else {
+  Write-Host 'no regressions (每個失敗都在基準清單上)'
+}
+
+if ($fixed) {
+  Write-Host ''
+  Write-Host '基準上的項目現在會過了，請更新 scripts/test_baseline.txt:' -ForegroundColor Yellow
+  $fixed | ForEach-Object { Write-Host "   $_" }
+}
+
+# game_list_controller 那幾條是時序敏感的，全跑時偶爾會多失敗一兩個，
+# 單獨跑就會過。單次失敗不足以認定回歸——連跑三次再說。
+if ($new -and ($new -join "`n") -match 'game_list_controller') {
+  Write-Host ''
+  Write-Host '提示：game_list_controller 會偶發失敗，先用 -Only 單跑三次再判斷。'
+}
+
+if ($new) { exit 1 } else { exit 0 }
diff --git a/scripts/deploy.ps1 b/scripts/deploy.ps1
new file mode 100644
index 0000000..2958003
--- /dev/null
+++ b/scripts/deploy.ps1
@@ -0,0 +1,115 @@
+# Build R-Shop and put it on the AYN Thor.
+#
+# The same six steps were being typed out by hand every time, including the
+# JDK check that is easy to skip and expensive to skip — see
+# .agents/skills/rshop-build-deploy/SKILL.md.
+#
+#   scripts\deploy.ps1              analyze, build, install, launch, check
+#   scripts\deploy.ps1 -SkipAnalyze skip the analyze step
+#   scripts\deploy.ps1 -NoLaunch    install without starting the app
+#   scripts\deploy.ps1 -Release     build the release APK instead
+
+param(
+    [switch]$SkipAnalyze,
+    [switch]$NoLaunch,
+    [switch]$Release,
+    [string]$Serial
+)
+
+$ErrorActionPreference = 'Stop'
+
+$flutter = 'D:\flutter\bin\flutter.bat'
+$jdk     = 'C:\Program Files\Java\jdk-21'
+$adb     = "$env:LOCALAPPDATA\Android\Sdk\platform-tools\adb.exe"
+$pkg     = 'com.retro.rshop.tw'
+$root    = Split-Path -Parent $PSScriptRoot
+
+foreach ($tool in @($flutter, $adb)) {
+    if (-not (Test-Path $tool)) { throw "not found: $tool" }
+}
+Set-Location $root
+
+# --- Step 0: the JDK pointer, which empties itself -------------------------
+# Gradle 8.14 cannot parse Java 25 and reports it as a bare "25.0.2", which
+# reads like anything but a JDK mismatch. Checking costs a second.
+$settings = Join-Path $env:APPDATA '.flutter_settings'
+$jdkDir = $null
+if (Test-Path $settings) {
+    $jdkDir = (Get-Content $settings -Raw | ConvertFrom-Json).'jdk-dir'
+}
+if ($jdkDir -ne $jdk) {
+    Write-Host "jdk-dir is '$jdkDir' — setting it to $jdk" -ForegroundColor Yellow
+    & $flutter config --jdk-dir $jdk | Out-Null
+    # A daemon started under the old JVM survives the config change.
+    & (Join-Path $root 'android\gradlew.bat') --stop 2>&1 | Out-Null
+}
+
+# --- Step 1: analyze -------------------------------------------------------
+# Green here means nothing about focus, touch, overflow or layout. Those only
+# show up on the device — see .agents/skills/rshop-touch-and-gamepad.
+if (-not $SkipAnalyze) {
+    Write-Host '== analyze ==' -ForegroundColor Cyan
+    $analyze = & $flutter analyze lib 2>&1
+    $issues = $analyze | Select-String -Pattern '^\s*(error|warning|info) -'
+    $errors = $issues | Select-String -Pattern '^\s*error -'
+    if ($errors) {
+        $errors | ForEach-Object { Write-Host $_.Line -ForegroundColor Red }
+        throw 'analyze found errors'
+    }
+    Write-Host "  $($issues.Count) issues, no errors"
+}
+
+# --- Step 2: build ---------------------------------------------------------
+Write-Host '== build ==' -ForegroundColor Cyan
+$mode = if ($Release) { '--release' } else { '--debug' }
+& $flutter build apk $mode 2>&1 | Select-Object -Last 1
+if ($LASTEXITCODE -ne 0) { throw 'build failed' }
+$apk = if ($Release) {
+    'build\app\outputs\flutter-apk\app-release.apk'
+} else {
+    'build\app\outputs\flutter-apk\app-debug.apk'
+}
+
+# --- Step 3: install -------------------------------------------------------
+Write-Host '== install ==' -ForegroundColor Cyan
+$target = if ($Serial) { @('-s', $Serial) } else { @() }
+$out = & $adb @target install -r $apk 2>&1
+# Joined first: -match against an array filters it instead of testing it, so
+# the array form is truthy whenever any line fails to match — which is every
+# successful install, since adb also prints "Performing Streamed Install".
+if (($out -join "`n") -notmatch 'Success') {
+    $out | ForEach-Object { Write-Host $_ -ForegroundColor Red }
+    # A differently-signed APK refuses to install with no build-time warning.
+    throw 'install failed — if the signature differs, uninstall first (ASK before doing that: it takes the data with it)'
+}
+
+if ($NoLaunch) { Write-Host 'installed, not launched'; exit 0 }
+
+# --- Step 4: launch and look --------------------------------------------
+& $adb @target logcat -c
+& $adb @target shell am start -n "$pkg/.MainActivity" | Out-Null
+Start-Sleep -Seconds 6
+
+# `pidof` prints nothing when the process has not appeared yet, and calling
+# .Trim() on that null is an InvokeMethodOnNull that hides the real state.
+# Six seconds is not always enough on a cold start, so poll instead.
+$appPid = ''
+foreach ($attempt in 1..10) {
+  $raw = & $adb @target shell pidof $pkg
+  if ($raw) { $appPid = "$raw".Trim() }
+  if ($appPid) { break }
+  Start-Sleep -Seconds 2
+}
+if (-not $appPid) { throw 'app is not running after launch' }
+Write-Host "running, pid $appPid" -ForegroundColor Green
+
+# Layout overflow is the yellow-and-black stripe. logcat catches it; a
+# screenshot on this device grabs the wrong panel.
+$bad = & $adb @target logcat -d -s 'flutter:*' 'AndroidRuntime:E' |
+    Select-String -Pattern 'RenderFlex|overflowed|Exception'
+if ($bad) {
+    Write-Host '-- logcat --' -ForegroundColor Yellow
+    $bad | Select-Object -First 10 | ForEach-Object { Write-Host $_.Line }
+} else {
+    Write-Host 'logcat clean (no overflow, no exceptions)'
+}
diff --git a/scripts/test_baseline.txt b/scripts/test_baseline.txt
new file mode 100644
index 0000000..a166e3e
--- /dev/null
+++ b/scripts/test_baseline.txt
@@ -0,0 +1,15 @@
+# flutter test 的既有失敗清單，check.ps1 用它判斷「這次的失敗算不算回歸」。
+#
+# 規則：每一條都要寫得出「為什麼它不算回歸」，寫不出來的那條就是還沒查。
+# 這份原本是 7 條，第 7 條（l10n_completeness: DE has all EN keys）查下去
+# 是真的缺字串，補完就綠了——所以不要把不確定的東西丟進來當背景雜訊。
+#
+# network_discovery   Windows socket errno 10042（本機沒有 mDNS 回應者）
+# rom_folder_service  Windows 路徑行為
+# romm_pairing_live   需要真的有 RomM 跑在 localhost:8090
+test/network_discovery_service_test.dart: NetworkDiscoveryService completes without crashing on a network without mDNS responders
+test/rom_folder_service_test.dart: scanAllSubfolders counts ROM files in each subfolder
+test/rom_folder_service_test.dart: scanAllSubfolders lists subfolders sorted alphabetically
+test/rom_folder_service_test.dart: scanAllSubfolders skips hidden folders
+test/romm_pairing_live_smoke_test.dart: exchangeCode with bogus code throws RommPairCodeExpiredException
+test/romm_pairing_live_smoke_test.dart: probeServer returns RomM 4.8+ version
diff --git a/test/active_source_test.dart b/test/active_source_test.dart
new file mode 100644
index 0000000..f843e1b
--- /dev/null
+++ b/test/active_source_test.dart
@@ -0,0 +1,479 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:retro_eshop/models/config/app_config.dart';
+import 'package:retro_eshop/models/config/source.dart';
+import 'package:retro_eshop/models/config/system_config.dart';
+import 'package:retro_eshop/services/config_storage_service.dart';
+import 'package:retro_eshop/services/database_service.dart';
+import 'package:retro_eshop/services/source_resolver.dart';
+import 'package:retro_eshop/services/sources_notifier.dart';
+
+/// Two sources are two independent libraries — **even when they point at the
+/// same server**. The user's model, not an inference from the URLs. Switching
+/// changes which one is in view and which one a sync talks to, and must never
+/// discard the other one's cached games.
+class _SpyDb extends DatabaseService {
+  final purged = <String>[];
+
+  @override
+  Future<({int detached, int deleted})> purgeOrDetachSource(
+    String sourceId, {
+    required Map<String, String> systemTargetFolders,
+    Set<String> protectedOwnerIds = const {},
+  }) async {
+    purged.add(sourceId);
+    return (detached: 0, deleted: 0);
+  }
+}
+
+Source _romm(String id, String url) => Source(
+      id: id,
+      name: id,
+      type: SourceType.romm,
+      url: url,
+      autoMap: true,
+      knownPlatforms: const {'snes': 4},
+    );
+
+Future<ConfigStorageService> _storageWithSystem() async {
+  final dir = Directory.systemTemp.createTempSync('rshop_active_src_');
+  addTearDown(() async {
+    try {
+      if (await dir.exists()) await dir.delete(recursive: true);
+    } catch (_) {}
+  });
+  final storage = ConfigStorageService(directoryProvider: () async => dir);
+  await storage.saveConfig(jsonEncode(AppConfig(
+    version: AppConfig.currentVersion,
+    systems: [
+      const SystemConfig(
+        id: 'snes',
+        name: 'SNES',
+        targetFolder: '/roms/snes',
+        providers: [],
+      ),
+    ],
+    sources: const [],
+  ).toJson()));
+  return storage;
+}
+
+void main() {
+  group('SourceResolver.providersFor — active source', () {
+    const system = SystemConfig(
+      id: 'snes',
+      name: 'SNES',
+      targetFolder: '/roms/snes',
+      providers: [],
+    );
+    final all = [
+      _romm('a', 'http://192.168.0.20:9080'),
+      _romm('b', 'http://home.example.org:9080'),
+    ];
+
+    test('null means every enabled source, as before', () {
+      expect(SourceResolver.providersFor(system, all), hasLength(2));
+    });
+
+    test('an active id narrows to that one source', () {
+      final providers =
+          SourceResolver.providersFor(system, all, activeSourceId: 'b');
+
+      expect(providers, hasLength(1));
+      expect(providers.single.sourceId, 'b');
+    });
+
+    test('an unknown id shows everything rather than nothing', () {
+      // A source deleted while selected must not leave an empty library.
+      expect(
+        SourceResolver.providersFor(system, all, activeSourceId: 'deleted'),
+        hasLength(2),
+      );
+    });
+
+    test('disabled beats active — an off source stays off', () {
+      final withDisabled = [
+        all.first,
+        _romm('b', 'http://home.example.org:9080').copyWith(enabled: false),
+      ];
+
+      expect(
+        SourceResolver.providersFor(system, withDisabled, activeSourceId: 'b'),
+        isEmpty,
+      );
+    });
+  });
+
+  group('SourcesNotifier.setActiveSource', () {
+    test('narrows the systems providers to the chosen source', () async {
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+
+      await notifier.setActiveSource('b');
+
+      final reloaded = await storage.loadConfig();
+      expect(reloaded!.activeSourceId, 'b');
+      final providers = reloaded.systems.single.providers;
+      expect(providers.map((p) => p.sourceId), ['b']);
+    });
+
+    test('NEVER purges — switching back must be instant, not a re-sync',
+        () async {
+      final storage = await _storageWithSystem();
+      final db = _SpyDb();
+      final notifier = SourcesNotifier(storage, db: db);
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+
+      await notifier.setActiveSource('b');
+      await notifier.setActiveSource('a');
+
+      expect(db.purged, isEmpty);
+    });
+
+    test('and neither does turning one off', () async {
+      // Off used to purge, which made off-on cost a full re-sync — felt as a
+      // pause on the second press. Rows are read through the system's
+      // providers, and a disabled source is not in them, so they can stay.
+      final storage = await _storageWithSystem();
+      final db = _SpyDb();
+      final notifier = SourcesNotifier(storage, db: db);
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+
+      await notifier.setEnabled('a', false);
+
+      expect(db.purged, isEmpty);
+    });
+
+    test('removing one does still purge — it is not coming back', () async {
+      final storage = await _storageWithSystem();
+      final db = _SpyDb();
+      final notifier = SourcesNotifier(storage, db: db);
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+
+      await notifier.removeSource('a');
+
+      expect(db.purged, ['a']);
+    });
+
+    test('null puts every source back in view', () async {
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+      await notifier.setActiveSource('b');
+
+      await notifier.setActiveSource(null);
+
+      final reloaded = await storage.loadConfig();
+      expect(reloaded!.activeSourceId, isNull);
+      expect(reloaded.systems.single.providers, hasLength(2));
+    });
+
+    test('survives a reload', () async {
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+      await notifier.setActiveSource('b');
+
+      final reopened = SourcesNotifier(storage, db: _SpyDb());
+      await reopened.ready;
+
+      final cfg = await storage.loadConfig();
+      expect(cfg!.activeSourceId, 'b');
+    });
+
+    test('rejects an unknown source id', () async {
+      final notifier = SourcesNotifier(await _storageWithSystem(), db: _SpyDb());
+      await notifier.ready;
+
+      expect(
+        () => notifier.setActiveSource('ghost'),
+        throwsA(isA<StateError>()),
+      );
+    });
+  });
+
+  group('AppConfig.activeSource', () {
+    test('resolves the selected source', () {
+      final cfg = AppConfig(
+        systems: const [],
+        sources: [_romm('a', 'http://a'), _romm('b', 'http://b')],
+        activeSourceId: 'b',
+      );
+
+      expect(cfg.activeSource?.id, 'b');
+    });
+
+    test('a dangling id resolves to null, not a crash', () {
+      final cfg = AppConfig(
+        systems: const [],
+        sources: [_romm('a', 'http://a')],
+        activeSourceId: 'deleted',
+      );
+
+      expect(cfg.activeSource, isNull);
+    });
+
+    test('round-trips through JSON', () {
+      final cfg = AppConfig(
+        systems: const [],
+        sources: [_romm('a', 'http://a')],
+        activeSourceId: 'a',
+      );
+
+      expect(AppConfig.fromJson(cfg.toJson()).activeSourceId, 'a');
+    });
+  });
+
+  // Two different decisions: what you are looking at, and what the app
+  // actually works against. Browsing a borrowed library with the home
+  // triggers must not redirect the next sync at it.
+  group('the source in use vs the source on screen', () {
+    test('designating one puts it in use and on screen', () async {
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+
+      await notifier.setPrimarySource('b');
+
+      final cfg = await storage.loadConfig();
+      expect(cfg!.primarySourceId, 'b');
+      expect(cfg.activeSourceId, 'b');
+    });
+
+    test('browsing to another source leaves the one in use alone', () async {
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+      await notifier.setPrimarySource('b');
+
+      await notifier.setActiveSource('a');
+
+      final cfg = await storage.loadConfig();
+      expect(cfg!.activeSourceId, 'a', reason: 'the view moved');
+      expect(cfg.primarySourceId, 'b', reason: 'the one in use did not');
+    });
+
+    test('one press clears it — there is no second cancel', () async {
+      // The bug this guards: the screen used to mirror the id into a field
+      // seeded with `??=`, which cannot hold "deliberately none", so the next
+      // build re-seeded it and the toggle took two presses to let go.
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.setPrimarySource('a');
+
+      await notifier.setPrimarySource(null);
+
+      final cfg = await storage.loadConfig();
+      expect(cfg!.primarySourceId, isNull);
+      expect(cfg.activeSourceId, isNull);
+    });
+
+    test('showing another source from the list leaves the one in use alone',
+        () async {
+      // Both toggles now live on the same row, so the risk is one quietly
+      // moving the other.
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+      await notifier.setPrimarySource('a');
+
+      await notifier.setActiveSource('b');
+      await notifier.setActiveSource(null);
+
+      final cfg = await storage.loadConfig();
+      expect(cfg!.activeSourceId, isNull);
+      expect(cfg.primarySourceId, 'a');
+    });
+
+    test('designating a switched-off source turns it back on', () async {
+      // Designating a library that cannot sync is not a state worth having.
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.setEnabled('a', false);
+
+      await notifier.setPrimarySource('a');
+
+      final cfg = await storage.loadConfig();
+      expect(cfg!.sources.single.enabled, isTrue);
+    });
+
+    test('but clearing it leaves the switch alone', () async {
+      // Giving it up says nothing about wanting the library gone — and
+      // switching it off would discard that source's cached games.
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.setPrimarySource('a');
+
+      await notifier.setPrimarySource(null);
+
+      final cfg = await storage.loadConfig();
+      expect(cfg!.primarySourceId, isNull);
+      expect(cfg.sources.single.enabled, isTrue);
+    });
+
+    test('two switched-on sources and none picked lands on one', () async {
+      // Otherwise the home screen shows both merged — a third library that is
+      // not on the sources list, which the triggers then step through as if
+      // it were one.
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+      await notifier.setPrimarySource('b');
+      await notifier.setActiveSource(null);
+
+      final reopened = SourcesNotifier(storage, db: _SpyDb());
+      await reopened.ready;
+
+      expect(reopened.state.activeSourceId, 'b', reason: 'the one in use');
+    });
+
+    test('a single source is left alone — nothing to merge with', () async {
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+
+      final reopened = SourcesNotifier(storage, db: _SpyDb());
+      await reopened.ready;
+
+      expect(reopened.state.activeSourceId, isNull);
+    });
+
+    test('the notifier publishes both ids without a config re-read', () async {
+      // The screen renders from these. Going back through the config future
+      // means invalidating it and waiting on a disk read, and until that
+      // lands the old id is still what comes out — the press reads as lag.
+      final storage = await _storageWithSystem();
+      final notifier = SourcesNotifier(storage, db: _SpyDb());
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+
+      await notifier.setPrimarySource('b');
+      expect(notifier.state.primarySourceId, 'b');
+      expect(notifier.state.activeSourceId, 'b');
+
+      await notifier.setActiveSource('a');
+      expect(notifier.state.activeSourceId, 'a');
+      expect(notifier.state.primarySourceId, 'b');
+    });
+
+    test('designating never purges either library', () async {
+      final storage = await _storageWithSystem();
+      final db = _SpyDb();
+      final notifier = SourcesNotifier(storage, db: db);
+      await notifier.ready;
+      await notifier.addSource(_romm('a', 'http://192.168.0.20:9080'));
+      await notifier.addSource(_romm('b', 'http://home.example.org:9080'));
+
+      await notifier.setPrimarySource('b');
+      await notifier.setPrimarySource('a');
+
+      expect(db.purged, isEmpty);
+    });
+
+    test('a config written before the split keeps syncing what it synced', () {
+      // No primary_source_id on disk — read it as "the shown source is also
+      // the one in use", which is what those installs meant.
+      final cfg = AppConfig.fromJson({
+        'version': AppConfig.currentVersion,
+        'systems': <dynamic>[],
+        'sources': <dynamic>[],
+        'active_source_id': 'b',
+      });
+
+      expect(cfg.primarySourceId, 'b');
+    });
+
+    test('round-trips through JSON independently of the shown source', () {
+      final cfg = AppConfig(
+        systems: const [],
+        sources: [_romm('a', 'http://a'), _romm('b', 'http://b')],
+        activeSourceId: 'a',
+        primarySourceId: 'b',
+      );
+
+      final back = AppConfig.fromJson(cfg.toJson());
+      expect(back.activeSourceId, 'a');
+      expect(back.primarySourceId, 'b');
+      expect(back.primarySource?.id, 'b');
+    });
+
+    test('a deleted source in use resolves to null, not a crash', () {
+      final cfg = AppConfig(
+        systems: const [],
+        sources: [_romm('a', 'http://a')],
+        primarySourceId: 'deleted',
+      );
+
+      expect(cfg.primarySource, isNull);
+    });
+  });
+
+  // The eye on each row is the on/off switch — there was briefly a second,
+  // separate "show on home" flag, but turning a source off already did that.
+  group('the eye is the on/off switch', () {
+    const system = SystemConfig(
+      id: 'snes',
+      name: 'SNES',
+      targetFolder: '/roms/snes',
+      providers: [],
+    );
+
+    test('every switched-on source reaches the home screen', () {
+      final all = [_romm('a', 'http://a'), _romm('b', 'http://b')];
+
+      final out = SourceResolver.providersFor(system, all);
+
+      expect(out.map((p) => p.sourceId), ['a', 'b']);
+    });
+
+    test('a switched-off one drops out, the rest stay', () {
+      final all = [
+        _romm('a', 'http://a'),
+        _romm('b', 'http://b').copyWith(enabled: false),
+        _romm('c', 'http://c'),
+      ];
+
+      final out = SourceResolver.providersFor(system, all);
+
+      expect(out.map((p) => p.sourceId), ['a', 'c']);
+    });
+
+    test('and stays out even when named — off means off', () {
+      final all = [_romm('a', 'http://a').copyWith(enabled: false)];
+
+      expect(
+        SourceResolver.providersFor(system, all, activeSourceId: 'a'),
+        isEmpty,
+      );
+    });
+  });
+}
diff --git a/test/database_service_merge_perf_test.dart b/test/database_service_merge_perf_test.dart
new file mode 100644
index 0000000..1c73f69
--- /dev/null
+++ b/test/database_service_merge_perf_test.dart
@@ -0,0 +1,102 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+import 'package:retro_eshop/services/database_service.dart';
+
+/// Joining a group on a **real-sized** library, which is the only size at
+/// which this ever went wrong.
+///
+/// The merge drops the unique index to re-stamp the owner column, and that
+/// index is also the only thing backing the de-duplication self-join. Without
+/// a replacement the join degrades to a scan per row: this took **over ten
+/// minutes** on 65k rows, and on the device the tap that started it simply
+/// looked dead. The guard is the elapsed time, not the row count — a correct
+/// but quadratic merge passes every other test in this repo.
+void main() {
+  setUpAll(() {
+    sqfliteFfiInit();
+    databaseFactory = databaseFactoryFfi;
+  });
+
+  test('joining a group with 65k cached games stays interactive', () async {
+    DatabaseService.resetForTesting();
+    final db = await databaseFactoryFfi.openDatabase(
+      inMemoryDatabasePath,
+      options: OpenDatabaseOptions(
+        version: 16,
+        onCreate: (db, _) async {
+          await db.execute('''
+            CREATE TABLE games (
+              id INTEGER PRIMARY KEY AUTOINCREMENT,
+              systemSlug TEXT NOT NULL,
+              filename TEXT NOT NULL,
+              displayName TEXT NOT NULL,
+              url TEXT NOT NULL,
+              region TEXT,
+              cover_url TEXT,
+              provider_config TEXT,
+              thumb_hash TEXT,
+              has_thumbnail INTEGER NOT NULL DEFAULT 0,
+              is_folder INTEGER NOT NULL DEFAULT 0,
+              alternative_sources TEXT,
+              source_id TEXT NOT NULL DEFAULT '',
+              endpoint_id TEXT NOT NULL DEFAULT '',
+              cache_owner_id TEXT NOT NULL DEFAULT ''
+            )
+          ''');
+          await db.execute(
+              'CREATE UNIQUE INDEX idx_games_system_filename_owner ON games (systemSlug, filename, cache_owner_id)');
+          await db.execute('CREATE INDEX idx_games_owner ON games (cache_owner_id)');
+          await db.execute('CREATE INDEX idx_games_source ON games (source_id)');
+        },
+      ),
+    );
+    DatabaseService.testDatabase = db;
+    final service = DatabaseService();
+
+    // 60k rows in one library, 5k in the one joining it.
+    await db.transaction((txn) async {
+      final batch = txn.batch();
+      for (var i = 0; i < 60000; i++) {
+        batch.insert('games', {
+          'systemSlug': 'snes',
+          'filename': 'Game$i.zip',
+          'displayName': 'Game $i',
+          'url': 'http://lan/Game$i.zip',
+          'provider_config': '{"source_id":"lan"}',
+          'source_id': 'lan',
+          'cache_owner_id': 'lan',
+        });
+      }
+      for (var i = 0; i < 5000; i++) {
+        batch.insert('games', {
+          'systemSlug': 'snes',
+          'filename': 'Game$i.zip', // overlaps: same server, same games
+          'displayName': 'Game $i',
+          'url': 'http://wan/Game$i.zip',
+          'provider_config': '{"source_id":"wan"}',
+          'source_id': 'wan',
+          'cache_owner_id': 'wan',
+        });
+      }
+      await batch.commit(noResult: true);
+    });
+
+    final sw = Stopwatch()..start();
+    final collapsed =
+        await service.adoptCacheInto(ownerId: 'lan', memberIds: ['wan']);
+    sw.stop();
+
+    expect(collapsed, 5000);
+    expect(await service.getGameCountForOwner('lan'), 60000);
+    // Generous on purpose: it runs in well under a second with the index and
+    // in minutes without it, so anything in between is still a red flag
+    // without making the test flaky on a busy machine.
+    expect(
+      sw.elapsed,
+      lessThan(const Duration(seconds: 30)),
+      reason: 'the merge lost its index — see the doc comment',
+    );
+    await db.close();
+    DatabaseService.resetForTesting();
+  }, timeout: const Timeout(Duration(minutes: 10)));
+}
diff --git a/test/database_service_routes_test.dart b/test/database_service_routes_test.dart
new file mode 100644
index 0000000..c0453cc
--- /dev/null
+++ b/test/database_service_routes_test.dart
@@ -0,0 +1,349 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+import 'package:retro_eshop/models/game_item.dart';
+import 'package:retro_eshop/services/database_service.dart';
+
+/// One cached list per *source* (schema v16, ungrouped).
+///
+/// The routes of one source are the same server reached by another address, so
+/// there is only ever one game list behind them. v14 stored a copy per route
+/// and nothing could tell whether the copies were supposed to agree; v15 keys
+/// on the source alone and keeps `endpoint_id` only as a record of which route
+/// last fetched the row. v16 moved the key on again, from the source to the
+/// cache owner — which *is* the source until the user puts it in a group, so
+/// everything here still describes what an ungrouped install does. The grouped
+/// case is in `database_service_v16_migration_test.dart`.
+///
+/// Everything here guards two things: syncing one source never touches
+/// another's rows, and switching route never splits or re-fetches a list.
+void main() {
+  late Database db;
+  late DatabaseService service;
+
+  const romm = 'src-romm';
+  const smb = 'src-smb';
+  const lan = 'ep-lan';
+  const remote = 'ep-remote';
+
+  GameItem game(String name) => GameItem(
+        filename: name,
+        displayName: name.replaceAll('.zip', ''),
+        url: 'http://server/$name',
+      );
+
+  Future<void> save(
+    String system,
+    List<String> names,
+    String sourceId, {
+    String endpointId = lan,
+    bool deleteOrphans = false,
+  }) =>
+      service.saveGames(
+        system,
+        names.map(game).toList(),
+        deleteOrphans: deleteOrphans,
+        sourceId: sourceId,
+        endpointId: endpointId,
+      );
+
+  setUpAll(() {
+    sqfliteFfiInit();
+    databaseFactory = databaseFactoryFfi;
+  });
+
+  setUp(() async {
+    DatabaseService.resetForTesting();
+    db = await databaseFactoryFfi.openDatabase(
+      inMemoryDatabasePath,
+      options: OpenDatabaseOptions(
+        version: 16,
+        onCreate: (db, version) async {
+          await db.execute('''
+            CREATE TABLE games (
+              id INTEGER PRIMARY KEY AUTOINCREMENT,
+              systemSlug TEXT NOT NULL,
+              filename TEXT NOT NULL,
+              displayName TEXT NOT NULL,
+              url TEXT NOT NULL,
+              region TEXT,
+              cover_url TEXT,
+              provider_config TEXT,
+              thumb_hash TEXT,
+              has_thumbnail INTEGER NOT NULL DEFAULT 0,
+              is_folder INTEGER NOT NULL DEFAULT 0,
+              alternative_sources TEXT,
+              source_id TEXT NOT NULL DEFAULT '',
+              endpoint_id TEXT NOT NULL DEFAULT '',
+              cache_owner_id TEXT NOT NULL DEFAULT ''
+            )
+          ''');
+          await db.execute(
+              'CREATE UNIQUE INDEX idx_games_system_filename_owner ON games (systemSlug, filename, cache_owner_id)');
+          await db.execute(
+              'CREATE INDEX idx_games_source ON games (source_id)');
+          await db.execute('''
+            CREATE TABLE game_metadata (
+              filename TEXT NOT NULL,
+              system_slug TEXT NOT NULL,
+              summary TEXT,
+              PRIMARY KEY (filename, system_slug)
+            )
+          ''');
+          await db.execute('''
+            CREATE TABLE ra_matches (
+              game_filename TEXT NOT NULL,
+              system_slug TEXT NOT NULL,
+              ra_game_id INTEGER,
+              PRIMARY KEY (game_filename, system_slug)
+            )
+          ''');
+        },
+      ),
+    );
+    DatabaseService.testDatabase = db;
+    service = DatabaseService();
+  });
+
+  tearDown(() async {
+    await db.close();
+    DatabaseService.resetForTesting();
+  });
+
+  group('one list per source', () {
+    test('the same game fetched over two routes is stored once', () async {
+      await save('snes', ['Mario.zip'], romm, endpointId: lan);
+      await save('snes', ['Mario.zip'], romm, endpointId: remote);
+
+      final rows =
+          await db.query('games', where: 'filename = ?', whereArgs: ['Mario.zip']);
+      expect(rows, hasLength(1));
+    });
+
+    test('endpoint_id records the route that last fetched the row', () async {
+      await save('snes', ['Mario.zip'], romm, endpointId: lan);
+      await save('snes', ['Mario.zip'], romm, endpointId: remote);
+
+      final rows = await db.query('games');
+      expect(rows.single['endpoint_id'], remote);
+    });
+
+    test('two different sources still keep separate rows', () async {
+      // Two servers are two lists — that separation is the one v15 keeps.
+      await save('snes', ['Mario.zip'], romm);
+      await save('snes', ['Mario.zip'], smb);
+
+      final rows =
+          await db.query('games', where: 'filename = ?', whereArgs: ['Mario.zip']);
+      expect(rows, hasLength(2));
+    });
+
+    test('getGames filtered by source returns only that source', () async {
+      await save('snes', ['A.zip', 'B.zip'], romm);
+      await save('snes', ['C.zip'], smb);
+
+      expect(
+        (await service.getGames('snes', sourceId: romm)).map((g) => g.filename),
+        ['A.zip', 'B.zip'],
+      );
+      expect(
+        (await service.getGames('snes', sourceId: smb)).map((g) => g.filename),
+        ['C.zip'],
+      );
+    });
+
+    test('the endpoint argument does not narrow a source query', () async {
+      // Callers hand over a whole route without caring; only the source half
+      // selects. Asking over the LAN must not hide what the remote fetched.
+      await save('snes', ['A.zip'], romm, endpointId: remote);
+
+      final overLan =
+          await service.getGames('snes', sourceId: romm, endpointId: lan);
+      expect(overLan.map((g) => g.filename), ['A.zip']);
+    });
+
+    test('getGames without a source filter still returns everything', () async {
+      await save('snes', ['A.zip'], romm);
+      await save('snes', ['C.zip'], smb);
+
+      expect(await service.getGames('snes'), hasLength(2));
+    });
+
+    test('includeLocal folds the no-source bucket in with one source', () async {
+      await save('snes', ['Remote.zip'], romm);
+      await service.saveGames('snes', [game('OnDisk.nes')]);
+
+      expect(
+        (await service.getGames('snes', sourceId: romm)).map((g) => g.filename),
+        ['Remote.zip'],
+      );
+      expect(
+        (await service.getGames('snes', sourceId: romm, includeLocal: true))
+            .map((g) => g.filename),
+        ['OnDisk.nes', 'Remote.zip'],
+      );
+    });
+  });
+
+  group('getGamesForRoutes', () {
+    test('two routes of one source resolve to one list, not a doubled one',
+        () async {
+      await save('snes', ['A.zip', 'B.zip'], romm);
+
+      final games = await service.getGamesForRoutes(
+        'snes',
+        const [(source: romm, endpoint: lan), (source: romm, endpoint: remote)],
+        includeLocal: false,
+      );
+
+      expect(games.map((g) => g.filename), ['A.zip', 'B.zip']);
+    });
+
+    test('a route the source never synced still shows the source list',
+        () async {
+      // Switching route must not look like an empty library.
+      await save('snes', ['A.zip'], romm, endpointId: lan);
+
+      final games = await service.getGamesForRoutes(
+        'snes',
+        const [(source: romm, endpoint: 'ep-brand-new')],
+        includeLocal: false,
+      );
+
+      expect(games.map((g) => g.filename), ['A.zip']);
+    });
+
+    test('several sources are unioned, and local comes along by default',
+        () async {
+      await save('snes', ['A.zip'], romm);
+      await save('snes', ['B.zip'], smb);
+      await service.saveGames('snes', [game('OnDisk.nes')]);
+
+      final games = await service.getGamesForRoutes(
+        'snes',
+        const [(source: romm, endpoint: lan), (source: smb, endpoint: lan)],
+      );
+
+      expect(games.map((g) => g.filename), ['A.zip', 'B.zip', 'OnDisk.nes']);
+    });
+
+    test('no routes and no local means no query at all', () async {
+      await save('snes', ['A.zip'], romm);
+
+      expect(
+        await service.getGamesForRoutes('snes', const [], includeLocal: false),
+        isEmpty,
+      );
+    });
+  });
+
+  group('orphan deletion is scoped to one source', () {
+    test('syncing one source never deletes another source', () async {
+      await save('snes', ['A.zip', 'B.zip', 'C.zip'], smb);
+      await save('snes', ['X.zip'], romm, deleteOrphans: true);
+
+      expect(
+        (await service.getGames('snes', sourceId: smb)).map((g) => g.filename),
+        ['A.zip', 'B.zip', 'C.zip'],
+      );
+    });
+
+    test('a source prunes its own orphans even when the route changed',
+        () async {
+      // v14 would have pruned nothing here: the second sync arrived over a
+      // different route and so looked like a different list.
+      await save('snes', ['A.zip', 'B.zip'], romm, endpointId: lan);
+      await save('snes', ['A.zip'], romm,
+          endpointId: remote, deleteOrphans: true);
+
+      expect(
+        (await service.getGames('snes', sourceId: romm)).map((g) => g.filename),
+        ['A.zip'],
+      );
+    });
+
+    test('local scans do not prune a source, and a source does not prune local',
+        () async {
+      await save('snes', ['A.zip'], romm);
+      await service.saveGames(
+        'snes',
+        [game('OnDisk.nes')],
+        forceDeleteOrphans: true,
+      );
+
+      expect(await service.getGames('snes', sourceId: romm), hasLength(1));
+      expect(await service.getGames('snes'), hasLength(2));
+    });
+
+    test('metadata survives while another source still lists the file',
+        () async {
+      // game_metadata and ra_matches are keyed by (system, filename) with no
+      // source dimension. Cascading on a source-scoped delete would strip the
+      // cover and RA progress of a game the other source still shows.
+      await save('snes', ['Shared.zip'], romm);
+      await save('snes', ['Shared.zip'], smb);
+      await db.insert('game_metadata',
+          {'filename': 'Shared.zip', 'system_slug': 'snes', 'summary': 'x'});
+      await db.insert('ra_matches',
+          {'game_filename': 'Shared.zip', 'system_slug': 'snes', 'ra_game_id': 7});
+
+      await save('snes', ['Other.zip'], romm, deleteOrphans: true);
+
+      expect(await db.query('game_metadata'), hasLength(1));
+      expect(await db.query('ra_matches'), hasLength(1));
+    });
+
+    test('metadata is cascaded once no source lists the file any more',
+        () async {
+      await save('snes', ['Gone.zip'], romm);
+      await db.insert('game_metadata',
+          {'filename': 'Gone.zip', 'system_slug': 'snes', 'summary': 'x'});
+
+      await save('snes', ['Other.zip'], romm, deleteOrphans: true);
+
+      expect(await db.query('game_metadata'), isEmpty);
+    });
+  });
+
+  group('counts — what did this source actually find', () {
+    test('getGameCountsPerCacheOwner reports each library once', () async {
+      await save('snes', ['A.zip', 'B.zip'], romm, endpointId: lan);
+      await save('snes', ['B.zip'], romm, endpointId: remote);
+      await save('snes', ['C.zip'], smb);
+
+      expect(await service.getGameCountsPerCacheOwner(), {romm: 2, smb: 1});
+    });
+
+    test('the no-source bucket is excluded from per-library counts', () async {
+      await save('snes', ['A.zip'], romm);
+      await service.saveGames('snes', [game('OnDisk.nes')]);
+
+      expect(await service.getGameCountsPerCacheOwner(), {romm: 1});
+    });
+
+    test('getGameCountForOwner answers for one library', () async {
+      await save('snes', ['A.zip', 'B.zip'], romm);
+      await save('nes', ['C.zip'], romm);
+
+      expect(await service.getGameCountForOwner(romm), 3);
+      expect(await service.getGameCountForOwner(smb), 0);
+    });
+  });
+
+  group('deleteCacheOwnedBy', () {
+    test('removes one source and leaves its sibling intact', () async {
+      await save('snes', ['A.zip'], romm);
+      await save('snes', ['A.zip', 'B.zip'], smb);
+
+      expect(await service.deleteCacheOwnedBy(romm), 1);
+      expect(await service.getGames('snes', sourceId: smb), hasLength(2));
+    });
+
+    test('refuses an empty source id rather than wiping the local bucket',
+        () async {
+      await service.saveGames('snes', [game('OnDisk.nes')]);
+
+      expect(await service.deleteCacheOwnedBy(''), 0);
+      expect(await service.getGames('snes'), hasLength(1));
+    });
+  });
+}
diff --git a/test/database_service_test.dart b/test/database_service_test.dart
index 709e14f..b57ae02 100644
--- a/test/database_service_test.dart
+++ b/test/database_service_test.dart
@@ -33,13 +33,25 @@ void main() {
               thumb_hash TEXT,
               has_thumbnail INTEGER NOT NULL DEFAULT 0,
               is_folder INTEGER NOT NULL DEFAULT 0,
-              alternative_sources TEXT
+              alternative_sources TEXT,
+              source_id TEXT NOT NULL DEFAULT '',
+              endpoint_id TEXT NOT NULL DEFAULT '',
+              cache_owner_id TEXT NOT NULL DEFAULT ''
             )
           ''');
           await db.execute('CREATE INDEX idx_systemSlug ON games (systemSlug)');
           await db.execute('CREATE INDEX idx_displayName ON games (displayName)');
           await db.execute('CREATE INDEX idx_filename ON games (filename)');
-          await db.execute('CREATE UNIQUE INDEX idx_games_system_filename ON games (systemSlug, filename)');
+          // Mirrors production v16: uniqueness is per cache owner — the
+          // group when there is one, otherwise the source itself. source_id
+          // and endpoint_id are still stored (who fetched the row, over which
+          // route) but neither is keyed on.
+          await db.execute(
+              'CREATE UNIQUE INDEX idx_games_system_filename_owner ON games (systemSlug, filename, cache_owner_id)');
+          await db.execute(
+              'CREATE INDEX idx_games_owner ON games (cache_owner_id)');
+          await db.execute(
+              'CREATE INDEX idx_games_source ON games (source_id)');
           await db.execute('''
             CREATE TABLE game_metadata (
               filename TEXT NOT NULL,
@@ -92,7 +104,16 @@ void main() {
     test('indices exist', () async {
       final indices = await db.rawQuery('PRAGMA index_list(games)');
       final names = indices.map((r) => r['name'] as String).toSet();
-      expect(names, containsAll(['idx_systemSlug', 'idx_displayName', 'idx_filename', 'idx_games_system_filename']));
+      expect(
+          names,
+          containsAll([
+            'idx_systemSlug',
+            'idx_displayName',
+            'idx_filename',
+            'idx_games_system_filename_owner',
+            'idx_games_owner',
+            'idx_games_source',
+          ]));
     });
   });
 
diff --git a/test/database_service_v15_migration_test.dart b/test/database_service_v15_migration_test.dart
new file mode 100644
index 0000000..b64200a
--- /dev/null
+++ b/test/database_service_v15_migration_test.dart
@@ -0,0 +1,312 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+import 'package:retro_eshop/models/game_item.dart';
+import 'package:retro_eshop/services/database_service.dart';
+
+/// v14 → v15: collapse the per-route copies of a list into one per source.
+///
+/// This is the only step of v15 that can lose data. The fixture is the real
+/// v14 schema and the upgrade is the real `_onUpgrade`, because a migration
+/// that throws is an app that cannot open its database at all.
+void main() {
+  late Database db;
+  late DatabaseService service;
+
+  setUpAll(() {
+    sqfliteFfiInit();
+    databaseFactory = databaseFactoryFfi;
+  });
+
+  setUp(() async {
+    DatabaseService.resetForTesting();
+    // The v14 schema exactly as production left it.
+    db = await databaseFactoryFfi.openDatabase(
+      inMemoryDatabasePath,
+      options: OpenDatabaseOptions(
+        version: 14,
+        onCreate: (db, _) async {
+          await db.execute('''
+            CREATE TABLE games (
+              id INTEGER PRIMARY KEY AUTOINCREMENT,
+              systemSlug TEXT NOT NULL,
+              filename TEXT NOT NULL,
+              displayName TEXT NOT NULL,
+              url TEXT NOT NULL,
+              region TEXT,
+              cover_url TEXT,
+              provider_config TEXT,
+              thumb_hash TEXT,
+              has_thumbnail INTEGER NOT NULL DEFAULT 0,
+              is_folder INTEGER NOT NULL DEFAULT 0,
+              alternative_sources TEXT,
+              source_id TEXT NOT NULL DEFAULT '',
+              endpoint_id TEXT NOT NULL DEFAULT ''
+            )
+          ''');
+          await db.execute(
+              'CREATE UNIQUE INDEX idx_games_system_filename_route ON games (systemSlug, filename, source_id, endpoint_id)');
+          await db.execute(
+              'CREATE INDEX idx_games_route ON games (source_id, endpoint_id)');
+        },
+      ),
+    );
+    service = DatabaseService();
+  });
+
+  tearDown(() async {
+    await db.close();
+    DatabaseService.resetForTesting();
+  });
+
+  Future<void> seed(List<Map<String, Object?>> rows) async {
+    for (final row in rows) {
+      await db.insert('games', {
+        'systemSlug': 'snes',
+        'displayName': (row['filename'] as String).replaceAll('.zip', ''),
+        'url': 'http://lan/${row['filename']}',
+        'provider_config': '{"type":"romm","source_id":"${row['source_id']}"}',
+        ...row,
+      });
+    }
+  }
+
+  /// Runs the real upgrade, from v14 to whatever the app ships.
+  Future<void> migrate() => service.upgradeForTesting(db, 14);
+
+  test('a v14 install still upgrades through v15 on the way to what ships',
+      () {
+    // The fixture is v14, so every later step runs in order. Pinning the
+    // shipped version here is what proves this file exercises the upgrade
+    // users get rather than a path that stopped at v15.
+    expect(DatabaseService.schemaVersion, 16);
+  });
+
+  test('two routes of one source collapse to a single row', () async {
+    await seed([
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-net'},
+      {'filename': 'Zelda.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+      {'filename': 'Zelda.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-net'},
+    ]);
+
+    await migrate();
+
+    final rows = await db.query('games', orderBy: 'filename');
+    expect(rows.map((r) => r['filename']), ['Mario.zip', 'Zelda.zip']);
+    // Neither copy is on the device, so the oldest row wins and the surviving
+    // endpoint_id is the route that first fetched it.
+    expect(rows.map((r) => r['endpoint_id']), ['ep-lan', 'ep-lan']);
+  });
+
+  test('three routes of one source collapse to one row', () async {
+    await seed([
+      for (final ep in ['ep-1', 'ep-2', 'ep-3'])
+        {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': ep},
+    ]);
+
+    await migrate();
+
+    expect(await db.query('games'), hasLength(1));
+  });
+
+  test('the copy already on the device wins, even with a later id', () async {
+    // purgeOrDetachSource leaves installed games behind with their
+    // provider_config and url stripped: that row is the user's downloaded
+    // copy, and dropping it makes the library forget a game they own.
+    await seed([
+      {
+        'filename': 'Mario.zip',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-lan',
+        'url': 'http://lan/Mario.zip',
+      },
+      {
+        'filename': 'Mario.zip',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-net',
+        'url': '',
+        'provider_config': null,
+      },
+    ]);
+
+    await migrate();
+
+    final row = (await db.query('games')).single;
+    expect(row['endpoint_id'], 'ep-net');
+    expect(row['provider_config'], isNull);
+  });
+
+  test('two on-device copies still collapse, oldest first', () async {
+    await seed([
+      {
+        'filename': 'Mario.zip',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-lan',
+        'url': '',
+        'provider_config': null,
+      },
+      {
+        'filename': 'Mario.zip',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-net',
+        'url': '',
+        'provider_config': null,
+      },
+    ]);
+
+    await migrate();
+
+    expect((await db.query('games')).single['endpoint_id'], 'ep-lan');
+  });
+
+  test('different sources with the same game are left alone', () async {
+    await seed([
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+      {'filename': 'Mario.zip', 'source_id': 'src-b', 'endpoint_id': 'ep-lan'},
+    ]);
+
+    await migrate();
+
+    expect(await db.query('games'), hasLength(2));
+  });
+
+  test('the same filename under two systems is left alone', () async {
+    await seed([
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+      {
+        'filename': 'Mario.zip',
+        'systemSlug': 'nes',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-lan',
+      },
+    ]);
+
+    await migrate();
+
+    expect(await db.query('games'), hasLength(2));
+  });
+
+  test('the local bucket is not swallowed by a source', () async {
+    await seed([
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+      {
+        'filename': 'Mario.zip',
+        'source_id': '',
+        'endpoint_id': '',
+        'url': '',
+        'provider_config': null,
+      },
+    ]);
+
+    await migrate();
+
+    final rows = await db.query('games', orderBy: 'source_id');
+    expect(rows.map((r) => r['source_id']), ['', 'src-a']);
+  });
+
+  test('covers and thumbnail flags are salvaged onto the survivor', () async {
+    // Rebuilding a thumbnail costs a download, and the survivor may be the
+    // copy that never had one.
+    await seed([
+      {
+        'filename': 'Mario.zip',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-lan',
+        'cover_url': null,
+        'has_thumbnail': 0,
+        'alternative_sources': null,
+      },
+      {
+        'filename': 'Mario.zip',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-net',
+        'cover_url': 'http://covers/mario.png',
+        'has_thumbnail': 1,
+        'alternative_sources': '[{"sourceId":"src-b"}]',
+      },
+    ]);
+
+    await migrate();
+
+    final row = (await db.query('games')).single;
+    expect(row['endpoint_id'], 'ep-lan');
+    expect(row['cover_url'], 'http://covers/mario.png');
+    expect(row['has_thumbnail'], 1);
+    expect(row['alternative_sources'], '[{"sourceId":"src-b"}]');
+  });
+
+  test('a database with nothing to collapse comes through untouched', () async {
+    await seed([
+      {
+        'filename': 'Mario.zip',
+        'source_id': 'src-a',
+        'endpoint_id': 'ep-lan',
+        'cover_url': 'http://covers/mario.png',
+        'has_thumbnail': 1,
+      },
+      {'filename': 'Zelda.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+    ]);
+
+    await migrate();
+
+    final rows = await db.query('games', orderBy: 'filename');
+    expect(rows, hasLength(2));
+    expect(rows.first['cover_url'], 'http://covers/mario.png');
+    expect(rows.first['has_thumbnail'], 1);
+  });
+
+  test('an empty database migrates cleanly', () async {
+    await migrate();
+
+    expect(await db.query('games'), isEmpty);
+  });
+
+  test('the unique key drops endpoint_id and the old one is gone', () async {
+    await seed([
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+    ]);
+
+    await migrate();
+
+    final names = (await db.rawQuery('PRAGMA index_list(games)'))
+        .map((r) => r['name'] as String)
+        .toSet();
+    expect(names, isNot(contains('idx_games_system_filename_route')));
+    expect(names, isNot(contains('idx_games_dedupe_tmp')));
+    // v16 re-keys again, from the source to the cache owner; the shape it
+    // arrives in is that file's business. What matters here is that the route
+    // key is gone and its scratch index cleaned up.
+
+    // endpoint_id stays as a column — it still records the last route used.
+    final tableCols = await db.rawQuery('PRAGMA table_info(games)');
+    expect(tableCols.map((r) => r['name']), contains('endpoint_id'));
+  });
+
+  test('after migrating, a re-sync over a third route updates in place',
+      () async {
+    await seed([
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-lan'},
+      {'filename': 'Mario.zip', 'source_id': 'src-a', 'endpoint_id': 'ep-net'},
+    ]);
+
+    await migrate();
+    DatabaseService.testDatabase = db;
+    await service.saveGames(
+      'snes',
+      [
+        const GameItem(
+          filename: 'Mario.zip',
+          displayName: 'Mario',
+          url: 'http://third/Mario.zip',
+        ),
+      ],
+      sourceId: 'src-a',
+      endpointId: 'ep-third',
+    );
+
+    final rows = await db.query('games');
+    expect(rows, hasLength(1));
+    expect(rows.single['endpoint_id'], 'ep-third');
+    expect(rows.single['url'], 'http://third/Mario.zip');
+  });
+}
diff --git a/test/database_service_v16_migration_test.dart b/test/database_service_v16_migration_test.dart
new file mode 100644
index 0000000..db59115
--- /dev/null
+++ b/test/database_service_v16_migration_test.dart
@@ -0,0 +1,393 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+import 'package:retro_eshop/models/game_item.dart';
+import 'package:retro_eshop/models/config/provider_config.dart';
+import 'package:retro_eshop/services/database_service.dart';
+
+/// v15 → v16: the cached library moves from the source to the **cache owner**,
+/// so a group of sources holds one list instead of one per member.
+///
+/// The migration itself must not lose a row — it only backfills the new column
+/// from `source_id` and re-keys the unique index. The merging happens later, in
+/// [DatabaseService.adoptCacheInto], because groups live in the config file and
+/// this layer cannot read it; a migration that guessed at them would be a
+/// migration that deletes rows on a guess.
+void main() {
+  late Database db;
+  late DatabaseService service;
+
+  setUpAll(() {
+    sqfliteFfiInit();
+    databaseFactory = databaseFactoryFfi;
+  });
+
+  setUp(() async {
+    DatabaseService.resetForTesting();
+    // The v15 schema exactly as production left it.
+    db = await databaseFactoryFfi.openDatabase(
+      inMemoryDatabasePath,
+      options: OpenDatabaseOptions(
+        version: 15,
+        onCreate: (db, _) async {
+          await db.execute('''
+            CREATE TABLE games (
+              id INTEGER PRIMARY KEY AUTOINCREMENT,
+              systemSlug TEXT NOT NULL,
+              filename TEXT NOT NULL,
+              displayName TEXT NOT NULL,
+              url TEXT NOT NULL,
+              region TEXT,
+              cover_url TEXT,
+              provider_config TEXT,
+              thumb_hash TEXT,
+              has_thumbnail INTEGER NOT NULL DEFAULT 0,
+              is_folder INTEGER NOT NULL DEFAULT 0,
+              alternative_sources TEXT,
+              source_id TEXT NOT NULL DEFAULT '',
+              endpoint_id TEXT NOT NULL DEFAULT ''
+            )
+          ''');
+          await db.execute(
+              'CREATE UNIQUE INDEX idx_games_system_filename_source ON games (systemSlug, filename, source_id)');
+          await db.execute('CREATE INDEX idx_games_source ON games (source_id)');
+          await db.execute('''
+            CREATE TABLE game_metadata (
+              filename TEXT NOT NULL,
+              system_slug TEXT NOT NULL,
+              summary TEXT,
+              genres TEXT,
+              developer TEXT,
+              publisher TEXT,
+              release_date TEXT,
+              rating REAL,
+              players TEXT,
+              last_updated INTEGER NOT NULL,
+              PRIMARY KEY (filename, system_slug)
+            )
+          ''');
+        },
+      ),
+    );
+    service = DatabaseService();
+  });
+
+  tearDown(() async {
+    await db.close();
+    DatabaseService.resetForTesting();
+  });
+
+  Future<void> seed(List<Map<String, Object?>> rows) async {
+    for (final row in rows) {
+      await db.insert('games', {
+        'systemSlug': 'snes',
+        'displayName': (row['filename'] as String).replaceAll('.zip', ''),
+        'url': 'http://lan/${row['filename']}',
+        'provider_config': '{"type":"romm","source_id":"${row['source_id']}"}',
+        'endpoint_id': 'ep-lan',
+        ...row,
+      });
+    }
+  }
+
+  Future<void> migrate() => service.upgradeForTesting(db, 15);
+
+  GameItem game(String filename, {String? sourceId}) => GameItem(
+        filename: filename,
+        displayName: filename.replaceAll('.zip', ''),
+        url: 'http://lan/$filename',
+        providerConfig: sourceId == null
+            ? null
+            : ProviderConfig(
+                type: ProviderType.romm,
+                priority: 0,
+                url: 'http://lan',
+                sourceId: sourceId,
+              ),
+      );
+
+  group('the migration', () {
+    test('every source keeps its own library', () async {
+      await seed([
+        {'filename': 'Mario.zip', 'source_id': 'src-a'},
+        {'filename': 'Zelda.zip', 'source_id': 'src-a'},
+        {'filename': 'Mario.zip', 'source_id': 'src-b'},
+      ]);
+
+      await migrate();
+
+      final rows = await db.query('games', orderBy: 'source_id, filename');
+      expect(rows, hasLength(3));
+      // One-to-one: no source's rows moved and none were dropped.
+      expect(
+        rows.map((r) => r['cache_owner_id']),
+        ['src-a', 'src-a', 'src-b'],
+      );
+    });
+
+    test('the local bucket stays in the no-owner bucket', () async {
+      await seed([
+        {
+          'filename': 'OnDisk.nes',
+          'source_id': '',
+          'url': '',
+          'provider_config': null,
+        },
+      ]);
+
+      await migrate();
+
+      expect((await db.query('games')).single['cache_owner_id'], '');
+    });
+
+    test('the unique key moves to the owner and the old one is gone', () async {
+      await migrate();
+
+      final names = (await db.rawQuery('PRAGMA index_list(games)'))
+          .map((r) => r['name'] as String)
+          .toSet();
+      expect(names, contains('idx_games_system_filename_owner'));
+      expect(names, contains('idx_games_owner'));
+      expect(names, isNot(contains('idx_games_system_filename_source')));
+      // Still indexed: re-stamping a departing member and purgeOrDetachSource
+      // both look rows up by the source that fetched them.
+      expect(names, contains('idx_games_source'));
+
+      final cols = await db
+          .rawQuery('PRAGMA index_info(idx_games_system_filename_owner)');
+      expect(cols.map((r) => r['name']),
+          ['systemSlug', 'filename', 'cache_owner_id']);
+    });
+
+    test('an empty database migrates cleanly', () async {
+      await migrate();
+
+      expect(await db.query('games'), isEmpty);
+    });
+
+    test('a re-sync after migrating updates in place rather than duplicating',
+        () async {
+      await seed([
+        {'filename': 'Mario.zip', 'source_id': 'src-a'},
+      ]);
+
+      await migrate();
+      DatabaseService.testDatabase = db;
+      await service.saveGames(
+        'snes',
+        [game('Mario.zip', sourceId: 'src-a')],
+        sourceId: 'src-a',
+        endpointId: 'ep-net',
+      );
+
+      final rows = await db.query('games');
+      expect(rows, hasLength(1));
+      expect(rows.single['endpoint_id'], 'ep-net');
+      expect(rows.single['cache_owner_id'], 'src-a');
+    });
+  });
+
+  group('adoptCacheInto — joining a group', () {
+    setUp(() async {
+      await migrate();
+      DatabaseService.testDatabase = db;
+    });
+
+    test('the members end up sharing one list', () async {
+      await service.saveGames('snes', [game('Mario.zip'), game('Zelda.zip')],
+          sourceId: 'src-a');
+      await service.saveGames('snes', [game('Metroid.zip')], sourceId: 'src-b');
+
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+
+      expect(await service.getGameCountForOwner('src-a'), 3);
+      expect(await service.getGameCountForOwner('src-b'), 0);
+      expect(
+        (await service.getGames('snes', cacheOwnerId: 'src-a'))
+            .map((g) => g.filename),
+        ['Mario.zip', 'Metroid.zip', 'Zelda.zip'],
+      );
+    });
+
+    test('the same game held by both members collapses to one row', () async {
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-b');
+
+      final collapsed =
+          await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+
+      expect(collapsed, 1);
+      expect(await service.getGameCountForOwner('src-a'), 1);
+    });
+
+    test('the copy already on the device survives the collapse', () async {
+      // purgeOrDetachSource leaves an installed game behind with its
+      // provider_config and url stripped. That row is the user's downloaded
+      // copy; dropping it makes the library forget a game they own.
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-b');
+      await db.update(
+        'games',
+        {'provider_config': null, 'url': ''},
+        where: 'source_id = ?',
+        whereArgs: ['src-b'],
+      );
+
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+
+      final row = (await db.query('games')).single;
+      expect(row['provider_config'], isNull);
+      expect(row['cache_owner_id'], 'src-a');
+    });
+
+    test('covers and thumbnails are salvaged onto the survivor', () async {
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-b');
+      await db.update(
+        'games',
+        {'cover_url': 'http://covers/mario.png', 'has_thumbnail': 1},
+        where: 'source_id = ?',
+        whereArgs: ['src-b'],
+      );
+
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+
+      final row = (await db.query('games')).single;
+      expect(row['cover_url'], 'http://covers/mario.png');
+      expect(row['has_thumbnail'], 1);
+    });
+
+    test('a third member folds in later without disturbing the first two',
+        () async {
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+      await service.saveGames('snes', [game('Zelda.zip')], sourceId: 'src-b');
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+
+      await service.saveGames('snes', [game('Metroid.zip')], sourceId: 'src-c');
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-c']);
+
+      expect(await service.getGameCountForOwner('src-a'), 3);
+    });
+
+    test('sources outside the group are untouched', () async {
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-b');
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'other');
+
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+
+      expect(await service.getGameCountForOwner('other'), 1);
+    });
+
+    test('the local bucket is never adopted', () async {
+      await service.saveGames('snes', [game('OnDisk.nes')]);
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['', 'src-b']);
+
+      expect(await service.getGames('snes', cacheOwnerId: ''), hasLength(1));
+    });
+
+    test('adopting into itself is a no-op', () async {
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+
+      expect(
+        await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-a']),
+        0,
+      );
+      expect(await service.getGameCountForOwner('src-a'), 1);
+    });
+
+    test('the unique index is back afterwards, so a re-sync still upserts',
+        () async {
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-a');
+      await service.saveGames('snes', [game('Mario.zip')], sourceId: 'src-b');
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+
+      final names = (await db.rawQuery('PRAGMA index_list(games)'))
+          .map((r) => r['name'] as String)
+          .toSet();
+      expect(names, contains('idx_games_system_filename_owner'));
+
+      // Re-syncing over the other member writes into the same row.
+      await service.saveGames('snes', [game('Mario.zip')],
+          sourceId: 'src-b', cacheOwnerId: 'src-a');
+      expect(await service.getGameCountForOwner('src-a'), 1);
+    });
+  });
+
+  group('leaving a group', () {
+    setUp(() async {
+      await migrate();
+      DatabaseService.testDatabase = db;
+      // Both rows carry the provider_config blob a real sync writes: it names
+      // the source that fetched them, which is what purgeOrDetachSource
+      // matches on and therefore what the guard has to survive.
+      await service.saveGames('snes', [game('Mario.zip', sourceId: 'src-a')],
+          sourceId: 'src-a');
+      await service.saveGames('snes', [game('Zelda.zip', sourceId: 'src-b')],
+          sourceId: 'src-b');
+      await service.adoptCacheInto(ownerId: 'src-a', memberIds: ['src-b']);
+    });
+
+    test('moveCacheOwnership hands the whole list to the new owner', () async {
+      await service.moveCacheOwnership(
+          fromOwnerId: 'src-a', toOwnerId: 'src-b');
+
+      expect(await service.getGameCountForOwner('src-b'), 2);
+      expect(await service.getGameCountForOwner('src-a'), 0);
+    });
+
+    test('moveCacheOwnership collapses what the move makes duplicate',
+        () async {
+      // src-b left the group earlier and re-synced a list of its own.
+      await service.saveGames('snes', [game('Mario.zip')],
+          sourceId: 'src-b', cacheOwnerId: 'src-b');
+
+      await service.moveCacheOwnership(
+          fromOwnerId: 'src-a', toOwnerId: 'src-b');
+
+      expect(await service.getGameCountForOwner('src-b'), 2);
+    });
+
+    test('releaseCacheFrom leaves the list with the group', () async {
+      await service.releaseCacheFrom(sourceId: 'src-b', ownerId: 'src-a');
+
+      expect(await service.getGameCountForOwner('src-a'), 2);
+      // The leaver has nothing: there is no honest way to split rows nothing
+      // recorded the origin of, so it re-syncs.
+      expect(await service.getGameCountForOwner('src-b'), 0);
+    });
+
+    test('releaseCacheFrom re-stamps attribution to the owner', () async {
+      await service.releaseCacheFrom(sourceId: 'src-b', ownerId: 'src-a');
+
+      final sources = (await db.query('games', columns: ['source_id']))
+          .map((r) => r['source_id'])
+          .toSet();
+      expect(sources, {'src-a'});
+    });
+
+    test('removing the departed source cannot take the group rows with it',
+        () async {
+      // Attribution is re-stamped, but the provider_config blob still names
+      // src-b — that is what protectedOwnerIds is for.
+      final result = await service.purgeOrDetachSource(
+        'src-b',
+        systemTargetFolders: const {},
+        protectedOwnerIds: const {'src-a'},
+      );
+
+      expect(result.deleted, 0);
+      expect(await service.getGameCountForOwner('src-a'), 2);
+    });
+
+    test('without the guard, removing it does take them', () async {
+      final result = await service.purgeOrDetachSource(
+        'src-b',
+        systemTargetFolders: const {},
+      );
+
+      expect(result.deleted, 1);
+    });
+  });
+}
diff --git a/test/endpoint_probe_service_test.dart b/test/endpoint_probe_service_test.dart
new file mode 100644
index 0000000..ae2a0ce
--- /dev/null
+++ b/test/endpoint_probe_service_test.dart
@@ -0,0 +1,120 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:retro_eshop/models/config/source.dart';
+import 'package:retro_eshop/services/endpoint_probe_service.dart';
+
+Source _romm({
+  required String id,
+  required String url,
+}) {
+  return Source(
+    id: id,
+    name: id,
+    type: SourceType.romm,
+    url: url,
+    autoMap: true,
+  );
+}
+
+class _FakeNet {
+  _FakeNet(this.up);
+  final Set<String> up;
+  final asked = <String>[];
+
+  Future<void> connect(String host, int port, Duration timeout) async {
+    final address = '$host:$port';
+    asked.add(address);
+    if (!up.contains(address)) {
+      throw const SocketFailure();
+    }
+  }
+}
+
+class SocketFailure implements Exception {
+  const SocketFailure();
+}
+
+void main() {
+  group('targetFor — where to knock', () {
+    test('uses explicit port from url', () {
+      final s = _romm(id: 'lan', url: 'http://192.168.1.50:8090');
+      expect(
+        EndpointProbeService.targetFor(s),
+        const ProbeTarget('192.168.1.50', 8090),
+      );
+    });
+
+    test('defaults https to 443 and http to 80', () {
+      final sRemote = _romm(id: 'remote', url: 'https://roms.example.org');
+      final sHttp = _romm(id: 'plain', url: 'http://plain.local');
+      expect(
+        EndpointProbeService.targetFor(sRemote),
+        const ProbeTarget('roms.example.org', 443),
+      );
+      expect(
+        EndpointProbeService.targetFor(sHttp),
+        const ProbeTarget('plain.local', 80),
+      );
+    });
+
+    test('defaults SMB to 445 and FTP to 21', () {
+      final smb = Source(
+        id: 'smb',
+        name: 'SMB',
+        type: SourceType.smb,
+        host: 'nas.local',
+        autoMap: true,
+      );
+      final ftp = Source(
+        id: 'ftp',
+        name: 'FTP',
+        type: SourceType.ftp,
+        host: 'ftp.local',
+        autoMap: true,
+      );
+
+      expect(
+        EndpointProbeService.targetFor(smb),
+        const ProbeTarget('nas.local', 445),
+      );
+      expect(
+        EndpointProbeService.targetFor(ftp),
+        const ProbeTarget('ftp.local', 21),
+      );
+    });
+  });
+
+  group('reachableFor — probing source', () {
+    test('returns set containing source.id when reachable', () async {
+      final net = _FakeNet({'192.168.1.50:8090'});
+      final probe = EndpointProbeService(connect: net.connect);
+      final src = _romm(id: 'lan', url: 'http://192.168.1.50:8090');
+
+      final res = await probe.reachableFor(src);
+      expect(res, {'lan'});
+    });
+
+    test('returns empty set when unreachable', () async {
+      final net = _FakeNet(const {});
+      final probe = EndpointProbeService(connect: net.connect);
+      final src = _romm(id: 'lan', url: 'http://192.168.1.50:8090');
+
+      final res = await probe.reachableFor(src);
+      expect(res, isEmpty);
+    });
+
+    test('local source is always reachable', () async {
+      final net = _FakeNet(const {});
+      final probe = EndpointProbeService(connect: net.connect);
+      final local = Source(
+        id: 'loc',
+        name: 'Local',
+        type: SourceType.local,
+        autoMap: true,
+      );
+
+      final res = await probe.reachableFor(local);
+      expect(res, {'loc'});
+      expect(net.asked, isEmpty);
+    });
+  });
+}
diff --git a/test/game_list_controller_test.dart b/test/game_list_controller_test.dart
index a9cdece..ceffc53 100644
--- a/test/game_list_controller_test.dart
+++ b/test/game_list_controller_test.dart
@@ -28,13 +28,35 @@ class FakeDatabaseService extends DatabaseService {
   Future<bool> hasCache(String systemSlug) async => hasCacheResult;
 
   @override
-  Future<List<GameItem>> getGames(String systemSlug) async => cachedGames;
+  Future<List<GameItem>> getGames(
+    String systemSlug, {
+    String? sourceId,
+    String? endpointId,
+    bool includeLocal = false,
+    String? cacheOwnerId,
+  }) async =>
+      cachedGames;
+
+  /// Records the route scope so tests can assert that a sync writes into the
+  /// route it came from rather than the shared bucket.
+  String? savedSourceId;
+  String? savedEndpointId;
 
   @override
-  Future<void> saveGames(String systemSlug, List<GameItem> games, {bool deleteOrphans = false, bool forceDeleteOrphans = false}) async {
+  Future<void> saveGames(
+    String systemSlug,
+    List<GameItem> games, {
+    bool deleteOrphans = false,
+    bool forceDeleteOrphans = false,
+    String sourceId = '',
+    String endpointId = '',
+    String? cacheOwnerId,
+  }) async {
     savedSystemSlug = systemSlug;
     savedGames = games;
     lastDeleteOrphans = deleteOrphans || forceDeleteOrphans;
+    savedSourceId = sourceId;
+    savedEndpointId = endpointId;
   }
 
   @override
diff --git a/test/l10n_completeness_test.dart b/test/l10n_completeness_test.dart
index 32156b4..4d4d73c 100644
--- a/test/l10n_completeness_test.dart
+++ b/test/l10n_completeness_test.dart
@@ -14,19 +14,19 @@ void main() {
         as Map<String, dynamic>;
   });
 
-  Set<String> _translationKeys(Map<String, dynamic> arb) =>
+  Set<String> translationKeys(Map<String, dynamic> arb) =>
       arb.keys.where((k) => !k.startsWith('@')).toSet();
 
   test('DE has all EN keys', () {
-    final enKeys = _translationKeys(en);
-    final deKeys = _translationKeys(de);
+    final enKeys = translationKeys(en);
+    final deKeys = translationKeys(de);
     final missing = enKeys.difference(deKeys);
     expect(missing, isEmpty, reason: 'Keys in EN but missing in DE: $missing');
   });
 
   test('DE has no extra keys beyond EN', () {
-    final enKeys = _translationKeys(en);
-    final deKeys = _translationKeys(de);
+    final enKeys = translationKeys(en);
+    final deKeys = translationKeys(de);
     final extra = deKeys.difference(enKeys);
     expect(extra, isEmpty, reason: 'Keys in DE but not in EN: $extra');
   });
diff --git a/test/native_smb_service_test.dart b/test/native_smb_service_test.dart
index 6ca103e..8893d33 100644
--- a/test/native_smb_service_test.dart
+++ b/test/native_smb_service_test.dart
@@ -2,6 +2,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:retro_eshop/services/native_smb_service.dart';
+import 'package:retro_eshop/services/platform_channels.dart';
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -42,7 +43,7 @@ void main() {
       methodCalls = [];
       TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(
-        const MethodChannel('com.retro.rshop/smb'),
+        const MethodChannel(kSmbChannel),
         (call) async {
           methodCalls.add(call);
           switch (call.method) {
@@ -79,7 +80,7 @@ void main() {
     tearDown(() {
       TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
           .setMockMethodCallHandler(
-        const MethodChannel('com.retro.rshop/smb'),
+        const MethodChannel(kSmbChannel),
         null,
       );
     });
@@ -120,7 +121,7 @@ void main() {
       test('returns failure on connection error', () async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(
-          const MethodChannel('com.retro.rshop/smb'),
+          const MethodChannel(kSmbChannel),
           (call) async => {'success': false, 'error': 'Host unreachable'},
         );
 
@@ -135,7 +136,7 @@ void main() {
       test('handles PlatformException', () async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(
-          const MethodChannel('com.retro.rshop/smb'),
+          const MethodChannel(kSmbChannel),
           (call) async =>
               throw PlatformException(code: 'SMB_ERROR', message: 'Timeout'),
         );
@@ -151,7 +152,7 @@ void main() {
       test('handles null response', () async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(
-          const MethodChannel('com.retro.rshop/smb'),
+          const MethodChannel(kSmbChannel),
           (call) async => null,
         );
 
@@ -209,7 +210,7 @@ void main() {
       test('returns empty list on null response', () async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(
-          const MethodChannel('com.retro.rshop/smb'),
+          const MethodChannel(kSmbChannel),
           (call) async => null,
         );
 
@@ -224,7 +225,7 @@ void main() {
       test('throws on PlatformException', () async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(
-          const MethodChannel('com.retro.rshop/smb'),
+          const MethodChannel(kSmbChannel),
           (call) async => throw PlatformException(
               code: 'SMB_ERROR', message: 'Access denied'),
         );
@@ -269,7 +270,7 @@ void main() {
       test('throws on PlatformException', () async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(
-          const MethodChannel('com.retro.rshop/smb'),
+          const MethodChannel(kSmbChannel),
           (call) async => throw PlatformException(
               code: 'SMB_ERROR', message: 'Write failed'),
         );
@@ -300,7 +301,7 @@ void main() {
       test('handles PlatformException gracefully', () async {
         TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .setMockMethodCallHandler(
-          const MethodChannel('com.retro.rshop/smb'),
+          const MethodChannel(kSmbChannel),
           (call) async => throw PlatformException(
               code: 'ERROR', message: 'Not found'),
         );
diff --git a/test/provider_factory_test.dart b/test/provider_factory_test.dart
index d43d007..80667e0 100644
--- a/test/provider_factory_test.dart
+++ b/test/provider_factory_test.dart
@@ -50,4 +50,46 @@ void main() {
       expect(ProviderFactory.getProvider(config), isA<RommProvider>());
     });
   });
+
+  group('ProviderFactory 未初始化', () {
+    setUp(ProviderFactory.reset);
+
+    // 還原 static 狀態，避免影響其他 group／測試檔。
+    tearDown(() {
+      ProviderFactory.init(smbService: NativeSmbService());
+    });
+
+    test('未呼叫 init() 就取得 SMB provider 會拋出可辨識的 StateError', () {
+      const config = ProviderConfig(
+        type: ProviderType.smb,
+        priority: 1,
+        host: 'nas',
+        share: 'roms',
+      );
+
+      expect(
+        () => ProviderFactory.getProvider(config),
+        throwsA(
+          isA<StateError>().having(
+            (e) => e.message,
+            'message',
+            allOf(
+              contains('ProviderFactory.init'),
+              contains('smbService'),
+              contains('runApp'),
+            ),
+          ),
+        ),
+      );
+    });
+
+    test('未初始化時非 SMB 型別仍可正常建立', () {
+      const config = ProviderConfig(
+        type: ProviderType.web,
+        priority: 1,
+        url: 'https://example.com',
+      );
+      expect(ProviderFactory.getProvider(config), isA<WebProvider>());
+    });
+  });
 }
diff --git a/test/source_failover_choice_test.dart b/test/source_failover_choice_test.dart
new file mode 100644
index 0000000..080f630
--- /dev/null
+++ b/test/source_failover_choice_test.dart
@@ -0,0 +1,91 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:retro_eshop/models/config/source.dart';
+import 'package:retro_eshop/services/source_failover.dart';
+
+Source _src(
+  String id, {
+  List<String> fallbacks = const [],
+  bool autoSelect = false,
+  bool enabled = true,
+}) =>
+    Source(
+      id: id,
+      name: id,
+      type: SourceType.romm,
+      url: 'http://$id:9080',
+      enabled: enabled,
+      fallbackSourceIds: fallbacks,
+      fallbackAutoSelect: autoSelect,
+      autoMap: true,
+    );
+
+void main() {
+  final lan = _src('lan', fallbacks: ['wan1', 'wan2']);
+  final wan1 = _src('wan1');
+  final wan2 = _src('wan2');
+  final all = [lan, wan1, wan2];
+
+  group('chooseSource multi-entry ordered mode', () {
+    test('uses preferred source when it answers', () {
+      final c = chooseSource(
+        sources: all,
+        activeSourceId: 'lan',
+        reachable: const ['lan', 'wan1', 'wan2'],
+      );
+
+      expect(c.source?.id, 'lan');
+      expect(c.isFallback, isFalse);
+    });
+
+    test('substitutes first reachable fallback in order when preferred is silent', () {
+      final c = chooseSource(
+        sources: all,
+        activeSourceId: 'lan',
+        reachable: const ['wan2', 'wan1'], // wan1 is probed first in ordered list
+      );
+
+      expect(c.source?.id, 'wan1');
+      expect(c.preferred?.id, 'lan');
+      expect(c.isFallback, isTrue);
+    });
+
+    test('skips unreachable fallback and takes next available fallback', () {
+      final c = chooseSource(
+        sources: all,
+        activeSourceId: 'lan',
+        reachable: const ['wan2'],
+      );
+
+      expect(c.source?.id, 'wan2');
+      expect(c.isFallback, isTrue);
+    });
+
+    test('stays on preferred when no fallback answers', () {
+      final c = chooseSource(
+        sources: all,
+        activeSourceId: 'lan',
+        reachable: const [],
+      );
+
+      expect(c.source?.id, 'lan');
+      expect(c.isFallback, isFalse);
+    });
+  });
+
+  group('chooseSource auto-select mode', () {
+    final lanAuto = _src('lan', fallbacks: ['wan1', 'wan2'], autoSelect: true);
+    final allAuto = [lanAuto, wan1, wan2];
+
+    test('picks first responding fallback when primary is silent', () {
+      final c = chooseSource(
+        sources: allAuto,
+        activeSourceId: 'lan',
+        reachable: const ['wan2', 'wan1'], // wan2 responded first in network probe
+      );
+
+      expect(c.source?.id, 'wan2');
+      expect(c.preferred?.id, 'lan');
+      expect(c.isFallback, isTrue);
+    });
+  });
+}
diff --git a/test/source_failover_sync_test.dart b/test/source_failover_sync_test.dart
new file mode 100644
index 0000000..30736bd
--- /dev/null
+++ b/test/source_failover_sync_test.dart
@@ -0,0 +1,157 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:retro_eshop/models/config/app_config.dart';
+import 'package:retro_eshop/models/config/source.dart';
+import 'package:retro_eshop/models/config/system_config.dart';
+import 'package:retro_eshop/services/endpoint_probe_service.dart';
+import 'package:retro_eshop/services/source_failover.dart';
+
+class _FakeNet {
+  _FakeNet(this.up);
+  final Set<String> up;
+  final asked = <String>[];
+
+  Future<void> connect(String host, int port, Duration timeout) async {
+    asked.add(host);
+    if (!up.contains(host)) throw const _Down();
+  }
+}
+
+class _Down implements Exception {
+  const _Down();
+}
+
+Source _romm(String id, String host, {List<String> fallbacks = const [], bool autoSelect = false}) => Source(
+      id: id,
+      name: id,
+      type: SourceType.romm,
+      url: 'http://$host:9080',
+      autoMap: true,
+      fallbackSourceIds: fallbacks,
+      fallbackAutoSelect: autoSelect,
+      knownPlatforms: const {'snes': 4},
+    );
+
+AppConfig _config({String? active, String? primary}) => AppConfig(
+      systems: const [
+        SystemConfig(
+          id: 'snes',
+          name: 'SNES',
+          targetFolder: '/roms/snes',
+          providers: [],
+        ),
+      ],
+      sources: sources,
+      activeSourceId: active,
+      primarySourceId: primary,
+    );
+
+final sources = [
+  _romm('lan', 'lan.local', fallbacks: ['wan']),
+  _romm('wan', 'wan.example.org'),
+];
+
+void main() {
+  group('withEffectiveSource', () {
+    test('rebuilds providers around the given source', () {
+      final out = withEffectiveSource(_config(active: 'lan'), 'wan');
+
+      expect(out.systems.single.providers.map((p) => p.sourceId), ['wan']);
+    });
+
+    test('leaves the stored preference untouched', () {
+      final out = withEffectiveSource(_config(active: 'lan'), 'wan');
+
+      expect(out.activeSourceId, 'lan');
+    });
+
+    test('null puts every source back in the providers list', () {
+      final out = withEffectiveSource(_config(active: 'lan'), null);
+
+      expect(out.systems.single.providers, hasLength(2));
+    });
+  });
+
+  group('resolveForSync — which source a sync is for', () {
+    test('the one in use, not the one on screen', () async {
+      final net = _FakeNet({'lan.local', 'wan.example.org'});
+      final r = await resolveForSync(
+        config: _config(active: 'wan', primary: 'lan'),
+        probe: EndpointProbeService(connect: net.connect),
+      );
+
+      expect(r.choice.source?.id, 'lan');
+      expect(r.config.systems.single.providers.map((p) => p.sourceId), ['lan']);
+    });
+
+    test('falls back to active source when primary is null', () async {
+      final net = _FakeNet({'lan.local'});
+      final r = await resolveForSync(
+        config: _config(active: 'lan'),
+        probe: EndpointProbeService(connect: net.connect),
+      );
+
+      expect(r.choice.source?.id, 'lan');
+    });
+
+    test('the stand-in covers for the one in use, not the one shown', () async {
+      final net = _FakeNet({'wan.example.org'});
+      final r = await resolveForSync(
+        config: _config(active: 'wan', primary: 'lan'),
+        probe: EndpointProbeService(connect: net.connect),
+      );
+
+      expect(r.choice.isFallback, isTrue);
+      expect(r.choice.preferred?.id, 'lan');
+      expect(r.config.primarySourceId, 'lan');
+    });
+  });
+
+  group('resolveForSync multi-entry fallback chain', () {
+    test('keeps the preferred source when it answers', () async {
+      final net = _FakeNet({'lan.local', 'wan.example.org'});
+      final r = await resolveForSync(
+        config: _config(active: 'lan'),
+        probe: EndpointProbeService(connect: net.connect),
+      );
+
+      expect(r.choice.source?.id, 'lan');
+      expect(r.choice.isFallback, isFalse);
+      expect(r.config.systems.single.providers.map((p) => p.sourceId), ['lan']);
+    });
+
+    test('syncs against the fallback when primary is silent', () async {
+      final net = _FakeNet({'wan.example.org'});
+      final r = await resolveForSync(
+        config: _config(active: 'lan'),
+        probe: EndpointProbeService(connect: net.connect),
+      );
+
+      expect(r.choice.isFallback, isTrue);
+      expect(r.choice.preferred?.id, 'lan');
+      expect(r.choice.source?.id, 'wan');
+      expect(r.config.systems.single.providers.map((p) => p.sourceId), ['wan']);
+    });
+
+    test('stays on preferred when neither answers', () async {
+      final net = _FakeNet(const {});
+      final r = await resolveForSync(
+        config: _config(active: 'lan'),
+        probe: EndpointProbeService(connect: net.connect),
+      );
+
+      expect(r.config.systems.single.providers.map((p) => p.sourceId), ['lan']);
+      expect(r.choice.isFallback, isFalse);
+    });
+
+    test('no selection means no probing at all', () async {
+      final net = _FakeNet({'lan.local'});
+      final r = await resolveForSync(
+        config: _config(),
+        probe: EndpointProbeService(connect: net.connect),
+      );
+
+      expect(net.asked, isEmpty);
+      expect(r.choice.source, isNull);
+    });
+  });
+}
diff --git a/test/source_resolver_test.dart b/test/source_resolver_test.dart
index dccb580..b0ea2e6 100644
--- a/test/source_resolver_test.dart
+++ b/test/source_resolver_test.dart
@@ -329,4 +329,55 @@ void main() {
       expect(result.map((s) => s.id), ['b', 'a']);
     });
   });
+
+  group('SourceResolver — the live route decides the credentials', () {
+    // Invariant 4: the resolver reads the source's top-level fields and knows
+    // nothing about routes. Per-route credentials must therefore arrive the
+    // same way the address does.
+    const system = SystemConfig(
+      id: 'snes',
+      name: 'SNES',
+      targetFolder: '/roms/snes',
+      providers: [],
+    );
+    const lan = SourceEndpoint(
+      id: 'ep-lan',
+      label: '區網',
+      url: 'http://192.168.1.50:8090',
+    );
+    const gated = SourceEndpoint(
+      id: 'ep-remote',
+      label: '遠端',
+      url: 'https://roms.example.org',
+      auth: AuthConfig(clientToken: 'proxy-token'),
+    );
+    const source = Source(
+      id: 's1',
+      name: 'My RomM',
+      type: SourceType.romm,
+      url: 'http://192.168.1.50:8090',
+      auth: AuthConfig(clientToken: 'tok'),
+      endpoints: [lan, gated],
+      autoMap: true,
+      knownPlatforms: {'snes': 4},
+    );
+
+    test('a route without its own login gets the source\'s', () {
+      final providers = SourceResolver.providersFor(system, const [source]);
+
+      expect(providers.single.auth?.clientToken, 'tok');
+      expect(providers.single.endpointId, 'ep-lan');
+    });
+
+    test('a gated route gets its own', () {
+      final providers = SourceResolver.providersFor(
+        system,
+        [source.withLiveEndpoint(gated)],
+      );
+
+      expect(providers.single.url, 'https://roms.example.org');
+      expect(providers.single.auth?.clientToken, 'proxy-token');
+      expect(providers.single.endpointId, 'ep-remote');
+    });
+  });
 }
diff --git a/test/widgets/qr_pairing_screen_test.dart b/test/widgets/qr_pairing_screen_test.dart
new file mode 100644
index 0000000..45bc54e
--- /dev/null
+++ b/test/widgets/qr_pairing_screen_test.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:retro_eshop/core/widgets/console_focusable.dart';
+import 'package:retro_eshop/features/pairing/qr_pairing_screen.dart';
+import 'package:retro_eshop/providers/app_providers.dart';
+import 'package:retro_eshop/services/storage_service.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import '../helpers/pump_helpers.dart';
+
+Future<StorageService> _initMockStorage() async {
+  SharedPreferences.setMockInitialValues({});
+  FlutterSecureStorage.setMockInitialValues({});
+  final storage = StorageService();
+  await storage.init();
+  return storage;
+}
+
+Widget _wrap(StorageService storage, Widget child) {
+  return createTestAppWithProviders(
+    child,
+    overrides: [
+      storageServiceProvider.overrideWithValue(storage),
+    ],
+  );
+}
+
+void main() {
+  group('QrPairingScreen — Gamepad focus & navigation', () {
+    testWidgets('defaults focus to manual pairing button and moves to back button on Up',
+        (tester) async {
+      final storage = await _initMockStorage();
+      await tester.pumpWidget(_wrap(storage, const QrPairingScreen()));
+      await tester.pumpAndSettle();
+
+      // Verify ConsoleFocusable widgets are rendered (Back button & Manual button)
+      expect(find.byType(ConsoleFocusable), findsNWidgets(2));
+
+      // Press D-pad Up to navigate to top-left Back button
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowUp);
+      await tester.pumpAndSettle();
+
+      // Press D-pad Down to navigate back to Manual button
+      await tester.sendKeyEvent(LogicalKeyboardKey.arrowDown);
+      await tester.pumpAndSettle();
+
+      // Cleanup
+      await tester.pumpWidget(_wrap(storage, const SizedBox.shrink()));
+      await tester.pump(const Duration(milliseconds: 50));
+    });
+  });
+}
diff --git a/test/widgets/sources_screen_test.dart b/test/widgets/sources_screen_test.dart
index 0b55922..8e5b184 100644
--- a/test/widgets/sources_screen_test.dart
+++ b/test/widgets/sources_screen_test.dart
@@ -4,6 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:retro_eshop/features/settings/sources_screen.dart';
+import 'package:retro_eshop/features/sources/fallback_picker_overlay.dart';
+import 'package:retro_eshop/widgets/console_hud.dart';
 import 'package:retro_eshop/models/config/source.dart';
 import 'package:retro_eshop/providers/app_providers.dart';
 import 'package:retro_eshop/services/config_storage_service.dart';
@@ -80,7 +82,9 @@ void main() {
       expect(find.text('Mein RomM'), findsOneWidget);
       expect(find.textContaining('192.168.1.50'), findsOneWidget);
       expect(find.text('3 platforms'), findsOneWidget);
-      expect(find.text('1 source · [Y] add new'), findsOneWidget);
+      // The count line is localised now, and the key name lives in the HUD
+      // where it follows the configured controller layout.
+      expect(find.text('1 source'), findsOneWidget);
     });
 
     testWidgets('shows BORROWED badge for borrowed sources', (tester) async {
@@ -106,82 +110,121 @@ void main() {
       expect(find.byIcon(Icons.share), findsOneWidget);
     });
 
-    testWidgets('shows OFF badge for disabled sources', (tester) async {
+    testWidgets('the focused card puts its actions in the HUD',
+        (tester) async {
       final storage = await _initMockStorage();
       await tester.pumpWidget(_wrap(
         storage,
         const SourcesScreen(),
         seed: const [
           Source(
-            id: 'off',
-            name: 'Inactive',
+            id: 'mine',
+            name: 'Mein RomM',
             type: SourceType.romm,
-            url: 'http://x',
+            url: 'http://192.168.1.50:8090',
             autoMap: true,
-            enabled: false,
-            knownPlatforms: {'snes': 4},
           ),
         ],
       ));
       await tester.pumpAndSettle();
 
-      expect(find.text('OFF'), findsOneWidget);
+      expect(find.text('Use this'), findsOneWidget);
+      expect(find.text('Remove'), findsOneWidget);
+      expect(find.byIcon(Icons.radio_button_unchecked), findsOneWidget);
     });
 
-    testWidgets('shows expiry warning for tokens expiring within 7 days',
+    testWidgets('the actions menu ends in real buttons, not a typed-out line',
         (tester) async {
+      // It used to end in a hardcoded Chinese string naming [A]/[X]/[B]:
+      // untranslated in six languages, wrong on two of the three controller
+      // layouts, and doing nothing under a finger.
       final storage = await _initMockStorage();
-      // Use 5d so the inDays-rounding-down can land on 4 or 5 without
-      // the test going flaky depending on millisecond clock drift.
-      final soon = DateTime.now().add(const Duration(days: 5));
       await tester.pumpWidget(_wrap(
         storage,
-        SourcesScreen(),
-        seed: [
+        const SourcesScreen(),
+        seed: const [
           Source(
-            id: 'soon',
-            name: 'Expiring',
+            id: 'mine',
+            name: 'Mein RomM',
             type: SourceType.romm,
-            url: 'http://x',
+            url: 'http://192.168.1.50:8090',
             autoMap: true,
-            tokenExpiresAt: soon,
-            knownPlatforms: const {'snes': 4},
           ),
         ],
       ));
       await tester.pumpAndSettle();
 
-      expect(find.textContaining(RegExp(r'Expires in [45]d')), findsOneWidget);
+      // All of it outside the fake async zone: opening the menu plays a
+      // navigation sound, and the audio plugin's timers never complete inside
+      // that zone — the test then fails on teardown rather than on an
+      // expectation.
+      await tester.runAsync(() async {
+        await tester.tap(find.text('Mein RomM'));
+        await tester.pump();
+        await Future<void>.delayed(const Duration(milliseconds: 400));
+        await tester.pump();
+
+        expect(find.text('Remove'), findsWidgets);
+        expect(find.textContaining('[A]'), findsNothing);
+        // The screen's own HUD plus the menu's.
+        expect(find.byType(ConsoleHud), findsNWidgets(2));
+        expect(find.text('Select'), findsOneWidget);
+      });
+
+      // Swap the screen out while the scope is still alive: the overlay
+      // releases its dialog-priority claim from a zero-duration timer in
+      // dispose, and a test that ends on top of it fails the teardown rather
+      // than any expectation.
+      await tester.pumpWidget(_wrap(storage, const SizedBox.shrink()));
+      await tester.pump(const Duration(milliseconds: 50));
+    });
+
+    testWidgets('no card focused means no per-source hints', (tester) async {
+      final storage = await _initMockStorage();
+      await tester.pumpWidget(_wrap(storage, const SourcesScreen()));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Use this'), findsNothing);
+      expect(find.text('Disable'), findsNothing);
+      expect(find.text('Remove'), findsNothing);
     });
+  });
 
-    testWidgets('two sources render two cards', (tester) async {
+  group('SourcesScreen — fresh fallback source addition', () {
+    testWidgets('cancelling fresh fallback creation restores fallback overlay',
+        (tester) async {
       final storage = await _initMockStorage();
       await tester.pumpWidget(_wrap(
         storage,
         const SourcesScreen(),
         seed: const [
           Source(
-            id: 'a',
-            name: 'A',
+            id: 'parent',
+            name: 'Parent RomM',
             type: SourceType.romm,
-            url: 'http://a',
-            autoMap: true,
-            knownPlatforms: {'snes': 4},
-          ),
-          Source(
-            id: 'b',
-            name: 'B',
-            type: SourceType.smb,
-            host: 'nas',
-            share: 'roms',
+            url: 'http://parent',
           ),
         ],
       ));
       await tester.pumpAndSettle();
 
-      expect(find.text('A'), findsOneWidget);
-      expect(find.text('B'), findsOneWidget);
-      expect(find.text('2 sources · [Y] add new'), findsOneWidget);
+      // Directly pump FallbackPickerOverlay on SourcesScreen state
+      final state = tester.state(find.byType(SourcesScreen)) as dynamic;
+      // Trigger fresh fallback source addition
+      state.addFreshFallbackSourceForTest('parent');
+      await tester.pumpAndSettle();
+
+      expect(find.textContaining('Windows / NAS network share'), findsOneWidget);
+
+      // Cancel type picker
+      state.closeTypePickerForTest();
+      await tester.pumpAndSettle();
+
+      // Verify FallbackPickerOverlay for parent is restored
+      expect(find.byType(FallbackPickerOverlay), findsOneWidget);
+
+      await tester.pumpWidget(_wrap(storage, const SizedBox.shrink()));
+      await tester.pump(const Duration(milliseconds: 50));
     });
   });
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 795b45b..11c68ec 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
   flutter_soloud
+  jni
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)