§22 S1: thread collection_id through backend + update tests (N=1 unchanged, 454 green)

- collections.py resolution helpers (default_collection_id, type, initial_state)
- registry mirror writes project grouping fields + default-collection corpus fields
- auth.project_of_rfc joins collections; project_member_role reads memberships
- cache/api_*/funder writers+readers re-keyed to collection_id (cached_prs + denormalised
  project_id tags unchanged); api_deployment reads type/initial_state from the default collection
- projects.py restamp detects bootstrap via collections; initial_state via collection
- tests updated to the three-tier schema; test_migration_028 retired (superseded by 029)
- add @S1 acceptance test (collection grain + N=1 serving)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

backend/tests/test_restamp_default_project.py

@@ -1,6 +1,9 @@
 """§22.13 step 1 — the bootstrap-id re-stamp: 'default' → the configured
-DEFAULT_PROJECT_ID across every project-scoped table, with the composite FKs
-kept intact and the stale 'default' projects row dropped. Idempotent."""
+DEFAULT_PROJECT_ID. §22 three-tier (S1): the entry-corpus tables key on
+collection_id now, so the re-stamp renames the *project grain* — the
+`collections.project_id` link and the denormalised project_id tags — while the
+entries stay in their collection. The stale 'default' projects row is dropped,
+the composite FKs stay intact, and it is idempotent."""
 from __future__ import annotations
 
 import tempfile
@@ -19,30 +22,31 @@ class _Cfg:
 def _setup(monkeypatch, default_id="ohm"):
     path = str(Path(tempfile.mkdtemp()) / "t.db")
     cfg = _Cfg(path, default_id)
-    db.run_migrations(cfg)
+    db.run_migrations(cfg)  # seeds the bootstrap 'default' project + its default collection
     monkeypatch.setattr(db, "_CONN", db.connect(path))
     conn = db.conn()
-    # M1 bootstrap row + a registry-mirrored 'ohm' row coexist pre-restamp.
-    conn.execute("INSERT OR IGNORE INTO projects (id,name,type,content_repo,visibility,initial_state) "
-                 "VALUES ('default','Bootstrap','document','ohm-content','public','super-draft')")
-    conn.execute("INSERT OR IGNORE INTO projects (id,name,type,content_repo,visibility,initial_state) "
-                 "VALUES ('ohm','Open Human Model','document','ohm-content','public','super-draft')")
+    # A registry-mirrored 'ohm' project coexists with the bootstrap pre-restamp.
+    conn.execute("INSERT OR IGNORE INTO projects (id,name,content_repo,visibility) "
+                 "VALUES ('ohm','Open Human Model','ohm-content','public')")
     conn.execute("INSERT INTO users (id,gitea_login,display_name,role) VALUES (1,'a','A','contributor')")
-    # default-stamped data with a composite-FK child
-    conn.execute("INSERT INTO cached_rfcs (slug,title,state,project_id) VALUES ('human','Human','active','default')")
-    conn.execute("INSERT INTO rfc_collaborators (rfc_slug,user_id,role_in_rfc,project_id) "
+    # Entry data lives in the default collection (id='default'); the entry grain
+    # is the collection and does not move on a re-stamp.
+    conn.execute("INSERT INTO cached_rfcs (slug,title,state,collection_id) VALUES ('human','Human','active','default')")
+    conn.execute("INSERT INTO rfc_collaborators (rfc_slug,user_id,role_in_rfc,collection_id) "
                  "VALUES ('human',1,'contributor','default')")
-    conn.execute("INSERT INTO stars (user_id,rfc_slug,project_id) VALUES (1,'human','default')")
+    conn.execute("INSERT INTO stars (user_id,rfc_slug,collection_id) VALUES (1,'human','default')")
     return cfg, conn
 
 
-def test_restamp_moves_data_and_drops_bootstrap_row(monkeypatch):
+def test_restamp_moves_project_grain_and_drops_bootstrap_row(monkeypatch):
     cfg, conn = _setup(monkeypatch, default_id="ohm")
     projects.restamp_default_project(cfg)
-    assert conn.execute("SELECT COUNT(*) c FROM cached_rfcs WHERE project_id='default'").fetchone()["c"] == 0
-    assert conn.execute("SELECT project_id FROM cached_rfcs WHERE slug='human'").fetchone()["project_id"] == "ohm"
-    assert conn.execute("SELECT project_id FROM rfc_collaborators WHERE rfc_slug='human'").fetchone()["project_id"] == "ohm"
-    assert conn.execute("SELECT project_id FROM stars WHERE rfc_slug='human'").fetchone()["project_id"] == "ohm"
+    # The project grain (the collection's parent link) re-stamps to 'ohm'.
+    assert conn.execute("SELECT COUNT(*) c FROM collections WHERE project_id='default'").fetchone()["c"] == 0
+    assert conn.execute("SELECT project_id FROM collections WHERE id='default'").fetchone()["project_id"] == "ohm"
+    # Entries stay in their collection — the collection_id is unchanged.
+    assert conn.execute("SELECT collection_id FROM cached_rfcs WHERE slug='human'").fetchone()["collection_id"] == "default"
+    assert conn.execute("SELECT collection_id FROM rfc_collaborators WHERE rfc_slug='human'").fetchone()["collection_id"] == "default"
     # stale bootstrap projects row removed; 'ohm' remains
     assert conn.execute("SELECT 1 FROM projects WHERE id='default'").fetchone() is None
     assert conn.execute("SELECT 1 FROM projects WHERE id='ohm'").fetchone() is not None
@@ -53,12 +57,13 @@ def test_restamp_moves_data_and_drops_bootstrap_row(monkeypatch):
 def test_restamp_is_idempotent(monkeypatch):
     cfg, conn = _setup(monkeypatch, default_id="ohm")
     projects.restamp_default_project(cfg)
-    projects.restamp_default_project(cfg)  # second call: no rows left → no-op
-    assert conn.execute("SELECT COUNT(*) c FROM cached_rfcs WHERE project_id='ohm'").fetchone()["c"] == 1
+    projects.restamp_default_project(cfg)  # second call: no bootstrap rows left → no-op
+    assert conn.execute("SELECT project_id FROM collections WHERE id='default'").fetchone()["project_id"] == "ohm"
+    assert conn.execute("SELECT COUNT(*) c FROM cached_rfcs WHERE collection_id='default'").fetchone()["c"] == 1
 
 
 def test_restamp_noop_when_default_id_unchanged(monkeypatch):
     cfg, conn = _setup(monkeypatch, default_id="")  # resolves to 'default'
     projects.restamp_default_project(cfg)
-    # nothing renamed; bootstrap data + row still present
-    assert conn.execute("SELECT project_id FROM cached_rfcs WHERE slug='human'").fetchone()["project_id"] == "default"
+    # nothing renamed; the default collection still belongs to the bootstrap project
+    assert conn.execute("SELECT project_id FROM collections WHERE id='default'").fetchone()["project_id"] == "default"