fix(workflows): return not found when import loses archive race

Author: mzxchandra

apps/sim/app/api/superuser/import-workflow/route.ts

@@ -7,6 +7,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { importWorkflowAsSuperuserContract } from '@/lib/api/contracts/workflows'
 import { parseRequest } from '@/lib/api/server'
 import { getSession } from '@/lib/auth'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { loadCopilotChatMessages } from '@/lib/mothership/chat/lifecycle'
 import { appendCopilotChatMessages } from '@/lib/mothership/chat/messages-store'
@@ -227,6 +228,9 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       copilotChatsImported,
     })
   } catch (error) {
+    if (error instanceof OrchestrationError && error.code === 'not_found') {
+      return NextResponse.json({ error: 'Target workspace not found' }, { status: 404 })
+    }
     logger.error('Error importing workflow', error)
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }

apps/sim/app/api/v1/admin/workflows/import/route.ts

@@ -28,6 +28,7 @@ import { and, eq, isNull } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { adminV1ImportWorkflowContract } from '@/lib/api/contracts/v1/admin'
 import { parseRequest } from '@/lib/api/server'
+import { OrchestrationError } from '@/lib/core/orchestration/types'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { parseWorkflowJson } from '@/lib/workflows/operations/import-export'
 import { buildNewWorkflowRow } from '@/lib/workflows/persistence/new-workflow-row'
@@ -182,6 +183,9 @@ export const POST = withRouteHandler(
 
       return NextResponse.json(response)
     } catch (error) {
+      if (error instanceof OrchestrationError && error.code === 'not_found') {
+        return notFoundResponse('Workspace')
+      }
       if (error instanceof FolderNotFoundError) {
         return badRequestResponse(error.message)
       }

apps/sim/lib/projects/__integration__/foundation.integration.ts

@@ -27,6 +27,7 @@ import { getErrorMessage, getPostgresErrorCode } from '@sim/utils/errors'
 import { sleep } from '@sim/utils/helpers'
 import { generateId } from '@sim/utils/id'
 import { and, eq, inArray, sql } from 'drizzle-orm'
+import { NextRequest } from 'next/server'
 import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest'
 import { removeUserFromOrganization } from '@/lib/billing/organizations/membership'
 import { prepareProjectsForAccountDeletion } from '@/lib/projects/account-deletion'
@@ -55,9 +56,14 @@ import { archiveWorkspace } from '@/lib/workspaces/lifecycle'
 import { detachOrganizationWorkspacesTx } from '@/lib/workspaces/organization-workspaces'
 import { getWorkspaceWithOwner } from '@/lib/workspaces/permissions/utils'
 import { getWorkspaceCreationPolicy } from '@/lib/workspaces/policy'
+import { POST as importAdminWorkflow } from '@/app/api/v1/admin/workflows/import/route'
 import { createFork } from '@/ee/workspace-forking/lib/create-fork'
 import { unlinkForkEdge } from '@/ee/workspace-forking/lib/lineage/unlink'
 
+vi.hoisted(() => {
+  process.env.ADMIN_API_KEY = 'project-fixture-admin-key'
+})
+
 beforeEach(() => {
   vi.stubEnv('PROJECT_API_ENABLED', 'true')
 })
@@ -842,6 +848,55 @@ describe('Project foundation at the database and application boundary', () => {
     }
   )
 
+  check(
+    'admin import returns not found when a concurrent archive wins the workspace lock',
+    async () => {
+      const f = await fixture(false, 1)
+      const held = createDeferred<number>()
+      const release = createDeferred<void>()
+      const archive = db.transaction(async (tx) => {
+        const [connection] = await tx.execute<{ pid: number }>(sql`SELECT pg_backend_pid() AS pid`)
+        await archiveProjectInTransaction(tx, f.projectId)
+        held.resolve(connection.pid)
+        await release.promise
+      })
+      const blocker = await held.promise
+      const imported = importAdminWorkflow(
+        new NextRequest('http://localhost:3000/api/v1/admin/workflows/import', {
+          method: 'POST',
+          headers: {
+            'content-type': 'application/json',
+            'x-admin-key': 'project-fixture-admin-key',
+          },
+          body: JSON.stringify({
+            workspaceId: f.ids[0],
+            workflow: { blocks: {}, edges: [], loops: {}, parallels: {} },
+          }),
+        }),
+        {}
+      )
+      try {
+        let waiting = false
+        for (let attempt = 0; attempt < 100; attempt++) {
+          const rows = await db.execute(
+            sql`SELECT 1 FROM pg_stat_activity WHERE ${blocker} = ANY(pg_blocking_pids(pid))`
+          )
+          if (rows.length) {
+            waiting = true
+            break
+          }
+          await sleep(10)
+        }
+        expect(waiting).toBe(true)
+      } finally {
+        release.resolve()
+        await archive
+      }
+      expect((await imported).status).toBe(404)
+      expect(await db.select().from(workflow).where(eq(workflow.workspaceId, f.ids[0]))).toEqual([])
+    }
+  )
+
   check('workflow restore cannot overtake a concurrent Project archive', async () => {
     const f = await fixture()
     const workflowId = await addWorkflow(f.ids[0], f.ownerId)