v0.5.79: longer MCP tools timeout, optimize loop/parallel regeneration, enrich.so integration

v0.5.78: billing fixes, mcp timeout increase, reactquery migrations, updated tool param visibilities, DSPy and Google Maps integrations
v0.5.77: room manager redis migration, tool outputs, ui fixes
2026-02-03 11:14:58 -05:00 · 2026-01-31 21:57:56 -08:00 · 2026-01-31 13:48:22 -08:00 · 2026-01-30 14:57:17 -08:00 · 2026-01-29 00:13:19 -08:00 · 2026-01-28 22:54:13 -08:00
22 changed files with 277 additions and 790 deletions
--- a/apps/sim/app/api/cron/cleanup-stale-executions/route.ts
+++ b/apps/sim/app/api/cron/cleanup-stale-executions/route.ts
@@ -8,7 +8,6 @@ import { verifyCronAuth } from '@/lib/auth/internal'
 const logger = createLogger('CleanupStaleExecutions')
 const STALE_THRESHOLD_MINUTES = 30
 const MAX_INT32 = 2_147_483_647
 export async function GET(request: NextRequest) {
  try {
@@ -46,14 +45,13 @@ export async function GET(request: NextRequest) {
      try {
        const staleDurationMs = Date.now() - new Date(execution.startedAt).getTime()
        const staleDurationMinutes = Math.round(staleDurationMs / 60000)
        const totalDurationMs = Math.min(staleDurationMs, MAX_INT32)
        await db
          .update(workflowExecutionLogs)
          .set({
            status: 'failed',
            endedAt: new Date(),
-            totalDurationMs,
+            totalDurationMs: staleDurationMs,
            executionData: sql`jsonb_set(
              COALESCE(execution_data, '{}'::jsonb),
              ARRAY['error'],
--- a/apps/sim/app/api/mcp/serve/[serverId]/route.ts
+++ b/apps/sim/app/api/mcp/serve/[serverId]/route.ts
@@ -284,7 +284,7 @@ async function handleToolsCall(
      content: [
        { type: 'text', text: JSON.stringify(executeResult.output || executeResult, null, 2) },
      ],
-      isError: executeResult.success === false,
+      isError: !executeResult.success,
    }
    return NextResponse.json(createResponse(id, result))
--- a/apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts
+++ b/apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts
@@ -20,7 +20,6 @@ import { z } from 'zod'
 import { getEmailSubject, renderInvitationEmail } from '@/components/emails'
 import { getSession } from '@/lib/auth'
 import { hasAccessControlAccess } from '@/lib/billing'
 import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
@@ -502,18 +501,6 @@ export async function PUT(
      }
    }
    if (status === 'accepted') {
      try {
        await syncUsageLimitsFromSubscription(session.user.id)
      } catch (syncError) {
        logger.error('Failed to sync usage limits after joining org', {
          userId: session.user.id,
          organizationId,
          error: syncError,
        })
      }
    }
    logger.info(`Organization invitation ${status}`, {
      organizationId,
      invitationId,
--- a/apps/sim/app/api/users/me/subscription/[id]/transfer/route.ts
+++ b/apps/sim/app/api/users/me/subscription/[id]/transfer/route.ts
@@ -5,7 +5,6 @@ import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { hasActiveSubscription } from '@/lib/billing'
 const logger = createLogger('SubscriptionTransferAPI')
@@ -89,14 +88,6 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
      )
    }
    // Check if org already has an active subscription (prevent duplicates)
    if (await hasActiveSubscription(organizationId)) {
      return NextResponse.json(
        { error: 'Organization already has an active subscription' },
        { status: 409 }
      )
    }
    await db
      .update(subscription)
      .set({ referenceId: organizationId })
--- a/apps/sim/app/api/v1/admin/users/[id]/billing/route.ts
+++ b/apps/sim/app/api/v1/admin/users/[id]/billing/route.ts
@@ -203,10 +203,6 @@ export const PATCH = withAdminAuthParams<RouteParams>(async (request, context) =
      }
      updateData.billingBlocked = body.billingBlocked
      // Clear the reason when unblocking
      if (body.billingBlocked === false) {
        updateData.billingBlockedReason = null
      }
      updated.push('billingBlocked')
    }
--- a/apps/sim/app/api/workflows/[id]/execute-from-block/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute-from-block/route.ts
@@ -1,4 +1,6 @@
 import { db, workflow as workflowTable } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
@@ -6,7 +8,6 @@ import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { SSE_HEADERS } from '@/lib/core/utils/sse'
 import { markExecutionCancelled } from '@/lib/execution/cancellation'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
 import { createSSECallbacks } from '@/lib/workflows/executor/execution-events'
@@ -74,31 +75,12 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
    const { startBlockId, sourceSnapshot, input } = validation.data
    const executionId = uuidv4()
-    // Run preprocessing checks (billing, rate limits, usage limits)
+    const [workflowRecord] = await db
-    const preprocessResult = await preprocessExecution({
+      .select({ workspaceId: workflowTable.workspaceId, userId: workflowTable.userId })
-      workflowId,
+      .from(workflowTable)
-      userId,
+      .where(eq(workflowTable.id, workflowId))
-      triggerType: 'manual',
+      .limit(1)
      executionId,
      requestId,
      checkRateLimit: false, // Manual executions don't rate limit
      checkDeployment: false, // Run-from-block doesn't require deployment
    })
    if (!preprocessResult.success) {
      const { error } = preprocessResult
      logger.warn(`[${requestId}] Preprocessing failed for run-from-block`, {
        workflowId,
        error: error?.message,
        statusCode: error?.statusCode,
      })
      return NextResponse.json(
        { error: error?.message || 'Execution blocked' },
        { status: error?.statusCode || 500 }
      )
    }
    const workflowRecord = preprocessResult.workflowRecord
    if (!workflowRecord?.workspaceId) {
      return NextResponse.json({ error: 'Workflow not found or has no workspace' }, { status: 404 })
    }
@@ -110,7 +92,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
      workflowId,
      startBlockId,
      executedBlocksCount: sourceSnapshot.executedBlocks.length,
      billingActorUserId: preprocessResult.actorUserId,
    })
    const loggingSession = new LoggingSession(workflowId, executionId, 'manual', requestId)
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -1,7 +1,7 @@
 import type React from 'react'
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { ChevronRight, Loader2, ServerIcon, WrenchIcon, XIcon } from 'lucide-react'
+import { Loader2, WrenchIcon, XIcon } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import {
  Badge,
@@ -111,33 +111,18 @@ interface ToolInputProps {
 * Represents a tool selected and configured in the workflow
 *
 * @remarks
 * Valid types include:
 * - Standard block types (e.g., 'api', 'search', 'function')
 * - 'custom-tool': User-defined tools with custom code
 * - 'mcp': Individual MCP tool from a connected server
 * - 'mcp-server': All tools from an MCP server (agent discovery mode).
 *   At execution time, this expands into individual tool definitions for
 *   all tools available on the server.
 *
 * For custom tools (new format), we only store: type, customToolId, usageControl, isExpanded.
 * Everything else (title, schema, code) is loaded dynamically from the database.
 * Legacy custom tools with inline schema/code are still supported for backwards compatibility.
 */
 interface StoredTool {
-  /**
+  /** Block type identifier */
   * Block type identifier.
   * 'mcp-server' enables server-level selection where all tools from
   * the server are made available to the LLM at execution time.
   */
  type: string
  /** Display title for the tool (optional for new custom tool format) */
  title?: string
  /** Direct tool ID for execution (optional for new custom tool format) */
  toolId?: string
-  /**
+  /** Parameter values configured by the user (optional for new custom tool format) */
   * Parameter values configured by the user.
   * For 'mcp-server' type, includes: serverId, serverUrl, serverName, toolCount
   */
  params?: Record<string, string>
  /** Whether the tool details are expanded in UI */
  isExpanded?: boolean
@@ -1022,7 +1007,6 @@ export const ToolInput = memo(function ToolInput({
  const [draggedIndex, setDraggedIndex] = useState<number | null>(null)
  const [dragOverIndex, setDragOverIndex] = useState<number | null>(null)
  const [usageControlPopoverIndex, setUsageControlPopoverIndex] = useState<number | null>(null)
  const [expandedMcpServers, setExpandedMcpServers] = useState<Set<string>>(new Set())
  const value = isPreview ? previewValue : storeValue
@@ -1252,18 +1236,6 @@ export const ToolInput = memo(function ToolInput({
    return selectedTools.some((tool) => tool.type === 'mcp' && tool.toolId === mcpToolId)
  }
  /**
   * Checks if an MCP server is already selected (all tools mode).
   *
   * @param serverId - The MCP server identifier to check
   * @returns `true` if the MCP server is already selected
   */
  const isMcpServerAlreadySelected = (serverId: string): boolean => {
    return selectedTools.some(
      (tool) => tool.type === 'mcp-server' && tool.params?.serverId === serverId
    )
  }
  /**
   * Checks if a custom tool is already selected.
   *
@@ -1288,37 +1260,6 @@ export const ToolInput = memo(function ToolInput({
    )
  }
  /**
   * Groups MCP tools by their parent server.
   *
   * @returns Map of serverId to array of tools
   */
  const mcpToolsByServer = useMemo(() => {
    const grouped = new Map<string, typeof availableMcpTools>()
    for (const tool of availableMcpTools) {
      if (!grouped.has(tool.serverId)) {
        grouped.set(tool.serverId, [])
      }
      grouped.get(tool.serverId)!.push(tool)
    }
    return grouped
  }, [availableMcpTools])
  /**
   * Toggles the expanded state of an MCP server in the dropdown.
   */
  const toggleMcpServerExpanded = useCallback((serverId: string) => {
    setExpandedMcpServers((prev) => {
      const next = new Set(prev)
      if (next.has(serverId)) {
        next.delete(serverId)
      } else {
        next.add(serverId)
      }
      return next
    })
  }, [])
  /**
   * Checks if a block supports multiple operations.
   *
@@ -1864,95 +1805,17 @@ export const ToolInput = memo(function ToolInput({
      })
    }
-    // MCP Servers section - grouped by server with expandable folders
+    // MCP Tools section
-    if (!permissionConfig.disableMcpTools && mcpToolsByServer.size > 0) {
+    if (!permissionConfig.disableMcpTools && availableMcpTools.length > 0) {
-      // Create items for each server (as expandable folders)
+      groups.push({
-      const serverItems: ComboboxOption[] = []
+        section: 'MCP Tools',
-
+        items: availableMcpTools.map((mcpTool) => {
-      for (const [serverId, tools] of mcpToolsByServer) {
+          const server = mcpServers.find((s) => s.id === mcpTool.serverId)
-        const server = mcpServers.find((s) => s.id === serverId)
+          const alreadySelected = isMcpToolAlreadySelected(mcpTool.id)
-        const serverName = tools[0]?.serverName || server?.name || 'Unknown Server'
+          return {
        const isExpanded = expandedMcpServers.has(serverId)
        const serverAlreadySelected = isMcpServerAlreadySelected(serverId)
        const toolCount = tools.length
        // Server folder header (clickable to expand/collapse)
        serverItems.push({
          label: serverName,
          value: `mcp-server-folder-${serverId}`,
          iconElement: (
            <div className='flex items-center gap-[4px]'>
              <ChevronRight
                className={cn(
                  'h-[12px] w-[12px] text-[var(--text-tertiary)] transition-transform',
                  isExpanded && 'rotate-90'
                )}
              />
              <div
                className='flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center rounded-[4px]'
                style={{ background: '#6366F1' }}
              >
                <ServerIcon className='h-[10px] w-[10px] text-white' />
              </div>
            </div>
          ),
          onSelect: () => {
            toggleMcpServerExpanded(serverId)
          },
          disabled: false,
          keepOpen: true, // Keep dropdown open when toggling folder expansion
        })
        // If expanded, show "Use all tools" option and individual tools
        if (isExpanded) {
          // "Use all tools from server" option
          serverItems.push({
            label: `Use all ${toolCount} tools`,
            value: `mcp-server-all-${serverId}`,
            iconElement: (
              <div className='ml-[20px] flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center rounded-[4px] bg-[#6366F1]'>
                <McpIcon className='h-[10px] w-[10px] text-white' />
              </div>
            ),
            onSelect: () => {
              if (serverAlreadySelected) return
              // Remove any individual tools from this server that were previously selected
              const filteredTools = selectedTools.filter(
                (tool) => !(tool.type === 'mcp' && tool.params?.serverId === serverId)
              )
              const newTool: StoredTool = {
                type: 'mcp-server',
                title: `${serverName} (all tools)`,
                toolId: `mcp-server-${serverId}`,
                params: {
                  serverId,
                  ...(server?.url && { serverUrl: server.url }),
                  serverName,
                  toolCount: String(toolCount),
                },
                isExpanded: false,
                usageControl: 'auto',
              }
              setStoreValue([
                ...filteredTools.map((tool) => ({ ...tool, isExpanded: false })),
                newTool,
              ])
              setOpen(false)
            },
            disabled: isPreview || disabled || serverAlreadySelected,
          })
          // Individual tools from this server
          for (const mcpTool of tools) {
            const alreadySelected = isMcpToolAlreadySelected(mcpTool.id) || serverAlreadySelected
            serverItems.push({
            label: mcpTool.name,
            value: `mcp-${mcpTool.id}`,
-              iconElement: (
+            iconElement: createToolIcon(mcpTool.bgColor || '#6366F1', mcpTool.icon || McpIcon),
                <div className='ml-[20px]'>
                  {createToolIcon(mcpTool.bgColor || '#6366F1', mcpTool.icon || McpIcon)}
                </div>
              ),
            onSelect: () => {
              if (alreadySelected) return
              const newTool: StoredTool = {
@@ -1975,14 +1838,8 @@ export const ToolInput = memo(function ToolInput({
              handleMcpToolSelect(newTool, true)
            },
            disabled: isPreview || disabled || alreadySelected,
            })
          }
-        }
+        }),
      }
      groups.push({
        section: 'MCP Servers',
        items: serverItems,
      })
    }
@@ -2065,8 +1922,6 @@ export const ToolInput = memo(function ToolInput({
    customTools,
    availableMcpTools,
    mcpServers,
    mcpToolsByServer,
    expandedMcpServers,
    toolBlocks,
    isPreview,
    disabled,
@@ -2080,10 +1935,8 @@ export const ToolInput = memo(function ToolInput({
    getToolIdForOperation,
    isToolAlreadySelected,
    isMcpToolAlreadySelected,
    isMcpServerAlreadySelected,
    isCustomToolAlreadySelected,
    isWorkflowAlreadySelected,
    toggleMcpServerExpanded,
  ])
  const toolRequiresOAuth = (toolId: string): boolean => {
@@ -2510,25 +2363,24 @@ export const ToolInput = memo(function ToolInput({
      {/* Selected Tools List */}
      {selectedTools.length > 0 &&
        selectedTools.map((tool, toolIndex) => {
-          // Handle custom tools, MCP tools, MCP servers, and workflow tools differently
+          // Handle custom tools, MCP tools, and workflow tools differently
          const isCustomTool = tool.type === 'custom-tool'
          const isMcpTool = tool.type === 'mcp'
          const isMcpServer = tool.type === 'mcp-server'
          const isWorkflowTool = tool.type === 'workflow'
          const toolBlock =
-            !isCustomTool && !isMcpTool && !isMcpServer
+            !isCustomTool && !isMcpTool
              ? toolBlocks.find((block) => block.type === tool.type)
              : null
          // Get the current tool ID (may change based on operation)
          const currentToolId =
-            !isCustomTool && !isMcpTool && !isMcpServer
+            !isCustomTool && !isMcpTool
              ? getToolIdForOperation(tool.type, tool.operation) || tool.toolId || ''
              : tool.toolId || ''
          // Get tool parameters using the new utility with block type for UI components
          const toolParams =
-            !isCustomTool && !isMcpTool && !isMcpServer && currentToolId
+            !isCustomTool && !isMcpTool && currentToolId
              ? getToolParametersConfig(currentToolId, tool.type, {
                  operation: tool.operation,
                  ...tool.params,
@@ -2597,32 +2449,21 @@ export const ToolInput = memo(function ToolInput({
            ? customToolParams
            : isMcpTool
              ? mcpToolParams
              : isMcpServer
                ? [] // MCP servers have no user-configurable params
              : toolParams?.userInputParameters || []
          // Check if tool requires OAuth
          const requiresOAuth =
-            !isCustomTool &&
+            !isCustomTool && !isMcpTool && currentToolId && toolRequiresOAuth(currentToolId)
            !isMcpTool &&
            !isMcpServer &&
            currentToolId &&
            toolRequiresOAuth(currentToolId)
          const oauthConfig =
-            !isCustomTool && !isMcpTool && !isMcpServer && currentToolId
+            !isCustomTool && !isMcpTool && currentToolId ? getToolOAuthConfig(currentToolId) : null
              ? getToolOAuthConfig(currentToolId)
              : null
          // Determine if tool has expandable body content
-          const hasOperations =
+          const hasOperations = !isCustomTool && !isMcpTool && hasMultipleOperations(tool.type)
            !isCustomTool && !isMcpTool && !isMcpServer && hasMultipleOperations(tool.type)
          const filteredDisplayParams = displayParams.filter((param) =>
            evaluateParameterCondition(param, tool)
          )
-          // MCP servers are expandable to show tool list
+          const hasToolBody =
-          const hasToolBody = isMcpServer
+            hasOperations || (requiresOAuth && oauthConfig) || filteredDisplayParams.length > 0
            ? true
            : hasOperations || (requiresOAuth && oauthConfig) || filteredDisplayParams.length > 0
          // Only show expansion if tool has body content
          const isExpandedForDisplay = hasToolBody
@@ -2631,11 +2472,6 @@ export const ToolInput = memo(function ToolInput({
              : !!tool.isExpanded
            : false
          // For MCP servers, get the list of tools for display
          const mcpServerTools = isMcpServer
            ? availableMcpTools.filter((t) => t.serverId === tool.params?.serverId)
            : []
          return (
            <div
              key={`${tool.customToolId || tool.toolId || toolIndex}-${toolIndex}`}
@@ -2672,7 +2508,7 @@ export const ToolInput = memo(function ToolInput({
                    style={{
                      backgroundColor: isCustomTool
                        ? '#3B82F6'
-                        : isMcpTool || isMcpServer
+                        : isMcpTool
                          ? mcpTool?.bgColor || '#6366F1'
                          : isWorkflowTool
                            ? '#6366F1'
@@ -2683,8 +2519,6 @@ export const ToolInput = memo(function ToolInput({
                      <WrenchIcon className='h-[10px] w-[10px] text-white' />
                    ) : isMcpTool ? (
                      <IconComponent icon={McpIcon} className='h-[10px] w-[10px] text-white' />
                    ) : isMcpServer ? (
                      <ServerIcon className='h-[10px] w-[10px] text-white' />
                    ) : isWorkflowTool ? (
                      <IconComponent icon={WorkflowIcon} className='h-[10px] w-[10px] text-white' />
                    ) : (
@@ -2697,11 +2531,6 @@ export const ToolInput = memo(function ToolInput({
                  <span className='truncate font-medium text-[13px] text-[var(--text-primary)]'>
                    {isCustomTool ? customToolTitle : tool.title}
                  </span>
                  {isMcpServer && (
                    <Badge variant='default' size='sm'>
                      {tool.params?.toolCount || mcpServerTools.length} tools
                    </Badge>
                  )}
                  {isMcpTool &&
                    !mcpDataLoading &&
                    (() => {
@@ -2807,30 +2636,8 @@ export const ToolInput = memo(function ToolInput({
              {!isCustomTool && isExpandedForDisplay && (
                <div className='flex flex-col gap-[10px] overflow-visible rounded-b-[4px] border-[var(--border-1)] border-t px-[8px] py-[8px]'>
                  {/* MCP Server tool list (read-only) */}
                  {isMcpServer && mcpServerTools.length > 0 && (
                    <div className='flex flex-col gap-[4px]'>
                      <div className='font-medium text-[12px] text-[var(--text-tertiary)]'>
                        Available tools:
                      </div>
                      <div className='flex flex-wrap gap-[4px]'>
                        {mcpServerTools.map((serverTool) => (
                          <Badge
                            key={serverTool.id}
                            variant='outline'
                            size='sm'
                            className='text-[11px]'
                          >
                            {serverTool.name}
                          </Badge>
                        ))}
                      </div>
                    </div>
                  )}
                  {/* Operation dropdown for tools with multiple operations */}
-                  {!isMcpServer &&
+                  {(() => {
                    (() => {
                    const hasOperations = hasMultipleOperations(tool.type)
                    const operationOptions = hasOperations ? getOperationOptions(tool.type) : []
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
@@ -50,12 +50,6 @@ import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 /** Stable empty object to avoid creating new references */
 const EMPTY_SUBBLOCK_VALUES = {} as Record<string, any>
 /** Shared style for dashed divider lines */
 const DASHED_DIVIDER_STYLE = {
  backgroundImage:
    'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
 } as const
 /**
 * Icon component for rendering block icons.
 *
@@ -95,23 +89,31 @@ export function Editor() {
  const blockConfig = currentBlock ? getBlock(currentBlock.type) : null
  const title = currentBlock?.name || 'Editor'
  // Check if selected block is a subflow (loop or parallel)
  const isSubflow =
    currentBlock && (currentBlock.type === 'loop' || currentBlock.type === 'parallel')
  // Get subflow display properties from configs
  const subflowConfig = isSubflow ? (currentBlock.type === 'loop' ? LoopTool : ParallelTool) : null
  // Check if selected block is a workflow block
  const isWorkflowBlock =
    currentBlock && (currentBlock.type === 'workflow' || currentBlock.type === 'workflow_input')
  // Get workspace ID from params
  const params = useParams()
  const workspaceId = params.workspaceId as string
  // Refs for resize functionality
  const subBlocksRef = useRef<HTMLDivElement>(null)
  // Get user permissions
  const userPermissions = useUserPermissionsContext()
  // Get active workflow ID
  const activeWorkflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
  // Get block properties (advanced/trigger modes)
  const { advancedMode, triggerMode } = useEditorBlockProperties(
    currentBlockId,
    currentWorkflow.isSnapshotView
@@ -143,9 +145,10 @@ export function Editor() {
    [subBlocksForCanonical]
  )
  const canonicalModeOverrides = currentBlock?.data?.canonicalModes
-  const advancedValuesPresent = useMemo(
+  const advancedValuesPresent = hasAdvancedValues(
-    () => hasAdvancedValues(subBlocksForCanonical, blockSubBlockValues, canonicalIndex),
+    subBlocksForCanonical,
-    [subBlocksForCanonical, blockSubBlockValues, canonicalIndex]
+    blockSubBlockValues,
    canonicalIndex
  )
  const displayAdvancedOptions = userPermissions.canEdit
    ? advancedMode
@@ -153,9 +156,11 @@ export function Editor() {
  const hasAdvancedOnlyFields = useMemo(() => {
    for (const subBlock of subBlocksForCanonical) {
      // Must be standalone advanced (mode: 'advanced' without canonicalParamId)
      if (subBlock.mode !== 'advanced') continue
      if (canonicalIndex.canonicalIdBySubBlockId[subBlock.id]) continue
      // Check condition - skip if condition not met for current values
      if (
        subBlock.condition &&
        !evaluateSubBlockCondition(subBlock.condition, blockSubBlockValues)
@@ -168,6 +173,7 @@ export function Editor() {
    return false
  }, [subBlocksForCanonical, canonicalIndex.canonicalIdBySubBlockId, blockSubBlockValues])
  // Get subblock layout using custom hook
  const { subBlocks, stateToUse: subBlockState } = useEditorSubblockLayout(
    blockConfig || ({} as any),
    currentBlockId || '',
@@ -200,34 +206,31 @@ export function Editor() {
    return { regularSubBlocks: regular, advancedOnlySubBlocks: advancedOnly }
  }, [subBlocks, canonicalIndex.canonicalIdBySubBlockId])
  // Get block connections
  const { incomingConnections, hasIncomingConnections } = useBlockConnections(currentBlockId || '')
  // Connections resize hook
  const { handleMouseDown: handleConnectionsResizeMouseDown, isResizing } = useConnectionsResize({
    subBlocksRef,
  })
  // Collaborative actions
  const {
    collaborativeSetBlockCanonicalMode,
    collaborativeUpdateBlockName,
    collaborativeToggleBlockAdvancedMode,
  } = useCollaborativeWorkflow()
  // Advanced mode toggle handler
  const handleToggleAdvancedMode = useCallback(() => {
    if (!currentBlockId || !userPermissions.canEdit) return
    collaborativeToggleBlockAdvancedMode(currentBlockId)
  }, [currentBlockId, userPermissions.canEdit, collaborativeToggleBlockAdvancedMode])
  // Rename state
  const [isRenaming, setIsRenaming] = useState(false)
  const [editedName, setEditedName] = useState('')
-
+  const nameInputRef = useRef<HTMLInputElement>(null)
  /**
   * Ref callback that auto-selects the input text when mounted.
   */
  const nameInputRefCallback = useCallback((element: HTMLInputElement | null) => {
    if (element) {
      element.select()
    }
  }, [])
  /**
   * Handles starting the rename process.
@@ -248,6 +251,7 @@ export function Editor() {
    if (trimmedName && trimmedName !== currentBlock?.name) {
      const result = collaborativeUpdateBlockName(currentBlockId, trimmedName)
      if (!result.success) {
        // Keep rename mode open on error so user can correct the name
        return
      }
    }
@@ -262,6 +266,14 @@ export function Editor() {
    setEditedName('')
  }, [])
  // Focus input when entering rename mode
  useEffect(() => {
    if (isRenaming && nameInputRef.current) {
      nameInputRef.current.select()
    }
  }, [isRenaming])
  // Trigger rename mode when signaled from context menu
  useEffect(() => {
    if (shouldFocusRename && currentBlock) {
      handleStartRename()
@@ -272,13 +284,17 @@ export function Editor() {
  /**
   * Handles opening documentation link in a new secure tab.
   */
-  const handleOpenDocs = useCallback(() => {
+  const handleOpenDocs = () => {
    const docsLink = isSubflow ? subflowConfig?.docsLink : blockConfig?.docsLink
-    window.open(docsLink || 'https://docs.sim.ai/quick-reference', '_blank', 'noopener,noreferrer')
+    if (docsLink) {
-  }, [isSubflow, subflowConfig?.docsLink, blockConfig?.docsLink])
+      window.open(docsLink, '_blank', 'noopener,noreferrer')
    }
  }
  // Get child workflow ID for workflow blocks
  const childWorkflowId = isWorkflowBlock ? blockSubBlockValues?.workflowId : null
  // Fetch child workflow state for preview (only for workflow blocks with a selected workflow)
  const { data: childWorkflowState, isLoading: isLoadingChildWorkflow } =
    useWorkflowState(childWorkflowId)
@@ -291,6 +307,7 @@ export function Editor() {
    }
  }, [childWorkflowId, workspaceId])
  // Determine if connections are at minimum height (collapsed state)
  const isConnectionsAtMinHeight = connectionsHeight <= 35
  return (
@@ -311,7 +328,7 @@ export function Editor() {
          )}
          {isRenaming ? (
            <input
-              ref={nameInputRefCallback}
+              ref={nameInputRef}
              type='text'
              value={editedName}
              onChange={(e) => setEditedName(e.target.value)}
@@ -382,6 +399,7 @@ export function Editor() {
              </Tooltip.Content>
            </Tooltip.Root>
          )} */}
          {currentBlock && (isSubflow ? subflowConfig?.docsLink : blockConfig?.docsLink) && (
            <Tooltip.Root>
              <Tooltip.Trigger asChild>
                <Button
@@ -397,6 +415,7 @@ export function Editor() {
                <p>Open docs</p>
              </Tooltip.Content>
            </Tooltip.Root>
          )}
        </div>
      </div>
@@ -476,7 +495,13 @@ export function Editor() {
                    </div>
                  </div>
                  <div className='subblock-divider px-[2px] pt-[16px] pb-[13px]'>
-                    <div className='h-[1.25px]' style={DASHED_DIVIDER_STYLE} />
+                    <div
                      className='h-[1.25px]'
                      style={{
                        backgroundImage:
                          'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
                      }}
                    />
                  </div>
                </>
              )}
@@ -541,7 +566,13 @@ export function Editor() {
                        />
                        {showDivider && (
                          <div className='subblock-divider px-[2px] pt-[16px] pb-[13px]'>
-                            <div className='h-[1.25px]' style={DASHED_DIVIDER_STYLE} />
+                            <div
                              className='h-[1.25px]'
                              style={{
                                backgroundImage:
                                  'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
                              }}
                            />
                          </div>
                        )}
                      </div>
@@ -550,7 +581,13 @@ export function Editor() {
                  {hasAdvancedOnlyFields && userPermissions.canEdit && (
                    <div className='flex items-center gap-[10px] px-[2px] pt-[14px] pb-[12px]'>
-                      <div className='h-[1.25px] flex-1' style={DASHED_DIVIDER_STYLE} />
+                      <div
                        className='h-[1.25px] flex-1'
                        style={{
                          backgroundImage:
                            'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
                        }}
                      />
                      <button
                        type='button'
                        onClick={handleToggleAdvancedMode}
@@ -563,7 +600,13 @@ export function Editor() {
                          className={`h-[14px] w-[14px] transition-transform duration-200 ${displayAdvancedOptions ? 'rotate-180' : ''}`}
                        />
                      </button>
-                      <div className='h-[1.25px] flex-1' style={DASHED_DIVIDER_STYLE} />
+                      <div
                        className='h-[1.25px] flex-1'
                        style={{
                          backgroundImage:
                            'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
                        }}
                      />
                    </div>
                  )}
@@ -587,7 +630,13 @@ export function Editor() {
                        />
                        {index < advancedOnlySubBlocks.length - 1 && (
                          <div className='subblock-divider px-[2px] pt-[16px] pb-[13px]'>
-                            <div className='h-[1.25px]' style={DASHED_DIVIDER_STYLE} />
+                            <div
                              className='h-[1.25px]'
                              style={{
                                backgroundImage:
                                  'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
                              }}
                            />
                          </div>
                        )}
                      </div>
--- a/apps/sim/components/emcn/components/combobox/combobox.tsx
+++ b/apps/sim/components/emcn/components/combobox/combobox.tsx
@@ -52,8 +52,6 @@ export type ComboboxOption = {
  onSelect?: () => void
  /** Whether this option is disabled */
  disabled?: boolean
  /** When true, keep the dropdown open after selecting this option */
  keepOpen?: boolean
 }
 /**
@@ -254,15 +252,13 @@ const Combobox = memo(
       * Handles selection of an option
       */
      const handleSelect = useCallback(
-        (selectedValue: string, customOnSelect?: () => void, keepOpen?: boolean) => {
+        (selectedValue: string, customOnSelect?: () => void) => {
          // If option has custom onSelect, use it instead
          if (customOnSelect) {
            customOnSelect()
            if (!keepOpen) {
            setOpen(false)
            setHighlightedIndex(-1)
            setSearchQuery('')
            }
            return
          }
@@ -274,7 +270,6 @@ const Combobox = memo(
            onMultiSelectChange(newValues)
          } else {
            onChange?.(selectedValue)
            if (!keepOpen) {
            setOpen(false)
            setHighlightedIndex(-1)
            setSearchQuery('')
@@ -282,7 +277,6 @@ const Combobox = memo(
              inputRef.current.blur()
            }
          }
          }
        },
        [onChange, multiSelect, onMultiSelectChange, multiSelectValues, editable, inputRef]
      )
@@ -349,7 +343,7 @@ const Combobox = memo(
              e.preventDefault()
              const selectedOption = filteredOptions[highlightedIndex]
              if (selectedOption && !selectedOption.disabled) {
-                handleSelect(selectedOption.value, selectedOption.onSelect, selectedOption.keepOpen)
+                handleSelect(selectedOption.value, selectedOption.onSelect)
              }
            } else if (!editable) {
              e.preventDefault()
@@ -674,7 +668,7 @@ const Combobox = memo(
                                  e.preventDefault()
                                  e.stopPropagation()
                                  if (!option.disabled) {
-                                    handleSelect(option.value, option.onSelect, option.keepOpen)
+                                    handleSelect(option.value, option.onSelect)
                                  }
                                }}
                                onMouseEnter={() =>
@@ -749,7 +743,7 @@ const Combobox = memo(
                              e.preventDefault()
                              e.stopPropagation()
                              if (!option.disabled) {
-                                handleSelect(option.value, option.onSelect, option.keepOpen)
+                                handleSelect(option.value, option.onSelect)
                              }
                            }}
                            onMouseEnter={() => !option.disabled && setHighlightedIndex(index)}
--- a/apps/sim/executor/handlers/agent/agent-handler.ts
+++ b/apps/sim/executor/handlers/agent/agent-handler.ts
@@ -143,7 +143,7 @@ export class AgentBlockHandler implements BlockHandler {
  private async validateToolPermissions(ctx: ExecutionContext, tools: ToolInput[]): Promise<void> {
    if (!Array.isArray(tools) || tools.length === 0) return
-    const hasMcpTools = tools.some((t) => t.type === 'mcp' || t.type === 'mcp-server')
+    const hasMcpTools = tools.some((t) => t.type === 'mcp')
    const hasCustomTools = tools.some((t) => t.type === 'custom-tool')
    if (hasMcpTools) {
@@ -161,7 +161,7 @@ export class AgentBlockHandler implements BlockHandler {
  ): Promise<ToolInput[]> {
    if (!Array.isArray(tools) || tools.length === 0) return tools
-    const mcpTools = tools.filter((t) => t.type === 'mcp' || t.type === 'mcp-server')
+    const mcpTools = tools.filter((t) => t.type === 'mcp')
    if (mcpTools.length === 0) return tools
    const serverIds = [...new Set(mcpTools.map((t) => t.params?.serverId).filter(Boolean))]
@@ -195,7 +195,7 @@ export class AgentBlockHandler implements BlockHandler {
    }
    return tools.filter((tool) => {
-      if (tool.type !== 'mcp' && tool.type !== 'mcp-server') return true
+      if (tool.type !== 'mcp') return true
      const serverId = tool.params?.serverId
      if (!serverId) return false
      return availableServerIds.has(serverId)
@@ -211,14 +211,11 @@ export class AgentBlockHandler implements BlockHandler {
    })
    const mcpTools: ToolInput[] = []
    const mcpServers: ToolInput[] = []
    const otherTools: ToolInput[] = []
    for (const tool of filtered) {
      if (tool.type === 'mcp') {
        mcpTools.push(tool)
      } else if (tool.type === 'mcp-server') {
        mcpServers.push(tool)
      } else {
        otherTools.push(tool)
      }
@@ -227,12 +224,7 @@ export class AgentBlockHandler implements BlockHandler {
    const otherResults = await Promise.all(
      otherTools.map(async (tool) => {
        try {
-          if (
+          if (tool.type && tool.type !== 'custom-tool' && tool.type !== 'mcp') {
            tool.type &&
            tool.type !== 'custom-tool' &&
            tool.type !== 'mcp' &&
            tool.type !== 'mcp-server'
          ) {
            await validateBlockType(ctx.userId, tool.type, ctx)
          }
          if (tool.type === 'custom-tool' && (tool.schema || tool.customToolId)) {
@@ -248,133 +240,12 @@ export class AgentBlockHandler implements BlockHandler {
    const mcpResults = await this.processMcpToolsBatched(ctx, mcpTools)
-    // Process MCP servers (all tools from server mode)
+    const allTools = [...otherResults, ...mcpResults]
    const mcpServerResults = await this.processMcpServerSelections(ctx, mcpServers)
    const allTools = [...otherResults, ...mcpResults, ...mcpServerResults]
    return allTools.filter(
      (tool): tool is NonNullable<typeof tool> => tool !== null && tool !== undefined
    )
  }
  /**
   * Process MCP server selections by discovering and formatting all tools from each server.
   * This enables "agent discovery" mode where the LLM can call any tool from the server.
   */
  private async processMcpServerSelections(
    ctx: ExecutionContext,
    mcpServerSelections: ToolInput[]
  ): Promise<any[]> {
    if (mcpServerSelections.length === 0) return []
    const results: any[] = []
    for (const serverSelection of mcpServerSelections) {
      const serverId = serverSelection.params?.serverId
      const serverName = serverSelection.params?.serverName
      const usageControl = serverSelection.usageControl || 'auto'
      if (!serverId) {
        logger.error('MCP server selection missing serverId:', serverSelection)
        continue
      }
      try {
        // Discover all tools from this server
        const discoveredTools = await this.discoverMcpToolsForServer(ctx, serverId)
        // Create tool definitions for each discovered tool
        for (const mcpTool of discoveredTools) {
          const created = await this.createMcpToolFromDiscoveredServerTool(
            ctx,
            mcpTool,
            serverId,
            serverName || serverId,
            usageControl
          )
          if (created) results.push(created)
        }
        logger.info(
          `[AgentHandler] Expanded MCP server ${serverName} into ${discoveredTools.length} tools`
        )
      } catch (error) {
        logger.error(`[AgentHandler] Failed to process MCP server selection:`, { serverId, error })
      }
    }
    return results
  }
  /**
   * Create an MCP tool from server discovery for the "all tools" mode.
   */
  private async createMcpToolFromDiscoveredServerTool(
    ctx: ExecutionContext,
    mcpTool: any,
    serverId: string,
    serverName: string,
    usageControl: string
  ): Promise<any> {
    const toolName = mcpTool.name
    const { filterSchemaForLLM } = await import('@/tools/params')
    const filteredSchema = filterSchemaForLLM(
      mcpTool.inputSchema || { type: 'object', properties: {} },
      {}
    )
    const toolId = createMcpToolId(serverId, toolName)
    return {
      id: toolId,
      name: toolName,
      description: mcpTool.description || `MCP tool ${toolName} from ${serverName}`,
      parameters: filteredSchema,
      params: {},
      usageControl,
      executeFunction: async (callParams: Record<string, any>) => {
        const headers = await buildAuthHeaders()
        const execUrl = buildAPIUrl('/api/mcp/tools/execute')
        const execResponse = await fetch(execUrl.toString(), {
          method: 'POST',
          headers,
          body: stringifyJSON({
            serverId,
            toolName,
            arguments: callParams,
            workspaceId: ctx.workspaceId,
            workflowId: ctx.workflowId,
            toolSchema: mcpTool.inputSchema,
          }),
        })
        if (!execResponse.ok) {
          throw new Error(
            `MCP tool execution failed: ${execResponse.status} ${execResponse.statusText}`
          )
        }
        const result = await execResponse.json()
        if (!result.success) {
          throw new Error(result.error || 'MCP tool execution failed')
        }
        return {
          success: true,
          output: result.data.output || {},
          metadata: {
            source: 'mcp-server',
            serverId,
            serverName,
            toolName,
          },
        }
      },
    }
  }
  private async createCustomTool(ctx: ExecutionContext, tool: ToolInput): Promise<any> {
    const userProvidedParams = tool.params || {}
--- a/apps/sim/executor/handlers/agent/types.ts
+++ b/apps/sim/executor/handlers/agent/types.ts
@@ -29,36 +29,11 @@ export interface AgentInputs {
  verbosity?: string
 }
 /**
 * Represents a tool input for the agent block.
 *
 * @remarks
 * Valid types include:
 * - Standard block types (e.g., 'api', 'search', 'function')
 * - 'custom-tool': User-defined tools with custom code
 * - 'mcp': Individual MCP tool from a connected server
 * - 'mcp-server': All tools from an MCP server (agent discovery mode).
 *   At execution time, this is expanded into individual tool definitions
 *   for all tools available on the server. This enables dynamic capability
 *   discovery where the LLM can call any tool from the server.
 */
 export interface ToolInput {
  /**
   * Tool type identifier.
   * 'mcp-server' enables server-level selection where all tools from
   * the server are made available to the LLM at execution time.
   */
  type?: string
  schema?: any
  title?: string
  code?: string
  /**
   * Tool parameters. For 'mcp-server' type, includes:
   * - serverId: The MCP server ID
   * - serverUrl: The server URL (optional)
   * - serverName: Human-readable server name
   * - toolCount: Number of tools available (for display)
   */
  params?: Record<string, any>
  timeout?: number
  usageControl?: 'auto' | 'force' | 'none'
--- a/apps/sim/lib/billing/authorization.ts
+++ b/apps/sim/lib/billing/authorization.ts
@@ -1,37 +1,20 @@
 import { db } from '@sim/db'
 import * as schema from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { hasActiveSubscription } from '@/lib/billing'
 const logger = createLogger('BillingAuthorization')
 /**
 * Check if a user is authorized to manage billing for a given reference ID
 * Reference ID can be either a user ID (individual subscription) or organization ID (team subscription)
 *
 * This function also performs duplicate subscription validation for organizations:
 * - Rejects if an organization already has an active subscription (prevents duplicates)
 * - Personal subscriptions (referenceId === userId) skip this check to allow upgrades
 */
 export async function authorizeSubscriptionReference(
  userId: string,
  referenceId: string
 ): Promise<boolean> {
-  // User can always manage their own subscriptions (Pro upgrades, etc.)
+  // User can always manage their own subscriptions
  if (referenceId === userId) {
    return true
  }
  // For organizations: check for existing active subscriptions to prevent duplicates
  if (await hasActiveSubscription(referenceId)) {
    logger.warn('Blocking checkout - active subscription already exists for organization', {
      userId,
      referenceId,
    })
    return false
  }
  // Check if referenceId is an organizationId the user has admin rights to
  const members = await db
    .select()
--- a/apps/sim/lib/billing/client/upgrade.ts
+++ b/apps/sim/lib/billing/client/upgrade.ts
@@ -25,11 +25,9 @@ export function useSubscriptionUpgrade() {
      }
      let currentSubscriptionId: string | undefined
      let allSubscriptions: any[] = []
      try {
        const listResult = await client.subscription.list()
-        allSubscriptions = listResult.data || []
+        const activePersonalSub = listResult.data?.find(
        const activePersonalSub = allSubscriptions.find(
          (sub: any) => sub.status === 'active' && sub.referenceId === userId
        )
        currentSubscriptionId = activePersonalSub?.id
@@ -52,25 +50,6 @@ export function useSubscriptionUpgrade() {
          )
          if (existingOrg) {
            // Check if this org already has an active team subscription
            const existingTeamSub = allSubscriptions.find(
              (sub: any) =>
                sub.status === 'active' &&
                sub.referenceId === existingOrg.id &&
                (sub.plan === 'team' || sub.plan === 'enterprise')
            )
            if (existingTeamSub) {
              logger.warn('Organization already has an active team subscription', {
                userId,
                organizationId: existingOrg.id,
                existingSubscriptionId: existingTeamSub.id,
              })
              throw new Error(
                'This organization already has an active team subscription. Please manage it from the billing settings.'
              )
            }
            logger.info('Using existing organization for team plan upgrade', {
              userId,
              organizationId: existingOrg.id,
--- a/apps/sim/lib/billing/core/plan.ts
+++ b/apps/sim/lib/billing/core/plan.ts
@@ -1,5 +1,5 @@
 import { db } from '@sim/db'
-import { member, organization, subscription } from '@sim/db/schema'
+import { member, subscription } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray } from 'drizzle-orm'
 import { checkEnterprisePlan, checkProPlan, checkTeamPlan } from '@/lib/billing/subscriptions/utils'
@@ -26,22 +26,10 @@ export async function getHighestPrioritySubscription(userId: string) {
    let orgSubs: typeof personalSubs = []
    if (orgIds.length > 0) {
      // Verify orgs exist to filter out orphaned subscriptions
      const existingOrgs = await db
        .select({ id: organization.id })
        .from(organization)
        .where(inArray(organization.id, orgIds))
      const validOrgIds = existingOrgs.map((o) => o.id)
      if (validOrgIds.length > 0) {
      orgSubs = await db
        .select()
        .from(subscription)
-          .where(
+        .where(and(inArray(subscription.referenceId, orgIds), eq(subscription.status, 'active')))
            and(inArray(subscription.referenceId, validOrgIds), eq(subscription.status, 'active'))
          )
      }
    }
    const allSubs = [...personalSubs, ...orgSubs]
--- a/apps/sim/lib/billing/core/subscription.ts
+++ b/apps/sim/lib/billing/core/subscription.ts
@@ -25,28 +25,6 @@ const logger = createLogger('SubscriptionCore')
 export { getHighestPrioritySubscription }
 /**
 * Check if a referenceId (user ID or org ID) has an active subscription
 * Used for duplicate subscription prevention
 *
 * Fails closed: returns true on error to prevent duplicate creation
 */
 export async function hasActiveSubscription(referenceId: string): Promise<boolean> {
  try {
    const [activeSub] = await db
      .select({ id: subscription.id })
      .from(subscription)
      .where(and(eq(subscription.referenceId, referenceId), eq(subscription.status, 'active')))
      .limit(1)
    return !!activeSub
  } catch (error) {
    logger.error('Error checking active subscription', { error, referenceId })
    // Fail closed: assume subscription exists to prevent duplicate creation
    return true
  }
 }
 /**
 * Check if user is on Pro plan (direct or via organization)
 */
--- a/apps/sim/lib/billing/index.ts
+++ b/apps/sim/lib/billing/index.ts
@@ -11,7 +11,6 @@ export {
  getHighestPrioritySubscription as getActiveSubscription,
  getUserSubscriptionState as getSubscriptionState,
  hasAccessControlAccess,
  hasActiveSubscription,
  hasCredentialSetsAccess,
  hasSSOAccess,
  isEnterpriseOrgAdminOrOwner,
@@ -33,11 +32,6 @@ export {
 } from '@/lib/billing/core/usage'
 export * from '@/lib/billing/credits/balance'
 export * from '@/lib/billing/credits/purchase'
 export {
  blockOrgMembers,
  getOrgMemberIds,
  unblockOrgMembers,
 } from '@/lib/billing/organizations/membership'
 export * from '@/lib/billing/subscriptions/utils'
 export { canEditUsageLimit as canEditLimit } from '@/lib/billing/subscriptions/utils'
 export * from '@/lib/billing/types'
--- a/apps/sim/lib/billing/organization.ts
+++ b/apps/sim/lib/billing/organization.ts
@@ -8,7 +8,6 @@ import {
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { hasActiveSubscription } from '@/lib/billing'
 import { getPlanPricing } from '@/lib/billing/core/billing'
 import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage'
@@ -160,16 +159,6 @@ export async function ensureOrganizationForTeamSubscription(
  if (existingMembership.length > 0) {
    const membership = existingMembership[0]
    if (membership.role === 'owner' || membership.role === 'admin') {
      // Check if org already has an active subscription (prevent duplicates)
      if (await hasActiveSubscription(membership.organizationId)) {
        logger.error('Organization already has an active subscription', {
          userId,
          organizationId: membership.organizationId,
          newSubscriptionId: subscription.id,
        })
        throw new Error('Organization already has an active subscription')
      }
      logger.info('User already owns/admins an org, using it', {
        userId,
        organizationId: membership.organizationId,
--- a/apps/sim/lib/billing/organizations/membership.ts
+++ b/apps/sim/lib/billing/organizations/membership.ts
@@ -15,86 +15,13 @@ import {
  userStats,
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, inArray, isNull, ne, or, sql } from 'drizzle-orm'
+import { and, eq, sql } from 'drizzle-orm'
 import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { validateSeatAvailability } from '@/lib/billing/validation/seat-management'
 const logger = createLogger('OrganizationMembership')
 export type BillingBlockReason = 'payment_failed' | 'dispute'
 /**
 * Get all member user IDs for an organization
 */
 export async function getOrgMemberIds(organizationId: string): Promise<string[]> {
  const members = await db
    .select({ userId: member.userId })
    .from(member)
    .where(eq(member.organizationId, organizationId))
  return members.map((m) => m.userId)
 }
 /**
 * Block all members of an organization for billing reasons
 * Returns the number of members actually blocked
 *
 * Reason priority: dispute > payment_failed
 * A payment_failed block won't overwrite an existing dispute block
 */
 export async function blockOrgMembers(
  organizationId: string,
  reason: BillingBlockReason
 ): Promise<number> {
  const memberIds = await getOrgMemberIds(organizationId)
  if (memberIds.length === 0) {
    return 0
  }
  // Don't overwrite dispute blocks with payment_failed (dispute is higher priority)
  const whereClause =
    reason === 'payment_failed'
      ? and(
          inArray(userStats.userId, memberIds),
          or(ne(userStats.billingBlockedReason, 'dispute'), isNull(userStats.billingBlockedReason))
        )
      : inArray(userStats.userId, memberIds)
  const result = await db
    .update(userStats)
    .set({ billingBlocked: true, billingBlockedReason: reason })
    .where(whereClause)
    .returning({ userId: userStats.userId })
  return result.length
 }
 /**
 * Unblock all members of an organization blocked for a specific reason
 * Only unblocks members blocked for the specified reason (not other reasons)
 * Returns the number of members actually unblocked
 */
 export async function unblockOrgMembers(
  organizationId: string,
  reason: BillingBlockReason
 ): Promise<number> {
  const memberIds = await getOrgMemberIds(organizationId)
  if (memberIds.length === 0) {
    return 0
  }
  const result = await db
    .update(userStats)
    .set({ billingBlocked: false, billingBlockedReason: null })
    .where(and(inArray(userStats.userId, memberIds), eq(userStats.billingBlockedReason, reason)))
    .returning({ userId: userStats.userId })
  return result.length
 }
 export interface RestoreProResult {
  restored: boolean
  usageRestored: boolean
--- a/apps/sim/lib/billing/webhooks/disputes.ts
+++ b/apps/sim/lib/billing/webhooks/disputes.ts
@@ -1,9 +1,8 @@
 import { db } from '@sim/db'
-import { subscription, user, userStats } from '@sim/db/schema'
+import { member, subscription, user, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import type Stripe from 'stripe'
 import { blockOrgMembers, unblockOrgMembers } from '@/lib/billing'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 const logger = createLogger('DisputeWebhooks')
@@ -58,34 +57,36 @@ export async function handleChargeDispute(event: Stripe.Event): Promise<void> {
  if (subs.length > 0) {
    const orgId = subs[0].referenceId
    const memberCount = await blockOrgMembers(orgId, 'dispute')
-    if (memberCount > 0) {
+    const owners = await db
-      logger.warn('Blocked all org members due to dispute', {
+      .select({ userId: member.userId })
      .from(member)
      .where(and(eq(member.organizationId, orgId), eq(member.role, 'owner')))
      .limit(1)
    if (owners.length > 0) {
      await db
        .update(userStats)
        .set({ billingBlocked: true, billingBlockedReason: 'dispute' })
        .where(eq(userStats.userId, owners[0].userId))
      logger.warn('Blocked org owner due to dispute', {
        disputeId: dispute.id,
        ownerId: owners[0].userId,
        organizationId: orgId,
        memberCount,
      })
    }
  }
 }
 /**
- * Handles charge.dispute.closed - unblocks user if dispute was won or warning closed
+ * Handles charge.dispute.closed - unblocks user if dispute was won
 *
 * Status meanings:
 * - 'won': Merchant won, customer's chargeback denied → unblock
 * - 'lost': Customer won, money refunded → stay blocked (they owe us)
 * - 'warning_closed': Pre-dispute inquiry closed without chargeback → unblock (false alarm)
 */
 export async function handleDisputeClosed(event: Stripe.Event): Promise<void> {
  const dispute = event.data.object as Stripe.Dispute
-  // Only unblock if we won or the warning was closed without a full dispute
+  if (dispute.status !== 'won') {
-  const shouldUnblock = dispute.status === 'won' || dispute.status === 'warning_closed'
+    logger.info('Dispute not won, user remains blocked', {
  if (!shouldUnblock) {
    logger.info('Dispute resolved against us, user remains blocked', {
      disputeId: dispute.id,
      status: dispute.status,
    })
@@ -97,7 +98,7 @@ export async function handleDisputeClosed(event: Stripe.Event): Promise<void> {
    return
  }
-  // Find and unblock user (Pro plans) - only if blocked for dispute, not other reasons
+  // Find and unblock user (Pro plans)
  const users = await db
    .select({ id: user.id })
    .from(user)
@@ -108,17 +109,16 @@ export async function handleDisputeClosed(event: Stripe.Event): Promise<void> {
    await db
      .update(userStats)
      .set({ billingBlocked: false, billingBlockedReason: null })
-      .where(and(eq(userStats.userId, users[0].id), eq(userStats.billingBlockedReason, 'dispute')))
+      .where(eq(userStats.userId, users[0].id))
-    logger.info('Unblocked user after dispute resolved in our favor', {
+    logger.info('Unblocked user after winning dispute', {
      disputeId: dispute.id,
      userId: users[0].id,
      status: dispute.status,
    })
    return
  }
-  // Find and unblock all org members (Team/Enterprise) - consistent with payment success
+  // Find and unblock org owner (Team/Enterprise)
  const subs = await db
    .select({ referenceId: subscription.referenceId })
    .from(subscription)
@@ -127,13 +127,24 @@ export async function handleDisputeClosed(event: Stripe.Event): Promise<void> {
  if (subs.length > 0) {
    const orgId = subs[0].referenceId
    const memberCount = await unblockOrgMembers(orgId, 'dispute')
-    logger.info('Unblocked all org members after dispute resolved in our favor', {
+    const owners = await db
      .select({ userId: member.userId })
      .from(member)
      .where(and(eq(member.organizationId, orgId), eq(member.role, 'owner')))
      .limit(1)
    if (owners.length > 0) {
      await db
        .update(userStats)
        .set({ billingBlocked: false, billingBlockedReason: null })
        .where(eq(userStats.userId, owners[0].userId))
      logger.info('Unblocked org owner after winning dispute', {
        disputeId: dispute.id,
        ownerId: owners[0].userId,
        organizationId: orgId,
      memberCount,
      status: dispute.status,
      })
    }
  }
 }
--- a/apps/sim/lib/billing/webhooks/invoices.ts
+++ b/apps/sim/lib/billing/webhooks/invoices.ts
@@ -8,13 +8,12 @@ import {
  userStats,
 } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, inArray, isNull, ne, or } from 'drizzle-orm'
+import { and, eq, inArray } from 'drizzle-orm'
 import type Stripe from 'stripe'
 import { getEmailSubject, PaymentFailedEmail, renderCreditPurchaseEmail } from '@/components/emails'
 import { calculateSubscriptionOverage } from '@/lib/billing/core/billing'
 import { addCredits, getCreditBalance, removeCredits } from '@/lib/billing/credits/balance'
 import { setUsageLimitForCredits } from '@/lib/billing/credits/purchase'
 import { blockOrgMembers, unblockOrgMembers } from '@/lib/billing/organizations/membership'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
@@ -503,7 +502,24 @@ export async function handleInvoicePaymentSucceeded(event: Stripe.Event) {
    }
    if (sub.plan === 'team' || sub.plan === 'enterprise') {
-      await unblockOrgMembers(sub.referenceId, 'payment_failed')
+      const members = await db
        .select({ userId: member.userId })
        .from(member)
        .where(eq(member.organizationId, sub.referenceId))
      const memberIds = members.map((m) => m.userId)
      if (memberIds.length > 0) {
        // Only unblock users blocked for payment_failed, not disputes
        await db
          .update(userStats)
          .set({ billingBlocked: false, billingBlockedReason: null })
          .where(
            and(
              inArray(userStats.userId, memberIds),
              eq(userStats.billingBlockedReason, 'payment_failed')
            )
          )
      }
    } else {
      // Only unblock users blocked for payment_failed, not disputes
      await db
@@ -600,26 +616,28 @@ export async function handleInvoicePaymentFailed(event: Stripe.Event) {
      if (records.length > 0) {
        const sub = records[0]
        if (sub.plan === 'team' || sub.plan === 'enterprise') {
-          const memberCount = await blockOrgMembers(sub.referenceId, 'payment_failed')
+          const members = await db
-          logger.info('Blocked team/enterprise members due to payment failure', {
+            .select({ userId: member.userId })
-            organizationId: sub.referenceId,
+            .from(member)
-            memberCount,
+            .where(eq(member.organizationId, sub.referenceId))
-            isOverageInvoice,
+          const memberIds = members.map((m) => m.userId)
-          })
+
-        } else {
+          if (memberIds.length > 0) {
          // Don't overwrite dispute blocks (dispute > payment_failed priority)
            await db
              .update(userStats)
              .set({ billingBlocked: true, billingBlockedReason: 'payment_failed' })
-            .where(
+              .where(inArray(userStats.userId, memberIds))
-              and(
+          }
-                eq(userStats.userId, sub.referenceId),
+          logger.info('Blocked team/enterprise members due to payment failure', {
-                or(
+            organizationId: sub.referenceId,
-                  ne(userStats.billingBlockedReason, 'dispute'),
+            memberCount: members.length,
-                  isNull(userStats.billingBlockedReason)
+            isOverageInvoice,
-                )
+          })
-              )
+        } else {
-            )
+          await db
            .update(userStats)
            .set({ billingBlocked: true, billingBlockedReason: 'payment_failed' })
            .where(eq(userStats.userId, sub.referenceId))
          logger.info('Blocked user due to payment failure', {
            userId: sub.referenceId,
            isOverageInvoice,
--- a/apps/sim/lib/billing/webhooks/subscription.ts
+++ b/apps/sim/lib/billing/webhooks/subscription.ts
@@ -3,7 +3,6 @@ import { member, organization, subscription } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, ne } from 'drizzle-orm'
 import { calculateSubscriptionOverage } from '@/lib/billing/core/billing'
 import { hasActiveSubscription } from '@/lib/billing/core/subscription'
 import { syncUsageLimitsFromSubscription } from '@/lib/billing/core/usage'
 import { restoreUserProSubscription } from '@/lib/billing/organizations/membership'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
@@ -53,37 +52,14 @@ async function restoreMemberProSubscriptions(organizationId: string): Promise<nu
 /**
 * Cleanup organization when team/enterprise subscription is deleted.
 * - Checks if other active subscriptions point to this org (skip deletion if so)
 * - Restores member Pro subscriptions
- * - Deletes the organization (only if no other active subs)
+ * - Deletes the organization
 * - Syncs usage limits for former members (resets to free or Pro tier)
 */
 async function cleanupOrganizationSubscription(organizationId: string): Promise<{
  restoredProCount: number
  membersSynced: number
  organizationDeleted: boolean
 }> {
  // Check if other active subscriptions still point to this org
  // Note: The subscription being deleted is already marked as 'canceled' by better-auth
  // before this handler runs, so we only find truly active ones
  if (await hasActiveSubscription(organizationId)) {
    logger.info('Skipping organization deletion - other active subscriptions exist', {
      organizationId,
    })
    // Still sync limits for members since this subscription was deleted
    const memberUserIds = await db
      .select({ userId: member.userId })
      .from(member)
      .where(eq(member.organizationId, organizationId))
    for (const m of memberUserIds) {
      await syncUsageLimitsFromSubscription(m.userId)
    }
    return { restoredProCount: 0, membersSynced: memberUserIds.length, organizationDeleted: false }
  }
  // Get member userIds before deletion (needed for limit syncing after org deletion)
  const memberUserIds = await db
    .select({ userId: member.userId })
@@ -99,7 +75,7 @@ async function cleanupOrganizationSubscription(organizationId: string): Promise<
    await syncUsageLimitsFromSubscription(m.userId)
  }
-  return { restoredProCount, membersSynced: memberUserIds.length, organizationDeleted: true }
+  return { restoredProCount, membersSynced: memberUserIds.length }
 }
 /**
@@ -196,14 +172,15 @@ export async function handleSubscriptionDeleted(subscription: {
        referenceId: subscription.referenceId,
      })
-      const { restoredProCount, membersSynced, organizationDeleted } =
+      const { restoredProCount, membersSynced } = await cleanupOrganizationSubscription(
-        await cleanupOrganizationSubscription(subscription.referenceId)
+        subscription.referenceId
      )
      logger.info('Successfully processed enterprise subscription cancellation', {
        subscriptionId: subscription.id,
        stripeSubscriptionId,
        restoredProCount,
-        organizationDeleted,
+        organizationDeleted: true,
        membersSynced,
      })
      return
@@ -320,7 +297,7 @@ export async function handleSubscriptionDeleted(subscription: {
      const cleanup = await cleanupOrganizationSubscription(subscription.referenceId)
      restoredProCount = cleanup.restoredProCount
      membersSynced = cleanup.membersSynced
-      organizationDeleted = cleanup.organizationDeleted
+      organizationDeleted = true
    } else if (subscription.plan === 'pro') {
      await syncUsageLimitsFromSubscription(subscription.referenceId)
      membersSynced = 1
--- a/apps/sim/lib/logs/execution/logger.ts
+++ b/apps/sim/lib/logs/execution/logger.ts
@@ -33,7 +33,6 @@ import type {
  WorkflowExecutionSnapshot,
  WorkflowState,
 } from '@/lib/logs/types'
 import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
 export interface ToolCall {
  name: string
@@ -504,7 +503,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
    }
    try {
-      // Get the workflow record to get workspace and fallback userId
+      // Get the workflow record to get the userId
      const [workflowRecord] = await db
        .select()
        .from(workflow)
@@ -516,12 +515,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
        return
      }
-      let billingUserId: string | null = null
+      const userId = workflowRecord.userId
      if (workflowRecord.workspaceId) {
        billingUserId = await getWorkspaceBilledAccountUserId(workflowRecord.workspaceId)
      }
      const userId = billingUserId || workflowRecord.userId
      const costToStore = costSummary.totalCost
      const existing = await db.select().from(userStats).where(eq(userStats.userId, userId))