improvement(admin): update defaults for better UX

[icecrasher321]

Summary

Admin routes dependent changes + perf improvements pass

Type of Change

• Other: Code cleanup + Perf improvments

Testing

N/A

Checklist

• Code follows project style guidelines
• Self-reviewed my changes
• Tests added/updated and passing
• No new warnings introduced
• I confirm that I have read and agree to the terms outlined in the Contributor License Agreement (CLA)

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment

Project	Deployment	Actions	Updated (UTC)
docs	Skipped		Jul 31, 2026 2:53am

[cursor]

PR Summary

High Risk
Touches concurrent org membership, invitation state, credential creation, billing webhooks, and admin workspace moves—incorrect locking or compensation could deny access, double-grant seats, or leave partial billing state.

Overview
Hardens organization membership and workspace lifecycle mutations against races by introducing a shared organization → user billing identity → membership lock sequence (acquireOrganizationUserMutationLocks) and re-reading authoritative context after locks before writing.

Credential creation now plans workspace context inside the transaction, acquires those locks, re-validates write access (403/409 if org or permissions changed), and seeds memberships from the locked context. Personal env credential sync runs in one transaction behind the same user-identity fence with chunked inserts/deletes.

Workspace creation replaces ad-hoc billing-identity checks with lockWorkspaceCreationContext aligned to transfer/removal fencing; invitation accept/update/reject/revoke paths claim invitation and workspace advisory locks, then authorize from protected re-reads (lockInvitationForMutation, revokeInvitationAsAdmin, updateInvitation). Direct workspace grants use the same ordering and revoke pending grants in-transaction instead of post-hoc cancel. Failed invitation emails compensate with expected updatedAt / organization id guards; outbox adds coalesced reschedule for pending events on the same subject.

Admin workspace moves accept optional expectedOwnerId; attachable personal workspace selection uses ownedAttachableWorkspacesWhere. Seat counting excludes pending invites whose email already belongs to any organization. External org access removal clears per-user usage caps in the removal transaction. Enterprise webhook retries when Stripe create races ahead of paused-collection provisioning.

Smaller changes: chunkArray centralized in @sim/utils/helpers; subscription reads can forUpdate in caller transactions; invitation acceptance maps unexpected transaction failures to server-error instead of leaking throws.

^{Reviewed by Cursor Bugbot for commit 1f26f7f. Configure here.}

[greptile-apps]

Greptile Summary

This PR strengthens transactional consistency across administrative workspace, invitation, credential, billing, and cleanup operations.

• Centralizes invitation updates, revocation, acceptance, and workspace-grant changes behind transactional helpers and coordinated locks.
• Adds owner validation and invitation, credential, storage-payer, permission, and outbox migration handling to administrative workspace moves.
• Reworks credential creation to re-authorize the caller after acquiring organization and user mutation locks.
• Introduces batched cleanup utilities and updates log, soft-delete, task, billing, and outbox cleanup paths.
• Consolidates workspace authorization and organization-membership behavior while expanding concurrency and rollback tests.

Confidence Score: 5/5

The PR appears safe to merge.

No blocking failure remains in the eligible follow-up review scope.

Important Files Changed

Filename	Overview
apps/sim/lib/invitations/core.ts	Centralizes invitation acceptance, updates, revocation, authorization, and concurrency control into transactional mutation flows.
apps/sim/lib/workspaces/admin-move.ts	Expands administrative workspace moves to coordinate ownership validation, invitation migration, storage billing, permissions, credentials, and outbox work.
apps/sim/app/api/credentials/route.ts	Re-authorizes credential creation under shared organization and user mutation locks before inserting credentials and memberships.
apps/sim/lib/billing/organizations/membership.ts	Adds shared organization-user locking and coordinates membership mutations with invitation and workspace state.
apps/sim/lib/cleanup/batch-delete.ts	Introduces reusable bounded batch-selection and deletion machinery used by the revised cleanup jobs.
apps/sim/lib/core/outbox/service.ts	Updates outbox processing and coalescing behavior to support deferred administrative and invitation side effects.

Sequence Diagram

sequenceDiagram
participant Admin as Admin/API caller
participant Service as Transactional service
participant Locks as Advisory and row locks
participant DB as PostgreSQL
participant Outbox as Outbox worker
Admin->>Service: Move workspace or mutate invitation
Service->>Locks: Acquire invitation/workspace/org locks
Locks-->>Service: Mutation scope serialized
Service->>DB: Re-read authoritative state
Service->>Service: Re-authorize and validate expected state
alt State remains valid
Service->>DB: Apply coordinated mutations
Service->>Outbox: Enqueue post-commit work
DB-->>Admin: Commit result
else State changed or authorization lost
Service-->>Admin: Conflict or forbidden response
end

Loading

_{Reviews (2): Last reviewed commit: "refactor: address review nits on the adm..." | Re-trigger Greptile}

[icecrasher321]

bugbot run

[icecrasher321]

@greptile

[icecrasher321]

bugbot run

[cursor]

✅ Bugbot reviewed your changes and found no new issues!

Comment @cursor review or bugbot run to trigger another review on this PR

^{Reviewed by Cursor Bugbot for commit 1f26f7f. Configure here.}