merge: link silo upstream history and sync admin UX

cmd/prairie/main.go

@@ -1180,7 +1180,13 @@ func main() {
 		s.SetLiteraryWorkLinker(literaryWorkService)
 		s.SetEbookEnrichmentQueue(ebooks.NewEnrichmentQueue(deps.DB))
 		deps.Scanner = s
-		deps.ProbeEnsurer = scanner.NewPlaybackProbeEnsurer(fileRepo, ffprobePath, cfg.Playback.FFmpegPath, 10*time.Second)
+		probeEnsurer := scanner.NewPlaybackProbeEnsurer(fileRepo, ffprobePath, cfg.Playback.FFmpegPath, 10*time.Second)
+		// Probe repair and the copy-safety scan follow playback.ffmpeg_path
+		// without a restart; the scanner's own ffprobe path above still does not.
+		configWatcher.OnChange(func(_, updated *config.Config) {
+			probeEnsurer.SetFFmpegPath(updated.Playback.FFmpegPath)
+		})
+		deps.ProbeEnsurer = probeEnsurer
 		slog.Info("scanner initialized")
 	}
 

contracts/settings/v1/conformance.json

@@ -1,6 +1,6 @@
 {
   "fixture_version": 1,
-  "manifest_revision": 7,
+  "manifest_revision": 8,
   "description": "Cross-platform conformance cases for settings resolution. Every case runs against the shipped manifest in this directory: definitions are referenced by key, never restated, so an expectation can only be satisfied by resolving the real contract. Each platform's resolver (Go in internal/settingsresolve, TypeScript in web/src/lib/settingsResolve.ts, Kotlin and Swift in the client repos) runs every case through a hand-written runner; a runner must fail on any fixture field it does not know, because schema drift in the fixture itself is drift. A case's constraint_bindings attach a constraint to a copy of a real definition so constraint semantics stay testable even while no shipped definition carries that constraint kind. In expected entries, constrained:true requires stored_value and constraint_kind to be present, and stored_value may be null to mean the authored value was JSON null.",
   "cases": [
     {
@@ -733,6 +733,149 @@
           "source": "default"
         }
       ]
+    },
+    {
+      "name": "card_overlays_enabled_profile_opt_out",
+      "description": "A profile that turned its own overlay badges off resolves false at profile scope; the server-wide default is not part of settings resolution.",
+      "keys": ["ui.card_overlays_enabled"],
+      "context": { "profile_id": "p1" },
+      "stored": [
+        {
+          "key": "ui.card_overlays_enabled",
+          "scope": "profile",
+          "profile_id": "p1",
+          "value": false
+        }
+      ],
+      "expected": [
+        {
+          "key": "ui.card_overlays_enabled",
+          "value": false,
+          "source": "profile"
+        }
+      ]
+    },
+    {
+      "name": "card_overlays_enabled_profile_opt_in",
+      "description": "A profile that turned its own overlay badges on resolves true at profile scope, which is what lets it override a server-wide default of off.",
+      "keys": ["ui.card_overlays_enabled"],
+      "context": { "profile_id": "p1" },
+      "stored": [
+        {
+          "key": "ui.card_overlays_enabled",
+          "scope": "profile",
+          "profile_id": "p1",
+          "value": true
+        }
+      ],
+      "expected": [
+        {
+          "key": "ui.card_overlays_enabled",
+          "value": true,
+          "source": "profile"
+        }
+      ]
+    },
+    {
+      "name": "card_overlays_absent_express_no_preference",
+      "description": "Nothing stored resolves both card-overlay keys to null with source \"default\", which is what lets the server-wide admin defaults apply.",
+      "keys": ["ui.card_overlays", "ui.card_overlays_enabled"],
+      "context": { "profile_id": "p1" },
+      "stored": [],
+      "expected": [
+        {
+          "key": "ui.card_overlays",
+          "value": null,
+          "source": "default"
+        },
+        {
+          "key": "ui.card_overlays_enabled",
+          "value": null,
+          "source": "default"
+        }
+      ]
+    },
+    {
+      "name": "card_quick_actions_profile_choice_wins",
+      "description": "A profile that picked favorites-only shortcuts resolves at profile scope instead of falling through to the server-wide default.",
+      "keys": ["ui.card_quick_actions"],
+      "context": { "profile_id": "p1" },
+      "stored": [
+        {
+          "key": "ui.card_quick_actions",
+          "scope": "profile",
+          "profile_id": "p1",
+          "value": "favorites"
+        }
+      ],
+      "expected": [
+        {
+          "key": "ui.card_quick_actions",
+          "value": "favorites",
+          "source": "profile"
+        }
+      ]
+    },
+    {
+      "name": "card_quick_actions_enabled_profile_opt_out",
+      "description": "A profile that turned its own quick actions off resolves false at profile scope; the server-wide default is not part of settings resolution.",
+      "keys": ["ui.card_quick_actions_enabled"],
+      "context": { "profile_id": "p1" },
+      "stored": [
+        {
+          "key": "ui.card_quick_actions_enabled",
+          "scope": "profile",
+          "profile_id": "p1",
+          "value": false
+        }
+      ],
+      "expected": [
+        {
+          "key": "ui.card_quick_actions_enabled",
+          "value": false,
+          "source": "profile"
+        }
+      ]
+    },
+    {
+      "name": "card_quick_actions_enabled_profile_opt_in",
+      "description": "A profile that turned its own quick actions on resolves true at profile scope, which is what lets it override a server-wide default of off.",
+      "keys": ["ui.card_quick_actions_enabled"],
+      "context": { "profile_id": "p1" },
+      "stored": [
+        {
+          "key": "ui.card_quick_actions_enabled",
+          "scope": "profile",
+          "profile_id": "p1",
+          "value": true
+        }
+      ],
+      "expected": [
+        {
+          "key": "ui.card_quick_actions_enabled",
+          "value": true,
+          "source": "profile"
+        }
+      ]
+    },
+    {
+      "name": "card_quick_actions_absent_express_no_preference",
+      "description": "Nothing stored resolves both quick-action keys to null with source \"default\", which is what lets the server-wide admin defaults apply.",
+      "keys": ["ui.card_quick_actions", "ui.card_quick_actions_enabled"],
+      "context": { "profile_id": "p1" },
+      "stored": [],
+      "expected": [
+        {
+          "key": "ui.card_quick_actions",
+          "value": null,
+          "source": "default"
+        },
+        {
+          "key": "ui.card_quick_actions_enabled",
+          "value": null,
+          "source": "default"
+        }
+      ]
     }
   ]
 }

contracts/settings/v1/manifest.json

@@ -1,6 +1,6 @@
 {
   "api_version": 1,
-  "revision": 7,
+  "revision": 8,
   "option_sets": {
     "playback_audio_languages": {
       "type": "language_tag",
@@ -828,7 +828,60 @@
       "category": "appearance",
       "label": "Poster badges",
       "description": "Which badges appear on poster cards, and where.",
-      "notes": "Registered from the legacy unprefixed key card_overlays, which reached the server only through the unknown-key extension bag — stored as an arbitrary string with no validation. null means the user has expressed no preference, which is what lets the server-wide admin default in the overlay-config endpoint apply; writing a resolved-but-unchosen value would silently pin them. The admin default and the enabled kill switch stay in server_settings and are not user settings."
+      "notes": "Registered from the legacy unprefixed key card_overlays, which reached the server only through the unknown-key extension bag — stored as an arbitrary string with no validation. null means the user has expressed no preference, which is what lets the server-wide admin default in the overlay-config endpoint apply; writing a resolved-but-unchosen value would silently pin them. The server-wide default configuration stays in server_settings and is not a user setting. This key describes which badges to show, not whether to show them — that is ui.card_overlays_enabled."
+    },
+    {
+      "key": "ui.card_overlays_enabled",
+      "introduced_in": 8,
+      "persistence": "remote",
+      "allowed_scopes": ["profile"],
+      "resolution_order": ["profile", "default"],
+      "value_schema": { "type": "boolean", "nullable": true },
+      "default_value": null,
+      "platforms": ["web"],
+      "category": "appearance",
+      "label": "Card overlays enabled",
+      "description": "Show overlay badges on media cards.",
+      "recommended_control": "switch",
+      "notes": "null means the profile has not chosen whether overlay badges are enabled, so the server-wide default from the overlay-config endpoint applies. An explicit profile choice overrides the server-wide default in either direction."
+    },
+    {
+      "key": "ui.card_quick_actions",
+      "introduced_in": 8,
+      "persistence": "remote",
+      "allowed_scopes": ["profile"],
+      "resolution_order": ["profile", "default"],
+      "value_schema": {
+        "type": "enum",
+        "nullable": true,
+        "values": [
+          { "value": "both", "label": "Both" },
+          { "value": "favorites", "label": "Favorites only" },
+          { "value": "watched", "label": "Watch indicator only" }
+        ]
+      },
+      "default_value": null,
+      "platforms": ["web"],
+      "category": "appearance",
+      "label": "Card quick actions",
+      "description": "Which favorite and watched shortcuts appear on media cards.",
+      "recommended_control": "select",
+      "notes": "null means the user has not chosen a mode, so the server-wide default from the overlay-config endpoint applies. The mode applies whenever quick actions are effectively enabled for the profile."
+    },
+    {
+      "key": "ui.card_quick_actions_enabled",
+      "introduced_in": 8,
+      "persistence": "remote",
+      "allowed_scopes": ["profile"],
+      "resolution_order": ["profile", "default"],
+      "value_schema": { "type": "boolean", "nullable": true },
+      "default_value": null,
+      "platforms": ["web"],
+      "category": "appearance",
+      "label": "Card quick actions enabled",
+      "description": "Show the selected favorite and watched shortcuts on media cards.",
+      "recommended_control": "switch",
+      "notes": "null means the profile has not chosen whether quick actions are enabled, so the server-wide default from the overlay-config endpoint applies. An explicit profile choice overrides the server-wide default in either direction."
     },
     {
       "key": "ui.next_up_mode",