fix(projects): backfill only families missing membership

Author: mzxchandra

packages/db/migrations/0394_project_membership_enforcement.sql

@@ -6,7 +6,14 @@ SET statement_timeout = '15min';
 --> statement-breakpoint
 CREATE TEMP TABLE IF NOT EXISTS project_backfill_roots (id text PRIMARY KEY) ON COMMIT PRESERVE ROWS;
 TRUNCATE project_backfill_roots;
-INSERT INTO project_backfill_roots SELECT id FROM workspace WHERE forked_from_workspace_id IS NULL;
+-- Only legacy families need assignment locks; existing complete Projects only need validation.
+WITH RECURSIVE ancestors(id, parent_id) AS (
+  SELECT w.id, w.forked_from_workspace_id FROM workspace w
+    LEFT JOIN project_workspace pw ON pw.workspace_id = w.id WHERE pw.workspace_id IS NULL
+  UNION
+  SELECT w.id, w.forked_from_workspace_id FROM workspace w JOIN ancestors a ON a.parent_id = w.id
+)
+INSERT INTO project_backfill_roots SELECT id FROM ancestors WHERE parent_id IS NULL;
 --> statement-breakpoint
 CREATE OR REPLACE PROCEDURE pg_temp.backfill_project_families() LANGUAGE plpgsql AS $$
 DECLARE
@@ -138,7 +145,7 @@ BEGIN
     RAISE EXCEPTION 'Project backfill found a fork cycle or missing parent; reconcile before retrying' USING ERRCODE = '55000';
   END IF;
   IF EXISTS (SELECT 1 FROM workspace w LEFT JOIN project_workspace pw ON pw.workspace_id = w.id WHERE pw.workspace_id IS NULL) THEN
-    RAISE EXCEPTION 'Project enforcement found environments unreachable from a valid fork root or concurrently detached; reconcile and retry' USING ERRCODE = '55000';
+    RAISE EXCEPTION 'Project backfill found newly unassigned or detached environments; retry migration discovery' USING ERRCODE = '55P03';
   END IF;
   IF EXISTS (
     SELECT 1 FROM project p LEFT JOIN project_workspace pw ON pw.project_id = p.id

packages/db/scripts/project-contract.integration.ts

@@ -625,4 +625,24 @@ describe('Project expand/backfill/contract against PostgreSQL', () => {
       expect(await sql`SELECT 1 FROM project_workspace`).toHaveLength(2)
     })
   }, 15000)
+  it.each(['separate-roots', 'large-family'] as const)(
+    'preserves a complete existing Project with %s without putting it through legacy assignment',
+    async (shape) => {
+      await database(async (sql) => {
+        await sql`INSERT INTO project (id, name, owner_id) VALUES ('existing', 'Keep this Project', 'owner')`
+        await sql`INSERT INTO workspace (id, name, owner_id) VALUES ('root', 'Root', 'owner')`
+        const count = shape === 'large-family' ? 1001 : 1
+        await sql`INSERT INTO workspace (id, name, owner_id, forked_from_workspace_id)
+          SELECT 'other-' || n, 'Other', 'owner', ${shape === 'large-family' ? 'root' : null} FROM generate_series(1, ${count}) n`
+        await sql`INSERT INTO project_workspace (project_id, workspace_id) SELECT 'existing', id FROM workspace`
+        await enforce(sql)
+        expect(await sql`SELECT id, name FROM project`).toEqual([
+          { id: 'existing', name: 'Keep this Project' },
+        ])
+        expect((await sql`SELECT count(*)::int AS count FROM project_workspace`)[0].count).toBe(
+          count + 1
+        )
+      })
+    }
+  )
 })