Fix lint

apps/docs/content/docs/en/execution/meta.json

@@ -1,3 +1,3 @@
 {
-  "pages": ["index", "basics", "api", "logging", "costs"]
+  "pages": ["index", "basics", "api", "form", "logging", "costs"]
 }

apps/sim/app/api/copilot/execute-tool/route.ts

@@ -14,7 +14,8 @@ import {
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
 import { refreshTokenIfNeeded } from '@/app/api/auth/oauth/utils'
-import { resolveEnvVarReferences } from '@/executor/utils/reference-validation'
+import { REFERENCE } from '@/executor/constants'
+import { createEnvVarPattern } from '@/executor/utils/reference-validation'
 import { executeTool } from '@/tools'
 import { getTool, resolveToolId } from '@/tools/utils'
 
@@ -27,6 +28,45 @@ const ExecuteToolSchema = z.object({
   workflowId: z.string().optional(),
 })
 
+/**
+ * Resolves all {{ENV_VAR}} references in a value recursively
+ * Works with strings, arrays, and objects
+ */
+function resolveEnvVarReferences(value: any, envVars: Record<string, string>): any {
+  if (typeof value === 'string') {
+    // Check for exact match: entire string is "{{VAR_NAME}}"
+    const exactMatchPattern = new RegExp(
+      `^\\${REFERENCE.ENV_VAR_START}([^}]+)\\${REFERENCE.ENV_VAR_END}$`
+    )
+    const exactMatch = exactMatchPattern.exec(value)
+    if (exactMatch) {
+      const envVarName = exactMatch[1].trim()
+      return envVars[envVarName] ?? value
+    }
+
+    // Check for embedded references: "prefix {{VAR}} suffix"
+    const envVarPattern = createEnvVarPattern()
+    return value.replace(envVarPattern, (match, varName) => {
+      const trimmedName = varName.trim()
+      return envVars[trimmedName] ?? match
+    })
+  }
+
+  if (Array.isArray(value)) {
+    return value.map((item) => resolveEnvVarReferences(item, envVars))
+  }
+
+  if (value !== null && typeof value === 'object') {
+    const resolved: Record<string, any> = {}
+    for (const [key, val] of Object.entries(value)) {
+      resolved[key] = resolveEnvVarReferences(val, envVars)
+    }
+    return resolved
+  }
+
+  return value
+}
+
 export async function POST(req: NextRequest) {
   const tracker = createRequestTracker()
 
@@ -105,17 +145,7 @@ export async function POST(req: NextRequest) {
 
     // Build execution params starting with LLM-provided arguments
     // Resolve all {{ENV_VAR}} references in the arguments
-    const executionParams: Record<string, any> = resolveEnvVarReferences(
-      toolArgs,
-      decryptedEnvVars,
-      {
-        resolveExactMatch: true,
-        allowEmbedded: true,
-        trimKeys: true,
-        onMissing: 'keep',
-        deep: true,
-      }
-    ) as Record<string, any>
+    const executionParams: Record<string, any> = resolveEnvVarReferences(toolArgs, decryptedEnvVars)
 
     logger.info(`[${tracker.requestId}] Resolved env var references in arguments`, {
       toolName,

apps/sim/app/api/function/execute/route.ts

@@ -9,7 +9,6 @@ import { escapeRegExp, normalizeName, REFERENCE } from '@/executor/constants'
 import {
   createEnvVarPattern,
   createWorkflowVariablePattern,
-  resolveEnvVarReferences,
 } from '@/executor/utils/reference-validation'
 export const dynamic = 'force-dynamic'
 export const runtime = 'nodejs'
@@ -480,29 +479,9 @@ function resolveEnvironmentVariables(
   const replacements: Array<{ match: string; index: number; varName: string; varValue: string }> =
     []
 
-  const resolverVars: Record<string, string> = {}
-  Object.entries(params).forEach(([key, value]) => {
-    if (value) {
-      resolverVars[key] = String(value)
-    }
-  })
-  Object.entries(envVars).forEach(([key, value]) => {
-    if (value) {
-      resolverVars[key] = value
-    }
-  })
-
   while ((match = regex.exec(code)) !== null) {
     const varName = match[1].trim()
-    const resolved = resolveEnvVarReferences(match[0], resolverVars, {
-      allowEmbedded: true,
-      resolveExactMatch: true,
-      trimKeys: true,
-      onMissing: 'empty',
-      deep: false,
-    })
-    const varValue =
-      typeof resolved === 'string' ? resolved : resolved == null ? '' : String(resolved)
+    const varValue = envVars[varName] || params[varName] || ''
     replacements.push({
       match: match[0],
       index: match.index,

apps/sim/app/api/mcp/servers/test-connection/route.ts

@@ -5,7 +5,8 @@ import { McpClient } from '@/lib/mcp/client'
 import { getParsedBody, withMcpAuth } from '@/lib/mcp/middleware'
 import type { McpServerConfig, McpTransport } from '@/lib/mcp/types'
 import { createMcpErrorResponse, createMcpSuccessResponse } from '@/lib/mcp/utils'
-import { resolveEnvVarReferences } from '@/executor/utils/reference-validation'
+import { REFERENCE } from '@/executor/constants'
+import { createEnvVarPattern } from '@/executor/utils/reference-validation'
 
 const logger = createLogger('McpServerTestAPI')
 
@@ -23,23 +24,22 @@ function isUrlBasedTransport(transport: McpTransport): boolean {
  * Resolve environment variables in strings
  */
 function resolveEnvVars(value: string, envVars: Record<string, string>): string {
-  const missingVars: string[] = []
-  const resolvedValue = resolveEnvVarReferences(value, envVars, {
-    allowEmbedded: true,
-    resolveExactMatch: true,
-    trimKeys: true,
-    onMissing: 'keep',
-    deep: false,
-    missingKeys: missingVars,
-  }) as string
+  const envVarPattern = createEnvVarPattern()
+  const envMatches = value.match(envVarPattern)
+  if (!envMatches) return value
 
-  if (missingVars.length > 0) {
-    const uniqueMissing = Array.from(new Set(missingVars))
-    uniqueMissing.forEach((envKey) => {
+  let resolvedValue = value
+  for (const match of envMatches) {
+    const envKey = match.slice(REFERENCE.ENV_VAR_START.length, -REFERENCE.ENV_VAR_END.length).trim()
+    const envValue = envVars[envKey]
+
+    if (envValue === undefined) {
       logger.warn(`Environment variable "${envKey}" not found in MCP server test`)
-    })
-  }
+      continue
+    }
 
+    resolvedValue = resolvedValue.replace(match, envValue)
+  }
   return resolvedValue
 }
 

apps/sim/app/api/schedules/execute/route.test.ts

@@ -57,7 +57,6 @@ describe('Scheduled Workflow Execution API Route', () => {
       not: vi.fn((condition) => ({ type: 'not', condition })),
       isNull: vi.fn((field) => ({ type: 'isNull', field })),
       or: vi.fn((...conditions) => ({ type: 'or', conditions })),
-      sql: vi.fn((strings, ...values) => ({ type: 'sql', strings, values })),
     }))
 
     vi.doMock('@sim/db', () => {
@@ -93,17 +92,6 @@ describe('Scheduled Workflow Execution API Route', () => {
           status: 'status',
           nextRunAt: 'nextRunAt',
           lastQueuedAt: 'lastQueuedAt',
-          deploymentVersionId: 'deploymentVersionId',
-        },
-        workflowDeploymentVersion: {
-          id: 'id',
-          workflowId: 'workflowId',
-          isActive: 'isActive',
-        },
-        workflow: {
-          id: 'id',
-          userId: 'userId',
-          workspaceId: 'workspaceId',
         },
       }
     })
@@ -146,7 +134,6 @@ describe('Scheduled Workflow Execution API Route', () => {
       not: vi.fn((condition) => ({ type: 'not', condition })),
       isNull: vi.fn((field) => ({ type: 'isNull', field })),
       or: vi.fn((...conditions) => ({ type: 'or', conditions })),
-      sql: vi.fn((strings, ...values) => ({ type: 'sql', strings, values })),
     }))
 
     vi.doMock('@sim/db', () => {
@@ -182,17 +169,6 @@ describe('Scheduled Workflow Execution API Route', () => {
           status: 'status',
           nextRunAt: 'nextRunAt',
           lastQueuedAt: 'lastQueuedAt',
-          deploymentVersionId: 'deploymentVersionId',
-        },
-        workflowDeploymentVersion: {
-          id: 'id',
-          workflowId: 'workflowId',
-          isActive: 'isActive',
-        },
-        workflow: {
-          id: 'id',
-          userId: 'userId',
-          workspaceId: 'workspaceId',
         },
       }
     })
@@ -230,7 +206,6 @@ describe('Scheduled Workflow Execution API Route', () => {
       not: vi.fn((condition) => ({ type: 'not', condition })),
       isNull: vi.fn((field) => ({ type: 'isNull', field })),
       or: vi.fn((...conditions) => ({ type: 'or', conditions })),
-      sql: vi.fn((strings, ...values) => ({ type: 'sql', strings, values })),
     }))
 
     vi.doMock('@sim/db', () => {
@@ -253,17 +228,6 @@ describe('Scheduled Workflow Execution API Route', () => {
           status: 'status',
           nextRunAt: 'nextRunAt',
           lastQueuedAt: 'lastQueuedAt',
-          deploymentVersionId: 'deploymentVersionId',
-        },
-        workflowDeploymentVersion: {
-          id: 'id',
-          workflowId: 'workflowId',
-          isActive: 'isActive',
-        },
-        workflow: {
-          id: 'id',
-          userId: 'userId',
-          workspaceId: 'workspaceId',
         },
       }
     })
@@ -301,7 +265,6 @@ describe('Scheduled Workflow Execution API Route', () => {
       not: vi.fn((condition) => ({ type: 'not', condition })),
       isNull: vi.fn((field) => ({ type: 'isNull', field })),
       or: vi.fn((...conditions) => ({ type: 'or', conditions })),
-      sql: vi.fn((strings, ...values) => ({ type: 'sql', strings, values })),
     }))
 
     vi.doMock('@sim/db', () => {
@@ -347,17 +310,6 @@ describe('Scheduled Workflow Execution API Route', () => {
           status: 'status',
           nextRunAt: 'nextRunAt',
           lastQueuedAt: 'lastQueuedAt',
-          deploymentVersionId: 'deploymentVersionId',
-        },
-        workflowDeploymentVersion: {
-          id: 'id',
-          workflowId: 'workflowId',
-          isActive: 'isActive',
-        },
-        workflow: {
-          id: 'id',
-          userId: 'userId',
-          workspaceId: 'workspaceId',
         },
       }
     })

apps/sim/app/api/schedules/execute/route.ts

@@ -1,7 +1,7 @@
-import { db, workflowDeploymentVersion, workflowSchedule } from '@sim/db'
+import { db, workflowSchedule } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { tasks } from '@trigger.dev/sdk'
-import { and, eq, isNull, lt, lte, not, or, sql } from 'drizzle-orm'
+import { and, eq, isNull, lt, lte, not, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
@@ -37,8 +37,7 @@ export async function GET(request: NextRequest) {
           or(
             isNull(workflowSchedule.lastQueuedAt),
             lt(workflowSchedule.lastQueuedAt, workflowSchedule.nextRunAt)
-          ),
-          sql`${workflowSchedule.deploymentVersionId} = (select ${workflowDeploymentVersion.id} from ${workflowDeploymentVersion} where ${workflowDeploymentVersion.workflowId} = ${workflowSchedule.workflowId} and ${workflowDeploymentVersion.isActive} = true)`
+          )
         )
       )
       .returning({

apps/sim/app/api/schedules/route.test.ts

@@ -29,23 +29,12 @@ vi.mock('@sim/db', () => ({
 
 vi.mock('@sim/db/schema', () => ({
   workflow: { id: 'id', userId: 'userId', workspaceId: 'workspaceId' },
-  workflowSchedule: {
-    workflowId: 'workflowId',
-    blockId: 'blockId',
-    deploymentVersionId: 'deploymentVersionId',
-  },
-  workflowDeploymentVersion: {
-    id: 'id',
-    workflowId: 'workflowId',
-    isActive: 'isActive',
-  },
+  workflowSchedule: { workflowId: 'workflowId', blockId: 'blockId' },
 }))
 
 vi.mock('drizzle-orm', () => ({
   eq: vi.fn(),
   and: vi.fn(),
-  or: vi.fn(),
-  isNull: vi.fn(),
 }))
 
 vi.mock('@/lib/core/utils/request', () => ({
@@ -67,11 +56,6 @@ function mockDbChain(results: any[]) {
       where: () => ({
         limit: () => results[callIndex++] || [],
       }),
-      leftJoin: () => ({
-        where: () => ({
-          limit: () => results[callIndex++] || [],
-        }),
-      }),
     }),
   }))
 }
@@ -90,16 +74,7 @@ describe('Schedule GET API', () => {
   it('returns schedule data for authorized user', async () => {
     mockDbChain([
       [{ userId: 'user-1', workspaceId: null }],
-      [
-        {
-          schedule: {
-            id: 'sched-1',
-            cronExpression: '0 9 * * *',
-            status: 'active',
-            failedCount: 0,
-          },
-        },
-      ],
+      [{ id: 'sched-1', cronExpression: '0 9 * * *', status: 'active', failedCount: 0 }],
     ])
 
     const res = await GET(createRequest('http://test/api/schedules?workflowId=wf-1'))
@@ -153,7 +128,7 @@ describe('Schedule GET API', () => {
   it('allows workspace members to view', async () => {
     mockDbChain([
       [{ userId: 'other-user', workspaceId: 'ws-1' }],
-      [{ schedule: { id: 'sched-1', status: 'active', failedCount: 0 } }],
+      [{ id: 'sched-1', status: 'active', failedCount: 0 }],
     ])
 
     const res = await GET(createRequest('http://test/api/schedules?workflowId=wf-1'))
@@ -164,7 +139,7 @@ describe('Schedule GET API', () => {
   it('indicates disabled schedule with failures', async () => {
     mockDbChain([
       [{ userId: 'user-1', workspaceId: null }],
-      [{ schedule: { id: 'sched-1', status: 'disabled', failedCount: 100 } }],
+      [{ id: 'sched-1', status: 'disabled', failedCount: 100 }],
     ])
 
     const res = await GET(createRequest('http://test/api/schedules?workflowId=wf-1'))

apps/sim/app/api/schedules/route.ts

@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
-import { workflow, workflowDeploymentVersion, workflowSchedule } from '@sim/db/schema'
+import { workflow, workflowSchedule } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, isNull, or } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { generateRequestId } from '@/lib/core/utils/request'
@@ -62,24 +62,9 @@ export async function GET(req: NextRequest) {
     }
 
     const schedule = await db
-      .select({ schedule: workflowSchedule })
+      .select()
       .from(workflowSchedule)
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, workflowSchedule.workflowId),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
-      .where(
-        and(
-          ...conditions,
-          or(
-            eq(workflowSchedule.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(workflowSchedule.deploymentVersionId))
-          )
-        )
-      )
+      .where(conditions.length > 1 ? and(...conditions) : conditions[0])
       .limit(1)
 
     const headers = new Headers()
@@ -89,7 +74,7 @@ export async function GET(req: NextRequest) {
       return NextResponse.json({ schedule: null }, { headers })
     }
 
-    const scheduleData = schedule[0].schedule
+    const scheduleData = schedule[0]
     const isDisabled = scheduleData.status === 'disabled'
     const hasFailures = scheduleData.failedCount > 0
 

apps/sim/app/api/v1/admin/workflows/[id]/deploy/route.ts

@@ -60,17 +60,7 @@ export const POST = withAdminAuthParams<RouteParams>(async (request, context) =>
       return internalErrorResponse(deployResult.error || 'Failed to deploy workflow')
     }
 
-    if (!deployResult.deploymentVersionId) {
-      await undeployWorkflow({ workflowId })
-      return internalErrorResponse('Failed to resolve deployment version')
-    }
-
-    const scheduleResult = await createSchedulesForDeploy(
-      workflowId,
-      normalizedData.blocks,
-      db,
-      deployResult.deploymentVersionId
-    )
+    const scheduleResult = await createSchedulesForDeploy(workflowId, normalizedData.blocks, db)
     if (!scheduleResult.success) {
       logger.warn(`Schedule creation failed for workflow ${workflowId}: ${scheduleResult.error}`)
     }

apps/sim/app/api/webhooks/route.ts

@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
-import { webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
+import { webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, desc, eq, isNull, or } from 'drizzle-orm'
+import { and, desc, eq } from 'drizzle-orm'
 import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
@@ -71,23 +71,7 @@ export async function GET(request: NextRequest) {
         })
         .from(webhook)
         .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-        .leftJoin(
-          workflowDeploymentVersion,
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflow.id),
-            eq(workflowDeploymentVersion.isActive, true)
-          )
-        )
-        .where(
-          and(
-            eq(webhook.workflowId, workflowId),
-            eq(webhook.blockId, blockId),
-            or(
-              eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-              and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-            )
-          )
-        )
+        .where(and(eq(webhook.workflowId, workflowId), eq(webhook.blockId, blockId)))
         .orderBy(desc(webhook.updatedAt))
 
       logger.info(
@@ -165,23 +149,7 @@ export async function POST(request: NextRequest) {
           const existingForBlock = await db
             .select({ id: webhook.id, path: webhook.path })
             .from(webhook)
-            .leftJoin(
-              workflowDeploymentVersion,
-              and(
-                eq(workflowDeploymentVersion.workflowId, workflowId),
-                eq(workflowDeploymentVersion.isActive, true)
-              )
-            )
-            .where(
-              and(
-                eq(webhook.workflowId, workflowId),
-                eq(webhook.blockId, blockId),
-                or(
-                  eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-                  and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-                )
-              )
-            )
+            .where(and(eq(webhook.workflowId, workflowId), eq(webhook.blockId, blockId)))
             .limit(1)
 
           if (existingForBlock.length > 0) {
@@ -257,23 +225,7 @@ export async function POST(request: NextRequest) {
       const existingForBlock = await db
         .select({ id: webhook.id })
         .from(webhook)
-        .leftJoin(
-          workflowDeploymentVersion,
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.isActive, true)
-          )
-        )
-        .where(
-          and(
-            eq(webhook.workflowId, workflowId),
-            eq(webhook.blockId, blockId),
-            or(
-              eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-              and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-            )
-          )
-        )
+        .where(and(eq(webhook.workflowId, workflowId), eq(webhook.blockId, blockId)))
         .limit(1)
       if (existingForBlock.length > 0) {
         targetWebhookId = existingForBlock[0].id

apps/sim/app/api/webhooks/trigger/[path]/route.ts

@@ -152,6 +152,7 @@ export async function POST(
     const response = await queueWebhookExecution(foundWebhook, foundWorkflow, body, request, {
       requestId,
       path,
+      executionTarget: 'deployed',
     })
     responses.push(response)
   }

apps/sim/app/api/workflows/[id]/deploy/route.ts

@@ -10,11 +10,7 @@ import {
   loadWorkflowFromNormalizedTables,
   undeployWorkflow,
 } from '@/lib/workflows/persistence/utils'
-import {
-  cleanupDeploymentVersion,
-  createSchedulesForDeploy,
-  validateWorkflowSchedules,
-} from '@/lib/workflows/schedules'
+import { createSchedulesForDeploy, validateWorkflowSchedules } from '@/lib/workflows/schedules'
 import { validateWorkflowPermissions } from '@/lib/workflows/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 
@@ -135,6 +131,22 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       return createErrorResponse(`Invalid schedule configuration: ${scheduleValidation.error}`, 400)
     }
 
+    const triggerSaveResult = await saveTriggerWebhooksForDeploy({
+      request,
+      workflowId: id,
+      workflow: workflowData,
+      userId: actorUserId,
+      blocks: normalizedData.blocks,
+      requestId,
+    })
+
+    if (!triggerSaveResult.success) {
+      return createErrorResponse(
+        triggerSaveResult.error?.message || 'Failed to save trigger configuration',
+        triggerSaveResult.error?.status || 500
+      )
+    }
+
     const deployResult = await deployWorkflow({
       workflowId: id,
       deployedBy: actorUserId,
@@ -146,58 +158,14 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
     }
 
     const deployedAt = deployResult.deployedAt!
-    const deploymentVersionId = deployResult.deploymentVersionId
-
-    if (!deploymentVersionId) {
-      await undeployWorkflow({ workflowId: id })
-      return createErrorResponse('Failed to resolve deployment version', 500)
-    }
-
-    const triggerSaveResult = await saveTriggerWebhooksForDeploy({
-      request,
-      workflowId: id,
-      workflow: workflowData,
-      userId: actorUserId,
-      blocks: normalizedData.blocks,
-      requestId,
-      deploymentVersionId,
-    })
-
-    if (!triggerSaveResult.success) {
-      await cleanupDeploymentVersion({
-        workflowId: id,
-        workflow: workflowData as Record<string, unknown>,
-        requestId,
-        deploymentVersionId,
-      })
-      await undeployWorkflow({ workflowId: id })
-      return createErrorResponse(
-        triggerSaveResult.error?.message || 'Failed to save trigger configuration',
-        triggerSaveResult.error?.status || 500
-      )
-    }
 
     let scheduleInfo: { scheduleId?: string; cronExpression?: string; nextRunAt?: Date } = {}
-    const scheduleResult = await createSchedulesForDeploy(
-      id,
-      normalizedData.blocks,
-      db,
-      deploymentVersionId
-    )
+    const scheduleResult = await createSchedulesForDeploy(id, normalizedData.blocks, db)
     if (!scheduleResult.success) {
       logger.error(
         `[${requestId}] Failed to create schedule for workflow ${id}: ${scheduleResult.error}`
       )
-      await cleanupDeploymentVersion({
-        workflowId: id,
-        workflow: workflowData as Record<string, unknown>,
-        requestId,
-        deploymentVersionId,
-      })
-      await undeployWorkflow({ workflowId: id })
-      return createErrorResponse(scheduleResult.error || 'Failed to create schedule', 500)
-    }
-    if (scheduleResult.scheduleId) {
+    } else if (scheduleResult.scheduleId) {
       scheduleInfo = {
         scheduleId: scheduleResult.scheduleId,
         cronExpression: scheduleResult.cronExpression,

apps/sim/app/api/workflows/[id]/deployments/[version]/activate/route.ts

@@ -1,19 +1,10 @@
-import { db, workflowDeploymentVersion } from '@sim/db'
 import { createLogger } from '@sim/logger'
-import { and, eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { syncMcpToolsForWorkflow } from '@/lib/mcp/workflow-mcp-sync'
-import { saveTriggerWebhooksForDeploy } from '@/lib/webhooks/deploy'
 import { activateWorkflowVersion } from '@/lib/workflows/persistence/utils'
-import {
-  cleanupDeploymentVersion,
-  createSchedulesForDeploy,
-  validateWorkflowSchedules,
-} from '@/lib/workflows/schedules'
 import { validateWorkflowPermissions } from '@/lib/workflows/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
-import type { BlockState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('WorkflowActivateDeploymentAPI')
 
@@ -28,135 +19,30 @@ export async function POST(
   const { id, version } = await params
 
   try {
-    const {
-      error,
-      session,
-      workflow: workflowData,
-    } = await validateWorkflowPermissions(id, requestId, 'admin')
+    const { error } = await validateWorkflowPermissions(id, requestId, 'admin')
     if (error) {
       return createErrorResponse(error.message, error.status)
     }
 
-    const actorUserId = session?.user?.id
-    if (!actorUserId) {
-      logger.warn(`[${requestId}] Unable to resolve actor user for deployment activation: ${id}`)
-      return createErrorResponse('Unable to determine activating user', 400)
-    }
-
     const versionNum = Number(version)
     if (!Number.isFinite(versionNum)) {
       return createErrorResponse('Invalid version number', 400)
     }
 
-    const [versionRow] = await db
-      .select({
-        id: workflowDeploymentVersion.id,
-        state: workflowDeploymentVersion.state,
-      })
-      .from(workflowDeploymentVersion)
-      .where(
-        and(
-          eq(workflowDeploymentVersion.workflowId, id),
-          eq(workflowDeploymentVersion.version, versionNum)
-        )
-      )
-      .limit(1)
-
-    if (!versionRow?.state) {
-      return createErrorResponse('Deployment version not found', 404)
-    }
-
-    const [currentActiveVersion] = await db
-      .select({ id: workflowDeploymentVersion.id })
-      .from(workflowDeploymentVersion)
-      .where(
-        and(
-          eq(workflowDeploymentVersion.workflowId, id),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
-      .limit(1)
-
-    const previousVersionId = currentActiveVersion?.id
-
-    const deployedState = versionRow.state as { blocks?: Record<string, BlockState> }
-    const blocks = deployedState.blocks
-    if (!blocks || typeof blocks !== 'object') {
-      return createErrorResponse('Invalid deployed state structure', 500)
-    }
-
-    const triggerSaveResult = await saveTriggerWebhooksForDeploy({
-      request,
-      workflowId: id,
-      workflow: workflowData as Record<string, unknown>,
-      userId: actorUserId,
-      blocks,
-      requestId,
-      deploymentVersionId: versionRow.id,
-    })
-
-    if (!triggerSaveResult.success) {
-      return createErrorResponse(
-        triggerSaveResult.error?.message || 'Failed to sync trigger configuration',
-        triggerSaveResult.error?.status || 500
-      )
-    }
-
-    const scheduleValidation = validateWorkflowSchedules(blocks)
-    if (!scheduleValidation.isValid) {
-      return createErrorResponse(`Invalid schedule configuration: ${scheduleValidation.error}`, 400)
-    }
-
-    const scheduleResult = await createSchedulesForDeploy(id, blocks, db, versionRow.id)
-
-    if (!scheduleResult.success) {
-      await cleanupDeploymentVersion({
-        workflowId: id,
-        workflow: workflowData as Record<string, unknown>,
-        requestId,
-        deploymentVersionId: versionRow.id,
-      })
-      return createErrorResponse(scheduleResult.error || 'Failed to sync schedules', 500)
-    }
-
     const result = await activateWorkflowVersion({ workflowId: id, version: versionNum })
     if (!result.success) {
-      await cleanupDeploymentVersion({
-        workflowId: id,
-        workflow: workflowData as Record<string, unknown>,
-        requestId,
-        deploymentVersionId: versionRow.id,
-      })
       return createErrorResponse(result.error || 'Failed to activate deployment', 400)
     }
 
-    if (previousVersionId && previousVersionId !== versionRow.id) {
-      try {
-        logger.info(
-          `[${requestId}] Cleaning up previous version ${previousVersionId} webhooks/schedules`
-        )
-        await cleanupDeploymentVersion({
-          workflowId: id,
-          workflow: workflowData as Record<string, unknown>,
-          requestId,
-          deploymentVersionId: previousVersionId,
-        })
-        logger.info(`[${requestId}] Previous version cleanup completed`)
-      } catch (cleanupError) {
-        logger.error(
-          `[${requestId}] Failed to clean up previous version ${previousVersionId}`,
-          cleanupError
-        )
-      }
+    if (result.state) {
+      await syncMcpToolsForWorkflow({
+        workflowId: id,
+        requestId,
+        state: result.state,
+        context: 'activate',
+      })
     }
 
-    await syncMcpToolsForWorkflow({
-      workflowId: id,
-      requestId,
-      state: versionRow.state,
-      context: 'activate',
-    })
-
     return createSuccessResponse({ success: true, deployedAt: result.deployedAt })
   } catch (error: any) {
     logger.error(`[${requestId}] Error activating deployment for workflow: ${id}`, error)

apps/sim/app/api/workflows/[id]/execute/route.ts

@@ -110,7 +110,6 @@ type AsyncExecutionParams = {
   userId: string
   input: any
   triggerType: CoreTriggerType
-  preflighted?: boolean
 }
 
 /**
@@ -133,7 +132,6 @@ async function handleAsyncExecution(params: AsyncExecutionParams): Promise<NextR
     userId,
     input,
     triggerType,
-    preflighted: params.preflighted,
   }
 
   try {
@@ -266,7 +264,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
       requestId
     )
 
-    const shouldPreflightEnvVars = isAsyncMode && isTriggerDevEnabled
     const preprocessResult = await preprocessExecution({
       workflowId,
       userId,
@@ -275,9 +272,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
       requestId,
       checkDeployment: !shouldUseDraftState,
       loggingSession,
-      preflightEnvVars: shouldPreflightEnvVars,
-      useDraftState: shouldUseDraftState,
-      envUserId: isClientSession ? userId : undefined,
     })
 
     if (!preprocessResult.success) {
@@ -309,7 +303,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
         userId: actorUserId,
         input,
         triggerType: loggingTriggerType,
-        preflighted: shouldPreflightEnvVars,
       })
     }
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx

@@ -8,6 +8,7 @@ import { useNotificationStore } from '@/stores/notifications'
 import { useCopilotStore, usePanelStore } from '@/stores/panel'
 import { useTerminalStore } from '@/stores/terminal'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 const logger = createLogger('DiffControls')
 const NOTIFICATION_WIDTH = 240
@@ -37,8 +38,15 @@ export const DiffControls = memo(function DiffControls() {
     )
   )
 
+  const { activeWorkflowId } = useWorkflowRegistry(
+    useCallback((state) => ({ activeWorkflowId: state.activeWorkflowId }), [])
+  )
+
   const allNotifications = useNotificationStore((state) => state.notifications)
-  const hasVisibleNotifications = allNotifications.length > 0
+  const hasVisibleNotifications = useMemo(() => {
+    if (!activeWorkflowId) return false
+    return allNotifications.some((n) => !n.workflowId || n.workflowId === activeWorkflowId)
+  }, [allNotifications, activeWorkflowId])
 
   const handleAccept = useCallback(() => {
     logger.info('Accepting proposed changes with backup protection')

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts

@@ -94,7 +94,6 @@ export function useCheckpointManagement(
 
         setShowRestoreConfirmation(false)
         onRevertModeChange?.(false)
-        onEditModeChange?.(true)
 
         logger.info('Checkpoint reverted and removed from message', {
           messageId: message.id,
@@ -115,7 +114,6 @@ export function useCheckpointManagement(
     messages,
     currentChat,
     onRevertModeChange,
-    onEditModeChange,
   ])
 
   /**
@@ -176,6 +174,7 @@ export function useCheckpointManagement(
             fileAttachments: fileAttachments || message.fileAttachments,
             contexts: contexts || (message as any).contexts,
             messageId: message.id,
+            queueIfBusy: false,
           })
         }
         pendingEditRef.current = null
@@ -219,6 +218,7 @@ export function useCheckpointManagement(
           fileAttachments: fileAttachments || message.fileAttachments,
           contexts: contexts || (message as any).contexts,
           messageId: message.id,
+          queueIfBusy: false,
         })
       }
       pendingEditRef.current = null

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-editing.ts

@@ -166,6 +166,7 @@ export function useMessageEditing(props: UseMessageEditingProps) {
           fileAttachments: fileAttachments || message.fileAttachments,
           contexts: contexts || (message as any).contexts,
           messageId: message.id,
+          queueIfBusy: false,
         })
       }
     },

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx

@@ -2,19 +2,16 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useReactFlow } from 'reactflow'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
 import { cn } from '@/lib/core/utils/cn'
-import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
-import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { getDependsOnFields } from '@/blocks/utils'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { getProviderFromModel } from '@/providers/utils'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 /**
  * Constants for ComboBox component behavior
@@ -94,24 +91,15 @@ export function ComboBox({
   // Dependency tracking for fetchOptions
   const dependsOnFields = useMemo(() => getDependsOnFields(dependsOn), [dependsOn])
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
-  const blockState = useWorkflowStore((state) => state.blocks[blockId])
-  const blockConfig = blockState?.type ? getBlock(blockState.type) : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-  const canonicalModeOverrides = blockState?.data?.canonicalModes
   const dependencyValues = useSubBlockStore(
     useCallback(
       (state) => {
         if (dependsOnFields.length === 0 || !activeWorkflowId) return []
         const workflowValues = state.workflowValues[activeWorkflowId] || {}
         const blockValues = workflowValues[blockId] || {}
-        return dependsOnFields.map((depKey) =>
-          resolveDependencyValue(depKey, blockValues, canonicalIndex, canonicalModeOverrides)
-        )
+        return dependsOnFields.map((depKey) => blockValues[depKey] ?? null)
       },
-      [dependsOnFields, activeWorkflowId, blockId, canonicalIndex, canonicalModeOverrides]
+      [dependsOnFields, activeWorkflowId, blockId]
     )
   )
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx

@@ -1,15 +1,12 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Badge } from '@/components/emcn'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
-import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { getDependsOnFields } from '@/blocks/utils'
 import { ResponseBlockHandler } from '@/executor/handlers/response/response-handler'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 /**
  * Dropdown option type - can be a simple string or an object with label, id, and optional icon
@@ -92,24 +89,15 @@ export function Dropdown({
   const dependsOnFields = useMemo(() => getDependsOnFields(dependsOn), [dependsOn])
 
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
-  const blockState = useWorkflowStore((state) => state.blocks[blockId])
-  const blockConfig = blockState?.type ? getBlock(blockState.type) : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-  const canonicalModeOverrides = blockState?.data?.canonicalModes
   const dependencyValues = useSubBlockStore(
     useCallback(
       (state) => {
         if (dependsOnFields.length === 0 || !activeWorkflowId) return []
         const workflowValues = state.workflowValues[activeWorkflowId] || {}
         const blockValues = workflowValues[blockId] || {}
-        return dependsOnFields.map((depKey) =>
-          resolveDependencyValue(depKey, blockValues, canonicalIndex, canonicalModeOverrides)
-        )
+        return dependsOnFields.map((depKey) => blockValues[depKey] ?? null)
       },
-      [dependsOnFields, activeWorkflowId, blockId, canonicalIndex, canonicalModeOverrides]
+      [dependsOnFields, activeWorkflowId, blockId]
     )
   )
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx

@@ -4,19 +4,15 @@ import { useMemo } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
-import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
 import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { isDependency } from '@/blocks/utils'
 import { resolveSelectorForSubBlock, type SelectorResolution } from '@/hooks/selectors/resolution'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 interface FileSelectorInputProps {
   blockId: string
@@ -46,59 +42,21 @@ export function FileSelectorInput({
     previewContextValues,
   })
 
-  const blockState = useWorkflowStore((state) => state.blocks[blockId])
-  const blockConfig = blockState?.type ? getBlock(blockState.type) : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-  const canonicalModeOverrides = blockState?.data?.canonicalModes
-
-  const blockValues = useSubBlockStore((state) => {
-    if (!activeWorkflowId) return {}
-    const workflowValues = state.workflowValues[activeWorkflowId] || {}
-    return (workflowValues as Record<string, Record<string, unknown>>)[blockId] || {}
-  })
-
+  const [connectedCredentialFromStore] = useSubBlockValue(blockId, 'credential')
   const [domainValueFromStore] = useSubBlockValue(blockId, 'domain')
+  const [projectIdValueFromStore] = useSubBlockValue(blockId, 'projectId')
+  const [planIdValueFromStore] = useSubBlockValue(blockId, 'planId')
+  const [teamIdValueFromStore] = useSubBlockValue(blockId, 'teamId')
+  const [siteIdValueFromStore] = useSubBlockValue(blockId, 'siteId')
+  const [collectionIdValueFromStore] = useSubBlockValue(blockId, 'collectionId')
 
-  const connectedCredential = previewContextValues?.credential ?? blockValues.credential
+  const connectedCredential = previewContextValues?.credential ?? connectedCredentialFromStore
   const domainValue = previewContextValues?.domain ?? domainValueFromStore
-
-  const teamIdValue = useMemo(
-    () =>
-      previewContextValues?.teamId ??
-      resolveDependencyValue('teamId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues?.teamId, blockValues, canonicalIndex, canonicalModeOverrides]
-  )
-
-  const siteIdValue = useMemo(
-    () =>
-      previewContextValues?.siteId ??
-      resolveDependencyValue('siteId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues?.siteId, blockValues, canonicalIndex, canonicalModeOverrides]
-  )
-
-  const collectionIdValue = useMemo(
-    () =>
-      previewContextValues?.collectionId ??
-      resolveDependencyValue('collectionId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues?.collectionId, blockValues, canonicalIndex, canonicalModeOverrides]
-  )
-
-  const projectIdValue = useMemo(
-    () =>
-      previewContextValues?.projectId ??
-      resolveDependencyValue('projectId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues?.projectId, blockValues, canonicalIndex, canonicalModeOverrides]
-  )
-
-  const planIdValue = useMemo(
-    () =>
-      previewContextValues?.planId ??
-      resolveDependencyValue('planId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues?.planId, blockValues, canonicalIndex, canonicalModeOverrides]
-  )
+  const projectIdValue = previewContextValues?.projectId ?? projectIdValueFromStore
+  const planIdValue = previewContextValues?.planId ?? planIdValueFromStore
+  const teamIdValue = previewContextValues?.teamId ?? teamIdValueFromStore
+  const siteIdValue = previewContextValues?.siteId ?? siteIdValueFromStore
+  const collectionIdValue = previewContextValues?.collectionId ?? collectionIdValueFromStore
 
   const normalizedCredentialId =
     typeof connectedCredential === 'string'
@@ -107,6 +65,7 @@ export function FileSelectorInput({
         ? ((connectedCredential as Record<string, any>).id ?? '')
         : ''
 
+  // Derive provider from serviceId using OAuth config (same pattern as credential-selector)
   const serviceId = subBlock.serviceId || ''
   const effectiveProviderId = useMemo(() => getProviderIdFromServiceId(serviceId), [serviceId])
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx

@@ -4,17 +4,14 @@ import { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
-import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
 import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock } from '@/hooks/selectors/resolution'
+import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 interface ProjectSelectorInputProps {
   blockId: string
@@ -35,36 +32,21 @@ export function ProjectSelectorInput({
   previewValue,
   previewContextValues,
 }: ProjectSelectorInputProps) {
+  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
   const params = useParams()
-  const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId) as string | null
   const [selectedProjectId, setSelectedProjectId] = useState<string>('')
+  // Use the proper hook to get the current value and setter
   const [storeValue] = useSubBlockValue(blockId, subBlock.id)
+  const [connectedCredentialFromStore] = useSubBlockValue(blockId, 'credential')
+  const [linearTeamIdFromStore] = useSubBlockValue(blockId, 'teamId')
   const [jiraDomainFromStore] = useSubBlockValue(blockId, 'domain')
 
-  const blockState = useWorkflowStore((state) => state.blocks[blockId])
-  const blockConfig = blockState?.type ? getBlock(blockState.type) : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-  const canonicalModeOverrides = blockState?.data?.canonicalModes
-
-  const blockValues = useSubBlockStore((state) => {
-    if (!activeWorkflowId) return {}
-    const workflowValues = state.workflowValues[activeWorkflowId] || {}
-    return (workflowValues as Record<string, Record<string, unknown>>)[blockId] || {}
-  })
-
-  const connectedCredential = previewContextValues?.credential ?? blockValues.credential
+  // Use previewContextValues if provided (for tools inside agent blocks), otherwise use store values
+  const connectedCredential = previewContextValues?.credential ?? connectedCredentialFromStore
+  const linearTeamId = previewContextValues?.teamId ?? linearTeamIdFromStore
   const jiraDomain = previewContextValues?.domain ?? jiraDomainFromStore
 
-  const linearTeamId = useMemo(
-    () =>
-      previewContextValues?.teamId ??
-      resolveDependencyValue('teamId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues?.teamId, blockValues, canonicalIndex, canonicalModeOverrides]
-  )
-
+  // Derive provider from serviceId using OAuth config
   const serviceId = subBlock.serviceId || ''
   const effectiveProviderId = useMemo(() => getProviderIdFromServiceId(serviceId), [serviceId])
 
@@ -72,6 +54,7 @@ export function ProjectSelectorInput({
     effectiveProviderId,
     (connectedCredential as string) || ''
   )
+  const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId) as string | null
   const workflowIdFromUrl = (params?.workflowId as string) || activeWorkflowId || ''
   const { finalDisabled } = useDependsOnGate(blockId, subBlock, {
     disabled,
@@ -79,8 +62,12 @@ export function ProjectSelectorInput({
     previewContextValues,
   })
 
+  // Jira/Discord upstream fields - use values from previewContextValues or store
   const domain = (jiraDomain as string) || ''
 
+  // Verify Jira credential belongs to current user; if not, treat as absent
+
+  // Get the current value from the store or prop value if in preview mode
   useEffect(() => {
     if (isPreview && previewValue !== undefined) {
       setSelectedProjectId(previewValue)

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sheet-selector/sheet-selector-input.tsx

@@ -4,17 +4,14 @@ import { useMemo } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
-import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
 import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
-import { getBlock } from '@/blocks/registry'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock, type SelectorResolution } from '@/hooks/selectors/resolution'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 interface SheetSelectorInputProps {
   blockId: string
@@ -44,32 +41,16 @@ export function SheetSelectorInput({
     previewContextValues,
   })
 
-  const blockState = useWorkflowStore((state) => state.blocks[blockId])
-  const blockConfig = blockState?.type ? getBlock(blockState.type) : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-  const canonicalModeOverrides = blockState?.data?.canonicalModes
-
-  const blockValues = useSubBlockStore((state) => {
-    if (!activeWorkflowId) return {}
-    const workflowValues = state.workflowValues[activeWorkflowId] || {}
-    return (workflowValues as Record<string, Record<string, unknown>>)[blockId] || {}
-  })
-
-  const connectedCredentialFromStore = blockValues.credential
-
-  const spreadsheetIdFromStore = useMemo(
-    () =>
-      resolveDependencyValue('spreadsheetId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [blockValues, canonicalIndex, canonicalModeOverrides]
-  )
+  const [connectedCredentialFromStore] = useSubBlockValue(blockId, 'credential')
+  const [spreadsheetIdFromStore] = useSubBlockValue(blockId, 'spreadsheetId')
+  const [manualSpreadsheetIdFromStore] = useSubBlockValue(blockId, 'manualSpreadsheetId')
 
   const connectedCredential = previewContextValues?.credential ?? connectedCredentialFromStore
-  const spreadsheetId = previewContextValues
-    ? (previewContextValues.spreadsheetId ?? previewContextValues.manualSpreadsheetId)
-    : spreadsheetIdFromStore
+  const spreadsheetId =
+    previewContextValues?.spreadsheetId ??
+    spreadsheetIdFromStore ??
+    previewContextValues?.manualSpreadsheetId ??
+    manualSpreadsheetIdFromStore
 
   const normalizedCredentialId =
     typeof connectedCredential === 'string'
@@ -80,6 +61,7 @@ export function SheetSelectorInput({
 
   const normalizedSpreadsheetId = typeof spreadsheetId === 'string' ? spreadsheetId.trim() : ''
 
+  // Derive provider from serviceId using OAuth config
   const serviceId = subBlock.serviceId || ''
   const effectiveProviderId = useMemo(() => getProviderIdFromServiceId(serviceId), [serviceId])
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts

@@ -1,16 +1,9 @@
 'use client'
 
 import { useMemo } from 'react'
-import {
-  buildCanonicalIndex,
-  isNonEmptyValue,
-  resolveDependencyValue,
-} from '@/lib/workflows/subblocks/visibility'
-import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 type DependsOnConfig = string[] | { all?: string[]; any?: string[] }
 
@@ -57,13 +50,6 @@ export function useDependsOnGate(
   const previewContextValues = opts?.previewContextValues
 
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
-  const blockState = useWorkflowStore((state) => state.blocks[blockId])
-  const blockConfig = blockState?.type ? getBlock(blockState.type) : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
-  const canonicalModeOverrides = blockState?.data?.canonicalModes
 
   // Parse dependsOn config to get all/any field lists
   const { allFields, anyFields, allDependsOnFields } = useMemo(
@@ -105,13 +91,7 @@ export function useDependsOnGate(
     if (previewContextValues) {
       const map: Record<string, unknown> = {}
       for (const key of allDependsOnFields) {
-        const resolvedValue = resolveDependencyValue(
-          key,
-          previewContextValues,
-          canonicalIndex,
-          canonicalModeOverrides
-        )
-        map[key] = normalizeDependencyValue(resolvedValue)
+        map[key] = normalizeDependencyValue(previewContextValues[key])
       }
       return map
     }
@@ -128,25 +108,32 @@ export function useDependsOnGate(
     const blockValues = (workflowValues as any)[blockId] || {}
     const map: Record<string, unknown> = {}
     for (const key of allDependsOnFields) {
-      const resolvedValue = resolveDependencyValue(
-        key,
-        blockValues,
-        canonicalIndex,
-        canonicalModeOverrides
-      )
-      map[key] = normalizeDependencyValue(resolvedValue)
+      map[key] = normalizeDependencyValue((blockValues as any)[key])
     }
     return map
   })
 
+  // For backward compatibility, also provide array of values
+  const dependencyValues = useMemo(
+    () => allDependsOnFields.map((key) => dependencyValuesMap[key]),
+    [allDependsOnFields, dependencyValuesMap]
+  ) as any[]
+
+  const isValueSatisfied = (value: unknown): boolean => {
+    if (value === null || value === undefined) return false
+    if (typeof value === 'string') return value.trim().length > 0
+    if (Array.isArray(value)) return value.length > 0
+    return value !== ''
+  }
+
   const depsSatisfied = useMemo(() => {
     // Check all fields (AND logic) - all must be satisfied
     const allSatisfied =
-      allFields.length === 0 || allFields.every((key) => isNonEmptyValue(dependencyValuesMap[key]))
+      allFields.length === 0 || allFields.every((key) => isValueSatisfied(dependencyValuesMap[key]))
 
     // Check any fields (OR logic) - at least one must be satisfied
     const anySatisfied =
-      anyFields.length === 0 || anyFields.some((key) => isNonEmptyValue(dependencyValuesMap[key]))
+      anyFields.length === 0 || anyFields.some((key) => isValueSatisfied(dependencyValuesMap[key]))
 
     return allSatisfied && anySatisfied
   }, [allFields, anyFields, dependencyValuesMap])
@@ -159,6 +146,7 @@ export function useDependsOnGate(
 
   return {
     dependsOn,
+    dependencyValues,
     depsSatisfied,
     blocked,
     finalDisabled,

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx

@@ -1,5 +1,5 @@
 import { type JSX, type MouseEvent, memo, useRef, useState } from 'react'
-import { AlertTriangle, ArrowLeftRight, ArrowUp } from 'lucide-react'
+import { AlertTriangle, ArrowUp } from 'lucide-react'
 import { Button, Input, Label, Tooltip } from '@/components/emcn/components'
 import { cn } from '@/lib/core/utils/cn'
 import type { FieldDiffStatus } from '@/lib/workflows/diff/types'
@@ -67,11 +67,6 @@ interface SubBlockProps {
   disabled?: boolean
   fieldDiffStatus?: FieldDiffStatus
   allowExpandInPreview?: boolean
-  canonicalToggle?: {
-    mode: 'basic' | 'advanced'
-    disabled?: boolean
-    onToggle?: () => void
-  }
 }
 
 /**
@@ -187,11 +182,6 @@ const renderLabel = (
     onSearchSubmit: () => void
     onSearchCancel: () => void
     searchInputRef: React.RefObject<HTMLInputElement | null>
-  },
-  canonicalToggle?: {
-    mode: 'basic' | 'advanced'
-    disabled?: boolean
-    onToggle?: () => void
   }
 ): JSX.Element | null => {
   if (config.type === 'switch') return null
@@ -199,12 +189,13 @@ const renderLabel = (
 
   const required = isFieldRequired(config, subBlockValues)
   const showWand = wandState?.isWandEnabled && !wandState.isPreview && !wandState.disabled
-  const showCanonicalToggle = !!canonicalToggle && !wandState?.isPreview
-  const canonicalToggleDisabled = wandState?.disabled || canonicalToggle?.disabled
 
   return (
-    <div className='flex items-center justify-between gap-[6px] pl-[2px]'>
-      <Label className='flex items-center gap-[6px] whitespace-nowrap'>
+    <Label
+      className='flex items-center justify-between gap-[6px] pl-[2px]'
+      onClick={(e) => e.preventDefault()}
+    >
+      <div className='flex items-center gap-[6px] whitespace-nowrap'>
         {config.title}
         {required && <span className='ml-0.5'>*</span>}
         {config.type === 'code' && config.language === 'json' && (
@@ -222,82 +213,58 @@ const renderLabel = (
             </Tooltip.Content>
           </Tooltip.Root>
         )}
-      </Label>
-      <div className='flex items-center gap-[6px]'>
-        {showWand && (
-          <>
-            {!wandState.isSearchActive ? (
-              <Button
-                variant='active'
-                className='-my-1 h-5 px-2 py-0 text-[11px]'
-                onClick={wandState.onSearchClick}
-              >
-                Generate
-              </Button>
-            ) : (
-              <div className='-my-1 flex items-center gap-[4px]'>
-                <Input
-                  ref={wandState.searchInputRef}
-                  value={wandState.isStreaming ? 'Generating...' : wandState.searchQuery}
-                  onChange={(e) => wandState.onSearchChange(e.target.value)}
-                  onBlur={wandState.onSearchBlur}
-                  onKeyDown={(e) => {
-                    if (
-                      e.key === 'Enter' &&
-                      wandState.searchQuery.trim() &&
-                      !wandState.isStreaming
-                    ) {
-                      wandState.onSearchSubmit()
-                    } else if (e.key === 'Escape') {
-                      wandState.onSearchCancel()
-                    }
-                  }}
-                  disabled={wandState.isStreaming}
-                  className={cn(
-                    'h-5 max-w-[200px] flex-1 text-[11px]',
-                    wandState.isStreaming && 'text-muted-foreground'
-                  )}
-                  placeholder='Generate with AI...'
-                />
-                <Button
-                  variant='tertiary'
-                  disabled={!wandState.searchQuery.trim() || wandState.isStreaming}
-                  onMouseDown={(e) => {
-                    e.preventDefault()
-                    e.stopPropagation()
-                  }}
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    wandState.onSearchSubmit()
-                  }}
-                  className='h-[20px] w-[20px] flex-shrink-0 p-0'
-                >
-                  <ArrowUp className='h-[12px] w-[12px]' />
-                </Button>
-              </div>
-            )}
-          </>
-        )}
-        {showCanonicalToggle && (
-          <button
-            type='button'
-            className='flex h-[12px] w-[12px] flex-shrink-0 items-center justify-center bg-transparent p-0 disabled:cursor-not-allowed disabled:opacity-50'
-            onClick={canonicalToggle?.onToggle}
-            disabled={canonicalToggleDisabled}
-            aria-label={canonicalToggle?.mode === 'advanced' ? 'Use selector' : 'Enter manual ID'}
-          >
-            <ArrowLeftRight
-              className={cn(
-                '!h-[12px] !w-[12px]',
-                canonicalToggle?.mode === 'advanced'
-                  ? 'text-[var(--text-primary)]'
-                  : 'text-[var(--text-secondary)]'
-              )}
-            />
-          </button>
-        )}
       </div>
-    </div>
+      {showWand && (
+        <>
+          {!wandState.isSearchActive ? (
+            <Button
+              variant='active'
+              className='-my-1 h-5 px-2 py-0 text-[11px]'
+              onClick={wandState.onSearchClick}
+            >
+              Generate
+            </Button>
+          ) : (
+            <div className='-my-1 flex items-center gap-[4px]'>
+              <Input
+                ref={wandState.searchInputRef}
+                value={wandState.isStreaming ? 'Generating...' : wandState.searchQuery}
+                onChange={(e) => wandState.onSearchChange(e.target.value)}
+                onBlur={wandState.onSearchBlur}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter' && wandState.searchQuery.trim() && !wandState.isStreaming) {
+                    wandState.onSearchSubmit()
+                  } else if (e.key === 'Escape') {
+                    wandState.onSearchCancel()
+                  }
+                }}
+                disabled={wandState.isStreaming}
+                className={cn(
+                  'h-5 max-w-[200px] flex-1 text-[11px]',
+                  wandState.isStreaming && 'text-muted-foreground'
+                )}
+                placeholder='Generate...'
+              />
+              <Button
+                variant='tertiary'
+                disabled={!wandState.searchQuery.trim() || wandState.isStreaming}
+                onMouseDown={(e) => {
+                  e.preventDefault()
+                  e.stopPropagation()
+                }}
+                onClick={(e) => {
+                  e.stopPropagation()
+                  wandState.onSearchSubmit()
+                }}
+                className='h-[20px] w-[20px] flex-shrink-0 p-0'
+              >
+                <ArrowUp className='h-[12px] w-[12px]' />
+              </Button>
+            </div>
+          )}
+        </>
+      )}
+    </Label>
   )
 }
 
@@ -320,9 +287,7 @@ const arePropsEqual = (prevProps: SubBlockProps, nextProps: SubBlockProps): bool
     prevProps.subBlockValues === nextProps.subBlockValues &&
     prevProps.disabled === nextProps.disabled &&
     prevProps.fieldDiffStatus === nextProps.fieldDiffStatus &&
-    prevProps.allowExpandInPreview === nextProps.allowExpandInPreview &&
-    prevProps.canonicalToggle?.mode === nextProps.canonicalToggle?.mode &&
-    prevProps.canonicalToggle?.disabled === nextProps.canonicalToggle?.disabled
+    prevProps.allowExpandInPreview === nextProps.allowExpandInPreview
   )
 }
 
@@ -351,7 +316,6 @@ function SubBlockComponent({
   disabled = false,
   fieldDiffStatus,
   allowExpandInPreview,
-  canonicalToggle,
 }: SubBlockProps): JSX.Element {
   const [isValidJson, setIsValidJson] = useState(true)
   const [isSearchActive, setIsSearchActive] = useState(false)
@@ -923,26 +887,20 @@ function SubBlockComponent({
 
   return (
     <div onMouseDown={handleMouseDown} className='subblock-content flex flex-col gap-[10px]'>
-      {renderLabel(
-        config,
-        isValidJson,
-        subBlockValues,
-        {
-          isSearchActive,
-          searchQuery,
-          isWandEnabled,
-          isPreview,
-          isStreaming: wandControlRef.current?.isWandStreaming ?? false,
-          disabled: isDisabled,
-          onSearchClick: handleSearchClick,
-          onSearchBlur: handleSearchBlur,
-          onSearchChange: handleSearchChange,
-          onSearchSubmit: handleSearchSubmit,
-          onSearchCancel: handleSearchCancel,
-          searchInputRef,
-        },
-        canonicalToggle
-      )}
+      {renderLabel(config, isValidJson, subBlockValues, {
+        isSearchActive,
+        searchQuery,
+        isWandEnabled,
+        isPreview,
+        isStreaming: wandControlRef.current?.isWandStreaming ?? false,
+        disabled: isDisabled,
+        onSearchClick: handleSearchClick,
+        onSearchBlur: handleSearchBlur,
+        onSearchChange: handleSearchChange,
+        onSearchSubmit: handleSearchSubmit,
+        onSearchCancel: handleSearchCancel,
+        searchInputRef,
+      })}
       {renderInput()}
     </div>
   )

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx

@@ -1,15 +1,8 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { BookOpen, Check, ChevronDown, ChevronUp, Pencil } from 'lucide-react'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { BookOpen, Check, ChevronUp, Pencil, Settings } from 'lucide-react'
 import { Button, Tooltip } from '@/components/emcn'
-import {
-  buildCanonicalIndex,
-  hasAdvancedValues,
-  hasStandaloneAdvancedFields,
-  isCanonicalPair,
-  resolveCanonicalMode,
-} from '@/lib/workflows/subblocks/visibility'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import {
   ConnectionBlocks,
@@ -27,7 +20,6 @@ import { ParallelTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/compo
 import { getSubBlockStableKey } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils'
 import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
 import { getBlock } from '@/blocks/registry'
-import type { SubBlockType } from '@/blocks/types'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { usePanelEditorStore } from '@/stores/panel'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -97,65 +89,17 @@ export function Editor() {
     )
   )
 
-  const subBlocksForCanonical = useMemo(() => {
-    const subBlocks = blockConfig?.subBlocks || []
-    if (!triggerMode) return subBlocks
-    return subBlocks.filter(
-      (subBlock) =>
-        subBlock.mode === 'trigger' || subBlock.type === ('trigger-config' as SubBlockType)
-    )
-  }, [blockConfig?.subBlocks, triggerMode])
-
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(subBlocksForCanonical),
-    [subBlocksForCanonical]
-  )
-  const canonicalModeOverrides = currentBlock?.data?.canonicalModes
-  const advancedValuesPresent = hasAdvancedValues(
-    subBlocksForCanonical,
-    blockSubBlockValues,
-    canonicalIndex
-  )
-  const displayAdvancedOptions = advancedMode || advancedValuesPresent
-
-  const hasAdvancedOnlyFields = useMemo(
-    () => hasStandaloneAdvancedFields(subBlocksForCanonical, canonicalIndex),
-    [subBlocksForCanonical, canonicalIndex]
-  )
-
   // Get subblock layout using custom hook
   const { subBlocks, stateToUse: subBlockState } = useEditorSubblockLayout(
     blockConfig || ({} as any),
     currentBlockId || '',
-    displayAdvancedOptions,
+    advancedMode,
     triggerMode,
     activeWorkflowId,
     blockSubBlockValues,
     currentWorkflow.isSnapshotView
   )
 
-  /**
-   * Partitions subBlocks into regular fields and standalone advanced-only fields.
-   * Standalone advanced fields have mode 'advanced' and are not part of a canonical swap pair.
-   */
-  const { regularSubBlocks, advancedOnlySubBlocks } = useMemo(() => {
-    const regular: typeof subBlocks = []
-    const advancedOnly: typeof subBlocks = []
-
-    for (const subBlock of subBlocks) {
-      const isStandaloneAdvanced =
-        subBlock.mode === 'advanced' && !canonicalIndex.canonicalIdBySubBlockId[subBlock.id]
-
-      if (isStandaloneAdvanced) {
-        advancedOnly.push(subBlock)
-      } else {
-        regular.push(subBlock)
-      }
-    }
-
-    return { regularSubBlocks: regular, advancedOnlySubBlocks: advancedOnly }
-  }, [subBlocks, canonicalIndex.canonicalIdBySubBlockId])
-
   // Get block connections
   const { incomingConnections, hasIncomingConnections } = useBlockConnections(currentBlockId || '')
 
@@ -165,23 +109,21 @@ export function Editor() {
   })
 
   // 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])
+  const { collaborativeToggleBlockAdvancedMode, collaborativeUpdateBlockName } =
+    useCollaborativeWorkflow()
 
   // Rename state
   const [isRenaming, setIsRenaming] = useState(false)
   const [editedName, setEditedName] = useState('')
   const nameInputRef = useRef<HTMLInputElement>(null)
 
+  // Mode toggle handlers
+  const handleToggleAdvancedMode = useCallback(() => {
+    if (currentBlockId && userPermissions.canEdit) {
+      collaborativeToggleBlockAdvancedMode(currentBlockId)
+    }
+  }, [currentBlockId, userPermissions.canEdit, collaborativeToggleBlockAdvancedMode])
+
   /**
    * Handles starting the rename process.
    */
@@ -241,6 +183,9 @@ export function Editor() {
     }
   }
 
+  // Check if block has advanced mode or trigger mode available
+  const hasAdvancedMode = blockConfig?.subBlocks?.some((sb) => sb.mode === 'advanced')
+
   // Determine if connections are at minimum height (collapsed state)
   const isConnectionsAtMinHeight = connectionsHeight <= 35
 
@@ -333,6 +278,25 @@ export function Editor() {
               </Tooltip.Content>
             </Tooltip.Root>
           )} */}
+          {/* Mode toggles - Only show for regular blocks, not subflows */}
+          {currentBlock && !isSubflow && hasAdvancedMode && (
+            <Tooltip.Root>
+              <Tooltip.Trigger asChild>
+                <Button
+                  variant='ghost'
+                  className='p-0'
+                  onClick={handleToggleAdvancedMode}
+                  disabled={!userPermissions.canEdit}
+                  aria-label='Toggle advanced mode'
+                >
+                  <Settings className='h-[14px] w-[14px]' />
+                </Button>
+              </Tooltip.Trigger>
+              <Tooltip.Content side='top'>
+                <p>Advanced mode</p>
+              </Tooltip.Content>
+            </Tooltip.Root>
+          )}
           {currentBlock && (isSubflow ? subflowConfig?.docsLink : blockConfig?.docsLink) && (
             <Tooltip.Root>
               <Tooltip.Trigger asChild>
@@ -378,111 +342,14 @@ export function Editor() {
             ref={subBlocksRef}
             className='subblocks-section flex flex-1 flex-col overflow-hidden'
           >
-            <div className='flex-1 overflow-y-auto overflow-x-hidden px-[8px] pt-[12px] pb-[8px] [overflow-anchor:none]'>
+            <div className='flex-1 overflow-y-auto overflow-x-hidden px-[8px] pt-[12px] pb-[8px]'>
               {subBlocks.length === 0 ? (
                 <div className='flex h-full items-center justify-center text-center text-[#8D8D8D] text-[13px]'>
                   This block has no subblocks
                 </div>
               ) : (
                 <div className='flex flex-col'>
-                  {regularSubBlocks.map((subBlock, index) => {
-                    const stableKey = getSubBlockStableKey(
-                      currentBlockId || '',
-                      subBlock,
-                      subBlockState
-                    )
-                    const canonicalId = canonicalIndex.canonicalIdBySubBlockId[subBlock.id]
-                    const canonicalGroup = canonicalId
-                      ? canonicalIndex.groupsById[canonicalId]
-                      : undefined
-                    const isCanonicalSwap = isCanonicalPair(canonicalGroup)
-                    const canonicalMode =
-                      canonicalGroup && isCanonicalSwap
-                        ? resolveCanonicalMode(
-                            canonicalGroup,
-                            blockSubBlockValues,
-                            canonicalModeOverrides
-                          )
-                        : undefined
-
-                    const showDivider =
-                      index < regularSubBlocks.length - 1 ||
-                      (!hasAdvancedOnlyFields && index < subBlocks.length - 1)
-
-                    return (
-                      <div key={stableKey} className='subblock-row'>
-                        <SubBlock
-                          blockId={currentBlockId}
-                          config={subBlock}
-                          isPreview={false}
-                          subBlockValues={subBlockState}
-                          disabled={!userPermissions.canEdit}
-                          fieldDiffStatus={undefined}
-                          allowExpandInPreview={false}
-                          canonicalToggle={
-                            isCanonicalSwap && canonicalMode && canonicalId
-                              ? {
-                                  mode: canonicalMode,
-                                  disabled: !userPermissions.canEdit,
-                                  onToggle: () => {
-                                    if (!currentBlockId) return
-                                    const nextMode =
-                                      canonicalMode === 'advanced' ? 'basic' : 'advanced'
-                                    collaborativeSetBlockCanonicalMode(
-                                      currentBlockId,
-                                      canonicalId,
-                                      nextMode
-                                    )
-                                  },
-                                }
-                              : undefined
-                          }
-                        />
-                        {showDivider && (
-                          <div className='subblock-divider px-[2px] pt-[16px] pb-[13px]'>
-                            <div
-                              className='h-[1.25px]'
-                              style={{
-                                backgroundImage:
-                                  'repeating-linear-gradient(to right, var(--border) 0px, var(--border) 6px, transparent 6px, transparent 12px)',
-                              }}
-                            />
-                          </div>
-                        )}
-                      </div>
-                    )
-                  })}
-
-                  {hasAdvancedOnlyFields && userPermissions.canEdit && (
-                    <div className='flex items-center gap-[10px] px-[2px] pt-[14px] pb-[12px]'>
-                      <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}
-                        className='flex items-center gap-[6px] whitespace-nowrap font-medium text-[13px] text-[var(--text-secondary)] hover:text-[var(--text-primary)]'
-                      >
-                        {displayAdvancedOptions ? 'Hide advanced fields' : 'Show advanced fields'}
-                        <ChevronDown
-                          className={`h-[14px] w-[14px] transition-transform duration-200 ${displayAdvancedOptions ? 'rotate-180' : ''}`}
-                        />
-                      </button>
-                      <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>
-                  )}
-
-                  {advancedOnlySubBlocks.map((subBlock, index) => {
+                  {subBlocks.map((subBlock, index) => {
                     const stableKey = getSubBlockStableKey(
                       currentBlockId || '',
                       subBlock,
@@ -500,7 +367,7 @@ export function Editor() {
                           fieldDiffStatus={undefined}
                           allowExpandInPreview={false}
                         />
-                        {index < advancedOnlySubBlocks.length - 1 && (
+                        {index < subBlocks.length - 1 && (
                           <div className='subblock-divider px-[2px] pt-[16px] pb-[13px]'>
                             <div
                               className='h-[1.25px]'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts

@@ -1,10 +1,5 @@
-import { useCallback, useMemo } from 'react'
-import {
-  buildCanonicalIndex,
-  evaluateSubBlockCondition,
-  isSubBlockFeatureEnabled,
-  isSubBlockVisibleForMode,
-} from '@/lib/workflows/subblocks/visibility'
+import { useMemo } from 'react'
+import { getEnv, isTruthy } from '@/lib/core/config/env'
 import type { BlockConfig, SubBlockConfig, SubBlockType } from '@/blocks/types'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
 import { mergeSubblockState } from '@/stores/workflows/utils'
@@ -32,10 +27,6 @@ export function useEditorSubblockLayout(
   blockSubBlockValues: Record<string, any>,
   isSnapshotView: boolean
 ) {
-  const blockDataFromStore = useWorkflowStore(
-    useCallback((state) => state.blocks?.[blockId]?.data, [blockId])
-  )
-
   return useMemo(() => {
     // Guard against missing config or block selection
     if (!config || !Array.isArray((config as any).subBlocks) || !blockId) {
@@ -55,7 +46,6 @@ export function useEditorSubblockLayout(
 
     const mergedState = mergedMap ? mergedMap[blockId] : undefined
     const mergedSubBlocks = mergedState?.subBlocks || {}
-    const blockData = isSnapshotView ? mergedState?.data || {} : blockDataFromStore || {}
 
     const stateToUse = Object.keys(mergedSubBlocks).reduce(
       (acc, key) => {
@@ -79,29 +69,13 @@ export function useEditorSubblockLayout(
     }
 
     // Filter visible blocks and those that meet their conditions
-    const rawValues = Object.entries(stateToUse).reduce<Record<string, unknown>>(
-      (acc, [key, entry]) => {
-        acc[key] = entry?.value
-        return acc
-      },
-      {}
-    )
-
-    const subBlocksForCanonical = displayTriggerMode
-      ? (config.subBlocks || []).filter(
-          (subBlock) =>
-            subBlock.mode === 'trigger' || subBlock.type === ('trigger-config' as SubBlockType)
-        )
-      : config.subBlocks || []
-    const canonicalIndex = buildCanonicalIndex(subBlocksForCanonical)
-    const effectiveAdvanced = displayAdvancedMode
-    const canonicalModeOverrides = blockData?.canonicalModes
-
     const visibleSubBlocks = (config.subBlocks || []).filter((block) => {
       if (block.hidden) return false
 
       // Check required feature if specified - declarative feature gating
-      if (!isSubBlockFeatureEnabled(block)) return false
+      if (block.requiresFeature && !isTruthy(getEnv(block.requiresFeature))) {
+        return false
+      }
 
       // Special handling for trigger-config type (legacy trigger configuration UI)
       if (block.type === ('trigger-config' as SubBlockType)) {
@@ -110,8 +84,13 @@ export function useEditorSubblockLayout(
       }
 
       // Filter by mode if specified
-      if (block.mode === 'trigger') {
-        if (!displayTriggerMode) return false
+      if (block.mode) {
+        if (block.mode === 'basic' && displayAdvancedMode) return false
+        if (block.mode === 'advanced' && !displayAdvancedMode) return false
+        if (block.mode === 'trigger') {
+          // Show trigger mode blocks only when in trigger mode
+          if (!displayTriggerMode) return false
+        }
       }
 
       // When in trigger mode, hide blocks that don't have mode: 'trigger'
@@ -119,22 +98,42 @@ export function useEditorSubblockLayout(
         return false
       }
 
-      if (
-        !isSubBlockVisibleForMode(
-          block,
-          effectiveAdvanced,
-          canonicalIndex,
-          rawValues,
-          canonicalModeOverrides
-        )
-      ) {
-        return false
-      }
-
       // If there's no condition, the block should be shown
       if (!block.condition) return true
 
-      return evaluateSubBlockCondition(block.condition, rawValues)
+      // If condition is a function, call it to get the actual condition object
+      const actualCondition =
+        typeof block.condition === 'function' ? block.condition() : block.condition
+
+      // Get the values of the fields this block depends on from the appropriate state
+      const fieldValue = stateToUse[actualCondition.field]?.value
+      const andFieldValue = actualCondition.and
+        ? stateToUse[actualCondition.and.field]?.value
+        : undefined
+
+      // Check if the condition value is an array
+      const isValueMatch = Array.isArray(actualCondition.value)
+        ? fieldValue != null &&
+          (actualCondition.not
+            ? !actualCondition.value.includes(fieldValue as string | number | boolean)
+            : actualCondition.value.includes(fieldValue as string | number | boolean))
+        : actualCondition.not
+          ? fieldValue !== actualCondition.value
+          : fieldValue === actualCondition.value
+
+      // Check both conditions if 'and' is present
+      const isAndValueMatch =
+        !actualCondition.and ||
+        (Array.isArray(actualCondition.and.value)
+          ? andFieldValue != null &&
+            (actualCondition.and.not
+              ? !actualCondition.and.value.includes(andFieldValue as string | number | boolean)
+              : actualCondition.and.value.includes(andFieldValue as string | number | boolean))
+          : actualCondition.and.not
+            ? andFieldValue !== actualCondition.and.value
+            : andFieldValue === actualCondition.and.value)
+
+      return isValueMatch && isAndValueMatch
     })
 
     return { subBlocks: visibleSubBlocks, stateToUse }
@@ -148,6 +147,5 @@ export function useEditorSubblockLayout(
     blockSubBlockValues,
     activeWorkflowId,
     isSnapshotView,
-    blockDataFromStore,
   ])
 }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx

@@ -3,18 +3,11 @@ import { createLogger } from '@sim/logger'
 import { useParams } from 'next/navigation'
 import { Handle, type NodeProps, Position, useUpdateNodeInternals } from 'reactflow'
 import { Badge, Tooltip } from '@/components/emcn'
+import { getEnv, isTruthy } from '@/lib/core/config/env'
 import { cn } from '@/lib/core/utils/cn'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createMcpToolId } from '@/lib/mcp/utils'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
-import {
-  buildCanonicalIndex,
-  evaluateSubBlockCondition,
-  hasAdvancedValues,
-  isSubBlockFeatureEnabled,
-  isSubBlockVisibleForMode,
-  resolveDependencyValue,
-} from '@/lib/workflows/subblocks/visibility'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { ActionBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar'
 import {
@@ -337,9 +330,6 @@ const SubBlockRow = ({
   workflowId,
   blockId,
   allSubBlockValues,
-  displayAdvancedOptions,
-  canonicalIndex,
-  canonicalModeOverrides,
 }: {
   title: string
   value?: string
@@ -349,9 +339,6 @@ const SubBlockRow = ({
   workflowId?: string
   blockId?: string
   allSubBlockValues?: Record<string, { value: unknown }>
-  displayAdvancedOptions?: boolean
-  canonicalIndex?: ReturnType<typeof buildCanonicalIndex>
-  canonicalModeOverrides?: Record<string, 'basic' | 'advanced'>
 }) => {
   const getStringValue = useCallback(
     (key?: string): string | undefined => {
@@ -362,43 +349,17 @@ const SubBlockRow = ({
     [allSubBlockValues]
   )
 
-  const rawValues = useMemo(() => {
-    if (!allSubBlockValues) return {}
-    return Object.entries(allSubBlockValues).reduce<Record<string, unknown>>(
-      (acc, [key, entry]) => {
-        acc[key] = entry?.value
-        return acc
-      },
-      {}
-    )
-  }, [allSubBlockValues])
-
   const dependencyValues = useMemo(() => {
     const fields = getDependsOnFields(subBlock?.dependsOn)
     if (!fields.length) return {}
     return fields.reduce<Record<string, string>>((accumulator, dependency) => {
-      const dependencyValue = resolveDependencyValue(
-        dependency,
-        rawValues,
-        canonicalIndex || buildCanonicalIndex([]),
-        canonicalModeOverrides
-      )
-      const dependencyString =
-        typeof dependencyValue === 'string' && dependencyValue.length > 0
-          ? dependencyValue
-          : undefined
-      if (dependencyString) {
-        accumulator[dependency] = dependencyString
+      const dependencyValue = getStringValue(dependency)
+      if (dependencyValue) {
+        accumulator[dependency] = dependencyValue
       }
       return accumulator
     }, {})
-  }, [
-    canonicalIndex,
-    canonicalModeOverrides,
-    displayAdvancedOptions,
-    rawValues,
-    subBlock?.dependsOn,
-  ])
+  }, [getStringValue, subBlock?.dependsOn])
 
   const credentialSourceId =
     subBlock?.type === 'oauth-input' && typeof rawValue === 'string' ? rawValue : undefined
@@ -622,8 +583,6 @@ export const WorkflowBlock = memo(function WorkflowBlock({
 
   const { mutate: deployChildWorkflow, isPending: isDeploying } = useDeployChildWorkflow()
 
-  const userPermissions = useUserPermissionsContext()
-
   const currentStoreBlock = currentWorkflow.getBlockById(id)
 
   const isStarterBlock = type === 'starter'
@@ -642,8 +601,6 @@ export const WorkflowBlock = memo(function WorkflowBlock({
       [activeWorkflowId, id]
     )
   )
-  const canonicalIndex = useMemo(() => buildCanonicalIndex(config.subBlocks), [config.subBlocks])
-  const canonicalModeOverrides = currentStoreBlock?.data?.canonicalModes
 
   const subBlockRowsData = useMemo(() => {
     const rows: SubBlockConfig[][] = []
@@ -666,23 +623,16 @@ export const WorkflowBlock = memo(function WorkflowBlock({
             {} as Record<string, { value: unknown }>
           )
 
-    const rawValues = Object.entries(stateToUse).reduce<Record<string, unknown>>(
-      (acc, [key, entry]) => {
-        acc[key] = entry?.value
-        return acc
-      },
-      {}
-    )
-
-    const effectiveAdvanced = userPermissions.canEdit
-      ? displayAdvancedMode
-      : displayAdvancedMode || hasAdvancedValues(config.subBlocks, rawValues, canonicalIndex)
+    const effectiveAdvanced = displayAdvancedMode
     const effectiveTrigger = displayTriggerMode
 
     const visibleSubBlocks = config.subBlocks.filter((block) => {
       if (block.hidden) return false
       if (block.hideFromPreview) return false
-      if (!isSubBlockFeatureEnabled(block)) return false
+
+      if (block.requiresFeature && !isTruthy(getEnv(block.requiresFeature))) {
+        return false
+      }
 
       const isPureTriggerBlock = config?.triggers?.enabled && config.category === 'triggers'
 
@@ -700,21 +650,40 @@ export const WorkflowBlock = memo(function WorkflowBlock({
         }
       }
 
-      if (
-        !isSubBlockVisibleForMode(
-          block,
-          effectiveAdvanced,
-          canonicalIndex,
-          rawValues,
-          canonicalModeOverrides
-        )
-      ) {
-        return false
-      }
+      if (block.mode === 'basic' && effectiveAdvanced) return false
+      if (block.mode === 'advanced' && !effectiveAdvanced) return false
 
       if (!block.condition) return true
 
-      return evaluateSubBlockCondition(block.condition, rawValues)
+      const actualCondition =
+        typeof block.condition === 'function' ? block.condition() : block.condition
+
+      const fieldValue = stateToUse[actualCondition.field]?.value
+      const andFieldValue = actualCondition.and
+        ? stateToUse[actualCondition.and.field]?.value
+        : undefined
+
+      const isValueMatch = Array.isArray(actualCondition.value)
+        ? fieldValue != null &&
+          (actualCondition.not
+            ? !actualCondition.value.includes(fieldValue as string | number | boolean)
+            : actualCondition.value.includes(fieldValue as string | number | boolean))
+        : actualCondition.not
+          ? fieldValue !== actualCondition.value
+          : fieldValue === actualCondition.value
+
+      const isAndValueMatch =
+        !actualCondition.and ||
+        (Array.isArray(actualCondition.and.value)
+          ? andFieldValue != null &&
+            (actualCondition.and.not
+              ? !actualCondition.and.value.includes(andFieldValue as string | number | boolean)
+              : actualCondition.and.value.includes(andFieldValue as string | number | boolean))
+          : actualCondition.and.not
+            ? andFieldValue !== actualCondition.and.value
+            : andFieldValue === actualCondition.and.value)
+
+      return isValueMatch && isAndValueMatch
     })
 
     visibleSubBlocks.forEach((block) => {
@@ -746,33 +715,12 @@ export const WorkflowBlock = memo(function WorkflowBlock({
     data.subBlockValues,
     currentWorkflow.isDiffMode,
     currentBlock,
-    canonicalModeOverrides,
-    userPermissions.canEdit,
-    canonicalIndex,
     blockSubBlockValues,
     activeWorkflowId,
   ])
 
   const subBlockRows = subBlockRowsData.rows
   const subBlockState = subBlockRowsData.stateToUse
-  const effectiveAdvanced = useMemo(() => {
-    const rawValues = Object.entries(subBlockState).reduce<Record<string, unknown>>(
-      (acc, [key, entry]) => {
-        acc[key] = entry?.value
-        return acc
-      },
-      {}
-    )
-    return userPermissions.canEdit
-      ? displayAdvancedMode
-      : displayAdvancedMode || hasAdvancedValues(config.subBlocks, rawValues, canonicalIndex)
-  }, [
-    subBlockState,
-    displayAdvancedMode,
-    config.subBlocks,
-    canonicalIndex,
-    userPermissions.canEdit,
-  ])
 
   /**
    * Determine if block has content below the header (subblocks or error row).
@@ -935,6 +883,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
   const showWebhookIndicator = (isStarterBlock || isWebhookTriggerBlock) && isWebhookConfigured
   const shouldShowScheduleBadge =
     type === 'schedule' && !isLoadingScheduleInfo && scheduleInfo !== null
+  const userPermissions = useUserPermissionsContext()
   const isWorkflowSelector = type === 'workflow' || type === 'workflow_input'
 
   return (
@@ -1146,9 +1095,6 @@ export const WorkflowBlock = memo(function WorkflowBlock({
                       workflowId={currentWorkflowId}
                       blockId={id}
                       allSubBlockValues={subBlockState}
-                      displayAdvancedOptions={effectiveAdvanced}
-                      canonicalIndex={canonicalIndex}
-                      canonicalModeOverrides={canonicalModeOverrides}
                     />
                   )
                 })

apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block-details-sidebar.tsx

@@ -14,13 +14,6 @@ import { ReactFlowProvider } from 'reactflow'
 import { Badge, Button, ChevronDown, Code, Combobox, Input, Label } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import { extractReferencePrefixes } from '@/lib/workflows/sanitization/references'
-import {
-  buildCanonicalIndex,
-  evaluateSubBlockCondition,
-  hasAdvancedValues,
-  isSubBlockFeatureEnabled,
-  isSubBlockVisibleForMode,
-} from '@/lib/workflows/subblocks/visibility'
 import { SnapshotContextMenu } from '@/app/workspace/[workspaceId]/logs/components/log-details/components/execution-snapshot/components'
 import { SubBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components'
 import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
@@ -31,6 +24,56 @@ import { navigatePath } from '@/executor/variables/resolvers/reference'
 import { useCodeViewerFeatures } from '@/hooks/use-code-viewer'
 import type { BlockState, Loop, Parallel } from '@/stores/workflows/workflow/types'
 
+/**
+ * Evaluate whether a subblock's condition is met based on current values.
+ */
+function evaluateCondition(
+  condition: SubBlockConfig['condition'],
+  subBlockValues: Record<string, { value: unknown } | unknown>
+): boolean {
+  if (!condition) return true
+
+  const actualCondition = typeof condition === 'function' ? condition() : condition
+
+  const fieldValueObj = subBlockValues[actualCondition.field]
+  const fieldValue =
+    fieldValueObj && typeof fieldValueObj === 'object' && 'value' in fieldValueObj
+      ? (fieldValueObj as { value: unknown }).value
+      : fieldValueObj
+
+  const conditionValues = Array.isArray(actualCondition.value)
+    ? actualCondition.value
+    : [actualCondition.value]
+
+  let isMatch = conditionValues.some((v) => v === fieldValue)
+
+  if (actualCondition.not) {
+    isMatch = !isMatch
+  }
+
+  if (actualCondition.and && isMatch) {
+    const andFieldValueObj = subBlockValues[actualCondition.and.field]
+    const andFieldValue =
+      andFieldValueObj && typeof andFieldValueObj === 'object' && 'value' in andFieldValueObj
+        ? (andFieldValueObj as { value: unknown }).value
+        : andFieldValueObj
+
+    const andConditionValues = Array.isArray(actualCondition.and.value)
+      ? actualCondition.and.value
+      : [actualCondition.and.value]
+
+    let andMatch = andConditionValues.some((v) => v === andFieldValue)
+
+    if (actualCondition.and.not) {
+      andMatch = !andMatch
+    }
+
+    isMatch = isMatch && andMatch
+  }
+
+  return isMatch
+}
+
 /**
  * Format a value for display as JSON string
  */
@@ -1079,44 +1122,15 @@ function BlockDetailsSidebarContent({
     )
   }
 
-  const rawValues = useMemo(() => {
-    return Object.entries(subBlockValues).reduce<Record<string, unknown>>((acc, [key, entry]) => {
-      if (entry && typeof entry === 'object' && 'value' in entry) {
-        acc[key] = (entry as { value: unknown }).value
-      } else {
-        acc[key] = entry
-      }
-      return acc
-    }, {})
-  }, [subBlockValues])
-
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig.subBlocks),
-    [blockConfig.subBlocks]
-  )
-  const canonicalModeOverrides = block.data?.canonicalModes
-  const effectiveAdvanced =
-    (block.advancedMode ?? false) ||
-    hasAdvancedValues(blockConfig.subBlocks, rawValues, canonicalIndex)
-
   const visibleSubBlocks = blockConfig.subBlocks.filter((subBlock) => {
     if (subBlock.hidden || subBlock.hideFromPreview) return false
     // Only filter out trigger-mode subblocks for non-trigger blocks
     // Trigger-only blocks (category 'triggers') should display their trigger subblocks
     if (subBlock.mode === 'trigger' && blockConfig.category !== 'triggers') return false
-    if (!isSubBlockFeatureEnabled(subBlock)) return false
-    if (
-      !isSubBlockVisibleForMode(
-        subBlock,
-        effectiveAdvanced,
-        canonicalIndex,
-        rawValues,
-        canonicalModeOverrides
-      )
-    ) {
-      return false
+    if (subBlock.condition) {
+      return evaluateCondition(subBlock.condition, subBlockValues)
     }
-    return evaluateSubBlockCondition(subBlock.condition, rawValues)
+    return true
   })
 
   const statusVariant =

apps/sim/background/schedule-execution.ts

@@ -5,6 +5,7 @@ import { Cron } from 'croner'
 import { eq } from 'drizzle-orm'
 import { v4 as uuidv4 } from 'uuid'
 import type { ZodRecord, ZodString } from 'zod'
+import { decryptSecret } from '@/lib/core/security/encryption'
 import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
@@ -21,9 +22,12 @@ import {
   getScheduleTimeValues,
   getSubBlockValue,
 } from '@/lib/workflows/schedules/utils'
+import { REFERENCE } from '@/executor/constants'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata } from '@/executor/execution/types'
 import type { ExecutionResult } from '@/executor/types'
+import { createEnvVarPattern } from '@/executor/utils/reference-validation'
+import { mergeSubblockState } from '@/stores/workflows/server-utils'
 import { MAX_CONSECUTIVE_FAILURES } from '@/triggers/constants'
 
 const logger = createLogger('TriggerScheduleExecution')
@@ -115,6 +119,68 @@ async function determineNextRunAfterError(
   return new Date(now.getTime() + 24 * 60 * 60 * 1000)
 }
 
+async function ensureBlockVariablesResolvable(
+  blocks: Record<string, BlockState>,
+  variables: Record<string, string>,
+  requestId: string
+) {
+  await Promise.all(
+    Object.values(blocks).map(async (block) => {
+      const subBlocks = block.subBlocks ?? {}
+      await Promise.all(
+        Object.values(subBlocks).map(async (subBlock) => {
+          const value = subBlock.value
+          if (
+            typeof value !== 'string' ||
+            !value.includes(REFERENCE.ENV_VAR_START) ||
+            !value.includes(REFERENCE.ENV_VAR_END)
+          ) {
+            return
+          }
+
+          const envVarPattern = createEnvVarPattern()
+          const matches = value.match(envVarPattern)
+          if (!matches) {
+            return
+          }
+
+          for (const match of matches) {
+            const varName = match.slice(
+              REFERENCE.ENV_VAR_START.length,
+              -REFERENCE.ENV_VAR_END.length
+            )
+            const encryptedValue = variables[varName]
+            if (!encryptedValue) {
+              throw new Error(`Environment variable "${varName}" was not found`)
+            }
+
+            try {
+              await decryptSecret(encryptedValue)
+            } catch (error) {
+              logger.error(`[${requestId}] Error decrypting value for variable "${varName}"`, error)
+
+              const message = error instanceof Error ? error.message : 'Unknown error'
+              throw new Error(`Failed to decrypt environment variable "${varName}": ${message}`)
+            }
+          }
+        })
+      )
+    })
+  )
+}
+
+async function ensureEnvVarsDecryptable(variables: Record<string, string>, requestId: string) {
+  for (const [key, encryptedValue] of Object.entries(variables)) {
+    try {
+      await decryptSecret(encryptedValue)
+    } catch (error) {
+      logger.error(`[${requestId}] Failed to decrypt environment variable "${key}"`, error)
+      const message = error instanceof Error ? error.message : 'Unknown error'
+      throw new Error(`Failed to decrypt environment variable "${key}": ${message}`)
+    }
+  }
+}
+
 async function runWorkflowExecution({
   payload,
   workflowRecord,
@@ -151,6 +217,8 @@ async function runWorkflowExecution({
       }
     }
 
+    const mergedStates = mergeSubblockState(blocks)
+
     const workspaceId = workflowRecord.workspaceId
     if (!workspaceId) {
       throw new Error(`Workflow ${payload.workflowId} has no associated workspace`)
@@ -168,6 +236,9 @@ async function runWorkflowExecution({
       ...workspaceEncrypted,
     })
 
+    await ensureBlockVariablesResolvable(mergedStates, variables, requestId)
+    await ensureEnvVarsDecryptable(variables, requestId)
+
     const input = {
       _context: {
         workflowId: payload.workflowId,
@@ -277,7 +348,6 @@ export type ScheduleExecutionPayload = {
   failedCount?: number
   now: string
   scheduledFor?: string
-  preflighted?: boolean
 }
 
 function calculateNextRunTime(
@@ -337,7 +407,6 @@ export async function executeScheduleJob(payload: ScheduleExecutionPayload) {
       checkRateLimit: true,
       checkDeployment: true,
       loggingSession,
-      preflightEnvVars: !payload.preflighted,
     })
 
     if (!preprocessResult.success) {

apps/sim/background/webhook-execution.ts

@@ -12,11 +12,16 @@ import { WebhookAttachmentProcessor } from '@/lib/webhooks/attachment-processor'
 import { fetchAndProcessAirtablePayloads, formatWebhookInput } from '@/lib/webhooks/utils.server'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
-import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
+import {
+  loadDeployedWorkflowState,
+  loadWorkflowFromNormalizedTables,
+} from '@/lib/workflows/persistence/utils'
 import { getWorkflowById } from '@/lib/workflows/utils'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata } from '@/executor/execution/types'
 import type { ExecutionResult } from '@/executor/types'
+import { Serializer } from '@/serializer'
+import { mergeSubblockState } from '@/stores/workflows/server-utils'
 import { getTrigger, isTriggerValid } from '@/triggers'
 
 const logger = createLogger('TriggerWebhookExecution')
@@ -87,6 +92,7 @@ export type WebhookExecutionPayload = {
   headers: Record<string, string>
   path: string
   blockId?: string
+  executionTarget?: 'deployed' | 'live'
   credentialId?: string
   credentialAccountUserId?: string
 }
@@ -137,16 +143,20 @@ async function executeWebhookJobInternal(
   let deploymentVersionId: string | undefined
 
   try {
-    const workflowData = await loadDeployedWorkflowState(payload.workflowId)
+    const useDraftState = payload.executionTarget === 'live'
+    const workflowData = useDraftState
+      ? await loadWorkflowFromNormalizedTables(payload.workflowId)
+      : await loadDeployedWorkflowState(payload.workflowId)
     if (!workflowData) {
       throw new Error(
-        'Workflow state not found. The workflow may not be deployed or the deployment data may be corrupted.'
+        `Workflow state not found. The workflow may not be ${useDraftState ? 'saved' : 'deployed'} or the deployment data may be corrupted.`
       )
     }
 
     const { blocks, edges, loops, parallels } = workflowData
+    // Only deployed executions have a deployment version ID
     deploymentVersionId =
-      'deploymentVersionId' in workflowData
+      !useDraftState && 'deploymentVersionId' in workflowData
         ? (workflowData.deploymentVersionId as string)
         : undefined
 
@@ -161,6 +171,19 @@ async function executeWebhookJobInternal(
     }
     const workflowVariables = (wfRows[0]?.variables as Record<string, any>) || {}
 
+    // Merge subblock states (matching workflow-execution pattern)
+    const mergedStates = mergeSubblockState(blocks)
+
+    // Create serialized workflow
+    const serializer = new Serializer()
+    const serializedWorkflow = serializer.serializeWorkflow(
+      mergedStates,
+      edges,
+      loops || {},
+      parallels || {},
+      true // Enable validation during execution
+    )
+
     // Handle special Airtable case
     if (payload.provider === 'airtable') {
       logger.info(`[${requestId}] Processing Airtable webhook via fetchAndProcessAirtablePayloads`)
@@ -295,6 +318,7 @@ async function executeWebhookJobInternal(
         variables: {},
         triggerData: {
           isTest: false,
+          executionTarget: payload.executionTarget || 'deployed',
         },
         deploymentVersionId,
       })
@@ -352,6 +376,7 @@ async function executeWebhookJobInternal(
         variables: {},
         triggerData: {
           isTest: false,
+          executionTarget: payload.executionTarget || 'deployed',
         },
         deploymentVersionId,
       })
@@ -570,6 +595,7 @@ async function executeWebhookJobInternal(
         variables: {},
         triggerData: {
           isTest: false,
+          executionTarget: payload.executionTarget || 'deployed',
         },
         deploymentVersionId,
       })

apps/sim/background/workflow-execution.ts

@@ -20,7 +20,6 @@ export type WorkflowExecutionPayload = {
   input?: any
   triggerType?: CoreTriggerType
   metadata?: Record<string, any>
-  preflighted?: boolean
 }
 
 /**
@@ -52,7 +51,6 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
       checkRateLimit: true,
       checkDeployment: true,
       loggingSession: loggingSession,
-      preflightEnvVars: !payload.preflighted,
     })
 
     if (!preprocessResult.success) {

apps/sim/executor/utils/permission-check.ts

@@ -3,7 +3,6 @@ import { member, permissionGroup, permissionGroupMember } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { isOrganizationOnEnterprisePlan } from '@/lib/billing'
-import { isAccessControlEnabled, isHosted } from '@/lib/core/config/feature-flags'
 import {
   type PermissionGroupConfig,
   parsePermissionGroupConfig,
@@ -53,10 +52,6 @@ export class InvitationsNotAllowedError extends Error {
 export async function getUserPermissionConfig(
   userId: string
 ): Promise<PermissionGroupConfig | null> {
-  if (!isHosted && !isAccessControlEnabled) {
-    return null
-  }
-
   const [membership] = await db
     .select({ organizationId: member.organizationId })
     .from(member)

apps/sim/executor/utils/reference-validation.ts

@@ -19,85 +19,6 @@ export function createEnvVarPattern(): RegExp {
   return new RegExp(`\\${REFERENCE.ENV_VAR_START}([^}]+)\\${REFERENCE.ENV_VAR_END}`, 'g')
 }
 
-export interface EnvVarResolveOptions {
-  allowEmbedded?: boolean
-  resolveExactMatch?: boolean
-  trimKeys?: boolean
-  onMissing?: 'keep' | 'throw' | 'empty'
-  deep?: boolean
-  missingKeys?: string[]
-}
-
-/**
- * Resolve {{ENV_VAR}} references in values using provided env vars.
- */
-export function resolveEnvVarReferences(
-  value: unknown,
-  envVars: Record<string, string>,
-  options: EnvVarResolveOptions = {}
-): unknown {
-  const {
-    allowEmbedded = true,
-    resolveExactMatch = true,
-    trimKeys = false,
-    onMissing = 'keep',
-    deep = true,
-  } = options
-
-  if (typeof value === 'string') {
-    if (resolveExactMatch) {
-      const exactMatchPattern = new RegExp(
-        `^\\${REFERENCE.ENV_VAR_START}([^}]+)\\${REFERENCE.ENV_VAR_END}$`
-      )
-      const exactMatch = exactMatchPattern.exec(value)
-      if (exactMatch) {
-        const envKey = trimKeys ? exactMatch[1].trim() : exactMatch[1]
-        const envValue = envVars[envKey]
-        if (envValue !== undefined) return envValue
-        if (options.missingKeys) options.missingKeys.push(envKey)
-        if (onMissing === 'throw') {
-          throw new Error(`Environment variable "${envKey}" was not found`)
-        }
-        if (onMissing === 'empty') {
-          return ''
-        }
-        return value
-      }
-    }
-
-    if (!allowEmbedded) return value
-
-    const envVarPattern = createEnvVarPattern()
-    return value.replace(envVarPattern, (match, varName) => {
-      const envKey = trimKeys ? String(varName).trim() : String(varName)
-      const envValue = envVars[envKey]
-      if (envValue !== undefined) return envValue
-      if (options.missingKeys) options.missingKeys.push(envKey)
-      if (onMissing === 'throw') {
-        throw new Error(`Environment variable "${envKey}" was not found`)
-      }
-      if (onMissing === 'empty') {
-        return ''
-      }
-      return match
-    })
-  }
-
-  if (deep && Array.isArray(value)) {
-    return value.map((item) => resolveEnvVarReferences(item, envVars, options))
-  }
-
-  if (deep && value !== null && typeof value === 'object') {
-    const resolved: Record<string, any> = {}
-    for (const [key, val] of Object.entries(value)) {
-      resolved[key] = resolveEnvVarReferences(val, envVars, options)
-    }
-    return resolved
-  }
-
-  return value
-}
-
 /**
  * Creates a regex pattern for matching workflow variables <variable.name>
  * Captures the variable name (after "variable.") in group 1

apps/sim/executor/variables/resolvers/block.test.ts

@@ -126,14 +126,16 @@ describe('BlockResolver', () => {
       expect(resolver.resolve('<source.items.1.id>', ctx)).toBe(2)
     })
 
-    it.concurrent('should return undefined for non-existent path', () => {
+    it.concurrent('should throw error for non-existent path', () => {
       const workflow = createTestWorkflow([{ id: 'source' }])
       const resolver = new BlockResolver(workflow)
       const ctx = createTestContext('current', {
         source: { existing: 'value' },
       })
 
-      expect(resolver.resolve('<source.nonexistent>', ctx)).toBeUndefined()
+      expect(() => resolver.resolve('<source.nonexistent>', ctx)).toThrow(
+        /No value found at path "nonexistent" in block "source"/
+      )
     })
 
     it.concurrent('should return undefined for non-existent block', () => {
@@ -969,17 +971,19 @@ describe('BlockResolver', () => {
         source: { value: undefined, other: 'exists' },
       })
 
-      expect(resolver.resolve('<source.value>', ctx)).toBeUndefined()
+      expect(() => resolver.resolve('<source.value>', ctx)).toThrow()
     })
 
-    it.concurrent('should return undefined for deeply nested non-existent path', () => {
+    it.concurrent('should handle deeply nested path errors', () => {
       const workflow = createTestWorkflow([{ id: 'source' }])
       const resolver = new BlockResolver(workflow)
       const ctx = createTestContext('current', {
         source: { level1: { level2: {} } },
       })
 
-      expect(resolver.resolve('<source.level1.level2.level3>', ctx)).toBeUndefined()
+      expect(() => resolver.resolve('<source.level1.level2.level3>', ctx)).toThrow(
+        /No value found at path "level1.level2.level3"/
+      )
     })
   })
 })

apps/sim/executor/variables/resolvers/block.ts

@@ -108,7 +108,11 @@ export class BlockResolver implements Resolver {
       }
     }
 
-    return undefined
+    // If still undefined, throw error with original path
+    const availableKeys = output && typeof output === 'object' ? Object.keys(output) : []
+    throw new Error(
+      `No value found at path "${pathParts.join('.')}" in block "${blockName}". Available fields: ${availableKeys.join(', ')}`
+    )
   }
 
   private getBlockOutput(blockId: string, context: ResolutionContext): any {

apps/sim/hooks/use-collaborative-workflow.ts

@@ -203,13 +203,6 @@ export function useCollaborativeWorkflow() {
             case BLOCK_OPERATIONS.UPDATE_ADVANCED_MODE:
               workflowStore.setBlockAdvancedMode(payload.id, payload.advancedMode)
               break
-            case BLOCK_OPERATIONS.UPDATE_CANONICAL_MODE:
-              workflowStore.setBlockCanonicalMode(
-                payload.id,
-                payload.canonicalId,
-                payload.canonicalMode
-              )
-              break
           }
         } else if (target === OPERATION_TARGETS.BLOCKS) {
           switch (operation) {
@@ -925,26 +918,16 @@ export function useCollaborativeWorkflow() {
 
   const collaborativeToggleBlockAdvancedMode = useCallback(
     (id: string) => {
-      const block = workflowStore.blocks[id]
-      if (!block) return
-      const newAdvancedMode = !block.advancedMode
+      const currentBlock = workflowStore.blocks[id]
+      if (!currentBlock) return
+
+      const newAdvancedMode = !currentBlock.advancedMode
+
       executeQueuedOperation(
         BLOCK_OPERATIONS.UPDATE_ADVANCED_MODE,
         OPERATION_TARGETS.BLOCK,
         { id, advancedMode: newAdvancedMode },
-        () => workflowStore.setBlockAdvancedMode(id, newAdvancedMode)
-      )
-    },
-    [executeQueuedOperation, workflowStore]
-  )
-
-  const collaborativeSetBlockCanonicalMode = useCallback(
-    (id: string, canonicalId: string, canonicalMode: 'basic' | 'advanced') => {
-      executeQueuedOperation(
-        BLOCK_OPERATIONS.UPDATE_CANONICAL_MODE,
-        OPERATION_TARGETS.BLOCK,
-        { id, canonicalId, canonicalMode },
-        () => workflowStore.setBlockCanonicalMode(id, canonicalId, canonicalMode)
+        () => workflowStore.toggleBlockAdvancedMode(id)
       )
     },
     [executeQueuedOperation, workflowStore]
@@ -1624,7 +1607,6 @@ export function useCollaborativeWorkflow() {
     collaborativeBatchToggleBlockEnabled,
     collaborativeBatchUpdateParent,
     collaborativeToggleBlockAdvancedMode,
-    collaborativeSetBlockCanonicalMode,
     collaborativeBatchToggleBlockHandles,
     collaborativeBatchAddBlocks,
     collaborativeBatchRemoveBlocks,

apps/sim/hooks/use-permission-config.ts

@@ -1,6 +1,5 @@
 import { useMemo } from 'react'
 import { getEnv, isTruthy } from '@/lib/core/config/env'
-import { isAccessControlEnabled, isHosted } from '@/lib/core/config/feature-flags'
 import {
   DEFAULT_PERMISSION_GROUP_CONFIG,
   type PermissionGroupConfig,
@@ -20,23 +19,19 @@ export interface PermissionConfigResult {
 }
 
 export function usePermissionConfig(): PermissionConfigResult {
-  const accessControlDisabled = !isHosted && !isAccessControlEnabled
   const { data: organizationsData } = useOrganizations()
   const activeOrganization = organizationsData?.activeOrganization
 
   const { data: permissionData, isLoading } = useUserPermissionConfig(activeOrganization?.id)
 
   const config = useMemo(() => {
-    if (accessControlDisabled) {
-      return DEFAULT_PERMISSION_GROUP_CONFIG
-    }
     if (!permissionData?.config) {
       return DEFAULT_PERMISSION_GROUP_CONFIG
     }
     return permissionData.config
-  }, [permissionData, accessControlDisabled])
+  }, [permissionData])
 
-  const isInPermissionGroup = !accessControlDisabled && !!permissionData?.permissionGroupId
+  const isInPermissionGroup = !!permissionData?.permissionGroupId
 
   const isBlockAllowed = useMemo(() => {
     return (blockType: string) => {

apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts

@@ -878,6 +878,25 @@ function validateSourceHandleForBlock(
         error: `Invalid source handle "${sourceHandle}" for router block. Valid handles: source, ${EDGE.ROUTER_PREFIX}{targetId}, error`,
       }
 
+    case 'router_v2': {
+      if (!sourceHandle.startsWith(EDGE.ROUTER_PREFIX)) {
+        return {
+          valid: false,
+          error: `Invalid source handle "${sourceHandle}" for router_v2 block. Must start with "${EDGE.ROUTER_PREFIX}"`,
+        }
+      }
+
+      const routesValue = sourceBlock?.subBlocks?.routes?.value
+      if (!routesValue) {
+        return {
+          valid: false,
+          error: `Invalid router handle "${sourceHandle}" - no routes defined`,
+        }
+      }
+
+      return validateRouterHandle(sourceHandle, sourceBlock.id, routesValue)
+    }
+
     default:
       if (sourceHandle === 'source') {
         return { valid: true }
@@ -963,6 +982,85 @@ function validateConditionHandle(
   }
 }
 
+/**
+ * Validates router handle references a valid route in the block.
+ * Accepts both internal IDs (router-{routeId}) and semantic keys (router-{blockId}-route-1)
+ */
+function validateRouterHandle(
+  sourceHandle: string,
+  blockId: string,
+  routesValue: string | any[]
+): EdgeHandleValidationResult {
+  let routes: any[]
+  if (typeof routesValue === 'string') {
+    try {
+      routes = JSON.parse(routesValue)
+    } catch {
+      return {
+        valid: false,
+        error: `Cannot validate router handle "${sourceHandle}" - routes is not valid JSON`,
+      }
+    }
+  } else if (Array.isArray(routesValue)) {
+    routes = routesValue
+  } else {
+    return {
+      valid: false,
+      error: `Cannot validate router handle "${sourceHandle}" - routes is not an array`,
+    }
+  }
+
+  if (!Array.isArray(routes) || routes.length === 0) {
+    return {
+      valid: false,
+      error: `Invalid router handle "${sourceHandle}" - no routes defined`,
+    }
+  }
+
+  const validHandles = new Set<string>()
+  const semanticPrefix = `router-${blockId}-`
+
+  for (let i = 0; i < routes.length; i++) {
+    const route = routes[i]
+
+    // Accept internal ID format: router-{uuid}
+    if (route.id) {
+      validHandles.add(`router-${route.id}`)
+    }
+
+    // Accept 1-indexed route number format: router-{blockId}-route-1, router-{blockId}-route-2, etc.
+    validHandles.add(`${semanticPrefix}route-${i + 1}`)
+
+    // Accept normalized title format: router-{blockId}-{normalized-title}
+    // Normalize: lowercase, replace spaces with dashes, remove special chars
+    if (route.title && typeof route.title === 'string') {
+      const normalizedTitle = route.title
+        .toLowerCase()
+        .replace(/\s+/g, '-')
+        .replace(/[^a-z0-9-]/g, '')
+      if (normalizedTitle) {
+        validHandles.add(`${semanticPrefix}${normalizedTitle}`)
+      }
+    }
+  }
+
+  if (validHandles.has(sourceHandle)) {
+    return { valid: true }
+  }
+
+  const validOptions = Array.from(validHandles).slice(0, 5)
+  const moreCount = validHandles.size - validOptions.length
+  let validOptionsStr = validOptions.join(', ')
+  if (moreCount > 0) {
+    validOptionsStr += `, ... and ${moreCount} more`
+  }
+
+  return {
+    valid: false,
+    error: `Invalid router handle "${sourceHandle}". Valid handles: ${validOptionsStr}`,
+  }
+}
+
 /**
  * Validates target handle is valid (must be 'target')
  */

apps/sim/lib/core/utils/response-format.ts

@@ -53,25 +53,14 @@ export function extractFieldsFromSchema(schema: any): Field[] {
  * Helper function to safely parse response format
  * Handles both string and object formats
  */
-export function parseResponseFormatSafely(
-  responseFormatValue: any,
-  blockId: string,
-  options?: { allowReferences?: boolean }
-): any {
+export function parseResponseFormatSafely(responseFormatValue: any, blockId: string): any {
   if (!responseFormatValue) {
     return null
   }
 
-  const allowReferences = options?.allowReferences ?? false
-
   try {
     if (typeof responseFormatValue === 'string') {
-      const trimmedValue = responseFormatValue.trim()
-      if (trimmedValue === '') return null
-      if (allowReferences && trimmedValue.startsWith('<') && trimmedValue.includes('>')) {
-        return trimmedValue
-      }
-      return JSON.parse(trimmedValue)
+      return JSON.parse(responseFormatValue)
     }
     return responseFormatValue
   } catch (error) {

apps/sim/lib/environment/utils.ts

@@ -3,9 +3,6 @@ import { environment, workspaceEnvironment } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { eq } from 'drizzle-orm'
 import { decryptSecret } from '@/lib/core/security/encryption'
-import { REFERENCE } from '@/executor/constants'
-import { createEnvVarPattern } from '@/executor/utils/reference-validation'
-import type { BlockState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('EnvironmentUtils')
 
@@ -110,86 +107,3 @@ export async function getEffectiveDecryptedEnv(
   )
   return { ...personalDecrypted, ...workspaceDecrypted }
 }
-
-/**
- * Ensure all environment variables can be decrypted.
- */
-export async function ensureEnvVarsDecryptable(
-  variables: Record<string, string>,
-  options: { requestId?: string } = {}
-): Promise<void> {
-  const requestId = options.requestId
-  for (const [key, encryptedValue] of Object.entries(variables)) {
-    try {
-      await decryptSecret(encryptedValue)
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Unknown error'
-      if (requestId) {
-        logger.error(`[${requestId}] Failed to decrypt environment variable "${key}"`, error)
-      } else {
-        logger.error(`Failed to decrypt environment variable "${key}"`, error)
-      }
-      throw new Error(`Failed to decrypt environment variable "${key}": ${message}`)
-    }
-  }
-}
-
-/**
- * Ensure all {{ENV_VAR}} references in block subblocks resolve to decryptable values.
- */
-export async function ensureBlockEnvVarsResolvable(
-  blocks: Record<string, BlockState>,
-  variables: Record<string, string>,
-  options: { requestId?: string } = {}
-): Promise<void> {
-  const requestId = options.requestId
-  await Promise.all(
-    Object.values(blocks).map(async (block) => {
-      const subBlocks = block.subBlocks ?? {}
-      await Promise.all(
-        Object.values(subBlocks).map(async (subBlock) => {
-          const value = subBlock.value
-          if (
-            typeof value !== 'string' ||
-            !value.includes(REFERENCE.ENV_VAR_START) ||
-            !value.includes(REFERENCE.ENV_VAR_END)
-          ) {
-            return
-          }
-
-          const envVarPattern = createEnvVarPattern()
-          const matches = value.match(envVarPattern)
-          if (!matches) {
-            return
-          }
-
-          for (const match of matches) {
-            const varName = match.slice(
-              REFERENCE.ENV_VAR_START.length,
-              -REFERENCE.ENV_VAR_END.length
-            )
-            const encryptedValue = variables[varName]
-            if (!encryptedValue) {
-              throw new Error(`Environment variable "${varName}" was not found`)
-            }
-
-            try {
-              await decryptSecret(encryptedValue)
-            } catch (error) {
-              const message = error instanceof Error ? error.message : 'Unknown error'
-              if (requestId) {
-                logger.error(
-                  `[${requestId}] Error decrypting value for variable "${varName}"`,
-                  error
-                )
-              } else {
-                logger.error(`Error decrypting value for variable "${varName}"`, error)
-              }
-              throw new Error(`Failed to decrypt environment variable "${varName}": ${message}`)
-            }
-          }
-        })
-      )
-    })
-  )
-}

apps/sim/lib/execution/preprocessing.ts

@@ -6,7 +6,6 @@ import { checkServerSideUsageLimits } from '@/lib/billing/calculations/usage-mon
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { RateLimiter } from '@/lib/core/rate-limiter/rate-limiter'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
-import { preflightWorkflowEnvVars } from '@/lib/workflows/executor/preflight'
 import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
 import type { CoreTriggerType } from '@/stores/logs/filters/types'
 
@@ -118,15 +117,11 @@ export interface PreprocessExecutionOptions {
   checkRateLimit?: boolean // Default: false for manual/chat, true for others
   checkDeployment?: boolean // Default: true for non-manual triggers
   skipUsageLimits?: boolean // Default: false (only use for test mode)
-  preflightEnvVars?: boolean // Default: false
 
   // Context information
   workspaceId?: string // If known, used for billing resolution
   loggingSession?: LoggingSession // If provided, will be used for error logging
   isResumeContext?: boolean // If true, allows fallback billing on resolution failure (for paused workflow resumes)
-  /** @deprecated No longer used - preflight always uses deployed state */
-  useDraftState?: boolean
-  envUserId?: string // Optional override for env var resolution user
 }
 
 /**
@@ -164,11 +159,9 @@ export async function preprocessExecution(
     checkRateLimit = triggerType !== 'manual' && triggerType !== 'chat',
     checkDeployment = triggerType !== 'manual',
     skipUsageLimits = false,
-    preflightEnvVars = false,
     workspaceId: providedWorkspaceId,
     loggingSession: providedLoggingSession,
     isResumeContext = false,
-    envUserId,
   } = options
 
   logger.info(`[${requestId}] Starting execution preprocessing`, {
@@ -483,44 +476,6 @@ export async function preprocessExecution(
   }
 
   // ========== SUCCESS: All Checks Passed ==========
-  if (preflightEnvVars) {
-    try {
-      const resolvedEnvUserId = envUserId || workflowRecord.userId || userId
-      await preflightWorkflowEnvVars({
-        workflowId,
-        workspaceId,
-        envUserId: resolvedEnvUserId,
-        requestId,
-      })
-    } catch (error) {
-      const message = error instanceof Error ? error.message : 'Env var preflight failed'
-      logger.warn(`[${requestId}] Env var preflight failed`, {
-        workflowId,
-        message,
-      })
-
-      await logPreprocessingError({
-        workflowId,
-        executionId,
-        triggerType,
-        requestId,
-        userId: actorUserId,
-        workspaceId,
-        errorMessage: message,
-        loggingSession: providedLoggingSession,
-      })
-
-      return {
-        success: false,
-        error: {
-          message,
-          statusCode: 400,
-          logCreated: true,
-        },
-      }
-    }
-  }
-
   logger.info(`[${requestId}] All preprocessing checks passed`, {
     workflowId,
     actorUserId,

apps/sim/lib/mcp/service.ts

@@ -25,7 +25,8 @@ import type {
   McpTransport,
 } from '@/lib/mcp/types'
 import { MCP_CONSTANTS } from '@/lib/mcp/utils'
-import { resolveEnvVarReferences } from '@/executor/utils/reference-validation'
+import { REFERENCE } from '@/executor/constants'
+import { createEnvVarPattern } from '@/executor/utils/reference-validation'
 
 const logger = createLogger('McpService')
 
@@ -50,21 +51,31 @@ class McpService {
    * Resolve environment variables in strings
    */
   private resolveEnvVars(value: string, envVars: Record<string, string>): string {
+    const envVarPattern = createEnvVarPattern()
+    const envMatches = value.match(envVarPattern)
+    if (!envMatches) return value
+
+    let resolvedValue = value
     const missingVars: string[] = []
-    const resolvedValue = resolveEnvVarReferences(value, envVars, {
-      allowEmbedded: true,
-      resolveExactMatch: true,
-      trimKeys: true,
-      onMissing: 'keep',
-      deep: false,
-      missingKeys: missingVars,
-    }) as string
+
+    for (const match of envMatches) {
+      const envKey = match
+        .slice(REFERENCE.ENV_VAR_START.length, -REFERENCE.ENV_VAR_END.length)
+        .trim()
+      const envValue = envVars[envKey]
+
+      if (envValue === undefined) {
+        missingVars.push(envKey)
+        continue
+      }
+
+      resolvedValue = resolvedValue.replace(match, envValue)
+    }
 
     if (missingVars.length > 0) {
-      const uniqueMissing = Array.from(new Set(missingVars))
       throw new Error(
-        `Missing required environment variable${uniqueMissing.length > 1 ? 's' : ''}: ${uniqueMissing.join(', ')}. ` +
-          `Please set ${uniqueMissing.length > 1 ? 'these variables' : 'this variable'} in your workspace or personal environment settings.`
+        `Missing required environment variable${missingVars.length > 1 ? 's' : ''}: ${missingVars.join(', ')}. ` +
+          `Please set ${missingVars.length > 1 ? 'these variables' : 'this variable'} in your workspace or personal environment settings.`
       )
     }
 

apps/sim/lib/webhooks/deploy.ts

@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
 import { webhook } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, inArray } from 'drizzle-orm'
+import { eq, inArray } from 'drizzle-orm'
 import { nanoid } from 'nanoid'
 import type { NextRequest } from 'next/server'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
@@ -41,7 +41,6 @@ interface SaveTriggerWebhooksInput {
   userId: string
   blocks: Record<string, BlockState>
   requestId: string
-  deploymentVersionId?: string
 }
 
 function getSubBlockValue(block: BlockState, subBlockId: string): unknown {
@@ -247,17 +246,8 @@ async function syncCredentialSetWebhooks(params: {
   triggerPath: string
   providerConfig: Record<string, unknown>
   requestId: string
-  deploymentVersionId?: string
 }): Promise<TriggerSaveError | null> {
-  const {
-    workflowId,
-    blockId,
-    provider,
-    triggerPath,
-    providerConfig,
-    requestId,
-    deploymentVersionId,
-  } = params
+  const { workflowId, blockId, provider, triggerPath, providerConfig, requestId } = params
 
   const credentialSetId = providerConfig.credentialSetId as string | undefined
   if (!credentialSetId) {
@@ -277,7 +267,6 @@ async function syncCredentialSetWebhooks(params: {
     oauthProviderId,
     providerConfig: baseConfig as Record<string, any>,
     requestId,
-    deploymentVersionId,
   })
 
   if (syncResult.webhooks.length === 0) {
@@ -319,7 +308,6 @@ async function createWebhookForBlock(params: {
   providerConfig: Record<string, unknown>
   triggerPath: string
   requestId: string
-  deploymentVersionId?: string
 }): Promise<TriggerSaveError | null> {
   const {
     request,
@@ -331,7 +319,6 @@ async function createWebhookForBlock(params: {
     providerConfig,
     triggerPath,
     requestId,
-    deploymentVersionId,
   } = params
 
   const webhookId = nanoid()
@@ -359,7 +346,6 @@ async function createWebhookForBlock(params: {
       .values({
         id: webhookId,
         workflowId,
-        deploymentVersionId: deploymentVersionId || null,
         blockId: block.id,
         path: triggerPath,
         provider,
@@ -397,31 +383,16 @@ export async function saveTriggerWebhooksForDeploy({
   userId,
   blocks,
   requestId,
-  deploymentVersionId,
 }: SaveTriggerWebhooksInput): Promise<TriggerSaveResult> {
   const triggerBlocks = Object.values(blocks || {}).filter(Boolean)
   const currentBlockIds = new Set(triggerBlocks.map((b) => b.id))
 
   // 1. Get all existing webhooks for this workflow
-  const existingWebhooks = await db
-    .select()
-    .from(webhook)
-    .where(
-      deploymentVersionId
-        ? and(
-            eq(webhook.workflowId, workflowId),
-            eq(webhook.deploymentVersionId, deploymentVersionId)
-          )
-        : eq(webhook.workflowId, workflowId)
-    )
+  const existingWebhooks = await db.select().from(webhook).where(eq(webhook.workflowId, workflowId))
 
-  const webhooksByBlockId = new Map<string, typeof existingWebhooks>()
-  for (const wh of existingWebhooks) {
-    if (!wh.blockId) continue
-    const existingForBlock = webhooksByBlockId.get(wh.blockId) ?? []
-    existingForBlock.push(wh)
-    webhooksByBlockId.set(wh.blockId, existingForBlock)
-  }
+  const webhooksByBlockId = new Map(
+    existingWebhooks.filter((wh) => wh.blockId).map((wh) => [wh.blockId!, wh])
+  )
 
   logger.info(`[${requestId}] Starting webhook sync`, {
     workflowId,
@@ -432,7 +403,6 @@ export async function saveTriggerWebhooksForDeploy({
   // 2. Determine which webhooks to delete (orphaned or config changed)
   const webhooksToDelete: typeof existingWebhooks = []
   const blocksNeedingWebhook: BlockState[] = []
-  const blocksNeedingCredentialSetSync: BlockState[] = []
 
   for (const block of triggerBlocks) {
     const triggerId = resolveTriggerId(block)
@@ -459,24 +429,11 @@ export async function saveTriggerWebhooksForDeploy({
 
     ;(block as any)._webhookConfig = { provider, providerConfig, triggerPath, triggerDef }
 
-    if (providerConfig.credentialSetId) {
-      blocksNeedingCredentialSetSync.push(block)
-      continue
-    }
-
-    const existingForBlock = webhooksByBlockId.get(block.id) ?? []
-    if (existingForBlock.length === 0) {
+    const existingWh = webhooksByBlockId.get(block.id)
+    if (!existingWh) {
       // No existing webhook - needs creation
       blocksNeedingWebhook.push(block)
     } else {
-      const [existingWh, ...extraWebhooks] = existingForBlock
-      if (extraWebhooks.length > 0) {
-        webhooksToDelete.push(...extraWebhooks)
-        logger.info(
-          `[${requestId}] Found ${extraWebhooks.length} extra webhook(s) for block ${block.id}`
-        )
-      }
-
       // Check if config changed
       const existingConfig = (existingWh.providerConfig as Record<string, unknown>) || {}
       if (
@@ -522,40 +479,7 @@ export async function saveTriggerWebhooksForDeploy({
     await db.delete(webhook).where(inArray(webhook.id, idsToDelete))
   }
 
-  // 4. Sync credential set webhooks
-  for (const block of blocksNeedingCredentialSetSync) {
-    const config = (block as any)._webhookConfig
-    if (!config) continue
-
-    const { provider, providerConfig, triggerPath } = config
-
-    try {
-      const credentialSetError = await syncCredentialSetWebhooks({
-        workflowId,
-        blockId: block.id,
-        provider,
-        triggerPath,
-        providerConfig,
-        requestId,
-        deploymentVersionId,
-      })
-
-      if (credentialSetError) {
-        return { success: false, error: credentialSetError }
-      }
-    } catch (error: any) {
-      logger.error(`[${requestId}] Failed to create webhook for ${block.id}`, error)
-      return {
-        success: false,
-        error: {
-          message: error?.message || 'Failed to save trigger configuration',
-          status: 500,
-        },
-      }
-    }
-  }
-
-  // 5. Create webhooks for blocks that need them
+  // 4. Create webhooks for blocks that need them
   for (const block of blocksNeedingWebhook) {
     const config = (block as any)._webhookConfig
     if (!config) continue
@@ -563,6 +487,24 @@ export async function saveTriggerWebhooksForDeploy({
     const { provider, providerConfig, triggerPath } = config
 
     try {
+      // Handle credential sets
+      const credentialSetError = await syncCredentialSetWebhooks({
+        workflowId,
+        blockId: block.id,
+        provider,
+        triggerPath,
+        providerConfig,
+        requestId,
+      })
+
+      if (credentialSetError) {
+        return { success: false, error: credentialSetError }
+      }
+
+      if (providerConfig.credentialSetId) {
+        continue
+      }
+
       const createError = await createWebhookForBlock({
         request,
         workflowId,
@@ -573,7 +515,6 @@ export async function saveTriggerWebhooksForDeploy({
         providerConfig,
         triggerPath,
         requestId,
-        deploymentVersionId,
       })
 
       if (createError) {
@@ -606,20 +547,9 @@ export async function saveTriggerWebhooksForDeploy({
 export async function cleanupWebhooksForWorkflow(
   workflowId: string,
   workflow: Record<string, unknown>,
-  requestId: string,
-  deploymentVersionId?: string
+  requestId: string
 ): Promise<void> {
-  const existingWebhooks = await db
-    .select()
-    .from(webhook)
-    .where(
-      deploymentVersionId
-        ? and(
-            eq(webhook.workflowId, workflowId),
-            eq(webhook.deploymentVersionId, deploymentVersionId)
-          )
-        : eq(webhook.workflowId, workflowId)
-    )
+  const existingWebhooks = await db.select().from(webhook).where(eq(webhook.workflowId, workflowId))
 
   if (existingWebhooks.length === 0) {
     logger.debug(`[${requestId}] No webhooks to clean up for workflow ${workflowId}`)
@@ -628,7 +558,6 @@ export async function cleanupWebhooksForWorkflow(
 
   logger.info(`[${requestId}] Cleaning up ${existingWebhooks.length} webhook(s) for undeploy`, {
     workflowId,
-    deploymentVersionId,
     webhookIds: existingWebhooks.map((wh) => wh.id),
   })
 
@@ -643,20 +572,7 @@ export async function cleanupWebhooksForWorkflow(
   }
 
   // Delete all webhook records
-  await db
-    .delete(webhook)
-    .where(
-      deploymentVersionId
-        ? and(
-            eq(webhook.workflowId, workflowId),
-            eq(webhook.deploymentVersionId, deploymentVersionId)
-          )
-        : eq(webhook.workflowId, workflowId)
-    )
+  await db.delete(webhook).where(eq(webhook.workflowId, workflowId))
 
-  logger.info(
-    deploymentVersionId
-      ? `[${requestId}] Cleaned up webhooks for workflow ${workflowId} deployment ${deploymentVersionId}`
-      : `[${requestId}] Cleaned up all webhooks for workflow ${workflowId}`
-  )
+  logger.info(`[${requestId}] Cleaned up all webhooks for workflow ${workflowId}`)
 }

apps/sim/lib/webhooks/gmail-polling-service.ts

@@ -1,13 +1,7 @@
 import { db } from '@sim/db'
-import {
-  account,
-  credentialSet,
-  webhook,
-  workflow,
-  workflowDeploymentVersion,
-} from '@sim/db/schema'
+import { account, credentialSet, webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, isNull, or, sql } from 'drizzle-orm'
+import { and, eq, sql } from 'drizzle-orm'
 import { nanoid } from 'nanoid'
 import { isOrganizationOnTeamOrEnterprisePlan } from '@/lib/billing'
 import { pollingIdempotency } from '@/lib/core/idempotency/service'
@@ -117,22 +111,11 @@ export async function pollGmailWebhooks() {
       .select({ webhook })
       .from(webhook)
       .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, workflow.id),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
       .where(
         and(
           eq(webhook.provider, 'gmail'),
           eq(webhook.isActive, true),
-          eq(workflow.isDeployed, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
+          eq(workflow.isDeployed, true)
         )
       )
 

apps/sim/lib/webhooks/imap-polling-service.ts

@@ -1,8 +1,8 @@
 import { db } from '@sim/db'
-import { webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
+import { webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import type { InferSelectModel } from 'drizzle-orm'
-import { and, eq, isNull, or, sql } from 'drizzle-orm'
+import { and, eq, sql } from 'drizzle-orm'
 import type { FetchMessageObject, MailboxLockObject } from 'imapflow'
 import { ImapFlow } from 'imapflow'
 import { nanoid } from 'nanoid'
@@ -113,23 +113,8 @@ export async function pollImapWebhooks() {
       .select({ webhook })
       .from(webhook)
       .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, workflow.id),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
       .where(
-        and(
-          eq(webhook.provider, 'imap'),
-          eq(webhook.isActive, true),
-          eq(workflow.isDeployed, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
-        )
+        and(eq(webhook.provider, 'imap'), eq(webhook.isActive, true), eq(workflow.isDeployed, true))
       )
 
     const activeWebhooks = activeWebhooksResult.map((r) => r.webhook)

apps/sim/lib/webhooks/outlook-polling-service.ts

@@ -1,13 +1,7 @@
 import { db } from '@sim/db'
-import {
-  account,
-  credentialSet,
-  webhook,
-  workflow,
-  workflowDeploymentVersion,
-} from '@sim/db/schema'
+import { account, credentialSet, webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, isNull, or, sql } from 'drizzle-orm'
+import { and, eq, sql } from 'drizzle-orm'
 import { htmlToText } from 'html-to-text'
 import { nanoid } from 'nanoid'
 import { isOrganizationOnTeamOrEnterprisePlan } from '@/lib/billing'
@@ -167,22 +161,11 @@ export async function pollOutlookWebhooks() {
       .select({ webhook })
       .from(webhook)
       .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, workflow.id),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
       .where(
         and(
           eq(webhook.provider, 'outlook'),
           eq(webhook.isActive, true),
-          eq(workflow.isDeployed, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
+          eq(workflow.isDeployed, true)
         )
       )
 

apps/sim/lib/webhooks/processor.ts

@@ -1,8 +1,8 @@
-import { db, webhook, workflow, workflowDeploymentVersion } from '@sim/db'
+import { db, webhook, workflow } from '@sim/db'
 import { credentialSet, subscription } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { tasks } from '@trigger.dev/sdk'
-import { and, eq, isNull, or } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { checkEnterprisePlan, checkTeamPlan } from '@/lib/billing/subscriptions/utils'
@@ -16,7 +16,8 @@ import {
   verifyProviderWebhook,
 } from '@/lib/webhooks/utils.server'
 import { executeWebhookJob } from '@/background/webhook-execution'
-import { resolveEnvVarReferences } from '@/executor/utils/reference-validation'
+import { REFERENCE } from '@/executor/constants'
+import { createEnvVarPattern } from '@/executor/utils/reference-validation'
 
 const logger = createLogger('WebhookProcessor')
 
@@ -24,6 +25,7 @@ export interface WebhookProcessorOptions {
   requestId: string
   path?: string
   webhookId?: string
+  executionTarget?: 'deployed' | 'live'
 }
 
 function getExternalUrl(request: NextRequest): string {
@@ -294,23 +296,7 @@ export async function findWebhookAndWorkflow(
       })
       .from(webhook)
       .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, workflow.id),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
-      .where(
-        and(
-          eq(webhook.id, options.webhookId),
-          eq(webhook.isActive, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
-        )
-      )
+      .where(and(eq(webhook.id, options.webhookId), eq(webhook.isActive, true)))
       .limit(1)
 
     if (results.length === 0) {
@@ -329,23 +315,7 @@ export async function findWebhookAndWorkflow(
       })
       .from(webhook)
       .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, workflow.id),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
-      .where(
-        and(
-          eq(webhook.path, options.path),
-          eq(webhook.isActive, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
-        )
-      )
+      .where(and(eq(webhook.path, options.path), eq(webhook.isActive, true)))
       .limit(1)
 
     if (results.length === 0) {
@@ -377,23 +347,7 @@ export async function findAllWebhooksForPath(
     })
     .from(webhook)
     .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-    .leftJoin(
-      workflowDeploymentVersion,
-      and(
-        eq(workflowDeploymentVersion.workflowId, workflow.id),
-        eq(workflowDeploymentVersion.isActive, true)
-      )
-    )
-    .where(
-      and(
-        eq(webhook.path, options.path),
-        eq(webhook.isActive, true),
-        or(
-          eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-          and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-        )
-      )
-    )
+    .where(and(eq(webhook.path, options.path), eq(webhook.isActive, true)))
 
   if (results.length === 0) {
     logger.warn(`[${options.requestId}] No active webhooks found for path: ${options.path}`)
@@ -413,13 +367,19 @@ export async function findAllWebhooksForPath(
  * @returns String with all {{VARIABLE}} references replaced
  */
 function resolveEnvVars(value: string, envVars: Record<string, string>): string {
-  return resolveEnvVarReferences(value, envVars, {
-    allowEmbedded: true,
-    resolveExactMatch: true,
-    trimKeys: true,
-    onMissing: 'keep',
-    deep: false,
-  }) as string
+  const envVarPattern = createEnvVarPattern()
+  const envMatches = value.match(envVarPattern)
+  if (!envMatches) return value
+
+  let resolvedValue = value
+  for (const match of envMatches) {
+    const envKey = match.slice(REFERENCE.ENV_VAR_START.length, -REFERENCE.ENV_VAR_END.length).trim()
+    const envValue = envVars[envKey]
+    if (envValue !== undefined) {
+      resolvedValue = resolvedValue.replaceAll(match, envValue)
+    }
+  }
+  return resolvedValue
 }
 
 /**
@@ -804,7 +764,6 @@ export async function checkWebhookPreprocessing(
       checkRateLimit: true,
       checkDeployment: true,
       workspaceId: foundWorkflow.workspaceId,
-      preflightEnvVars: isTriggerDevEnabled,
     })
 
     if (!preprocessResult.success) {
@@ -1003,6 +962,7 @@ export async function queueWebhookExecution(
       headers,
       path: options.path || foundWebhook.path,
       blockId: foundWebhook.blockId,
+      executionTarget: options.executionTarget,
       ...(credentialId ? { credentialId } : {}),
     }
 

apps/sim/lib/webhooks/rss-polling-service.ts

@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
-import { webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
+import { webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, isNull, or, sql } from 'drizzle-orm'
+import { and, eq, sql } from 'drizzle-orm'
 import { nanoid } from 'nanoid'
 import Parser from 'rss-parser'
 import { pollingIdempotency } from '@/lib/core/idempotency/service'
@@ -119,23 +119,8 @@ export async function pollRssWebhooks() {
       .select({ webhook })
       .from(webhook)
       .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, workflow.id),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
       .where(
-        and(
-          eq(webhook.provider, 'rss'),
-          eq(webhook.isActive, true),
-          eq(workflow.isDeployed, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
-        )
+        and(eq(webhook.provider, 'rss'), eq(webhook.isActive, true), eq(workflow.isDeployed, true))
       )
 
     const activeWebhooks = activeWebhooksResult.map((r) => r.webhook)

apps/sim/lib/webhooks/utils.server.ts

@@ -1,7 +1,7 @@
-import { db, workflowDeploymentVersion } from '@sim/db'
+import { db } from '@sim/db'
 import { account, webhook } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, isNull, or } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { createPinnedUrl, validateUrlWithDNS } from '@/lib/core/security/input-validation'
 import type { DbOrTx } from '@/lib/db/types'
@@ -28,28 +28,11 @@ export async function handleWhatsAppVerification(
     }
 
     const webhooks = await db
-      .select({ webhook })
+      .select()
       .from(webhook)
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, webhook.workflowId),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
-      .where(
-        and(
-          eq(webhook.provider, 'whatsapp'),
-          eq(webhook.isActive, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
-        )
-      )
+      .where(and(eq(webhook.provider, 'whatsapp'), eq(webhook.isActive, true)))
 
-    for (const row of webhooks) {
-      const wh = row.webhook
+    for (const wh of webhooks) {
       const providerConfig = (wh.providerConfig as Record<string, any>) || {}
       const verificationToken = providerConfig.verificationToken
 
@@ -1962,7 +1945,6 @@ export async function syncWebhooksForCredentialSet(params: {
   providerConfig: Record<string, any>
   requestId: string
   tx?: DbOrTx
-  deploymentVersionId?: string
 }): Promise<CredentialSetWebhookSyncResult> {
   const {
     workflowId,
@@ -1974,7 +1956,6 @@ export async function syncWebhooksForCredentialSet(params: {
     providerConfig,
     requestId,
     tx,
-    deploymentVersionId,
   } = params
 
   const dbCtx = tx ?? db
@@ -2009,15 +1990,7 @@ export async function syncWebhooksForCredentialSet(params: {
   const existingWebhooks = await dbCtx
     .select()
     .from(webhook)
-    .where(
-      deploymentVersionId
-        ? and(
-            eq(webhook.workflowId, workflowId),
-            eq(webhook.blockId, blockId),
-            eq(webhook.deploymentVersionId, deploymentVersionId)
-          )
-        : and(eq(webhook.workflowId, workflowId), eq(webhook.blockId, blockId))
-    )
+    .where(and(eq(webhook.workflowId, workflowId), eq(webhook.blockId, blockId)))
 
   // Filter to only webhooks belonging to this credential set
   const credentialSetWebhooks = existingWebhooks.filter((wh) => {
@@ -2071,7 +2044,6 @@ export async function syncWebhooksForCredentialSet(params: {
       await dbCtx
         .update(webhook)
         .set({
-          ...(deploymentVersionId ? { deploymentVersionId } : {}),
           providerConfig: updatedConfig,
           isActive: true,
           updatedAt: new Date(),
@@ -2110,7 +2082,6 @@ export async function syncWebhooksForCredentialSet(params: {
         providerConfig: newConfig,
         credentialSetId, // Indexed column for efficient credential set queries
         isActive: true,
-        ...(deploymentVersionId ? { deploymentVersionId } : {}),
         createdAt: new Date(),
         updatedAt: new Date(),
       })
@@ -2166,24 +2137,9 @@ export async function syncAllWebhooksForCredentialSet(
 
   // Find all webhooks that use this credential set using the indexed column
   const webhooksForSet = await dbCtx
-    .select({ webhook })
+    .select()
     .from(webhook)
-    .leftJoin(
-      workflowDeploymentVersion,
-      and(
-        eq(workflowDeploymentVersion.workflowId, webhook.workflowId),
-        eq(workflowDeploymentVersion.isActive, true)
-      )
-    )
-    .where(
-      and(
-        eq(webhook.credentialSetId, credentialSetId),
-        or(
-          eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-          and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-        )
-      )
-    )
+    .where(eq(webhook.credentialSetId, credentialSetId))
 
   if (webhooksForSet.length === 0) {
     syncLogger.info(`[${requestId}] No webhooks found using credential set ${credentialSetId}`)
@@ -2191,9 +2147,8 @@ export async function syncAllWebhooksForCredentialSet(
   }
 
   // Group webhooks by workflow+block to find unique triggers
-  const triggerGroups = new Map<string, (typeof webhooksForSet)[number]['webhook']>()
-  for (const row of webhooksForSet) {
-    const wh = row.webhook
+  const triggerGroups = new Map<string, (typeof webhooksForSet)[number]>()
+  for (const wh of webhooksForSet) {
     const key = `${wh.workflowId}:${wh.blockId}`
     // Keep the first webhook as representative (they all have same config)
     if (!triggerGroups.has(key)) {
@@ -2233,7 +2188,6 @@ export async function syncAllWebhooksForCredentialSet(
         providerConfig: baseConfig,
         requestId,
         tx: dbCtx,
-        deploymentVersionId: representativeWebhook.deploymentVersionId || undefined,
       })
 
       workflowsUpdated++

apps/sim/lib/workflows/credentials/credential-extractor.ts

@@ -1,17 +1,16 @@
-import {
-  buildCanonicalIndex,
-  buildSubBlockValues,
-  evaluateSubBlockCondition,
-  hasAdvancedValues,
-  isSubBlockFeatureEnabled,
-  isSubBlockVisibleForMode,
-  type SubBlockCondition,
-} from '@/lib/workflows/subblocks/visibility'
 import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
 import type { BlockState, SubBlockState, WorkflowState } from '@/stores/workflows/workflow/types'
 
+/** Condition type for SubBlock visibility - mirrors the inline type from blocks/types.ts */
+interface SubBlockCondition {
+  field: string
+  value: string | number | boolean | Array<string | number | boolean> | undefined
+  not?: boolean
+  and?: SubBlockCondition
+}
+
 // Credential types based on actual patterns in the codebase
 export enum CredentialType {
   OAUTH = 'oauth',
@@ -118,32 +117,36 @@ export function extractRequiredCredentials(
 
   /** Helper to check visibility, respecting mode and conditions */
   function isSubBlockVisible(block: BlockState, subBlockConfig: SubBlockConfig): boolean {
-    if (!isSubBlockFeatureEnabled(subBlockConfig)) return false
+    const mode = subBlockConfig.mode ?? 'both'
+    if (mode === 'trigger' && !block?.triggerMode) return false
+    if (mode === 'basic' && block?.advancedMode) return false
+    if (mode === 'advanced' && !block?.advancedMode) return false
 
-    const values = buildSubBlockValues(block?.subBlocks || {})
-    const blockConfig = getBlock(block.type)
-    const blockSubBlocks = blockConfig?.subBlocks || []
-    const canonicalIndex = buildCanonicalIndex(blockSubBlocks)
-    const effectiveAdvanced =
-      (block?.advancedMode ?? false) || hasAdvancedValues(blockSubBlocks, values, canonicalIndex)
-    const canonicalModeOverrides = block.data?.canonicalModes
+    if (!subBlockConfig.condition) return true
 
-    if (subBlockConfig.mode === 'trigger' && !block?.triggerMode) return false
-    if (block?.triggerMode && subBlockConfig.mode && subBlockConfig.mode !== 'trigger') return false
+    const condition =
+      typeof subBlockConfig.condition === 'function'
+        ? subBlockConfig.condition()
+        : subBlockConfig.condition
 
-    if (
-      !isSubBlockVisibleForMode(
-        subBlockConfig,
-        effectiveAdvanced,
-        canonicalIndex,
-        values,
-        canonicalModeOverrides
-      )
-    ) {
-      return false
+    const evaluate = (cond: SubBlockCondition): boolean => {
+      const currentValue = block?.subBlocks?.[cond.field]?.value
+      const expected = cond.value
+
+      let match =
+        expected === undefined
+          ? true
+          : Array.isArray(expected)
+            ? expected.includes(currentValue as string)
+            : currentValue === expected
+
+      if (cond.not) match = !match
+      if (cond.and) match = match && evaluate(cond.and)
+
+      return match
     }
 
-    return evaluateSubBlockCondition(subBlockConfig.condition as SubBlockCondition, values)
+    return evaluate(condition)
   }
 
   // Sort: OAuth first, then secrets, alphabetically within each type

apps/sim/lib/workflows/executor/execution-core.ts

@@ -6,7 +6,6 @@
 import { createLogger } from '@sim/logger'
 import type { Edge } from 'reactflow'
 import { z } from 'zod'
-import { parseResponseFormatSafely } from '@/lib/core/utils/response-format'
 import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils'
 import { clearExecutionCancellation } from '@/lib/execution/cancellation'
 import type { LoggingSession } from '@/lib/logs/execution/logging-session'
@@ -18,6 +17,7 @@ import {
 import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
 import { updateWorkflowRunCounts } from '@/lib/workflows/utils'
 import { Executor } from '@/executor'
+import { REFERENCE } from '@/executor/constants'
 import type { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type {
   ContextExtensions,
@@ -25,7 +25,7 @@ import type {
   IterationContext,
 } from '@/executor/execution/types'
 import type { ExecutionResult, NormalizedBlockOutput } from '@/executor/types'
-import { resolveEnvVarReferences } from '@/executor/utils/reference-validation'
+import { createEnvVarPattern } from '@/executor/utils/reference-validation'
 import { Serializer } from '@/serializer'
 import { mergeSubblockState } from '@/stores/workflows/server-utils'
 
@@ -203,13 +203,25 @@ export async function executeWorkflowCore(
           (subAcc, [key, subBlock]) => {
             let value = subBlock.value
 
-            if (typeof value === 'string') {
-              value = resolveEnvVarReferences(value, decryptedEnvVars, {
-                resolveExactMatch: false,
-                trimKeys: false,
-                onMissing: 'keep',
-                deep: false,
-              }) as string
+            if (
+              typeof value === 'string' &&
+              value.includes(REFERENCE.ENV_VAR_START) &&
+              value.includes(REFERENCE.ENV_VAR_END)
+            ) {
+              const envVarPattern = createEnvVarPattern()
+              const matches = value.match(envVarPattern)
+              if (matches) {
+                for (const match of matches) {
+                  const varName = match.slice(
+                    REFERENCE.ENV_VAR_START.length,
+                    -REFERENCE.ENV_VAR_END.length
+                  )
+                  const decryptedValue = decryptedEnvVars[varName]
+                  if (decryptedValue !== undefined) {
+                    value = (value as string).replace(match, decryptedValue)
+                  }
+                }
+              }
             }
 
             subAcc[key] = value
@@ -225,16 +237,26 @@ export async function executeWorkflowCore(
     // Process response format
     const processedBlockStates = Object.entries(currentBlockStates).reduce(
       (acc, [blockId, blockState]) => {
-        const responseFormatValue = blockState.responseFormat
-        if (responseFormatValue === undefined || responseFormatValue === null) {
+        if (blockState.responseFormat && typeof blockState.responseFormat === 'string') {
+          const responseFormatValue = blockState.responseFormat.trim()
+          if (responseFormatValue && !responseFormatValue.startsWith(REFERENCE.START)) {
+            try {
+              acc[blockId] = {
+                ...blockState,
+                responseFormat: JSON.parse(responseFormatValue),
+              }
+            } catch {
+              acc[blockId] = {
+                ...blockState,
+                responseFormat: undefined,
+              }
+            }
+          } else {
+            acc[blockId] = blockState
+          }
+        } else {
           acc[blockId] = blockState
-          return acc
         }
-
-        const responseFormat = parseResponseFormatSafely(responseFormatValue, blockId, {
-          allowReferences: true,
-        })
-        acc[blockId] = { ...blockState, responseFormat: responseFormat ?? undefined }
         return acc
       },
       {} as Record<string, Record<string, any>>

apps/sim/lib/workflows/executor/preflight.ts

@@ -1,51 +0,0 @@
-import { createLogger } from '@sim/logger'
-import {
-  ensureBlockEnvVarsResolvable,
-  ensureEnvVarsDecryptable,
-  getPersonalAndWorkspaceEnv,
-} from '@/lib/environment/utils'
-import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
-import { mergeSubblockState } from '@/stores/workflows/server-utils'
-
-const logger = createLogger('ExecutionPreflight')
-
-export interface EnvVarPreflightOptions {
-  workflowId: string
-  workspaceId: string
-  envUserId: string
-  requestId?: string
-}
-
-/**
- * Preflight env var checks to avoid scheduling executions that will fail.
- * Always uses deployed workflow state since preflight is only done for async
- * executions which always run on deployed state.
- */
-export async function preflightWorkflowEnvVars({
-  workflowId,
-  workspaceId,
-  envUserId,
-  requestId,
-}: EnvVarPreflightOptions): Promise<void> {
-  const workflowData = await loadDeployedWorkflowState(workflowId)
-
-  if (!workflowData) {
-    throw new Error('Workflow state not found')
-  }
-
-  const mergedStates = mergeSubblockState(workflowData.blocks)
-  const { personalEncrypted, workspaceEncrypted } = await getPersonalAndWorkspaceEnv(
-    envUserId,
-    workspaceId
-  )
-  const variables = { ...personalEncrypted, ...workspaceEncrypted }
-
-  await ensureBlockEnvVarsResolvable(mergedStates, variables, { requestId })
-  await ensureEnvVarsDecryptable(variables, { requestId })
-
-  if (requestId) {
-    logger.debug(`[${requestId}] Env var preflight passed`, { workflowId })
-  } else {
-    logger.debug('Env var preflight passed', { workflowId })
-  }
-}

apps/sim/lib/workflows/persistence/utils.ts

@@ -495,7 +495,6 @@ export async function deployWorkflow(params: {
 }): Promise<{
   success: boolean
   version?: number
-  deploymentVersionId?: string
   deployedAt?: Date
   currentState?: any
   error?: string
@@ -534,7 +533,6 @@ export async function deployWorkflow(params: {
         .where(eq(workflowDeploymentVersion.workflowId, workflowId))
 
       const nextVersion = Number(maxVersion) + 1
-      const deploymentVersionId = uuidv4()
 
       // Deactivate all existing versions
       await tx
@@ -544,7 +542,7 @@ export async function deployWorkflow(params: {
 
       // Create new deployment version
       await tx.insert(workflowDeploymentVersion).values({
-        id: deploymentVersionId,
+        id: uuidv4(),
         workflowId,
         version: nextVersion,
         state: currentState,
@@ -564,10 +562,10 @@ export async function deployWorkflow(params: {
       // Note: Templates are NOT automatically updated on deployment
       // Template updates must be done explicitly through the "Update Template" button
 
-      return { version: nextVersion, deploymentVersionId }
+      return nextVersion
     })
 
-    logger.info(`Deployed workflow ${workflowId} as v${deployedVersion.version}`)
+    logger.info(`Deployed workflow ${workflowId} as v${deployedVersion}`)
 
     if (workflowName) {
       try {
@@ -584,7 +582,7 @@ export async function deployWorkflow(params: {
           workflowName,
           blocksCount: Object.keys(currentState.blocks).length,
           edgesCount: currentState.edges.length,
-          version: deployedVersion.version,
+          version: deployedVersion,
           loopsCount: Object.keys(currentState.loops).length,
           parallelsCount: Object.keys(currentState.parallels).length,
           blockTypes: JSON.stringify(blockTypeCounts),
@@ -596,8 +594,7 @@ export async function deployWorkflow(params: {
 
     return {
       success: true,
-      version: deployedVersion.version,
-      deploymentVersionId: deployedVersion.deploymentVersionId,
+      version: deployedVersion,
       deployedAt: now,
       currentState,
     }

apps/sim/lib/workflows/sanitization/json-sanitizer.ts

@@ -268,12 +268,128 @@ function sanitizeSubBlocks(
   return sanitized
 }
 
+/**
+ * Convert internal condition handle (condition-{uuid}) to semantic format (condition-{blockId}-if)
+ */
+function convertConditionHandleToSemantic(
+  handle: string,
+  blockId: string,
+  block: BlockState
+): string {
+  if (!handle.startsWith('condition-')) {
+    return handle
+  }
+
+  // Extract the condition UUID from the handle
+  const conditionId = handle.substring('condition-'.length)
+
+  // Get conditions from block subBlocks
+  const conditionsValue = block.subBlocks?.conditions?.value
+  if (!conditionsValue || typeof conditionsValue !== 'string') {
+    return handle
+  }
+
+  let conditions: Array<{ id: string; title: string }>
+  try {
+    conditions = JSON.parse(conditionsValue)
+  } catch {
+    return handle
+  }
+
+  if (!Array.isArray(conditions)) {
+    return handle
+  }
+
+  // Find the condition by ID and generate semantic handle
+  let elseIfCount = 0
+  for (const condition of conditions) {
+    const title = condition.title?.toLowerCase()
+    if (condition.id === conditionId) {
+      if (title === 'if') {
+        return `condition-${blockId}-if`
+      }
+      if (title === 'else if') {
+        elseIfCount++
+        return elseIfCount === 1
+          ? `condition-${blockId}-else-if`
+          : `condition-${blockId}-else-if-${elseIfCount}`
+      }
+      if (title === 'else') {
+        return `condition-${blockId}-else`
+      }
+    }
+    // Count else-ifs as we iterate
+    if (title === 'else if') {
+      elseIfCount++
+    }
+  }
+
+  // Fallback: return original handle if condition not found
+  return handle
+}
+
+/**
+ * Convert internal router handle (router-{uuid}) to semantic format (router-{blockId}-route-N)
+ */
+function convertRouterHandleToSemantic(handle: string, blockId: string, block: BlockState): string {
+  if (!handle.startsWith('router-')) {
+    return handle
+  }
+
+  // Extract the route UUID from the handle
+  const routeId = handle.substring('router-'.length)
+
+  // Get routes from block subBlocks
+  const routesValue = block.subBlocks?.routes?.value
+  if (!routesValue || typeof routesValue !== 'string') {
+    return handle
+  }
+
+  let routes: Array<{ id: string; title?: string }>
+  try {
+    routes = JSON.parse(routesValue)
+  } catch {
+    return handle
+  }
+
+  if (!Array.isArray(routes)) {
+    return handle
+  }
+
+  // Find the route by ID and generate semantic handle (1-indexed)
+  for (let i = 0; i < routes.length; i++) {
+    if (routes[i].id === routeId) {
+      return `router-${blockId}-route-${i + 1}`
+    }
+  }
+
+  // Fallback: return original handle if route not found
+  return handle
+}
+
+/**
+ * Convert source handle to semantic format for condition and router blocks
+ */
+function convertToSemanticHandle(handle: string, blockId: string, block: BlockState): string {
+  if (handle.startsWith('condition-') && block.type === 'condition') {
+    return convertConditionHandleToSemantic(handle, blockId, block)
+  }
+
+  if (handle.startsWith('router-') && block.type === 'router_v2') {
+    return convertRouterHandleToSemantic(handle, blockId, block)
+  }
+
+  return handle
+}
+
 /**
  * Extract connections for a block from edges and format as operations-style connections
+ * Converts internal UUID handles to semantic format for training data
  */
 function extractConnectionsForBlock(
   blockId: string,
-  edges: WorkflowState['edges']
+  edges: WorkflowState['edges'],
+  block: BlockState
 ): Record<string, string | string[]> | undefined {
   const connections: Record<string, string[]> = {}
 
@@ -284,9 +400,12 @@ function extractConnectionsForBlock(
     return undefined
   }
 
-  // Group by source handle
+  // Group by source handle (converting to semantic format)
   for (const edge of outgoingEdges) {
-    const handle = edge.sourceHandle || 'source'
+    let handle = edge.sourceHandle || 'source'
+
+    // Convert internal UUID handles to semantic format
+    handle = convertToSemanticHandle(handle, blockId, block)
 
     if (!connections[handle]) {
       connections[handle] = []
@@ -321,7 +440,7 @@ export function sanitizeForCopilot(state: WorkflowState): CopilotWorkflowState {
 
   // Helper to recursively sanitize a block and its children
   const sanitizeBlock = (blockId: string, block: BlockState): CopilotBlockState => {
-    const connections = extractConnectionsForBlock(blockId, state.edges)
+    const connections = extractConnectionsForBlock(blockId, state.edges, block)
 
     // For loop/parallel blocks, extract config from block.data instead of subBlocks
     let inputs: Record<string, string | number | string[][] | object>

apps/sim/lib/workflows/schedules/deploy.test.ts

@@ -35,18 +35,11 @@ vi.mock('@sim/db', () => ({
   workflowSchedule: {
     workflowId: 'workflow_id',
     blockId: 'block_id',
-    deploymentVersionId: 'deployment_version_id',
   },
 }))
 
 vi.mock('drizzle-orm', () => ({
   eq: vi.fn((...args) => ({ type: 'eq', args })),
-  and: vi.fn((...args) => ({ type: 'and', args })),
-  sql: vi.fn((strings, ...values) => ({ type: 'sql', strings, values })),
-}))
-
-vi.mock('@/lib/webhooks/deploy', () => ({
-  cleanupWebhooksForWorkflow: vi.fn().mockResolvedValue(undefined),
 }))
 
 vi.mock('@sim/logger', () => loggerMock)

apps/sim/lib/workflows/schedules/deploy.ts

@@ -1,8 +1,7 @@
-import { db, workflowSchedule } from '@sim/db'
+import { workflowSchedule } from '@sim/db'
 import { createLogger } from '@sim/logger'
-import { and, eq } from 'drizzle-orm'
+import { eq } from 'drizzle-orm'
 import type { DbOrTx } from '@/lib/db/types'
-import { cleanupWebhooksForWorkflow } from '@/lib/webhooks/deploy'
 import type { BlockState } from '@/lib/workflows/schedules/utils'
 import { findScheduleBlocks, validateScheduleBlock } from '@/lib/workflows/schedules/validation'
 
@@ -27,8 +26,7 @@ export interface ScheduleDeployResult {
 export async function createSchedulesForDeploy(
   workflowId: string,
   blocks: Record<string, BlockState>,
-  tx: DbOrTx,
-  deploymentVersionId?: string
+  tx: DbOrTx
 ): Promise<ScheduleDeployResult> {
   const scheduleBlocks = findScheduleBlocks(blocks)
 
@@ -63,7 +61,6 @@ export async function createSchedulesForDeploy(
     const values = {
       id: scheduleId,
       workflowId,
-      deploymentVersionId: deploymentVersionId || null,
       blockId,
       cronExpression: cronExpression!,
       triggerType: 'schedule',
@@ -78,7 +75,6 @@ export async function createSchedulesForDeploy(
     const setValues = {
       blockId,
       cronExpression: cronExpression!,
-      ...(deploymentVersionId ? { deploymentVersionId } : {}),
       updatedAt: now,
       nextRunAt: nextRunAt!,
       timezone: timezone!,
@@ -90,11 +86,7 @@ export async function createSchedulesForDeploy(
       .insert(workflowSchedule)
       .values(values)
       .onConflictDoUpdate({
-        target: [
-          workflowSchedule.workflowId,
-          workflowSchedule.blockId,
-          workflowSchedule.deploymentVersionId,
-        ],
+        target: [workflowSchedule.workflowId, workflowSchedule.blockId],
         set: setValues,
       })
 
@@ -117,36 +109,8 @@ export async function createSchedulesForDeploy(
  * Delete all schedules for a workflow
  * This should be called within a database transaction during undeploy
  */
-export async function deleteSchedulesForWorkflow(
-  workflowId: string,
-  tx: DbOrTx,
-  deploymentVersionId?: string
-): Promise<void> {
-  await tx
-    .delete(workflowSchedule)
-    .where(
-      deploymentVersionId
-        ? and(
-            eq(workflowSchedule.workflowId, workflowId),
-            eq(workflowSchedule.deploymentVersionId, deploymentVersionId)
-          )
-        : eq(workflowSchedule.workflowId, workflowId)
-    )
+export async function deleteSchedulesForWorkflow(workflowId: string, tx: DbOrTx): Promise<void> {
+  await tx.delete(workflowSchedule).where(eq(workflowSchedule.workflowId, workflowId))
 
-  logger.info(
-    deploymentVersionId
-      ? `Deleted schedules for workflow ${workflowId} deployment ${deploymentVersionId}`
-      : `Deleted all schedules for workflow ${workflowId}`
-  )
-}
-
-export async function cleanupDeploymentVersion(params: {
-  workflowId: string
-  workflow: Record<string, unknown>
-  requestId: string
-  deploymentVersionId: string
-}): Promise<void> {
-  const { workflowId, workflow, requestId, deploymentVersionId } = params
-  await cleanupWebhooksForWorkflow(workflowId, workflow, requestId, deploymentVersionId)
-  await deleteSchedulesForWorkflow(workflowId, db, deploymentVersionId)
+  logger.info(`Deleted all schedules for workflow ${workflowId}`)
 }

apps/sim/lib/workflows/schedules/index.ts

@@ -1,5 +1,4 @@
 export {
-  cleanupDeploymentVersion,
   createSchedulesForDeploy,
   deleteSchedulesForWorkflow,
   type ScheduleDeployResult,

apps/sim/lib/workflows/subblocks/visibility.ts

@@ -1,269 +0,0 @@
-import { getEnv, isTruthy } from '@/lib/core/config/env'
-import type { SubBlockConfig } from '@/blocks/types'
-
-export type CanonicalMode = 'basic' | 'advanced'
-
-export interface CanonicalGroup {
-  canonicalId: string
-  basicId?: string
-  advancedIds: string[]
-}
-
-export interface CanonicalIndex {
-  groupsById: Record<string, CanonicalGroup>
-  canonicalIdBySubBlockId: Record<string, string>
-}
-
-export interface SubBlockCondition {
-  field: string
-  value: string | number | boolean | Array<string | number | boolean> | undefined
-  not?: boolean
-  and?: SubBlockCondition
-}
-
-export interface CanonicalModeOverrides {
-  [canonicalId: string]: CanonicalMode | undefined
-}
-
-export interface CanonicalValueSelection {
-  basicValue: unknown
-  advancedValue: unknown
-  advancedSourceId?: string
-}
-
-/**
- * Build a flat map of subblock values keyed by subblock id.
- */
-export function buildSubBlockValues(
-  subBlocks: Record<string, { value?: unknown } | null | undefined>
-): Record<string, unknown> {
-  return Object.entries(subBlocks).reduce<Record<string, unknown>>((acc, [key, subBlock]) => {
-    acc[key] = subBlock?.value
-    return acc
-  }, {})
-}
-
-/**
- * Build canonical group indices for a block's subblocks.
- */
-export function buildCanonicalIndex(subBlocks: SubBlockConfig[]): CanonicalIndex {
-  const groupsById: Record<string, CanonicalGroup> = {}
-  const canonicalIdBySubBlockId: Record<string, string> = {}
-
-  subBlocks.forEach((subBlock) => {
-    if (!subBlock.canonicalParamId) return
-    const canonicalId = subBlock.canonicalParamId
-    if (!groupsById[canonicalId]) {
-      groupsById[canonicalId] = { canonicalId, advancedIds: [] }
-    }
-    const group = groupsById[canonicalId]
-    if (subBlock.mode === 'advanced') {
-      group.advancedIds.push(subBlock.id)
-    } else {
-      group.basicId = subBlock.id
-    }
-    canonicalIdBySubBlockId[subBlock.id] = canonicalId
-  })
-
-  return { groupsById, canonicalIdBySubBlockId }
-}
-
-/**
- * Resolve if a canonical group is a swap pair (basic + advanced).
- */
-export function isCanonicalPair(group?: CanonicalGroup): boolean {
-  return Boolean(group?.basicId && group?.advancedIds?.length)
-}
-
-/**
- * Determine the active mode for a canonical group.
- */
-export function resolveCanonicalMode(
-  group: CanonicalGroup,
-  values: Record<string, unknown>,
-  overrides?: CanonicalModeOverrides
-): CanonicalMode {
-  const override = overrides?.[group.canonicalId]
-  if (override === 'advanced' && group.advancedIds.length > 0) return 'advanced'
-  if (override === 'basic' && group.basicId) return 'basic'
-
-  const { basicValue, advancedValue } = getCanonicalValues(group, values)
-  const hasBasic = isNonEmptyValue(basicValue)
-  const hasAdvanced = isNonEmptyValue(advancedValue)
-
-  if (!group.basicId) return 'advanced'
-  if (!hasBasic && hasAdvanced) return 'advanced'
-  return 'basic'
-}
-
-/**
- * Evaluate a subblock condition against a map of raw values.
- */
-export function evaluateSubBlockCondition(
-  condition: SubBlockCondition | (() => SubBlockCondition) | undefined,
-  values: Record<string, unknown>
-): boolean {
-  if (!condition) return true
-  const actual = typeof condition === 'function' ? condition() : condition
-  const fieldValue = values[actual.field]
-  const valueMatch = Array.isArray(actual.value)
-    ? fieldValue != null &&
-      (actual.not
-        ? !actual.value.includes(fieldValue as any)
-        : actual.value.includes(fieldValue as any))
-    : actual.not
-      ? fieldValue !== actual.value
-      : fieldValue === actual.value
-  const andMatch = !actual.and
-    ? true
-    : (() => {
-        const andFieldValue = values[actual.and!.field]
-        const andValueMatch = Array.isArray(actual.and!.value)
-          ? andFieldValue != null &&
-            (actual.and!.not
-              ? !actual.and!.value.includes(andFieldValue as any)
-              : actual.and!.value.includes(andFieldValue as any))
-          : actual.and!.not
-            ? andFieldValue !== actual.and!.value
-            : andFieldValue === actual.and!.value
-        return andValueMatch
-      })()
-
-  return valueMatch && andMatch
-}
-
-/**
- * Check if a value is considered set for advanced visibility/selection.
- */
-export function isNonEmptyValue(value: unknown): boolean {
-  if (value === null || value === undefined) return false
-  if (typeof value === 'string') return value.trim().length > 0
-  if (Array.isArray(value)) return value.length > 0
-  return true
-}
-
-/**
- * Resolve basic and advanced values for a canonical group.
- */
-export function getCanonicalValues(
-  group: CanonicalGroup,
-  values: Record<string, unknown>
-): CanonicalValueSelection {
-  const basicValue = group.basicId ? values[group.basicId] : undefined
-  let advancedValue: unknown
-  let advancedSourceId: string | undefined
-
-  group.advancedIds.forEach((advancedId) => {
-    if (advancedValue !== undefined) return
-    const candidate = values[advancedId]
-    if (isNonEmptyValue(candidate)) {
-      advancedValue = candidate
-      advancedSourceId = advancedId
-    }
-  })
-
-  return { basicValue, advancedValue, advancedSourceId }
-}
-
-/**
- * Check if a block has any standalone advanced-only fields (not part of canonical pairs).
- * These require the block-level advanced mode toggle to be visible.
- */
-export function hasStandaloneAdvancedFields(
-  subBlocks: SubBlockConfig[],
-  canonicalIndex: CanonicalIndex
-): boolean {
-  for (const subBlock of subBlocks) {
-    if (subBlock.mode !== 'advanced') continue
-    if (!canonicalIndex.canonicalIdBySubBlockId[subBlock.id]) return true
-  }
-  return false
-}
-
-/**
- * Check if any advanced-only or canonical advanced values are present.
- */
-export function hasAdvancedValues(
-  subBlocks: SubBlockConfig[],
-  values: Record<string, unknown>,
-  canonicalIndex: CanonicalIndex
-): boolean {
-  const checkedCanonical = new Set<string>()
-
-  for (const subBlock of subBlocks) {
-    const canonicalId = canonicalIndex.canonicalIdBySubBlockId[subBlock.id]
-    if (canonicalId) {
-      const group = canonicalIndex.groupsById[canonicalId]
-      if (group && isCanonicalPair(group) && !checkedCanonical.has(canonicalId)) {
-        checkedCanonical.add(canonicalId)
-        const { advancedValue } = getCanonicalValues(group, values)
-        if (isNonEmptyValue(advancedValue)) return true
-      }
-      continue
-    }
-
-    if (subBlock.mode === 'advanced' && isNonEmptyValue(values[subBlock.id])) {
-      return true
-    }
-  }
-
-  return false
-}
-
-/**
- * Determine whether a subblock is visible based on mode and canonical swaps.
- */
-export function isSubBlockVisibleForMode(
-  subBlock: SubBlockConfig,
-  displayAdvancedOptions: boolean,
-  canonicalIndex: CanonicalIndex,
-  values: Record<string, unknown>,
-  overrides?: CanonicalModeOverrides
-): boolean {
-  const canonicalId = canonicalIndex.canonicalIdBySubBlockId[subBlock.id]
-  const group = canonicalId ? canonicalIndex.groupsById[canonicalId] : undefined
-
-  if (group && isCanonicalPair(group)) {
-    const mode = resolveCanonicalMode(group, values, overrides)
-    if (mode === 'advanced') return group.advancedIds.includes(subBlock.id)
-    return group.basicId === subBlock.id
-  }
-
-  if (subBlock.mode === 'basic' && displayAdvancedOptions) return false
-  if (subBlock.mode === 'advanced' && !displayAdvancedOptions) return false
-  return true
-}
-
-/**
- * Resolve the dependency value for a dependsOn key, honoring canonical swaps.
- */
-export function resolveDependencyValue(
-  dependencyKey: string,
-  values: Record<string, unknown>,
-  canonicalIndex: CanonicalIndex,
-  overrides?: CanonicalModeOverrides
-): unknown {
-  const canonicalId =
-    canonicalIndex.groupsById[dependencyKey]?.canonicalId ||
-    canonicalIndex.canonicalIdBySubBlockId[dependencyKey]
-
-  if (!canonicalId) {
-    return values[dependencyKey]
-  }
-
-  const group = canonicalIndex.groupsById[canonicalId]
-  if (!group) return values[dependencyKey]
-
-  const { basicValue, advancedValue } = getCanonicalValues(group, values)
-  const mode = resolveCanonicalMode(group, values, overrides)
-  if (mode === 'advanced') return advancedValue ?? basicValue
-  return basicValue ?? advancedValue
-}
-
-/**
- * Check if a subblock is gated by a feature flag.
- */
-export function isSubBlockFeatureEnabled(subBlock: SubBlockConfig): boolean {
-  if (!subBlock.requiresFeature) return true
-  return isTruthy(getEnv(subBlock.requiresFeature))
-}

apps/sim/serializer/index.test.ts

@@ -515,131 +515,103 @@ describe('Serializer', () => {
     })
   })
 
-  describe('canonical mode field selection', () => {
-    it.concurrent('should use advanced value when canonicalModes specifies advanced', () => {
+  /**
+   * Advanced mode field filtering tests
+   */
+  describe('advanced mode field filtering', () => {
+    it.concurrent('should include all fields when block is in advanced mode', () => {
       const serializer = new Serializer()
 
-      const block: any = {
+      const advancedModeBlock: any = {
         id: 'slack-1',
         type: 'slack',
         name: 'Test Slack Block',
         position: { x: 0, y: 0 },
-        data: {
-          canonicalModes: { channel: 'advanced' },
-        },
+        advancedMode: true, // Advanced mode enabled
         subBlocks: {
-          operation: { value: 'send' },
-          destinationType: { value: 'channel' },
-          channel: { value: 'general' },
-          manualChannel: { value: 'C1234567890' },
-          text: { value: 'Hello world' },
-          username: { value: 'bot' },
+          channel: { value: 'general' }, // basic mode field
+          manualChannel: { value: 'C1234567890' }, // advanced mode field
+          text: { value: 'Hello world' }, // both mode field
+          username: { value: 'bot' }, // both mode field
         },
         outputs: {},
         enabled: true,
       }
 
-      const serialized = serializer.serializeWorkflow({ 'slack-1': block }, [], {})
-      const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
+      const serialized = serializer.serializeWorkflow({ 'slack-1': advancedModeBlock }, [], {})
 
+      const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
       expect(slackBlock).toBeDefined()
-      expect(slackBlock?.config.params.channel).toBe('C1234567890')
-      expect(slackBlock?.config.params.manualChannel).toBeUndefined()
+
+      expect(slackBlock?.config.params.channel).toBe('general')
+      expect(slackBlock?.config.params.manualChannel).toBe('C1234567890')
       expect(slackBlock?.config.params.text).toBe('Hello world')
       expect(slackBlock?.config.params.username).toBe('bot')
     })
 
-    it.concurrent('should use basic value when canonicalModes specifies basic', () => {
+    it.concurrent('should exclude advanced-only fields when block is in basic mode', () => {
       const serializer = new Serializer()
 
-      const block: any = {
+      const basicModeBlock: any = {
         id: 'slack-1',
         type: 'slack',
         name: 'Test Slack Block',
         position: { x: 0, y: 0 },
-        data: {
-          canonicalModes: { channel: 'basic' },
-        },
+        advancedMode: false, // Basic mode enabled
         subBlocks: {
-          operation: { value: 'send' },
-          destinationType: { value: 'channel' },
-          channel: { value: 'general' },
-          manualChannel: { value: 'C1234567890' },
-          text: { value: 'Hello world' },
-          username: { value: 'bot' },
+          channel: { value: 'general' }, // basic mode field
+          manualChannel: { value: 'C1234567890' }, // advanced mode field
+          text: { value: 'Hello world' }, // both mode field
+          username: { value: 'bot' }, // both mode field
         },
         outputs: {},
         enabled: true,
       }
 
-      const serialized = serializer.serializeWorkflow({ 'slack-1': block }, [], {})
-      const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
+      const serialized = serializer.serializeWorkflow({ 'slack-1': basicModeBlock }, [], {})
 
+      const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
       expect(slackBlock).toBeDefined()
+
       expect(slackBlock?.config.params.channel).toBe('general')
       expect(slackBlock?.config.params.manualChannel).toBeUndefined()
       expect(slackBlock?.config.params.text).toBe('Hello world')
       expect(slackBlock?.config.params.username).toBe('bot')
     })
 
-    it.concurrent('should fall back to legacy advancedMode when canonicalModes not set', () => {
-      const serializer = new Serializer()
+    it.concurrent(
+      'should exclude advanced-only fields when advancedMode is undefined (defaults to basic mode)',
+      () => {
+        const serializer = new Serializer()
 
-      const block: any = {
-        id: 'slack-1',
-        type: 'slack',
-        name: 'Test Slack Block',
-        position: { x: 0, y: 0 },
-        advancedMode: true,
-        subBlocks: {
-          operation: { value: 'send' },
-          destinationType: { value: 'channel' },
-          channel: { value: 'general' },
-          manualChannel: { value: 'C1234567890' },
-          text: { value: 'Hello world' },
-          username: { value: 'bot' },
-        },
-        outputs: {},
-        enabled: true,
+        const defaultModeBlock: any = {
+          id: 'slack-1',
+          type: 'slack',
+          name: 'Test Slack Block',
+          position: { x: 0, y: 0 },
+          subBlocks: {
+            channel: { value: 'general' },
+            manualChannel: { value: 'C1234567890' },
+            text: { value: 'Hello world' },
+            username: { value: 'bot' },
+          },
+          outputs: {},
+          enabled: true,
+        }
+
+        const serialized = serializer.serializeWorkflow({ 'slack-1': defaultModeBlock }, [], {})
+
+        const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
+        expect(slackBlock).toBeDefined()
+
+        expect(slackBlock?.config.params.channel).toBe('general')
+        expect(slackBlock?.config.params.manualChannel).toBeUndefined()
+        expect(slackBlock?.config.params.text).toBe('Hello world')
+        expect(slackBlock?.config.params.username).toBe('bot')
       }
+    )
 
-      const serialized = serializer.serializeWorkflow({ 'slack-1': block }, [], {})
-      const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
-
-      expect(slackBlock).toBeDefined()
-      expect(slackBlock?.config.params.channel).toBe('C1234567890')
-      expect(slackBlock?.config.params.manualChannel).toBeUndefined()
-    })
-
-    it.concurrent('should use basic value by default when no mode specified', () => {
-      const serializer = new Serializer()
-
-      const block: any = {
-        id: 'slack-1',
-        type: 'slack',
-        name: 'Test Slack Block',
-        position: { x: 0, y: 0 },
-        subBlocks: {
-          operation: { value: 'send' },
-          destinationType: { value: 'channel' },
-          channel: { value: 'general' },
-          manualChannel: { value: 'C1234567890' },
-          text: { value: 'Hello world' },
-          username: { value: 'bot' },
-        },
-        outputs: {},
-        enabled: true,
-      }
-
-      const serialized = serializer.serializeWorkflow({ 'slack-1': block }, [], {})
-      const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
-
-      expect(slackBlock).toBeDefined()
-      expect(slackBlock?.config.params.channel).toBe('general')
-      expect(slackBlock?.config.params.manualChannel).toBeUndefined()
-    })
-
-    it.concurrent('should preserve advanced-only values when present in basic mode', () => {
+    it.concurrent('should filter memories field correctly in agent blocks', () => {
       const serializer = new Serializer()
 
       const agentInBasicMode: any = {
@@ -665,9 +637,7 @@ describe('Serializer', () => {
 
       expect(agentBlock?.config.params.systemPrompt).toBe('You are helpful')
       expect(agentBlock?.config.params.userPrompt).toBe('Hello')
-      expect(agentBlock?.config.params.memories).toEqual([
-        { role: 'user', content: 'My name is John' },
-      ])
+      expect(agentBlock?.config.params.memories).toBeUndefined()
       expect(agentBlock?.config.params.model).toBe('claude-3-sonnet')
     })
 

apps/sim/serializer/index.ts

@@ -1,17 +1,9 @@
 import { createLogger } from '@sim/logger'
 import type { Edge } from 'reactflow'
-import { parseResponseFormatSafely } from '@/lib/core/utils/response-format'
 import { BlockPathCalculator } from '@/lib/workflows/blocks/block-path-calculator'
-import {
-  buildCanonicalIndex,
-  buildSubBlockValues,
-  evaluateSubBlockCondition,
-  getCanonicalValues,
-  isNonEmptyValue,
-  isSubBlockFeatureEnabled,
-} from '@/lib/workflows/subblocks/visibility'
 import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
+import { REFERENCE } from '@/executor/constants'
 import type { SerializedBlock, SerializedWorkflow } from '@/serializer/types'
 import type { BlockState, Loop, Parallel } from '@/stores/workflows/workflow/types'
 import { generateLoopBlocks, generateParallelBlocks } from '@/stores/workflows/workflow/utils'
@@ -35,37 +27,67 @@ export class WorkflowValidationError extends Error {
 }
 
 /**
- * Helper function to check if a subblock should be serialized.
+ * Helper function to check if a subblock should be included in serialization based on current mode
  */
-function shouldSerializeSubBlock(
-  subBlockConfig: SubBlockConfig,
-  values: Record<string, unknown>,
-  displayAdvancedOptions: boolean,
-  isTriggerContext: boolean,
-  isTriggerCategory: boolean,
-  canonicalIndex: ReturnType<typeof buildCanonicalIndex>
+function shouldIncludeField(subBlockConfig: SubBlockConfig, isAdvancedMode: boolean): boolean {
+  const fieldMode = subBlockConfig.mode
+
+  if (fieldMode === 'advanced' && !isAdvancedMode) {
+    return false // Skip advanced-only fields when in basic mode
+  }
+
+  return true
+}
+
+/**
+ * Evaluates a condition object against current field values.
+ * Used to determine if a conditionally-visible field should be included in params.
+ */
+function evaluateCondition(
+  condition:
+    | {
+        field: string
+        value: any
+        not?: boolean
+        and?: { field: string; value: any; not?: boolean }
+      }
+    | (() => {
+        field: string
+        value: any
+        not?: boolean
+        and?: { field: string; value: any; not?: boolean }
+      })
+    | undefined,
+  values: Record<string, any>
 ): boolean {
-  if (!isSubBlockFeatureEnabled(subBlockConfig)) return false
+  if (!condition) return true
 
-  if (subBlockConfig.mode === 'trigger') {
-    if (!isTriggerContext && !isTriggerCategory) return false
-  } else if (isTriggerContext && !isTriggerCategory) {
-    return false
-  }
+  const actual = typeof condition === 'function' ? condition() : condition
+  const fieldValue = values[actual.field]
 
-  const isCanonicalMember = Boolean(canonicalIndex.canonicalIdBySubBlockId[subBlockConfig.id])
-  if (isCanonicalMember) {
-    return evaluateSubBlockCondition(subBlockConfig.condition, values)
-  }
+  const valueMatch = Array.isArray(actual.value)
+    ? fieldValue != null &&
+      (actual.not ? !actual.value.includes(fieldValue) : actual.value.includes(fieldValue))
+    : actual.not
+      ? fieldValue !== actual.value
+      : fieldValue === actual.value
 
-  if (subBlockConfig.mode === 'advanced' && !displayAdvancedOptions) {
-    return isNonEmptyValue(values[subBlockConfig.id])
-  }
-  if (subBlockConfig.mode === 'basic' && displayAdvancedOptions) {
-    return false
-  }
+  const andMatch = !actual.and
+    ? true
+    : (() => {
+        const andFieldValue = values[actual.and!.field]
+        const andValueMatch = Array.isArray(actual.and!.value)
+          ? andFieldValue != null &&
+            (actual.and!.not
+              ? !actual.and!.value.includes(andFieldValue)
+              : actual.and!.value.includes(andFieldValue))
+          : actual.and!.not
+            ? andFieldValue !== actual.and!.value
+            : andFieldValue === actual.and!.value
+        return andValueMatch
+      })()
 
-  return evaluateSubBlockCondition(subBlockConfig.condition, values)
+  return valueMatch && andMatch
 }
 
 /**
@@ -219,12 +241,16 @@ export class Serializer {
     // Extract parameters from UI state
     const params = this.extractParams(block)
 
-    const isTriggerCategory = blockConfig.category === 'triggers'
-    if (block.triggerMode === true || isTriggerCategory) {
-      params.triggerMode = true
-    }
-    if (block.advancedMode === true) {
-      params.advancedMode = true
+    try {
+      const isTriggerCategory = blockConfig.category === 'triggers'
+      if (block.triggerMode === true || isTriggerCategory) {
+        params.triggerMode = true
+      }
+      if (block.advancedMode === true) {
+        params.advancedMode = true
+      }
+    } catch (_) {
+      // no-op: conservative, avoid blocking serialization if blockConfig is unexpected
     }
 
     // Validate required fields that only users can provide (before execution starts)
@@ -245,7 +271,16 @@ export class Serializer {
         // For non-custom tools, we determine the tool ID
         const nonCustomTools = tools.filter((tool: any) => tool.type !== 'custom-tool')
         if (nonCustomTools.length > 0) {
-          toolId = this.selectToolId(blockConfig, params)
+          try {
+            toolId = blockConfig.tools.config?.tool
+              ? blockConfig.tools.config.tool(params)
+              : blockConfig.tools.access[0]
+          } catch (error) {
+            logger.warn('Tool selection failed during serialization, using default:', {
+              error: error instanceof Error ? error.message : String(error),
+            })
+            toolId = blockConfig.tools.access[0]
+          }
         }
       } catch (error) {
         logger.error('Error processing tools in agent block:', { error })
@@ -254,7 +289,16 @@ export class Serializer {
       }
     } else {
       // For non-agent blocks, get tool ID from block config as usual
-      toolId = this.selectToolId(blockConfig, params)
+      try {
+        toolId = blockConfig.tools.config?.tool
+          ? blockConfig.tools.config.tool(params)
+          : blockConfig.tools.access[0]
+      } catch (error) {
+        logger.warn('Tool selection failed during serialization, using default:', {
+          error: error instanceof Error ? error.message : String(error),
+        })
+        toolId = blockConfig.tools.access[0]
+      }
     }
 
     // Get inputs from block config
@@ -278,10 +322,7 @@ export class Serializer {
         // Include response format fields if available
         ...(params.responseFormat
           ? {
-              responseFormat:
-                parseResponseFormatSafely(params.responseFormat, block.id, {
-                  allowReferences: true,
-                }) ?? undefined,
+              responseFormat: this.parseResponseFormatSafely(params.responseFormat),
             }
           : {}),
       },
@@ -296,9 +337,52 @@ export class Serializer {
     }
   }
 
+  private parseResponseFormatSafely(responseFormat: any): any {
+    if (!responseFormat) {
+      return undefined
+    }
+
+    // If already an object, return as-is
+    if (typeof responseFormat === 'object' && responseFormat !== null) {
+      return responseFormat
+    }
+
+    // Handle string values
+    if (typeof responseFormat === 'string') {
+      const trimmedValue = responseFormat.trim()
+
+      // Check for variable references like <start.input>
+      if (trimmedValue.startsWith(REFERENCE.START) && trimmedValue.includes(REFERENCE.END)) {
+        // Keep variable references as-is
+        return trimmedValue
+      }
+
+      if (trimmedValue === '') {
+        return undefined
+      }
+
+      // Try to parse as JSON
+      try {
+        return JSON.parse(trimmedValue)
+      } catch (error) {
+        // If parsing fails, return undefined to avoid crashes
+        // This allows the workflow to continue without structured response format
+        logger.warn('Failed to parse response format as JSON in serializer, using undefined:', {
+          value: trimmedValue,
+          error: error instanceof Error ? error.message : String(error),
+        })
+        return undefined
+      }
+    }
+
+    // For any other type, return undefined
+    return undefined
+  }
+
   private extractParams(block: BlockState): Record<string, any> {
+    // Special handling for subflow blocks (loops, parallels, etc.)
     if (block.type === 'loop' || block.type === 'parallel') {
-      return {}
+      return {} // Loop and parallel blocks don't have traditional params
     }
 
     const blockConfig = getBlock(block.type)
@@ -307,42 +391,43 @@ export class Serializer {
     }
 
     const params: Record<string, any> = {}
-    const legacyAdvancedMode = block.advancedMode ?? false
-    const canonicalModeOverrides = block.data?.canonicalModes
+    const isAdvancedMode = block.advancedMode ?? false
     const isStarterBlock = block.type === 'starter'
     const isAgentBlock = block.type === 'agent'
-    const isTriggerContext = block.triggerMode ?? false
-    const isTriggerCategory = blockConfig.category === 'triggers'
-    const canonicalIndex = buildCanonicalIndex(blockConfig.subBlocks)
-    const allValues = buildSubBlockValues(block.subBlocks)
 
+    // First pass: collect ALL raw values for condition evaluation
+    const allValues: Record<string, any> = {}
+    Object.entries(block.subBlocks).forEach(([id, subBlock]) => {
+      allValues[id] = subBlock.value
+    })
+
+    // Second pass: filter by mode and conditions
     Object.entries(block.subBlocks).forEach(([id, subBlock]) => {
       const matchingConfigs = blockConfig.subBlocks.filter((config) => config.id === id)
 
+      // Include field if it matches current mode OR if it's the starter inputFormat with values
       const hasStarterInputFormatValues =
         isStarterBlock &&
         id === 'inputFormat' &&
         Array.isArray(subBlock.value) &&
         subBlock.value.length > 0
 
+      // Include legacy agent block fields (systemPrompt, userPrompt, memories) even if not in current config
+      // This ensures backward compatibility with old workflows that were exported before the messages array migration
       const isLegacyAgentField =
         isAgentBlock && ['systemPrompt', 'userPrompt', 'memories'].includes(id)
 
-      const shouldInclude =
-        matchingConfigs.length === 0 ||
-        matchingConfigs.some((config) =>
-          shouldSerializeSubBlock(
-            config,
-            allValues,
-            legacyAdvancedMode,
-            isTriggerContext,
-            isTriggerCategory,
-            canonicalIndex
-          )
-        )
+      const anyConditionMet =
+        matchingConfigs.length === 0
+          ? true
+          : matchingConfigs.some(
+              (config) =>
+                shouldIncludeField(config, isAdvancedMode) &&
+                evaluateCondition(config.condition, allValues)
+            )
 
       if (
-        (matchingConfigs.length > 0 && shouldInclude) ||
+        (matchingConfigs.length > 0 && anyConditionMet) ||
         hasStarterInputFormatValues ||
         isLegacyAgentField
       ) {
@@ -350,38 +435,56 @@ export class Serializer {
       }
     })
 
+    // Then check for any subBlocks with default values
     blockConfig.subBlocks.forEach((subBlockConfig) => {
       const id = subBlockConfig.id
       if (
-        params[id] == null &&
+        (params[id] === null || params[id] === undefined) &&
         subBlockConfig.value &&
-        shouldSerializeSubBlock(
-          subBlockConfig,
-          allValues,
-          legacyAdvancedMode,
-          isTriggerContext,
-          isTriggerCategory,
-          canonicalIndex
-        )
+        shouldIncludeField(subBlockConfig, isAdvancedMode)
       ) {
+        // If the value is absent and there's a default value function, use it
         params[id] = subBlockConfig.value(params)
       }
     })
 
-    Object.values(canonicalIndex.groupsById).forEach((group) => {
-      const { basicValue, advancedValue } = getCanonicalValues(group, params)
-      const pairMode =
-        canonicalModeOverrides?.[group.canonicalId] ?? (legacyAdvancedMode ? 'advanced' : 'basic')
-      const chosen = pairMode === 'advanced' ? advancedValue : basicValue
+    // Finally, consolidate canonical parameters (e.g., selector and manual ID into a single param)
+    const canonicalGroups: Record<string, { basic?: string; advanced: string[] }> = {}
+    blockConfig.subBlocks.forEach((sb) => {
+      if (!sb.canonicalParamId) return
+      const key = sb.canonicalParamId
+      if (!canonicalGroups[key]) canonicalGroups[key] = { basic: undefined, advanced: [] }
+      if (sb.mode === 'advanced') canonicalGroups[key].advanced.push(sb.id)
+      else canonicalGroups[key].basic = sb.id
+    })
 
-      const sourceIds = [group.basicId, ...group.advancedIds].filter(Boolean) as string[]
-      sourceIds.forEach((id) => {
-        if (id !== group.canonicalId) delete params[id]
-      })
+    Object.entries(canonicalGroups).forEach(([canonicalKey, group]) => {
+      const basicId = group.basic
+      const advancedIds = group.advanced
+      const basicVal = basicId ? params[basicId] : undefined
+      const advancedVal = advancedIds
+        .map((id) => params[id])
+        .find(
+          (v) => v !== undefined && v !== null && (typeof v !== 'string' || v.trim().length > 0)
+        )
 
-      if (chosen !== undefined) {
-        params[group.canonicalId] = chosen
+      let chosen: any
+      if (advancedVal !== undefined && basicVal !== undefined) {
+        chosen = isAdvancedMode ? advancedVal : basicVal
+      } else if (advancedVal !== undefined) {
+        chosen = advancedVal
+      } else if (basicVal !== undefined) {
+        chosen = isAdvancedMode ? undefined : basicVal
+      } else {
+        chosen = undefined
       }
+
+      const sourceIds = [basicId, ...advancedIds].filter(Boolean) as string[]
+      sourceIds.forEach((id) => {
+        if (id !== canonicalKey) delete params[id]
+      })
+      if (chosen !== undefined) params[canonicalKey] = chosen
+      else delete params[canonicalKey]
     })
 
     return params
@@ -417,7 +520,17 @@ export class Serializer {
     }
 
     // Determine the current tool ID using the same logic as the serializer
-    const currentToolId = this.selectToolId(blockConfig, params)
+    let currentToolId = ''
+    try {
+      currentToolId = blockConfig.tools.config?.tool
+        ? blockConfig.tools.config.tool(params)
+        : blockConfig.tools.access[0]
+    } catch (error) {
+      logger.warn('Tool selection failed during validation, using default:', {
+        error: error instanceof Error ? error.message : String(error),
+      })
+      currentToolId = blockConfig.tools.access[0]
+    }
 
     // Get the specific tool to validate against
     const currentTool = getTool(currentToolId)
@@ -425,11 +538,8 @@ export class Serializer {
       return // Tool not found, skip validation
     }
 
+    // Check required user-only parameters for the current tool
     const missingFields: string[] = []
-    const displayAdvancedOptions = block.advancedMode ?? false
-    const isTriggerContext = block.triggerMode ?? false
-    const isTriggerCategory = blockConfig.category === 'triggers'
-    const canonicalIndex = buildCanonicalIndex(blockConfig.subBlocks || [])
 
     // Iterate through the tool's parameters, not the block's subBlocks
     Object.entries(currentTool.params || {}).forEach(([paramId, paramConfig]) => {
@@ -439,23 +549,20 @@ export class Serializer {
         let shouldValidateParam = true
 
         if (matchingConfigs.length > 0) {
+          const isAdvancedMode = block.advancedMode ?? false
+
           shouldValidateParam = matchingConfigs.some((subBlockConfig: any) => {
-            const includedByMode = shouldSerializeSubBlock(
-              subBlockConfig,
-              params,
-              displayAdvancedOptions,
-              isTriggerContext,
-              isTriggerCategory,
-              canonicalIndex
-            )
+            const includedByMode = shouldIncludeField(subBlockConfig, isAdvancedMode)
+
+            const includedByCondition = evaluateCondition(subBlockConfig.condition, params)
 
             const isRequired = (() => {
               if (!subBlockConfig.required) return false
               if (typeof subBlockConfig.required === 'boolean') return subBlockConfig.required
-              return evaluateSubBlockCondition(subBlockConfig.required, params)
+              return evaluateCondition(subBlockConfig.required, params)
             })()
 
-            return includedByMode && isRequired
+            return includedByMode && includedByCondition && isRequired
           })
         }
 
@@ -465,15 +572,10 @@ export class Serializer {
 
         const fieldValue = params[paramId]
         if (fieldValue === undefined || fieldValue === null || fieldValue === '') {
-          const activeConfig = matchingConfigs.find((config: any) =>
-            shouldSerializeSubBlock(
-              config,
-              params,
-              displayAdvancedOptions,
-              isTriggerContext,
-              isTriggerCategory,
-              canonicalIndex
-            )
+          const activeConfig = matchingConfigs.find(
+            (config: any) =>
+              shouldIncludeField(config, block.advancedMode ?? false) &&
+              evaluateCondition(config.condition, params)
           )
           const displayName = activeConfig?.title || paramId
           missingFields.push(displayName)
@@ -527,19 +629,6 @@ export class Serializer {
     return accessibleMap
   }
 
-  private selectToolId(blockConfig: any, params: Record<string, any>): string {
-    try {
-      return blockConfig.tools.config?.tool
-        ? blockConfig.tools.config.tool(params)
-        : blockConfig.tools.access[0]
-    } catch (error) {
-      logger.warn('Tool selection failed during serialization, using default:', {
-        error: error instanceof Error ? error.message : String(error),
-      })
-      return blockConfig.tools.access[0]
-    }
-  }
-
   deserializeWorkflow(workflow: SerializedWorkflow): {
     blocks: Record<string, BlockState>
     edges: Edge[]

apps/sim/serializer/tests/serializer.extended.test.ts

@@ -147,19 +147,20 @@ const { mockBlockConfigs, createMockGetBlock, slackWithCanonicalParam } = vi.hoi
         config: { tool: () => 'slack_send_message' },
       },
       subBlocks: [
-        {
-          id: 'channel',
-          type: 'dropdown',
-          label: 'Channel',
-          mode: 'basic',
-          canonicalParamId: 'channel',
-        },
+        { id: 'channel', type: 'dropdown', label: 'Channel', mode: 'basic' },
         {
           id: 'manualChannel',
           type: 'short-input',
           label: 'Channel ID',
           mode: 'advanced',
-          canonicalParamId: 'channel',
+          canonicalParamId: 'targetChannel',
+        },
+        {
+          id: 'channelSelector',
+          type: 'dropdown',
+          label: 'Channel Selector',
+          mode: 'basic',
+          canonicalParamId: 'targetChannel',
         },
         { id: 'text', type: 'long-input', label: 'Message' },
         { id: 'username', type: 'short-input', label: 'Username', mode: 'both' },
@@ -655,18 +656,16 @@ describe('Serializer Extended Tests', () => {
   })
 
   describe('canonical parameter handling', () => {
-    it('should use advanced value when canonicalModes specifies advanced', () => {
+    it('should consolidate basic/advanced mode fields into canonical param in advanced mode', () => {
       const serializer = new Serializer()
       const block: BlockState = {
         id: 'slack-1',
         type: 'slack',
         name: 'Slack',
         position: { x: 0, y: 0 },
-        data: {
-          canonicalModes: { channel: 'advanced' },
-        },
+        advancedMode: true,
         subBlocks: {
-          channel: { id: 'channel', type: 'channel-selector', value: 'general' },
+          channelSelector: { id: 'channelSelector', type: 'dropdown', value: 'general' },
           manualChannel: { id: 'manualChannel', type: 'short-input', value: 'C12345' },
           text: { id: 'text', type: 'long-input', value: 'Hello' },
         },
@@ -677,23 +676,22 @@ describe('Serializer Extended Tests', () => {
       const serialized = serializer.serializeWorkflow({ 'slack-1': block }, [], {})
       const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
 
-      expect(slackBlock?.config.params.channel).toBe('C12345')
+      expect(slackBlock?.config.params.targetChannel).toBe('C12345')
+      expect(slackBlock?.config.params.channelSelector).toBeUndefined()
       expect(slackBlock?.config.params.manualChannel).toBeUndefined()
     })
 
-    it('should use basic value when canonicalModes specifies basic', () => {
+    it('should consolidate to basic value when in basic mode', () => {
       const serializer = new Serializer()
       const block: BlockState = {
         id: 'slack-1',
         type: 'slack',
         name: 'Slack',
         position: { x: 0, y: 0 },
-        data: {
-          canonicalModes: { channel: 'basic' },
-        },
+        advancedMode: false,
         subBlocks: {
-          channel: { id: 'channel', type: 'channel-selector', value: 'general' },
-          manualChannel: { id: 'manualChannel', type: 'short-input', value: 'C12345' },
+          channelSelector: { id: 'channelSelector', type: 'dropdown', value: 'general' },
+          manualChannel: { id: 'manualChannel', type: 'short-input', value: '' },
           text: { id: 'text', type: 'long-input', value: 'Hello' },
         },
         outputs: {},
@@ -703,7 +701,7 @@ describe('Serializer Extended Tests', () => {
       const serialized = serializer.serializeWorkflow({ 'slack-1': block }, [], {})
       const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
 
-      expect(slackBlock?.config.params.channel).toBe('general')
+      expect(slackBlock?.config.params.targetChannel).toBe('general')
     })
 
     it('should handle missing canonical param values', () => {
@@ -713,8 +711,9 @@ describe('Serializer Extended Tests', () => {
         type: 'slack',
         name: 'Slack',
         position: { x: 0, y: 0 },
+        advancedMode: false,
         subBlocks: {
-          channel: { id: 'channel', type: 'channel-selector', value: null },
+          channelSelector: { id: 'channelSelector', type: 'dropdown', value: null },
           manualChannel: { id: 'manualChannel', type: 'short-input', value: null },
           text: { id: 'text', type: 'long-input', value: 'Hello' },
         },
@@ -725,7 +724,8 @@ describe('Serializer Extended Tests', () => {
       const serialized = serializer.serializeWorkflow({ 'slack-1': block }, [], {})
       const slackBlock = serialized.blocks.find((b) => b.id === 'slack-1')
 
-      expect(slackBlock?.config.params.channel).toBeNull()
+      // When both values are null, the canonical param is set to null (preserving the null value)
+      expect(slackBlock?.config.params.targetChannel).toBeNull()
     })
   })
 

apps/sim/socket/constants.ts

@@ -4,7 +4,6 @@ export const BLOCK_OPERATIONS = {
   TOGGLE_ENABLED: 'toggle-enabled',
   UPDATE_PARENT: 'update-parent',
   UPDATE_ADVANCED_MODE: 'update-advanced-mode',
-  UPDATE_CANONICAL_MODE: 'update-canonical-mode',
   TOGGLE_HANDLES: 'toggle-handles',
 } as const
 

apps/sim/socket/database/operations.ts

@@ -398,46 +398,6 @@ async function handleBlockOperationTx(
       break
     }
 
-    case BLOCK_OPERATIONS.UPDATE_CANONICAL_MODE: {
-      if (!payload.id || !payload.canonicalId || !payload.canonicalMode) {
-        throw new Error('Missing required fields for update canonical mode operation')
-      }
-
-      const existingBlock = await tx
-        .select({ data: workflowBlocks.data })
-        .from(workflowBlocks)
-        .where(and(eq(workflowBlocks.id, payload.id), eq(workflowBlocks.workflowId, workflowId)))
-        .limit(1)
-
-      const currentData = (existingBlock?.[0]?.data as Record<string, unknown>) || {}
-      const currentCanonicalModes = (currentData.canonicalModes as Record<string, unknown>) || {}
-      const canonicalModes = {
-        ...currentCanonicalModes,
-        [payload.canonicalId]: payload.canonicalMode,
-      }
-
-      const updateResult = await tx
-        .update(workflowBlocks)
-        .set({
-          data: {
-            ...currentData,
-            canonicalModes,
-          },
-          updatedAt: new Date(),
-        })
-        .where(and(eq(workflowBlocks.id, payload.id), eq(workflowBlocks.workflowId, workflowId)))
-        .returning({ id: workflowBlocks.id })
-
-      if (updateResult.length === 0) {
-        throw new Error(`Block ${payload.id} not found in workflow ${workflowId}`)
-      }
-
-      logger.debug(
-        `Updated block canonical mode: ${payload.id} -> ${payload.canonicalId}: ${payload.canonicalMode}`
-      )
-      break
-    }
-
     case BLOCK_OPERATIONS.TOGGLE_HANDLES: {
       if (!payload.id || payload.horizontalHandles === undefined) {
         throw new Error('Missing required fields for toggle handles operation')

apps/sim/socket/middleware/permissions.test.ts

@@ -208,7 +208,7 @@ describe('checkRolePermission', () => {
       { operation: 'toggle-enabled', adminAllowed: true, writeAllowed: true, readAllowed: false },
       { operation: 'update-parent', adminAllowed: true, writeAllowed: true, readAllowed: false },
       {
-        operation: 'update-canonical-mode',
+        operation: 'update-advanced-mode',
         adminAllowed: true,
         writeAllowed: true,
         readAllowed: false,

apps/sim/socket/middleware/permissions.ts

@@ -22,7 +22,6 @@ const WRITE_OPERATIONS: string[] = [
   BLOCK_OPERATIONS.TOGGLE_ENABLED,
   BLOCK_OPERATIONS.UPDATE_PARENT,
   BLOCK_OPERATIONS.UPDATE_ADVANCED_MODE,
-  BLOCK_OPERATIONS.UPDATE_CANONICAL_MODE,
   BLOCK_OPERATIONS.TOGGLE_HANDLES,
   // Batch block operations
   BLOCKS_OPERATIONS.BATCH_UPDATE_POSITIONS,

apps/sim/socket/validation/schemas.ts

@@ -31,7 +31,6 @@ export const BlockOperationSchema = z.object({
     BLOCK_OPERATIONS.TOGGLE_ENABLED,
     BLOCK_OPERATIONS.UPDATE_PARENT,
     BLOCK_OPERATIONS.UPDATE_ADVANCED_MODE,
-    BLOCK_OPERATIONS.UPDATE_CANONICAL_MODE,
     BLOCK_OPERATIONS.TOGGLE_HANDLES,
   ]),
   target: z.literal(OPERATION_TARGETS.BLOCK),
@@ -47,10 +46,8 @@ export const BlockOperationSchema = z.object({
     parentId: z.string().nullable().optional(),
     extent: z.enum(['parent']).nullable().optional(),
     enabled: z.boolean().optional(),
-    advancedMode: z.boolean().optional(),
     horizontalHandles: z.boolean().optional(),
-    canonicalId: z.string().optional(),
-    canonicalMode: z.enum(['basic', 'advanced']).optional(),
+    advancedMode: z.boolean().optional(),
     triggerMode: z.boolean().optional(),
     height: z.number().optional(),
   }),

apps/sim/stores/panel/copilot/store.ts

@@ -2562,16 +2562,18 @@ export const useCopilotStore = create<CopilotStore>()(
         fileAttachments,
         contexts,
         messageId,
+        queueIfBusy = true,
       } = options as {
         stream?: boolean
         fileAttachments?: MessageFileAttachment[]
         contexts?: ChatContext[]
         messageId?: string
+        queueIfBusy?: boolean
       }
 
       if (!workflowId) return
 
-      // If already sending a message, queue this one instead
+      // If already sending a message, queue this one instead unless bypassing queue
       if (isSendingMessage && !activeAbortController) {
         logger.warn('[Copilot] sendMessage: stale sending state detected, clearing', {
           originalMessageId: messageId,
@@ -2583,12 +2585,15 @@ export const useCopilotStore = create<CopilotStore>()(
         })
         set({ isSendingMessage: false, abortController: null })
       } else if (isSendingMessage) {
-        get().addToQueue(message, { fileAttachments, contexts, messageId })
-        logger.info('[Copilot] Message queued (already sending)', {
-          queueLength: get().messageQueue.length + 1,
-          originalMessageId: messageId,
-        })
-        return
+        if (queueIfBusy) {
+          get().addToQueue(message, { fileAttachments, contexts, messageId })
+          logger.info('[Copilot] Message queued (already sending)', {
+            queueLength: get().messageQueue.length + 1,
+            originalMessageId: messageId,
+          })
+          return
+        }
+        get().abortMessage({ suppressContinueOption: true })
       }
 
       const nextAbortController = new AbortController()

apps/sim/stores/panel/copilot/types.ts

@@ -179,6 +179,7 @@ export interface CopilotActions {
       fileAttachments?: MessageFileAttachment[]
       contexts?: ChatContext[]
       messageId?: string
+      queueIfBusy?: boolean
     }
   ) => Promise<void>
   abortMessage: (options?: { suppressContinueOption?: boolean }) => void

apps/sim/stores/workflows/workflow/store.ts

@@ -848,35 +848,6 @@ export const useWorkflowStore = create<WorkflowStore>()(
         // Note: Socket.IO handles real-time sync automatically
       },
 
-      setBlockCanonicalMode: (id: string, canonicalId: string, mode: 'basic' | 'advanced') => {
-        set((state) => {
-          const block = state.blocks[id]
-          if (!block) {
-            return state
-          }
-
-          const currentData = block.data || {}
-          const currentCanonicalModes = currentData.canonicalModes || {}
-          const canonicalModes = { ...currentCanonicalModes, [canonicalId]: mode }
-
-          return {
-            blocks: {
-              ...state.blocks,
-              [id]: {
-                ...block,
-                data: {
-                  ...currentData,
-                  canonicalModes,
-                },
-              },
-            },
-            edges: [...state.edges],
-            loops: { ...state.loops },
-          }
-        })
-        get().updateLastSaved()
-      },
-
       setBlockTriggerMode: (id: string, triggerMode: boolean) => {
         set((state) => ({
           blocks: {

apps/sim/stores/workflows/workflow/types.ts

@@ -63,9 +63,6 @@ export interface BlockData {
 
   // Container node type (for ReactFlow node type determination)
   type?: string
-
-  /** Canonical swap overrides keyed by canonicalParamId */
-  canonicalModes?: Record<string, 'basic' | 'advanced'>
 }
 
 export interface BlockLayoutState {
@@ -221,7 +218,6 @@ export interface WorkflowActions {
     changedSubblocks: Array<{ blockId: string; subBlockId: string; newValue: any }>
   }
   setBlockAdvancedMode: (id: string, advancedMode: boolean) => void
-  setBlockCanonicalMode: (id: string, canonicalId: string, mode: 'basic' | 'advanced') => void
   setBlockTriggerMode: (id: string, triggerMode: boolean) => void
   updateBlockLayoutMetrics: (id: string, dimensions: { width: number; height: number }) => void
   triggerUpdate: () => void

apps/sim/triggers/lemlist/utils.ts

@@ -85,24 +85,17 @@ const coreOutputs = {
     type: 'string',
     description: 'Lemlist team identifier',
   },
-} as const
-
-/**
- * Campaign-related fields - only present when activity is part of a campaign
- * These may be missing for first replies or activities outside campaign context
- */
-const campaignOutputs = {
   leadId: {
     type: 'string',
-    description: 'Lead identifier (only present for campaign activities)',
+    description: 'Lead identifier',
   },
   campaignId: {
     type: 'string',
-    description: 'Campaign identifier (only present for campaign activities)',
+    description: 'Campaign identifier',
   },
   campaignName: {
     type: 'string',
-    description: 'Campaign name (only present for campaign activities)',
+    description: 'Campaign name',
   },
 } as const
 
@@ -200,7 +193,6 @@ const emailContentOutputs = {
 export function buildEmailSentOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
     ...senderOutputs,
@@ -214,7 +206,6 @@ export function buildEmailSentOutputs(): Record<string, TriggerOutput> {
 export function buildEmailRepliedOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
     ...senderOutputs,
@@ -228,7 +219,6 @@ export function buildEmailRepliedOutputs(): Record<string, TriggerOutput> {
 export function buildEmailOpenedOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
     ...senderOutputs,
@@ -245,7 +235,6 @@ export function buildEmailOpenedOutputs(): Record<string, TriggerOutput> {
 export function buildEmailClickedOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
     ...senderOutputs,
@@ -266,7 +255,6 @@ export function buildEmailClickedOutputs(): Record<string, TriggerOutput> {
 export function buildEmailBouncedOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
     ...senderOutputs,
@@ -287,7 +275,6 @@ export function buildEmailBouncedOutputs(): Record<string, TriggerOutput> {
 export function buildLinkedInRepliedOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
     text: {
@@ -303,7 +290,6 @@ export function buildLinkedInRepliedOutputs(): Record<string, TriggerOutput> {
 export function buildInterestOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
   } as Record<string, TriggerOutput>
@@ -316,7 +302,6 @@ export function buildInterestOutputs(): Record<string, TriggerOutput> {
 export function buildLemlistOutputs(): Record<string, TriggerOutput> {
   return {
     ...coreOutputs,
-    ...campaignOutputs,
     ...leadOutputs,
     ...sequenceOutputs,
     ...senderOutputs,

packages/db/migrations/0145_messy_archangel.sql

@@ -1,26 +0,0 @@
-ALTER TABLE "webhook" DROP CONSTRAINT "webhook_block_id_workflow_blocks_id_fk";
---> statement-breakpoint
-ALTER TABLE "workflow_schedule" DROP CONSTRAINT "workflow_schedule_block_id_workflow_blocks_id_fk";
---> statement-breakpoint
-DROP INDEX "path_idx";--> statement-breakpoint
-DROP INDEX "workflow_schedule_workflow_block_unique";--> statement-breakpoint
-ALTER TABLE "webhook" ADD COLUMN "deployment_version_id" text;--> statement-breakpoint
-ALTER TABLE "workflow_schedule" ADD COLUMN "deployment_version_id" text;--> statement-breakpoint
-ALTER TABLE "webhook" ADD CONSTRAINT "webhook_deployment_version_id_workflow_deployment_version_id_fk" FOREIGN KEY ("deployment_version_id") REFERENCES "public"."workflow_deployment_version"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
-ALTER TABLE "workflow_schedule" ADD CONSTRAINT "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk" FOREIGN KEY ("deployment_version_id") REFERENCES "public"."workflow_deployment_version"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
-CREATE UNIQUE INDEX "path_deployment_unique" ON "webhook" USING btree ("path","deployment_version_id");--> statement-breakpoint
-CREATE INDEX "webhook_workflow_deployment_idx" ON "webhook" USING btree ("workflow_id","deployment_version_id");--> statement-breakpoint
-CREATE UNIQUE INDEX "workflow_schedule_workflow_block_deployment_unique" ON "workflow_schedule" USING btree ("workflow_id","block_id","deployment_version_id");--> statement-breakpoint
-CREATE INDEX "workflow_schedule_workflow_deployment_idx" ON "workflow_schedule" USING btree ("workflow_id","deployment_version_id");--> statement-breakpoint
-UPDATE "webhook" AS w
-SET "deployment_version_id" = dv."id"
-FROM "workflow_deployment_version" AS dv
-WHERE dv."workflow_id" = w."workflow_id"
-  AND dv."is_active" = true
-  AND w."deployment_version_id" IS NULL;--> statement-breakpoint
-UPDATE "workflow_schedule" AS ws
-SET "deployment_version_id" = dv."id"
-FROM "workflow_deployment_version" AS dv
-WHERE dv."workflow_id" = ws."workflow_id"
-  AND dv."is_active" = true
-  AND ws."deployment_version_id" IS NULL;

packages/db/migrations/meta/_journal.json

@@ -1009,13 +1009,6 @@
       "when": 1768582494384,
       "tag": "0144_old_killer_shrike",
       "breakpoints": true
-    },
-    {
-      "idx": 145,
-      "version": "7",
-      "when": 1768602646955,
-      "tag": "0145_messy_archangel",
-      "breakpoints": true
     }
   ]
 }

packages/db/schema.ts

@@ -492,11 +492,7 @@ export const workflowSchedule = pgTable(
     workflowId: text('workflow_id')
       .notNull()
       .references(() => workflow.id, { onDelete: 'cascade' }),
-    deploymentVersionId: text('deployment_version_id').references(
-      () => workflowDeploymentVersion.id,
-      { onDelete: 'cascade' }
-    ),
-    blockId: text('block_id'),
+    blockId: text('block_id').references(() => workflowBlocks.id, { onDelete: 'cascade' }),
     cronExpression: text('cron_expression'),
     nextRunAt: timestamp('next_run_at'),
     lastRanAt: timestamp('last_ran_at'),
@@ -511,14 +507,9 @@ export const workflowSchedule = pgTable(
   },
   (table) => {
     return {
-      workflowBlockUnique: uniqueIndex('workflow_schedule_workflow_block_deployment_unique').on(
+      workflowBlockUnique: uniqueIndex('workflow_schedule_workflow_block_unique').on(
         table.workflowId,
-        table.blockId,
-        table.deploymentVersionId
-      ),
-      workflowDeploymentIdx: index('workflow_schedule_workflow_deployment_idx').on(
-        table.workflowId,
-        table.deploymentVersionId
+        table.blockId
       ),
     }
   }
@@ -531,11 +522,7 @@ export const webhook = pgTable(
     workflowId: text('workflow_id')
       .notNull()
       .references(() => workflow.id, { onDelete: 'cascade' }),
-    deploymentVersionId: text('deployment_version_id').references(
-      () => workflowDeploymentVersion.id,
-      { onDelete: 'cascade' }
-    ),
-    blockId: text('block_id'),
+    blockId: text('block_id').references(() => workflowBlocks.id, { onDelete: 'cascade' }), // ID of the webhook trigger block (nullable for legacy starter block webhooks)
     path: text('path').notNull(),
     provider: text('provider'), // e.g., "whatsapp", "github", etc.
     providerConfig: json('provider_config'), // Store provider-specific configuration
@@ -550,17 +537,13 @@ export const webhook = pgTable(
   },
   (table) => {
     return {
-      // Ensure webhook paths are unique per deployment version
-      pathIdx: uniqueIndex('path_deployment_unique').on(table.path, table.deploymentVersionId),
+      // Ensure webhook paths are unique
+      pathIdx: uniqueIndex('path_idx').on(table.path),
       // Optimize queries for webhooks by workflow and block
       workflowBlockIdx: index('idx_webhook_on_workflow_id_block_id').on(
         table.workflowId,
         table.blockId
       ),
-      workflowDeploymentIdx: index('webhook_workflow_deployment_idx').on(
-        table.workflowId,
-        table.deploymentVersionId
-      ),
       // Optimize queries for credential set webhooks
       credentialSetIdIdx: index('webhook_credential_set_id_idx').on(table.credentialSetId),
     }

packages/testing/src/factories/permission.factory.ts

@@ -260,7 +260,6 @@ const BLOCK_OPERATIONS = {
   TOGGLE_ENABLED: 'toggle-enabled',
   UPDATE_PARENT: 'update-parent',
   UPDATE_ADVANCED_MODE: 'update-advanced-mode',
-  UPDATE_CANONICAL_MODE: 'update-canonical-mode',
   TOGGLE_HANDLES: 'toggle-handles',
 } as const
 

packages/testing/src/mocks/blocks.mock.ts

@@ -169,20 +169,8 @@ export const mockBlockConfigs: Record<string, any> = {
       config: { tool: () => 'slack_send_message' },
     },
     subBlocks: [
-      {
-        id: 'channel',
-        type: 'dropdown',
-        title: 'Channel',
-        mode: 'basic',
-        canonicalParamId: 'channel',
-      },
-      {
-        id: 'manualChannel',
-        type: 'short-input',
-        title: 'Channel ID',
-        mode: 'advanced',
-        canonicalParamId: 'channel',
-      },
+      { id: 'channel', type: 'dropdown', title: 'Channel', mode: 'basic' },
+      { id: 'manualChannel', type: 'short-input', title: 'Channel ID', mode: 'advanced' },
       { id: 'text', type: 'long-input', title: 'Message' },
       { id: 'username', type: 'short-input', title: 'Username', mode: 'both' },
     ],