fix(projects): keep repair reads compatible with expansion schema

Author: mzxchandra

apps/sim/app/api/webhooks/agentmail/thread-scope.integration.ts

@@ -1,3 +1,4 @@
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 /**
  * An inbox reply continues its parent task's chat, and the parent is found by the
  * `In-Reply-To` header — a value every recipient of the agent's reply holds. Against
@@ -97,7 +98,7 @@ async function seedWorkspace(ws: InboxWorkspace): Promise<void> {
     createdAt: now,
     updatedAt: now,
   })
-  await db.insert(workspace).values({
+  await insertWorkspaceFixture(db, {
     id: ws.id,
     name: 'Inbox thread scope fixture',
     ownerId: ws.ownerId,
@@ -224,7 +225,7 @@ describe('inbox reply threading stays inside the receiving workspace', () => {
   afterAll(async () => {
     const ownerIds = [victim.ownerId, attacker.ownerId]
     await db.delete(permissions).where(inArray(permissions.userId, ownerIds))
-    await db.delete(workspace).where(inArray(workspace.id, [victim.id, attacker.id]))
+    await deleteWorkspaceFixture(db, inArray(workspace.id, [victim.id, attacker.id]))
     await db.delete(user).where(inArray(user.id, ownerIds))
   })
 

apps/sim/lib/projects/membership.ts

@@ -143,7 +143,14 @@ export async function lockWorkspaceProject(tx: DbTransaction, workspaceId: strin
       throw new ProjectConflictError('Project membership needs reconciliation')
     await acquireAdvisoryXactLock(tx, 'project', projectLockKey(membership.projectId))
     const [current] = await tx
-      .select({ project })
+      .select({
+        project: {
+          id: project.id,
+          ownerId: project.ownerId,
+          organizationId: project.organizationId,
+          archivedAt: project.archivedAt,
+        },
+      })
       .from(workspace)
       .innerJoin(project, eq(project.id, workspace.projectId))
       .where(eq(workspace.id, workspaceId))

packages/db/maintenance/project-membership.sql

@@ -1,6 +1,7 @@
 -- Installed by the registered Project migration after bounded backfill and verification.
 COMMIT;
 --> statement-breakpoint
+-- Validation scans and concurrent index builds have a separate 60-second budget.
 SET statement_timeout = '60s';
 --> statement-breakpoint
 DO $$ BEGIN
@@ -115,6 +116,8 @@ ALTER TABLE workspace ADD COLUMN IF NOT EXISTS organization_scope_key text
   GENERATED ALWAYS AS (CASE WHEN organization_id IS NULL THEN 'personal' ELSE 'organization:' || organization_id END) STORED;
 COMMIT;
 --> statement-breakpoint
+SET statement_timeout = '5s';
+--> statement-breakpoint
 -- Only invalid, unreferenced indexes from interrupted builds are removed. Valid indexes survive
 -- replay, including when the final foreign keys already depend on them.
 DO $$ DECLARE target_name text; BEGIN
@@ -134,6 +137,7 @@ CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS project_id_organization_scope_uni
 CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS workspace_id_project_unique ON workspace(id, project_id);
 --> statement-breakpoint
 SET lock_timeout = '1s';
+SET statement_timeout = '5s';
 --> statement-breakpoint
 DO $$ BEGIN
   IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conrelid = 'project'::regclass

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

@@ -1313,7 +1313,8 @@ describe('Project expand/backfill/contract against PostgreSQL', () => {
           if (statement.includes('LOCK TABLE workspace,')) {
             const before = await locks();
             await sleep(6500);
-            process.stdout.write(JSON.stringify({ before, after: await locks() }));
+            const result = JSON.stringify({ before, after: await locks() });
+            await new Promise((resolve, reject) => process.stdout.write(result, (error) => error ? reject(error) : resolve()));
             process.exit(0);
           }
         }