Merge ownership foundation corrections into Project files backend

Author: mzxchandra

.github/scripts/resolve-audit-base.sh

@@ -24,12 +24,13 @@ elif [ "$GITHUB_EVENT_NAME" = workflow_dispatch ]; then
     exit 1
   fi
 
-  base_sha=$(jq -r '.[0].base.sha' <<< "$matching_prs")
-  if [[ ! "$base_sha" =~ ^[0-9a-f]{40}$ ]]; then
-    echo 'The pull request did not provide a valid base commit SHA.' >&2
+  base_ref=$(jq -er '.[0].base.ref | select(type == "string" and length > 0)' <<< "$matching_prs")
+  if ! git check-ref-format "refs/heads/$base_ref"; then
+    echo 'The pull request did not provide a valid base branch.' >&2
     exit 1
   fi
-  git fetch --depth=1 origin "$base_sha"
+  git fetch --depth=1 origin "refs/heads/$base_ref"
+  base_sha=$(git rev-parse --verify 'FETCH_HEAD^{commit}')
   echo "ref=$base_sha" >> "$GITHUB_OUTPUT"
 elif [ -n "${GITHUB_BEFORE:-}" ] &&
      [ "$GITHUB_BEFORE" != 0000000000000000000000000000000000000000 ]; then

apps/desktop/e2e/fixtures/live-sim.ts

@@ -651,9 +651,16 @@ export class SimDatabase {
   }
 
   async close(): Promise<void> {
-    if (this.userIds.length > 0)
-      await this.sql`delete from "user" where id in ${this.sql(this.userIds)}`.catch(() => {})
-    await this.sql.end({ timeout: 5 })
+    try {
+      if (this.userIds.length > 0)
+        await this.sql.begin(async (tx) => {
+          await tx`delete from workspace where owner_id in ${tx(this.userIds)}`
+          await tx`delete from project where owner_id in ${tx(this.userIds)}`
+          await tx`delete from "user" where id in ${tx(this.userIds)}`
+        })
+    } finally {
+      await this.sql.end({ timeout: 5 })
+    }
   }
 
   /** A user with a workspace, a session as the desktop sign-in creates, and one chat per title. */
@@ -671,6 +678,10 @@ export class SimDatabase {
       await tx`insert into user_stats (id, user_id) values (${generateId()}, ${userId})`
       await tx`insert into workspace (id, name, owner_id, billed_account_user_id)
         values (${workspaceId}, 'Desktop tools E2E', ${userId}, ${userId})`
+      await tx`insert into project (id, name, owner_id)
+        values (${workspaceId}, 'E2E fixture project', ${userId})`
+      await tx`insert into project_workspace (project_id, workspace_id)
+        values (${workspaceId}, ${workspaceId})`
       await tx`insert into permissions (id, user_id, entity_type, entity_id, permission_type)
         values (${generateId()}, ${userId}, 'workspace', ${workspaceId}, 'admin')`
       await tx`insert into session (id, token, user_id, user_agent, expires_at, created_at, updated_at)

apps/sim/app/api/copilot/chat/stream/desktop-executor.integration.ts

@@ -4,6 +4,7 @@
  * Redis through the production reconnect route, for the live tail and the replay batch a view
  * attaches with after a reload.
  */
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { authMock, authMockFns } from '@sim/testing/mocks/auth.mock'
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
 
@@ -72,7 +73,7 @@ describe.runIf(Boolean(redisUrl))('desktop executor binding on a chat stream', (
       createdAt: now,
       updatedAt: now,
     })
-    await db.insert(workspace).values({
+    await insertWorkspaceFixture(db, {
       id: workspaceId,
       name: 'Desktop stream fixture',
       ownerId: userId,
@@ -105,7 +106,7 @@ describe.runIf(Boolean(redisUrl))('desktop executor binding on a chat stream', (
     await db.delete(copilotChats).where(eq(copilotChats.id, chatId))
     await db.delete(desktopDevices).where(eq(desktopDevices.id, deviceId))
     await db.delete(permissions).where(eq(permissions.userId, userId))
-    await db.delete(workspace).where(eq(workspace.id, workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, workspaceId))
     await db.delete(user).where(eq(user.id, userId))
     await closeRedisConnection()
   })

apps/sim/lib/credentials/application/credential-sharing.integration.ts

@@ -1,3 +1,4 @@
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { generateId } from '@sim/utils/id'
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
 
@@ -49,7 +50,7 @@ describe('Credential sharing through user-held API credentials in PostgreSQL', (
       role: 'admin',
       createdAt: new Date(),
     })
-    await db.insert(schema.workspace).values({
+    await insertWorkspaceFixture(db, {
       id: workspaceId,
       name: 'Sharing test',
       ownerId: actorId,
@@ -85,7 +86,7 @@ describe('Credential sharing through user-held API credentials in PostgreSQL', (
   afterAll(async () => {
     if (!runtime) return
     const { db, schema, eq, inArray } = runtime
-    await db.delete(schema.workspace).where(eq(schema.workspace.id, workspaceId))
+    await deleteWorkspaceFixture(db, eq(schema.workspace.id, workspaceId))
     await db.delete(schema.organization).where(eq(schema.organization.id, organizationId))
     await db
       .delete(schema.user)

apps/sim/lib/desktop/application/activity.integration.ts

@@ -2,6 +2,7 @@
  * Background desktop activity against real PostgreSQL and Redis: which of a user's chats a desktop
  * runs, and whether each is running, waiting on the user's approval, or blocked by an offline desktop.
  */
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { afterAll, describe, expect, it, vi } from 'vitest'
 
 const { redisUrl } = await vi.hoisted(async () => {
@@ -42,7 +43,7 @@ describe.runIf(Boolean(redisUrl))('background desktop activity', () => {
   const deviceIds: string[] = []
 
   afterAll(async () => {
-    if (workspaceIds.length) await db.delete(workspace).where(inArray(workspace.id, workspaceIds))
+    if (workspaceIds.length) await deleteWorkspaceFixture(db, inArray(workspace.id, workspaceIds))
     if (deviceIds.length)
       await db.delete(desktopDevices).where(inArray(desktopDevices.id, deviceIds))
     if (userIds.length) await db.delete(user).where(inArray(user.id, userIds))
@@ -65,7 +66,7 @@ describe.runIf(Boolean(redisUrl))('background desktop activity', () => {
       createdAt: now,
       updatedAt: now,
     })
-    await db.insert(workspace).values({
+    await insertWorkspaceFixture(db, {
       id: workspaceId,
       name: 'Desktop activity fixture',
       ownerId: userId,

apps/sim/lib/desktop/application/executor.integration.ts

@@ -4,6 +4,7 @@
  * completion. Calls are persisted the way the run loop persists a bound run's desktop calls, and
  * Stop runs through the real `requestRunStop`.
  */
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const { redisUrl, presence } = await vi.hoisted(async () => {
@@ -87,7 +88,7 @@ describe.runIf(Boolean(redisUrl))('desktop background executor protocol', () =>
       })
       const workspaceId = generateId()
       workspaceIds.set(userId, workspaceId)
-      await db.insert(workspace).values({
+      await insertWorkspaceFixture(db, {
         id: workspaceId,
         name: 'Desktop executor fixture',
         ownerId: userId,
@@ -243,7 +244,7 @@ describe.runIf(Boolean(redisUrl))('desktop background executor protocol', () =>
       await db.delete(desktopDevices).where(inArray(desktopDevices.id, deviceIds))
     }
     const workspaces = [...workspaceIds.values()]
-    if (workspaces.length) await db.delete(workspace).where(inArray(workspace.id, workspaces))
+    if (workspaces.length) await deleteWorkspaceFixture(db, inArray(workspace.id, workspaces))
     if (userIds.length) await db.delete(user).where(inArray(user.id, userIds))
   })
 

apps/sim/lib/desktop/application/import.integration.ts

@@ -8,6 +8,7 @@ import { mkdtempSync } from 'node:fs'
 import { rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import path from 'node:path'
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
 
 const fixtureStorage = vi.hoisted(() => ({ root: '' }))
@@ -52,7 +53,7 @@ describe('desktop imports', () => {
     if (userIds.length) {
       // Audit rows outlive their actor (the foreign key sets null), so they go first.
       await db.delete(auditLog).where(inArray(auditLog.actorId, userIds))
-      await db.delete(workspace).where(inArray(workspace.ownerId, userIds))
+      await deleteWorkspaceFixture(db, inArray(workspace.ownerId, userIds))
       await db.delete(user).where(inArray(user.id, userIds))
     }
     await rm(fixtureStorage.root, { recursive: true, force: true })
@@ -75,7 +76,7 @@ describe('desktop imports', () => {
       updatedAt: now,
     })
     await db.insert(userStats).values({ id: generateId(), userId })
-    await db.insert(workspace).values({
+    await insertWorkspaceFixture(db, {
       id: workspaceId,
       name: 'Desktop import fixture',
       ownerId: userId,

apps/sim/lib/desktop/executor/bound-turn.integration.ts

@@ -5,6 +5,7 @@
  * through the real `requestRunStop`, and a waiter that dies is settled by the stale-execution cron.
  * Deadlines are moved on the row itself, which is all the server reads.
  */
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { authMock, authMockFns } from '@sim/testing/mocks/auth.mock'
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
 
@@ -340,7 +341,7 @@ describe.runIf(Boolean(redisUrl))("a turn bound to a desktop's background execut
       createdAt: now,
       updatedAt: now,
     })
-    await db.insert(workspace).values({
+    await insertWorkspaceFixture(db, {
       id: workspaceId,
       name: 'Bound turn fixture',
       ownerId: userId,
@@ -369,7 +370,7 @@ describe.runIf(Boolean(redisUrl))("a turn bound to a desktop's background execut
       await db.delete(auditLog).where(inArray(auditLog.resourceId, deviceIds))
       await db.delete(desktopDevices).where(inArray(desktopDevices.id, deviceIds))
     }
-    await db.delete(workspace).where(eq(workspace.id, workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, workspaceId))
     await db.delete(user).where(eq(user.id, userId))
   })
 

apps/sim/lib/desktop/executor/desktop-call-classifier.integration.ts

@@ -14,6 +14,7 @@ import {
   user,
   workspace,
 } from '@sim/db/schema'
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { generateId } from '@sim/utils/id'
 import { eq, sql } from 'drizzle-orm'
 import { afterAll, beforeAll, describe, expect, it } from 'vitest'
@@ -105,7 +106,7 @@ describe('desktop call classification in SQL and TypeScript', () => {
       createdAt: now,
       updatedAt: now,
     })
-    await db.insert(workspace).values({
+    await insertWorkspaceFixture(db, {
       id: workspaceId,
       name: 'Classifier parity fixture',
       ownerId: userId,
@@ -154,7 +155,7 @@ describe('desktop call classification in SQL and TypeScript', () => {
   afterAll(async () => {
     await db.delete(copilotChats).where(eq(copilotChats.id, chatId))
     await db.delete(desktopDevices).where(eq(desktopDevices.id, deviceId))
-    await db.delete(workspace).where(eq(workspace.id, workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, workspaceId))
     await db.delete(user).where(eq(user.id, userId))
   })
 

apps/sim/lib/mothership/tools/client/desktop-tool-chat-view-lease.integration.ts

@@ -5,6 +5,7 @@
  * Runs against real PostgreSQL and Redis through the production pre-persist path, the authorize
  * route, the lease route and the confirm route.
  */
+import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
 import { authMock, authMockFns } from '@sim/testing/mocks/auth.mock'
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'
 
@@ -202,7 +203,7 @@ describe.runIf(Boolean(redisUrl))('a chat-view import kept alive by its lease',
         createdAt: now,
         updatedAt: now,
       })
-    await db.insert(workspace).values({
+    await insertWorkspaceFixture(db, {
       id: workspaceId,
       name: 'Chat-view lease fixture',
       ownerId: userId,
@@ -226,7 +227,7 @@ describe.runIf(Boolean(redisUrl))('a chat-view import kept alive by its lease',
 
   afterAll(async () => {
     await db.delete(copilotChats).where(eq(copilotChats.id, chatId))
-    await db.delete(workspace).where(eq(workspace.id, workspaceId))
+    await deleteWorkspaceFixture(db, eq(workspace.id, workspaceId))
     await db.delete(user).where(eq(user.id, userId))
     await db.delete(user).where(eq(user.id, otherUserId))
   })