feat(collections): merge the collections and Home rows revamp into main

Makefile

@@ -66,8 +66,7 @@ lint-changed:
 # an entry along with its fix, and never extend it to land a change. The Go
 # suite has no equivalent — a Go test that cannot pass yet carries a t.Skip and
 # its reason in the source, where whoever reads the test finds it.
-WEBTEST_KNOWN_FAILURES := \
-	--exclude src/pages/Catalog.test.tsx
+WEBTEST_KNOWN_FAILURES :=
 
 # The Go binary embeds the built frontend, so every Go build and test needs
 # web/dist to exist. Tests never serve it, so a placeholder is enough; `make

cmd/silo/main.go

@@ -2786,8 +2786,23 @@ func main() {
 		deps.TrendingRefresher = trendingRefresher
 
 		if deps.UserStoreProvider != nil {
-			userSync := usercollections.NewService(deps.UserStoreProvider, collItemRepo, libraryItemRepo, nil, slog.Default())
+			// Imports fill their item limit with titles their owner profile
+			// can access. Scheduled syncs start with the task manager below,
+			// so the owner resolver is wired here, not in the router.
+			var ownerScopes scopeResolver
+			if policySystem != nil {
+				ownerScopes = policy.NewViewerResolver(auth.NewUserRepository(deps.DB), deps.UserStoreProvider, nil, policySystem.PDP(), accessGroupStore).WithUnratedContentPolicy(unratedContent)
+			} else {
+				// Legacy resolver: proxy/test wiring without a policy system. Production integrated/api modes always take the policy path. Removed with the legacy cleanup phase.
+				ownerScopes = access.NewResolver(auth.NewUserRepository(deps.DB), deps.UserStoreProvider, nil, accessGroupStore).WithUnratedContentPolicy(unratedContent)
+			}
+			userSync := usercollections.NewService(deps.UserStoreProvider, collItemRepo, libraryItemRepo, usercollections.NewOwnerAccess(ownerScopes), nil, slog.Default())
 			userSync.TMDBCollections = collectionService.TMDBCollections
+			// Syncs refresh collages and start with the task manager below,
+			// before the router exists, so the collage service is shared from
+			// here; the router gives it its generator.
+			deps.PersonalCollectionCollages = catalog.NewPersonalCollectionCollages(deps.DB, nil)
+			userSync.Collages = deps.PersonalCollectionCollages
 			// Trakt fetchers are wired in router.go (they need settingsRepo);
 			// router.go propagates them onto userSync once configured.
 			userCollectionScheduler = usercollections.NewScheduler(deps.DB, userSync, slog.Default())

contracts/api/v2/breaking-approvals.json

@@ -1,3 +1,95 @@
 {
-  "approvals": []
+  "approvals": [
+    {
+      "operation_id": "createCollection",
+      "change_id": "request-property-removed",
+      "fingerprint": "4335d9d8cd09082a7556eea7d88a42e7a7b1ec90397226c3e0eb6a5e8ccbc7e4",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer accepted. The web client stops sending it in the same change; silo-apple never sends it and silo-android only declares it with a null default that its JSON configuration omits (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "createCollection",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "3527c887f3821ec21b6e91fcc4921192a600b72362d1cee5e58d6da6609eb7a7",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "getCollection",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "1615cc847ecf3620a4adb10ed9a31d3025a2f58b7fe938e713342513fb2dc99c",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "importMDBListCollection",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "7c2166381b851377739abd919a33b6f0d4915a8f4b9e0d4dc0d61f4fc01d3d19",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "importTMDBCollection",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "eb9653c04f0ef88685667b075ab1939dbb8bf5a39398612aeb949f34dbd6a9e6",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "importTMDBListCollection",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "602971b18d7e48319e2afae8557893940d9e03c1b883066b15a8a1e7f2ac0e2f",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "importTraktCollection",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "9aa5634209e0dc004f47d2876cfd1e9cd96d53bb351205e32e5559eb99ad8cd2",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "listCollections",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "faaa77f5e6c57ca17a6218625fbc09278b33af9c4eeb2380295be18d69ecf5a1",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "updateCollection",
+      "change_id": "request-property-removed",
+      "fingerprint": "039bb432c950e06d7c4fc0aea5f767808015a81e44b632e06c1ca75b69f37751",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer accepted. The web client stops sending it in the same change; silo-apple never sends it and silo-android only declares it with a null default that its JSON configuration omits (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "updateCollection",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "827e1959e5752120f5e54debb3e05a0f346884a1afd64730889d68bc221a50c9",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "uploadCollectionPoster",
+      "change_id": "response-required-property-removed",
+      "fingerprint": "074bdfeef759bb891ab58ff4b3ca50bcd310dfb42d5cbb675d2bc12449e318ca",
+      "reason": "Pre-lock removal for #1615: personal collection sharing is one switch (is_shared shows a collection to every profile on the login), so the per-profile allow list is no longer reported. The web client stops reading it in the same change; silo-apple does not decode it and silo-android defaults it to an empty list (follow-ups silo-apple#534, silo-android#406).",
+      "approved_in": "#1615"
+    },
+    {
+      "operation_id": "getAdminSectionSettings",
+      "change_id": "api-path-removed-without-deprecation",
+      "fingerprint": "c84f2053ffc9feaf140d1efe483b1a890e53caffbae740a5088c76804635638e",
+      "reason": "Pre-lock removal, owner decision: the Let profiles add rule rows setting is gone and profiles may always add rule rows, so there is nothing left to read. getProfileSectionFlags keeps allow_profile_custom_sections, always true and deprecated. The web admin stops calling this operation in the same change; silo-apple and silo-android never called it. The frozen /api/v1 route keeps answering, always true.",
+      "approved_in": "#1991"
+    },
+    {
+      "operation_id": "updateAdminSectionSettings",
+      "change_id": "api-path-removed-without-deprecation",
+      "fingerprint": "53d640609cee613e839b55131e2dd2d5ca929c38a80b33c685a35c44a5e8a767",
+      "reason": "Pre-lock removal, owner decision: the Let profiles add rule rows setting is gone and profiles may always add rule rows, so there is nothing left to change. The web admin's More menu switch, the only caller, is removed in the same change; silo-apple and silo-android never called it. The frozen /api/v1 route still accepts a write and changes nothing.",
+      "approved_in": "#1991"
+    }
+  ]
 }

contracts/api/v2/fixtures/admin_account_profile_section_settings.json

@@ -4,6 +4,7 @@
       "id": "s-continue",
       "section_type": "continue_watching",
       "title": "Continue Watching",
+      "default_title": "Continue Watching",
       "featured": false,
       "item_limit": 20,
       "hidden": true,
@@ -15,6 +16,7 @@
       "id": "u-gems",
       "section_type": "hidden_gems",
       "title": "Hidden gems",
+      "default_title": "",
       "featured": false,
       "item_limit": 12,
       "hidden": false,

contracts/api/v2/fixtures/admin_login_session_forbidden.json

@@ -3,5 +3,5 @@
   "title": "Permission denied",
   "status": 403,
   "detail": "Admin access required",
-  "instance": "urn:silo:request:0000000000000000000002dd"
+  "instance": "urn:silo:request:0000000000000000000002e6"
 }

contracts/api/v2/fixtures/collection_group_unsupported.json

@@ -0,0 +1,7 @@
+{
+  "type": "https://siloserver.org/docs/api/v2/problems/capability_unsupported",
+  "title": "Capability unsupported",
+  "status": 501,
+  "detail": "The acting account does not support collection groups",
+  "instance": "urn:silo:request:00000000000000000000010c"
+}

contracts/api/v2/fixtures/collection_order_foreign_id.json

@@ -0,0 +1,14 @@
+{
+  "type": "https://siloserver.org/docs/api/v2/problems/validation_failed",
+  "title": "Validation failed",
+  "status": 422,
+  "detail": "The request did not pass validation; see errors.",
+  "instance": "urn:silo:request:0000000000000000000002d8",
+  "errors": [
+    {
+      "location": "body.ordered_ids",
+      "code": "invalid",
+      "detail": "ordered_ids must name each of your own collections exactly once"
+    }
+  ]
+}

contracts/api/v2/fixtures/create_collection_ok.json

@@ -6,13 +6,13 @@
   "description": "",
   "collection_type": "manual",
   "is_shared": false,
-  "allowed_profile_ids": [],
   "query_definition": {},
   "sort_config": {},
   "sort_order": 0,
   "group_id": null,
   "source_url": "",
   "sync_schedule": "",
+  "sync_cadence": "",
   "next_sync_at": null,
   "last_sync_at": null,
   "last_sync_status": "",
@@ -21,6 +21,7 @@
   "include_in_server_collections": false,
   "poster_url": "",
   "poster_thumbhash": "",
+  "poster_is_collage": false,
   "created_at": "2026-01-02T03:04:05.678Z",
   "updated_at": "2026-01-02T03:04:05.678Z"
 }

contracts/api/v2/fixtures/create_collection_with_description_ok.json

@@ -0,0 +1,27 @@
+{
+  "id": "c1",
+  "profile_id": "p-owner",
+  "creator_profile_id": "p-owner",
+  "name": "Rainy days",
+  "description": "For wet afternoons",
+  "collection_type": "manual",
+  "is_shared": false,
+  "query_definition": {},
+  "sort_config": {},
+  "sort_order": 0,
+  "group_id": null,
+  "source_url": "",
+  "sync_schedule": "",
+  "sync_cadence": "",
+  "next_sync_at": null,
+  "last_sync_at": null,
+  "last_sync_status": "",
+  "last_sync_message": "",
+  "item_count": 4,
+  "include_in_server_collections": false,
+  "poster_url": "",
+  "poster_thumbhash": "",
+  "poster_is_collage": false,
+  "created_at": "2026-01-02T03:04:05.678Z",
+  "updated_at": "2026-01-02T03:04:05.678Z"
+}

contracts/api/v2/fixtures/get_admin_collection_capabilities_ok.json

@@ -0,0 +1,22 @@
+{
+  "revision": "f9622d80ff66956bdd64fcc3445fe57706ac2ce1c8b02df9e470959604c20337",
+  "state": "available",
+  "allowed": true,
+  "groups": true,
+  "imports": true,
+  "import_sources": [
+    "mdblist",
+    "tmdb",
+    "tmdb_list"
+  ],
+  "artwork": true,
+  "item_reorder": true,
+  "template_summaries": true,
+  "mdblist_search": true,
+  "schedule_time_zone": {
+    "utc_offset": "-05:00",
+    "abbreviation": "CDT",
+    "name": "America/Chicago"
+  },
+  "section_references": true
+}

contracts/api/v2/fixtures/get_admin_collection_ok.json

@@ -14,6 +14,7 @@
   "featured": false,
   "poster_url": "",
   "backdrop_url": "",
+  "poster_is_collage": false,
   "source_url": "",
   "query_definition": {},
   "sort_config": {},

contracts/api/v2/fixtures/get_catalog_search_capabilities_ok.json

@@ -1,8 +1,9 @@
 {
-  "revision": "ec966ce0e901578a98aa51e9daae0db0ee834c5b59dd7845b80ecc81bcae7203",
+  "revision": "3e1c28b18db74bb3167f7331d3387693ae45f5305fe9749d7580c44022885a22",
   "state": "available",
   "allowed": true,
   "people_media_scope": true,
+  "facet_value_search": true,
   "person_prefetch": true,
   "video_with_episodes_scope": true,
   "provider": "meilisearch",

contracts/api/v2/fixtures/get_collection_capabilities_ok.json

@@ -0,0 +1,47 @@
+{
+  "revision": "6a87601d9e894507e052de99b434f0e5ab0aac86724c3801b517fef58c4d5aa2",
+  "state": "available",
+  "allowed": true,
+  "groups": false,
+  "login_sharing": true,
+  "imports": false,
+  "import_sources": [],
+  "artwork": false,
+  "item_reorder": false,
+  "display_filter_fields": [
+    "type",
+    "watched"
+  ],
+  "display_filter_presets": {
+    "watched": [
+      "all",
+      "watched",
+      "unwatched"
+    ],
+    "media": [
+      "all",
+      "movie",
+      "series"
+    ]
+  },
+  "collection_default_sort": true,
+  "collection_sort_preferences": true,
+  "effective_collection_sort": true,
+  "sort_preference_kinds": [
+    "library",
+    "user",
+    "watchlist",
+    "favorites"
+  ],
+  "create_description": true,
+  "mdblist_search": true,
+  "schedule_time_zone": {
+    "utc_offset": "-05:00",
+    "abbreviation": "CDT",
+    "name": "America/Chicago"
+  },
+  "sync_schedule_editable": false,
+  "contains_item": true,
+  "preview_posters": true,
+  "poster_collages": false
+}

contracts/api/v2/fixtures/get_collection_ok.json

@@ -6,13 +6,13 @@
   "description": "",
   "collection_type": "manual",
   "is_shared": false,
-  "allowed_profile_ids": [],
   "query_definition": {},
   "sort_config": {},
   "sort_order": 0,
   "group_id": null,
   "source_url": "",
   "sync_schedule": "",
+  "sync_cadence": "",
   "next_sync_at": null,
   "last_sync_at": null,
   "last_sync_status": "",
@@ -21,6 +21,7 @@
   "include_in_server_collections": false,
   "poster_url": "",
   "poster_thumbhash": "",
+  "poster_is_collage": false,
   "created_at": "2026-01-02T03:04:05.678Z",
   "updated_at": "2026-01-02T03:04:05.678Z"
 }

contracts/api/v2/fixtures/get_library_collections_ok.json

@@ -30,7 +30,8 @@
       "last_sync_message": "",
       "item_count": 12,
       "created_at": "2026-01-02T03:04:05.000Z",
-      "updated_at": "2026-01-02T03:04:05.000Z"
+      "updated_at": "2026-01-02T03:04:05.000Z",
+      "poster_is_collage": false
     }
   ],
   "groups": [
@@ -46,7 +47,8 @@
           "title": "Rainy days",
           "poster_url": "",
           "item_count": 4,
-          "creator_profile_id": "p-owner"
+          "creator_profile_id": "p-owner",
+          "poster_is_collage": false
         }
       ]
     }
@@ -59,7 +61,8 @@
         "title": "Oscar Winners",
         "poster_url": "",
         "item_count": 12,
-        "featured": true
+        "featured": true,
+        "poster_is_collage": false
       }
     ]
   }

contracts/api/v2/fixtures/get_profile_section_settings_ok.json

@@ -3,7 +3,8 @@
     {
       "id": "s-continue",
       "section_type": "continue_watching",
-      "title": "Continue Watching",
+      "title": "Keep watching",
+      "default_title": "Continue Watching",
       "featured": false,
       "item_limit": 20,
       "hidden": true,
@@ -15,6 +16,7 @@
       "id": "u-gems",
       "section_type": "hidden_gems",
       "title": "Hidden gems",
+      "default_title": "",
       "featured": false,
       "item_limit": 12,
       "hidden": false,