Skip to content

Upstream sync needs conflict resolution #246

Open
Open
Upstream sync needs conflict resolution#246

Description

@JonahMMay
JonahMMay
opened on Oct 20, 2026

Upstream Silo-Server/silo-server is 179 commits ahead (6de6d5e5e2). 92 files auto-resolved (hunks: theirs 154, ours 0, same 0, superset 0, import-union 4; delete-over-noise 23), but 185 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 (185)

  • .github/actions/setup-go/action.yml
  • .golangci.yml
  • DEVELOPMENT.md
  • contracts/api/v2/migration.json
  • contracts/api/v2/openapi.json
  • docs/architecture/playback-protocol-v3.md
  • docs/architecture/secret-encryption.md
  • docs/non-goals.md
  • docs/playback-api.md
  • go.mod
  • internal/adminjob/item_refresh_test.go
  • internal/adminjob/lifecycle_test.go
  • internal/animeids/animeids_test.go
  • internal/api/handlers/admin_images_service_test.go
  • internal/api/handlers/admin_settings_checks_test.go
  • internal/api/handlers/api_keys_privacy_test.go
  • internal/api/handlers/catalog_series_rollup_test.go
  • internal/api/handlers/catalog_transfer_service_test.go
  • internal/api/handlers/collection_artwork_test.go
  • internal/api/handlers/collection_sort_prefs_test.go
  • internal/api/handlers/collections_paging_integration_test.go
  • internal/api/handlers/favorites_image_size_test.go
  • internal/api/handlers/libraries_chapter_thumbnail_test.go
  • internal/api/handlers/library_playback_prefs_test.go
  • internal/api/handlers/playback_service_test.go
  • internal/api/handlers/playback_v3_test.go
  • internal/api/handlers/policy_test.go
  • internal/api/handlers/sections_test.go
  • internal/api/handlers/settings_overlay_config_test.go
  • internal/api/handlers/system_test.go
  • internal/api/testdata/media_routes.txt
  • internal/apibench/samplers_test.go
  • internal/apiv2/catalog_items.go
  • internal/apiv2/document.go
  • internal/apiv2/onboarding_test.go
  • internal/apiv2/worker_protocols_test.go
  • internal/auth/api_key_metadata.go
  • internal/auth/api_key_repository.go
  • internal/auth/jwt_test.go
  • internal/auth/network_sign_in_db_test.go
  • internal/cache/redis_metrics_test.go
  • internal/cache/replicas_test.go
  • internal/catalog/advisory_age_limit_db_test.go
  • internal/catalog/artwork_selection_test.go
  • internal/catalog/browse.go
  • internal/catalog/catalog_collection_cursor_db_test.go
  • internal/catalog/detail_batch_equivalence_test.go
  • internal/catalog/detail_localization_query_test.go
  • internal/catalog/display_query_filter_test.go
  • internal/catalog/download_episode_page_test.go
  • internal/catalog/episode_catalog_entries_executor.go
  • internal/catalog/episode_repo_test.go
  • internal/catalog/item_repo_trailers_refresh_db_test.go
  • internal/catalog/nextup_repo_test.go
  • internal/catalog/person_repo_enrichment_test.go
  • internal/catalog/provider_id_tmdb_match_test.go
  • internal/catalog/query_cursor_test.go
  • internal/catalog/search_episode_db_test.go
  • internal/catalog/search_index_repo_test.go
  • internal/catalog/search_indexer_test.go
  • internal/catalog/server_settings_repo_db_test.go
  • internal/config/admin_settings.go
  • internal/contractledger/ledger_test.go
  • internal/database/pglock/pglock_test.go
  • internal/database/postgres_metrics_test.go
  • internal/database/subtitle_language_backfill_test.go
  • internal/diagnostics/cleanup_test.go
  • internal/ebooks/enrichment_test.go
  • internal/events/socket_ticket_test.go
  • internal/historyimport/plex_watchlist_test.go
  • internal/historyimport/repo.go
  • internal/imagecache/imagecache_test.go
  • internal/imageutil/imageutil_test.go
  • internal/intromarkers/analyzer_test.go
  • internal/intromarkers/kind_db_test.go
  • internal/intromarkers/repository_movie_db_test.go
  • internal/intromarkers/silence_backfill_db_test.go
  • internal/jellycompat/access_filter_test.go
  • internal/jellycompat/audio_profile_streams_test.go
  • internal/jellycompat/audiobook_exclusion_test.go
  • internal/jellycompat/auth_api_key_session_test.go
  • internal/jellycompat/auth_directplay_test.go
  • internal/jellycompat/auth_test.go
  • internal/jellycompat/batch_loaders_test.go
  • internal/jellycompat/batch_progress_test.go
  • internal/jellycompat/cleanup_test.go
  • internal/jellycompat/collection_images_test.go
  • internal/jellycompat/content_direct.go
  • internal/jellycompat/content_direct_test.go
  • internal/jellycompat/deviceprofile_conditions_test.go
  • internal/jellycompat/handlers_autoscan_test.go
  • internal/jellycompat/handlers_collections_test.go
  • internal/jellycompat/handlers_items.go
  • internal/jellycompat/handlers_items_test.go
  • internal/jellycompat/handlers_missing_endpoints_test.go
  • internal/jellycompat/hydrate_progress_no_detail_test.go
  • internal/jellycompat/idcodec_test.go
  • internal/jellycompat/image_cache_test.go
  • internal/jellycompat/image_variants_test.go
  • internal/jellycompat/images_test.go
  • internal/jellycompat/latest_via_sections_test.go
  • internal/jellycompat/list_seasons_batch_test.go
  • internal/jellycompat/mapping_images_test.go
  • internal/jellycompat/mapping_sort_test.go
  • internal/jellycompat/mapping_userdata_test.go
  • internal/jellycompat/parent_browse_test.go
  • internal/jellycompat/playback_report_liveness_test.go
  • internal/jellycompat/playback_scrobble_test.go
  • internal/jellycompat/playback_sessions_postgres_test.go
  • internal/jellycompat/playback_static_directplay_test.go
  • internal/jellycompat/query_test.go
  • internal/jellycompat/resume_filter_test.go
  • internal/jellycompat/router_test.go
  • internal/jellycompat/series_userdata_test.go
  • internal/jellycompat/session_store_test.go
  • internal/jellycompat/smart_boxset_test.go
  • internal/jellycompat/subtitle_selection_test.go
  • internal/jellycompat/web_component_test.go
  • internal/literaryworks/repository_test.go
  • internal/markers/contribution_repo.go
  • internal/markers/contribution_repo_test.go
  • internal/metadata/anchored_identity_repair_test.go
  • internal/metadata/artwork_delivery_test.go
  • internal/metadata/artwork_reconcile_test.go
  • internal/metadata/chain_builtin_db_test.go
  • internal/metadata/episode_refresh_debt_db_test.go
  • internal/metadata/image_cache_job_repo_db_test.go
  • internal/metadata/image_ladder_backfill_test.go
  • internal/metadata/local_artwork_db_test.go
  • internal/metadata/season_episode_query_count_db_test.go
  • internal/models/api_key.go
  • internal/noderecipe/store_test.go
  • internal/notifications/home_hides_test.go
  • internal/playback/remux_dv_test.go
  • internal/playback/subtitles.go
  • internal/playback/transcode.go
  • internal/playback/transcode_manifest_test.go
  • internal/plugins/builtin_guard_test.go
  • internal/policy/store_test.go
  • internal/requests/lifecycle_guard_test.go
  • internal/s3client/client_test.go
  • internal/scanner/dead_root_test.go
  • internal/scanner/file_repo_scan_provenance_test.go
  • internal/scenariocatalog/executor/password_sessions_pairing_test.go
  • internal/sections/trending_snapshot_test.go
  • internal/storagetransition/node_admission_postgres_test.go
  • internal/streamtelemetry/store_redis_test.go
  • internal/subtitles/provider_config_revision_test.go
  • internal/taskmanager/manager_test.go
  • internal/taskmanager/tasks/reconcile_artwork_cache_test.go
  • internal/taskmanager/tasks/refresh_request_downloads_test.go
  • internal/titleutil/provisional_test.go
  • internal/transcodenode/server.go
  • internal/userstore/pgstore/collection_mutations_test.go
  • internal/userstore/pgstore/collection_pages_test.go
  • internal/userstore/pgstore/conformance_test.go
  • internal/userstore/pgstore/progress_test.go
  • internal/userstore/pgstore/setting_values_test.go
  • internal/watchstate/service.go
  • internal/watchsync/service.go
  • web/package.json
  • web/src/api/v2/operations.ts
  • web/src/components/AppSidebar.test.tsx
  • web/src/components/AppSidebar.tsx
  • web/src/components/CastCarousel.test.tsx
  • web/src/components/overlays/CardOverlays.test.tsx
  • web/src/hooks/queries/useRequests.test.tsx
  • web/src/hooks/useTTS.test.ts
  • web/src/lib/adminNavigation.test.ts
  • web/src/lib/carouselEmbla.test.ts
  • web/src/pages/AdminPlugins.test.tsx
  • web/src/pages/InviteClaim.v2.test.tsx
  • web/src/pages/ItemDetail/DetailHero.test.tsx
  • web/src/pages/ItemDetail/EpisodeContent.tsx
  • web/src/pages/ItemDetail/MovieContent.tsx
  • web/src/pages/ItemDetail/SeasonContent.test.tsx
  • web/src/pages/ItemDetail/components/MediaUserActionBar.tsx
  • web/src/pages/Login.tsx
  • web/src/pages/audiobooks/player/useAudiobookPlayback.test.ts
  • web/src/player/components/VideoPlayer.tsx
  • web/src/player/hooks/usePlaybackSession.test.ts
  • web/src/sidebarCollapseCss.test.ts
  • web/src/themeBoot.test.tsx
  • web/src/utils/storage.test.ts
  • web/tsconfig.app.json

Upstream deleted files Prairie had modified

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

  • +4 -2 internal/access/group_guard_test.go
  • +3 -2 internal/access/group_store_test.go
  • +4 -2 internal/access/migration_backfill_db_test.go
  • +5 -5 internal/activitylog/consumer_db_test.go
  • +4 -3 internal/activitylog/ip_page_test.go
  • +5 -4 internal/adminjob/library_refresh_language_test.go
  • +5 -5 internal/adminjob/library_refresh_lock_test.go
  • +5 -4 internal/api/handlers/admin_bigint_db_test.go
  • +4 -2 internal/api/handlers/admin_dashboard_revision_test.go
  • +4 -2 internal/api/handlers/admin_marker_providers_service_test.go
  • +6 -5 internal/api/handlers/admin_node_sessions_service_test.go
  • +4 -3 internal/api/handlers/admin_playback_history_test.go
  • +2 -1 internal/api/handlers/admin_split_service_test.go
  • +4 -3 internal/api/handlers/admin_subtitle_list_test.go
  • +4 -3 internal/api/handlers/admin_subtitle_metadata_test.go
  • +6 -4 internal/api/handlers/admin_unmatched_page_test.go
  • +4 -3 internal/api/handlers/catalog_seasons_artwork_test.go
  • +3 -3 internal/api/handlers/catalog_versions_test.go
  • +3 -3 internal/api/handlers/home_next_up_reads_db_test.go
  • +2 -2 internal/api/handlers/libraries_language_change_test.go
  • +3 -3 internal/api/handlers/libraries_realtime_monitor_poke_test.go
  • +3 -2 internal/api/handlers/libraries_unmatched_test.go
  • +3 -3 internal/api/handlers/libraries_user_collections_group_test.go
  • +4 -3 internal/api/handlers/library_poster_storage_test.go
  • +4 -3 internal/api/handlers/notifications_apple_display_test.go
  • +2 -2 internal/api/handlers/plugins_builtin_test.go
  • +14 -0 internal/api/handlers/settings_registry_test.go
  • +4 -3 internal/api/handlers/user_libraries_service_test.go
  • +4 -3 internal/api/handlers/user_state_episode_db_test.go
  • +7 -7 internal/api/initial_setup_atomic_test.go
  • +4 -4 internal/api/middleware/identity_prelude_db_test.go
  • +4 -2 internal/api/router_v2_plugin_browser_test.go
  • +5 -3 internal/apiv2/admin_api_keys_postgres_test.go
  • +4 -3 internal/apiv2/admin_sessions_postgres_test.go
  • +2 -1 internal/apiv2/worker_download_prepare_test.go
  • +2 -1 internal/apiv2/worker_start_test.go
  • +3 -3 internal/audiobooks/enrichment_claim_db_test.go
  • +5 -3 internal/auth/api_key_metadata_test.go
  • +3 -3 internal/auth/password_change_db_test.go
  • +4 -3 internal/auth/session_retention_test.go
  • +3 -3 internal/auth/signup_atomic_test.go
  • +4 -3 internal/auth/signup_wrapped_provider_test.go
  • +3 -3 internal/catalog/advisory_age_db_test.go
  • +4 -3 internal/catalog/audiobook_groups_cursor_db_test.go
  • +4 -3 internal/catalog/catalog_personal_cursor_db_test.go
  • +4 -3 internal/catalog/catalog_resolved_sort_db_test.go
  • +4 -3 internal/catalog/catalog_section_cursor_db_test.go
  • +2 -2 internal/catalog/default_language_restamp_test.go
  • +3 -3 internal/catalog/dropped_series_db_test.go
  • +4 -3 internal/catalog/episode_ids_db_test.go
  • +3 -2 internal/catalog/folder_repo_local_roots_test.go
  • +5 -4 internal/catalog/folder_repo_realtime_monitoring_test.go
  • +4 -3 internal/catalog/history_display_groups_db_test.go
  • +2 -2 internal/catalog/history_episode_scope_db_test.go
  • +3 -3 internal/catalog/item_cards_test.go
  • +3 -3 internal/catalog/item_repo_content_rating_age_db_test.go
  • +4 -3 internal/catalog/jellyfin12_compat_db_test.go
  • +3 -2 internal/catalog/library_collection_aggregate_lock_test.go
  • +5 -4 internal/catalog/library_collection_items_page_db_test.go
  • +5 -4 internal/catalog/library_collection_lock_order_test.go
  • +3 -2 internal/catalog/library_collection_native_membership_test.go
  • +3 -2 internal/catalog/library_collection_references_test.go
  • +3 -2 internal/catalog/library_repo_dead_root_test.go
  • +4 -3 internal/catalog/library_repo_orphan_image_dirs_db_test.go
  • +3 -3 internal/catalog/playable_targets_benchmark_test.go
  • +4 -3 internal/catalog/query_cursor_episode_test.go
  • +4 -3 internal/catalog/query_executor_total_benchmark_test.go
  • +4 -3 internal/catalog/query_work_groups_db_test.go
  • +4 -3 internal/catalog/ratings_repo_db_test.go
  • +4 -3 internal/catalog/reattribute/reattribute_bigint_db_test.go
  • +4 -3 internal/catalog/recent_tv_cursor_db_test.go
  • +8 -7 internal/catalog/recent_tv_db_test.go
  • +4 -3 internal/catalog/search_meilisearch_batch_db_test.go
  • +7 -6 internal/catalog/search_session_db_test.go
  • +4 -3 internal/catalog/season_availability_db_test.go
  • +4 -3 internal/catalogseed/service_db_test.go
  • +7 -7 internal/database/displayprefs_move_test.go
  • +3 -2 internal/database/dolby_vision_probe_migration_test.go
  • +5 -5 internal/database/drop_dead_tables_test.go
  • +2 -2 internal/database/jellycompat_server_name_migration_test.go
  • +3 -3 internal/database/media_analysis_artifacts_migration_test.go
  • +3 -3 internal/database/migrate_downto_test.go
  • +3 -3 internal/database/settings_backfill_test.go
  • +3 -3 internal/database/simplify_playback_authority_migration_test.go
  • +2 -1 internal/downloads/create_revision_test.go
  • +4 -3 internal/historyimport/editor_concurrency_test.go
  • +3 -3 internal/idgen/lease_test.go
  • +3 -3 internal/intromarkers/artifact_db_test.go
  • +3 -3 internal/intromarkers/credits_tail_db_test.go
  • +1 -0 internal/jellycompat/needs_detail_fields_test.go
  • +3 -3 internal/librarymonitor/status_store_test.go
  • +3 -3 internal/metadata/skipped_root_repo_db_test.go
  • +3 -3 internal/metadata/stale_media_id_repo_db_test.go
  • +4 -3 internal/nodeconfig/watcher_overrides_db_test.go
  • +3 -3 internal/nodeconfig/watcher_settings_db_test.go
  • +5 -3 internal/nodepool/admin_configuration_test.go
  • +4 -3 internal/nodepool/repository_capabilities_test.go
  • +4 -2 internal/notifications/destination_pages_test.go
  • +4 -2 internal/notifications/destination_test_sends_test.go
  • +4 -3 internal/notifications/interest_updater_resolve_test.go
  • +7 -6 internal/notifications/operational_dispatch_test.go
  • +4 -3 internal/notifications/release_repeats_db_test.go
  • +4 -3 internal/notifications/release_repo_db_test.go
  • +4 -2 internal/notifications/server_channel_rotation_test.go
  • +4 -2 internal/notifications/server_channel_update_test.go
  • +4 -2 internal/notifications/webhook_guard_test.go
  • +4 -2 internal/notifications/webhook_rotation_test.go
  • +4 -2 internal/notifications/webhook_update_test.go
  • +3 -3 internal/opslog/consumer_db_test.go
  • +2 -2 internal/playback/planstore/postgres_test.go
  • +6 -4 internal/plugins/catalog_settings_conditional_test.go
  • +4 -2 internal/progresssync/repository_test.go
  • +3 -2 internal/progresssync/service_test.go
  • +2 -1 internal/proxy/delivery_activity_test.go
  • +4 -3 internal/requests/repository_page_test.go
  • +11 -10 internal/s3client/aws_style_smoke_test.go
  • +3 -3 internal/scanner/core_ids_bigint_db_test.go
  • +3 -2 internal/scanner/episode_added_denorm_test.go
  • +7 -6 internal/scanner/file_repo_active_path_test.go
  • +4 -3 internal/scanner/file_repo_copy_safety_db_test.go
  • +4 -3 internal/scanner/file_repo_duration_test.go
  • +4 -3 internal/scanner/file_repo_playable_content_id_test.go
  • +5 -4 internal/scanner/marker_atomic_db_test.go
  • +4 -3 internal/scanner/marker_invalidation_migration_db_test.go
  • +3 -3 internal/scanner/marker_withdraw_db_test.go
  • +4 -3 internal/scanner/present_file_state_test.go
  • +2 -2 internal/scanner/update_identity_db_test.go
  • +4 -3 internal/scanqueue/repository_direct_runs_db_test.go
  • +5 -4 internal/scenariocatalog/executor/device_start_lookup_pairing_test.go
  • +4 -4 internal/scenariocatalog/executor/oauth_refusals_pairing_test.go
  • +4 -3 internal/scenariocatalog/executor/sequence_guard_test.go
  • +4 -3 internal/sections/mutations_test.go
  • +7 -7 internal/storagetransition/aws_style_smoke_test.go
  • +29 -29 internal/storagetransition/service_postgres_test.go
  • +4 -3 internal/subtitles/ai/heartbeat_pg_test.go
  • +3 -3 internal/taskmanager/repository/postgres_trigger_initialization_test.go
  • +10 -9 internal/themesongs/repository_test.go
  • +4 -3 internal/userdb/bridgeimport/import_db_test.go
  • +3 -3 internal/userdb/bridgeimport/receipt_db_test.go
  • +3 -3 internal/userstore/pgstore/admin_settings_test.go
  • +4 -3 internal/userstore/pgstore/collection_add_test.go
  • +4 -3 internal/userstore/pgstore/collection_config_patch_test.go
  • +4 -3 internal/userstore/pgstore/collection_lock_order_test.go
  • +4 -3 internal/userstore/pgstore/device_settings_test.go
  • +4 -3 internal/userstore/pgstore/history_witness_test.go
  • +4 -3 internal/userstore/pgstore/imported_history_concurrency_test.go
  • +3 -3 internal/userstore/pgstore/list_devices_test.go
  • +3 -3 internal/userstore/pgstore/mark_watched_concurrency_test.go
  • +3 -3 internal/userstore/pgstore/personal_list_precision_test.go
  • +5 -5 internal/userstore/pgstore/profile_advisory_age_test.go
  • +4 -3 internal/userstore/pgstore/progress_resumable_index_test.go
  • +3 -3 internal/userstore/pgstore/section_overrides_test.go
  • +3 -3 internal/watchsync/connection_settings_test.go
  • +3 -2 internal/watchsync/dropped_db_test.go
  • +3 -3 internal/watchsync/ratings_db_test.go
  • +4 -3 internal/webhooksync/management_test.go
  • +4 -3 internal/worker/reconciler_postgres_test.go
  • +2 -2 migrations/person_refresh_outcomes_postgres_test.go
  • +27 -1 web/src/lib/documentTitle.test.ts
  • +11 -2 web/src/pages/ItemDetail/SeriesContent.test.tsx

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions