Upstream sync needs conflict resolution #240

Upstream Silo-Server/silo-server is 174 commits ahead (6ab2e85f11). 80 files auto-resolved (hunks: theirs 87, ours 2, same 0, superset 3, import-union 7; delete-over-noise 5), but 113 files still have real conflicts.

Finish it

git clone --depth 1 https://github.com/Prairie-Server/.github prairie-dotgithub
prairie-dotgithub/upstream-sync/sync.sh prairie-server      # clones/fetches, merges, leaves a worktree
# resolve the files below in the worktree, then:
prairie-dotgithub/upstream-sync/finish.sh           # commit, audit, push, open the PR

Follow upstream-sync/AGENT-GUIDE.md in Prairie-Server/.github. sync.sh also writes a resolution brief and file batches for agents.

Conflicted files (113)

• .golangci.yml
• cmd/prairie/main.go
• contracts/api/v2/fixtures/get_image_capabilities_ok.json
• contracts/api/v2/openapi.json
• docs/architecture/playback-protocol-v3.md
• docs/playback-api.md
• go.mod
• internal/access/profile_token.go
• internal/api/handlers/admin_images.go
• internal/api/handlers/admin_marker_providers.go
• internal/api/handlers/admin_settings_checks.go
• internal/api/handlers/favorites_image_size_test.go
• internal/api/handlers/image_size_test.go
• internal/api/handlers/images_capability_test.go
• internal/api/handlers/session_ws_test.go
• internal/apiv2/document.go
• internal/artworkkey/artworkkey.go
• internal/artworkkey/artworkkey_test.go
• internal/audiobooks/config.go
• internal/autoscan/probe.go
• internal/autoscan/suppress.go
• internal/catalog/detail.go
• internal/catalog/detail_audiobook_test.go
• internal/catalog/image_size_test.go
• internal/catalog/item_cards.go
• internal/catalog/last_air_date_denorm_test.go
• internal/catalog/library_collection_service.go
• internal/catalog/provider_id_repo.go
• internal/catalogseed/service.go
• internal/catalogseed/service_db_test.go
• internal/collections/templates/validate.go
• internal/config/admin_settings.go
• internal/contractledger/ledger_test.go
• internal/diagnostics/bundle.go
• internal/diagnostics/repo.go
• internal/diagnostics/service.go
• internal/ebookconvert/cache.go
• internal/ebookconvert/converter.go
• internal/historyimport/emby_client.go
• internal/imagecache/imagecache.go
• internal/imagecache/imagecache_test.go
• internal/imagesize/imagesize_test.go
• internal/jellycompat/handlers_userdata.go
• internal/jellycompat/login.go
• internal/jellycompat/person_image_tags_test.go
• internal/jellycompat/streams.go
• internal/logredact/url_test.go
• internal/markers/contribution_repo_test.go
• internal/metadata/image_cache_processor.go
• internal/metadata/image_ladder_backfill_test.go
• internal/metadata/image_ladder_fallback.go
• internal/metadata/image_ladder_fallback_test.go
• internal/metadata/local_person_photos.go
• internal/metadata/queue.go
• internal/metadata/service.go
• internal/metadata/worker.go
• internal/notifications/inbox_pages_test.go
• internal/opslog/cleanup.go
• internal/playback/copy_seek_anchor.go
• internal/playback/protocol_v3.go
• internal/playback/transcode.go
• internal/pluginhost/client.go
• internal/plugins/archive_cache.go
• internal/plugins/catalog_settings.go
• internal/plugins/installer.go
• internal/plugins/service.go
• internal/ratelimit/memory.go
• internal/recommendations/cowatch.go
• internal/recommendations/taste.go
• internal/requests/service.go
• internal/s3client/metrics_test.go
• internal/s3client/transport.go
• internal/transcodenode/server.go
• internal/uploads/session_test.go
• internal/usercollections/sync.go
• internal/userstore/pgstore/conformance_test.go
• internal/userstore/pgstore/section_overrides.go
• internal/watchsync/service.go
• internal/watchtogether/room_token.go
• internal/watchtogether/service.go
• web/package.json
• web/src/App.tsx
• web/src/app.css
• web/src/components/CastCarousel.tsx
• web/src/components/ImageSelectorTab.tsx
• web/src/components/admin/libraries/LibraryFormSections.tsx
• web/src/fonts.css
• web/src/hooks/admin/useSettingsHealth.test.ts
• web/src/lib/adminNavigation.ts
• web/src/lib/adminSettingsSearch.ts
• web/src/lib/documentTitle.ts
• web/src/lib/recommendation-provider-presets.test.ts
• web/src/lib/recommendation-provider-presets.ts
• web/src/pages/AdminLogs.tsx
• web/src/pages/AdminPlaybackHistory.tsx
• web/src/pages/AdminRecommendations.tsx
• web/src/pages/AdminRequests.tsx
• web/src/pages/ItemDetail/SeriesContent.test.tsx
• web/src/pages/ItemDetail/components/ActionBar.tsx
• web/src/pages/Login.tsx
• web/src/pages/Notifications.tsx
• web/src/pages/Profiles.tsx
• web/src/pages/SettingsLayout.tsx
• web/src/pages/TasteSeed.tsx
• web/src/pages/admin-settings/SettingField.tsx
• web/src/pages/settings/ConnectAppsSettings.tsx
• web/src/pages/watchtogether/room/picker/usePickerData.ts
• web/src/player/components/PlaybackInfoOverlay.tsx
• web/src/player/components/VideoPlayer.tsx
• web/src/player/hooks/useSubtitleTracks.ts
• web/src/player/playback-info.ts
• web/src/player/protocol-v3.ts
• web/tsconfig.app.json

Upstream deleted files Prairie had modified

The delete was applied; check for features to re-home.

• +2 -2 web/src/components/WatchTonightDialog.tsx
• +11 -4 web/src/components/watchtonight/CardStack.tsx
• +5 -2 web/src/components/watchtonight/SwipeCard.tsx
• +52 -2 web/src/lib/cssSanitizer.ts
• +145 -25 web/src/lib/themeTokens.ts
• +31 -6 web/src/pages/admin-settings/logRetentionPolicy.ts
• +12 -2 web/src/pages/admin-settings/overviewCards.tsx