fix(security): address PR review — active-status guard, FOR UPDATE locks, workspaceId propagation

- credentials/members POST: add `current.status === 'active'` check to the
  last-admin demotion guard so re-inviting a revoked admin as a non-admin role
  no longer incorrectly hits the "Cannot demote the last admin" path
- credentials/members POST+DELETE: add `.for('update')` to the active-admin
  count SELECT inside both transactions to serialize concurrent demotions and
  eliminate the admin-count TOCTOU race under Postgres READ COMMITTED
- credentials/members POST: also lock the member row itself with `.for('update')`
  so the role+status read and the subsequent UPDATE are atomic
- mcp/copilot handleDirectToolCall: thread the DB-verified workspaceId from the
  authorization result into prepareExecutionContext instead of relying on
  user-supplied args
- oauth handler: fix error message to mention both workspaceId and userId when
  either is missing from the execution context

Author: waleedlatif1

apps/sim/app/api/credentials/[id]/members/route.ts

@@ -122,11 +122,12 @@ export const POST = withRouteHandler(async (request: NextRequest, context: Route
     if (existing) {
       const ok = await db.transaction(async (tx) => {
         const [current] = await tx
-          .select({ role: credentialMember.role })
+          .select({ role: credentialMember.role, status: credentialMember.status })
           .from(credentialMember)
           .where(eq(credentialMember.id, existing.id))
           .limit(1)
-        if (current?.role === 'admin' && role !== 'admin') {
+          .for('update')
+        if (current?.role === 'admin' && current?.status === 'active' && role !== 'admin') {
           const activeAdmins = await tx
             .select({ id: credentialMember.id })
             .from(credentialMember)
@@ -137,6 +138,7 @@ export const POST = withRouteHandler(async (request: NextRequest, context: Route
                 eq(credentialMember.status, 'active')
               )
             )
+            .for('update')
           if (activeAdmins.length <= 1) return false
         }
         await tx
@@ -219,6 +221,7 @@ export const DELETE = withRouteHandler(async (request: NextRequest, context: Rou
               eq(credentialMember.status, 'active')
             )
           )
+          .for('update')
 
         if (activeAdmins.length <= 1) {
           return false

apps/sim/app/api/mcp/copilot/route.ts

@@ -447,6 +447,7 @@ async function handleDirectToolCall(
 ): Promise<CallToolResult> {
   try {
     const rawWorkflowId = (args.workflowId as string) || ''
+    let resolvedWorkspaceId: string | undefined
     if (rawWorkflowId) {
       const authorization = await authorizeWorkflowByWorkspacePermission({
         workflowId: rawWorkflowId,
@@ -468,11 +469,13 @@ async function handleDirectToolCall(
           isError: true,
         }
       }
+      resolvedWorkspaceId = authorization.workflow?.workspaceId || undefined
     }
     const execContext = await prepareExecutionContext(
       userId,
       rawWorkflowId,
-      (args.chatId as string) || undefined
+      (args.chatId as string) || undefined,
+      { workspaceId: resolvedWorkspaceId }
     )
 
     const toolCall = {

apps/sim/lib/copilot/tools/handlers/oauth.ts

@@ -16,7 +16,7 @@ export async function executeOAuthGetAuthLink(
   const baseUrl = getBaseUrl()
   try {
     if (!context.workspaceId || !context.userId) {
-      throw new Error('workspaceId is required to generate an OAuth link')
+      throw new Error('workspaceId and userId are required to generate an OAuth link')
     }
     await ensureWorkspaceAccess(context.workspaceId, context.userId, 'write')
     const result = await generateOAuthLink(