fix(admin): report member operation failures accurately

Author: icecrasher321

apps/sim/lib/admin/member-operation.test.ts

@@ -86,6 +86,7 @@ function payload(workspaceIds: string[]) {
       memberId: null,
       transferredFromOrganizationId: null,
       nextWorkspaceIndex: 0,
+      currentWorkspaceId: null,
     },
   }
 }
@@ -187,6 +188,7 @@ describe('durable admin member operation', () => {
         memberId: 'member-new',
         transferredFromOrganizationId: 'org-old',
         nextWorkspaceIndex: 2,
+        currentWorkspaceId: null,
       },
     })
   })
@@ -214,6 +216,92 @@ describe('durable admin member operation', () => {
         memberId: 'member-new',
         transferredFromOrganizationId: 'org-old',
         nextWorkspaceIndex: 10,
+        currentWorkspaceId: null,
+      },
+    })
+  })
+
+  it('checkpoints the active workspace before attempting its move', async () => {
+    queueTableRows(member, [{ id: 'member-new', role: 'member', organizationId: 'org-new' }])
+    mocks.moveWorkspace.mockRejectedValueOnce(new Error('Move failed'))
+    const checkpointPayload = vi.fn()
+
+    await expect(
+      processAdminMemberOperation(payload(['workspace-1']), {
+        eventId: 'operation-1',
+        eventType: 'admin.organization-member-operation',
+        attempts: 0,
+        checkpointPayload,
+      })
+    ).rejects.toThrow('Move failed')
+
+    expect(checkpointPayload).toHaveBeenLastCalledWith({
+      progress: {
+        memberId: 'member-new',
+        transferredFromOrganizationId: 'org-old',
+        nextWorkspaceIndex: 0,
+        currentWorkspaceId: 'workspace-1',
+      },
+    })
+  })
+
+  it('does not mislabel a membership failure as a workspace failure', async () => {
+    queueTableRows(outboxEvent, [
+      {
+        id: '1c38ca61-79d5-4d24-8094-c29cb52132ba',
+        eventType: 'admin.organization-member-operation',
+        payload: payload(['workspace-1', 'workspace-2']),
+        status: 'dead_letter',
+        lastError: 'Seat limit reached',
+        createdAt: new Date('2026-08-20T00:00:00.000Z'),
+      },
+    ])
+    queueTableRows(outboxEvent, [{ selected: 0, completed: 0, failed: 0 }])
+
+    await expect(
+      getAdminMemberOperation('org-new', '1c38ca61-79d5-4d24-8094-c29cb52132ba')
+    ).resolves.toMatchObject({
+      error: 'Seat limit reached',
+      workspaceMoves: {
+        selected: 2,
+        moved: 0,
+        pending: 2,
+        failedCount: 0,
+        failed: [],
+      },
+    })
+  })
+
+  it('separates the active failed workspace from still-pending workspaces', async () => {
+    queueTableRows(outboxEvent, [
+      {
+        id: '1c38ca61-79d5-4d24-8094-c29cb52132ba',
+        eventType: 'admin.organization-member-operation',
+        payload: {
+          ...payload(['workspace-1', 'workspace-2', 'workspace-3']),
+          progress: {
+            memberId: 'member-new',
+            transferredFromOrganizationId: 'org-old',
+            nextWorkspaceIndex: 1,
+            currentWorkspaceId: 'workspace-2',
+          },
+        },
+        status: 'dead_letter',
+        lastError: 'Move failed',
+        createdAt: new Date('2026-08-20T00:00:00.000Z'),
+      },
+    ])
+    queueTableRows(outboxEvent, [{ selected: 0, completed: 0, failed: 0 }])
+
+    await expect(
+      getAdminMemberOperation('org-new', '1c38ca61-79d5-4d24-8094-c29cb52132ba')
+    ).resolves.toMatchObject({
+      workspaceMoves: {
+        selected: 3,
+        moved: 1,
+        pending: 1,
+        failedCount: 1,
+        failed: [{ workspaceId: 'workspace-2', error: 'Move failed' }],
       },
     })
   })
@@ -229,6 +317,7 @@ describe('durable admin member operation', () => {
             memberId: 'member-new',
             transferredFromOrganizationId: 'org-old',
             nextWorkspaceIndex: 1,
+            currentWorkspaceId: null,
           },
         },
         status: 'completed',

apps/sim/lib/admin/member-operation.ts

@@ -55,6 +55,7 @@ const memberOperationProgressSchema = z
     memberId: z.string().min(1).nullable().default(null),
     transferredFromOrganizationId: z.string().min(1).nullable().default(null),
     nextWorkspaceIndex: z.number().int().min(0).default(0),
+    currentWorkspaceId: z.string().min(1).nullable().default(null),
   })
   .strict()
 
@@ -65,6 +66,7 @@ const memberOperationPayloadSchema = z
       memberId: null,
       transferredFromOrganizationId: null,
       nextWorkspaceIndex: 0,
+      currentWorkspaceId: null,
     }),
   })
   .strict()
@@ -198,11 +200,10 @@ async function toMemberOperationView(
   const payload = parseMemberOperationPayload(row.payload)
   const followUpJobs = await getMemberOperationFollowUpJobs(row.id, executor)
   const failed =
-    row.status === 'dead_letter' &&
-    payload.progress.nextWorkspaceIndex < payload.request.workspaceIds.length
+    row.status === 'dead_letter' && payload.progress.currentWorkspaceId
       ? [
           {
-            workspaceId: payload.request.workspaceIds[payload.progress.nextWorkspaceIndex],
+            workspaceId: payload.progress.currentWorkspaceId,
             error: row.lastError ?? 'Workspace move failed',
           },
         ]
@@ -220,7 +221,10 @@ async function toMemberOperationView(
     workspaceMoves: {
       selected: payload.request.workspaceIds.length,
       moved: payload.progress.nextWorkspaceIndex,
-      pending: payload.request.workspaceIds.length - payload.progress.nextWorkspaceIndex,
+      pending: Math.max(
+        0,
+        payload.request.workspaceIds.length - payload.progress.nextWorkspaceIndex - failed.length
+      ),
       failedCount: failed.length,
       failed,
     },
@@ -378,6 +382,7 @@ export async function startAdminMemberOperation(
         memberId: null,
         transferredFromOrganizationId: null,
         nextWorkspaceIndex: 0,
+        currentWorkspaceId: null,
       },
     }
     await enqueueOutboxEvent(tx, ADMIN_MEMBER_OPERATION_EVENT_TYPE, payload, {
@@ -643,8 +648,12 @@ export const processAdminMemberOperation: OutboxHandler<unknown> = async (rawPay
     nextWorkspaceIndex + MEMBER_OPERATION_WORKSPACE_BATCH_SIZE
   )
   while (nextWorkspaceIndex < batchEnd) {
+    const currentWorkspaceId = payload.request.workspaceIds[nextWorkspaceIndex]
+    await context.checkpointPayload({
+      progress: { ...progress, nextWorkspaceIndex, currentWorkspaceId },
+    })
     await moveWorkspaceToOrganization({
-      workspaceId: payload.request.workspaceIds[nextWorkspaceIndex],
+      workspaceId: currentWorkspaceId,
       destinationOrganizationId: payload.request.organizationId,
       adminEmail: payload.request.actor.email ?? ADMIN_API_AUDIT_EMAIL,
       auditActor: payload.request.actor,
@@ -654,7 +663,7 @@ export const processAdminMemberOperation: OutboxHandler<unknown> = async (rawPay
     })
     nextWorkspaceIndex += 1
     await context.checkpointPayload({
-      progress: { ...progress, nextWorkspaceIndex },
+      progress: { ...progress, nextWorkspaceIndex, currentWorkspaceId: null },
     })
   }