fix(tables): reject incomplete folder cohorts

Author: j15z

apps/sim/lib/folders/cascade.test.ts

@@ -615,6 +615,30 @@ describe('knowledge_base and table folder resources', () => {
     ).rejects.toMatchObject({ code: 'locked', message: 'Table deletion is locked' })
   })
 
+  it('rejects the cohort when a table changes after child selection', async () => {
+    resetDbChainMock()
+    queueTableRows(schemaMock.userTableDefinitions, [
+      { id: 'tbl_accounts' },
+      { id: 'tbl_contacts' },
+    ])
+    tableServiceMocks.deleteTables.mockResolvedValueOnce({
+      archived: [],
+      failed: [],
+      notFound: ['tbl_contacts'],
+    })
+
+    await expect(
+      tableConfig.archiveChildren?.({
+        workspaceId: 'ws-1',
+        folderIds: ['folder-1'],
+        timestamp: TIMESTAMP,
+      })
+    ).rejects.toMatchObject({
+      code: 'conflict',
+      message: 'One or more tables changed while their folder was being deleted',
+    })
+  })
+
   it('re-archives a successful restore prefix when a later cohort table fails', async () => {
     resetDbChainMock()
     queueTableRows(schemaMock.userTableDefinitions, [

apps/sim/lib/folders/config.ts

@@ -361,6 +361,12 @@ async function archiveTableChildren(context: CascadeChildrenContext): Promise<nu
       result.failed[0].reason
     )
   }
+  if (result.notFound.length > 0 || result.archived.length !== ids.length) {
+    throw new OrchestrationError(
+      'conflict',
+      'One or more tables changed while their folder was being deleted'
+    )
+  }
 
   return result.archived.length
 }

apps/sim/lib/table/service.test.ts

@@ -831,6 +831,24 @@ describe('deleteTables reference guard', () => {
     expect(dbChainMockFns.update).not.toHaveBeenCalled()
   })
 
+  it('archives none of a restore cohort when one selected table is no longer active', async () => {
+    queueTableRows(schemaMock.userTableDefinitions, [batchTable('tbl_accounts', 'Accounts')])
+
+    await expect(
+      deleteTables(['tbl_accounts', 'tbl_contacts'], 'folder-cascade-folder-1', {
+        expectedWorkspaceId: WORKSPACE_ID,
+        skipNotify: true,
+        archiveAsCohort: true,
+      })
+    ).resolves.toEqual({
+      archived: [],
+      failed: [],
+      notFound: ['tbl_contacts'],
+    })
+
+    expect(dbChainMockFns.update).not.toHaveBeenCalled()
+  })
+
   it('allows a self-referencing table to archive', async () => {
     queueTableRows(schemaMock.userTableDefinitions, [
       batchTable('tbl_categories', 'Categories', ['tbl_categories']),

apps/sim/lib/table/service.ts

@@ -1469,7 +1469,7 @@ export async function deleteTables(
 
     const archived: DeleteTablesResult['archived'] = []
     if (options.archiveAsCohort) {
-      if (failed.length > 0) return { archived, failed, notFound }
+      if (failed.length > 0 || notFound.length > 0) return { archived, failed, notFound }
       const cohort = [...archivePlan.ordered, ...archivePlan.blockedByCycle]
       if (cohort.length > 0) {
         archived.push(