v0.5.67: loading, password reset, ui improvements, helm updates (#2928 )

* fix(zustand): updated to useShallow from deprecated createWithEqualityFn (#2919) * fix(logger): use direct env access for webpack inlining (#2920) * fix(notifications): text overflow with line-clamp (#2921) * chore(helm): add env vars for Vertex AI, orgs, and telemetry (#2922) * fix(auth): improve reset password flow and consolidate brand detection (#2924) * fix(auth): improve reset password flow and consolidate brand detection * fix(auth): set errorHandled for EMAIL_NOT_VERIFIED to prevent duplicate error * fix(auth): clear success message on login errors * chore(auth): fix import order per lint * fix(action-bar): duplicate subflows with children (#2923) * fix(action-bar): duplicate subflows with children * fix(action-bar): add validateTriggerPaste for subflow duplicate * fix(resolver): agent response format, input formats, root level (#2925) * fix(resolvers): agent response format, input formats, root level * fix response block initial seeding * fix tests * fix(messages-input): fix cursor alignment and auto-resize with overlay (#2926) * fix(messages-input): fix cursor alignment and auto-resize with overlay * fixed remaining zustand warnings * fix(stores): remove dead code causing log spam on startup (#2927) * fix(stores): remove dead code causing log spam on startup * fix(stores): replace custom tools zustand store with react query cache * improvement(ui): use BrandedButton and BrandedLink components (#2930) - Refactor auth forms to use BrandedButton component - Add BrandedLink component for changelog page - Reduce code duplication in login, signup, reset-password forms - Update star count default value * fix(custom-tools): remove unsafe title fallback in getCustomTool (#2929) * fix(custom-tools): remove unsafe title fallback in getCustomTool * fix(custom-tools): restore title fallback in getCustomTool lookup Custom tools are referenced by title (custom_${title}), not database ID. The title fallback is required for client-side tool resolution to work. * fix(null-bodies): empty bodies handling (#2931) * fix(null-statuses): empty bodies handling * address bugbot comment * fix(token-refresh): microsoft, notion, x, linear (#2933) * fix(microsoft): proactive refresh needed * fix(x): missing token refresh flag * notion and linear missing flag too * address bugbot comment * fix(auth): handle EMAIL_NOT_VERIFIED in onError callback (#2932) * fix(auth): handle EMAIL_NOT_VERIFIED in onError callback * refactor(auth): extract redirectToVerify helper to reduce duplication * fix(workflow-selector): use dedicated selector for workflow dropdown (#2934) * feat(workflow-block): preview (#2935) * improvement(copilot): tool configs to show nested props (#2936) * fix(auth): add genericOAuth providers to trustedProviders (#2937) --------- Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com> Co-authored-by: Emir Karabeg <78010029+emir-karabeg@users.noreply.github.com>
v0.5.66: external http requests fix, ring highlighting
2026-01-22 21:38:05 -05:00 · 2026-01-21 22:53:25 -08:00 · 2026-01-21 02:55:39 -08:00 · 2026-01-20 23:54:55 -08:00 · 2026-01-20 00:34:11 -08:00 · 2026-01-18 15:22:42 -08:00
56 changed files with 606 additions and 13851 deletions
--- a/apps/sim/app/api/function/execute/route.test.ts
+++ b/apps/sim/app/api/function/execute/route.test.ts
@@ -313,7 +313,7 @@ describe('Function Execute API Route', () => {
          'block-2': 'world',
        },
        blockNameMapping: {
-          validvar: 'block-1',
+          validVar: 'block-1',
          another_valid: 'block-2',
        },
      })
@@ -539,7 +539,7 @@ describe('Function Execute API Route', () => {
          'block-complex': complexData,
        },
        blockNameMapping: {
-          complexdata: 'block-complex',
+          complexData: 'block-complex',
        },
      })

--- a/apps/sim/app/api/function/execute/route.ts
+++ b/apps/sim/app/api/function/execute/route.ts
@@ -6,11 +6,11 @@ import { executeInE2B } from '@/lib/execution/e2b'
 import { executeInIsolatedVM } from '@/lib/execution/isolated-vm'
 import { CodeLanguage, DEFAULT_CODE_LANGUAGE, isValidCodeLanguage } from '@/lib/execution/languages'
 import { escapeRegExp, normalizeName, REFERENCE } from '@/executor/constants'
-import { type OutputSchema, resolveBlockReference } from '@/executor/utils/block-reference'
 import {
  createEnvVarPattern,
  createWorkflowVariablePattern,
 } from '@/executor/utils/reference-validation'
+import { navigatePath } from '@/executor/variables/resolvers/reference'
 export const dynamic = 'force-dynamic'
 export const runtime = 'nodejs'

@@ -470,17 +470,14 @@ function resolveEnvironmentVariables(

 function resolveTagVariables(
  code: string,
-  blockData: Record<string, unknown>,
+  blockData: Record<string, any>,
  blockNameMapping: Record<string, string>,
-  blockOutputSchemas: Record<string, OutputSchema>,
-  contextVariables: Record<string, unknown>,
-  language = 'javascript'
+  contextVariables: Record<string, any>
 ): string {
  let resolvedCode = code
-  const undefinedLiteral = language === 'python' ? 'None' : 'undefined'

  const tagPattern = new RegExp(
-    `${REFERENCE.START}([a-zA-Z_](?:[a-zA-Z0-9_${REFERENCE.PATH_DELIMITER}]*[a-zA-Z0-9_])?)${REFERENCE.END}`,
+    `${REFERENCE.START}([a-zA-Z_][a-zA-Z0-9_${REFERENCE.PATH_DELIMITER}]*[a-zA-Z0-9_])${REFERENCE.END}`,
    'g'
  )
  const tagMatches = resolvedCode.match(tagPattern) || []
@@ -489,37 +486,41 @@ function resolveTagVariables(
    const tagName = match.slice(REFERENCE.START.length, -REFERENCE.END.length).trim()
    const pathParts = tagName.split(REFERENCE.PATH_DELIMITER)
    const blockName = pathParts[0]
-    const fieldPath = pathParts.slice(1)

-    const result = resolveBlockReference(blockName, fieldPath, {
-      blockNameMapping,
-      blockData,
-      blockOutputSchemas,
-    })
-
-    if (!result) {
+    const blockId = blockNameMapping[blockName]
+    if (!blockId) {
      continue
    }

-    let tagValue = result.value
+    const blockOutput = blockData[blockId]
+    if (blockOutput === undefined) {
+      continue
+    }
+
+    let tagValue: any
+    if (pathParts.length === 1) {
+      tagValue = blockOutput
+    } else {
+      tagValue = navigatePath(blockOutput, pathParts.slice(1))
+    }

    if (tagValue === undefined) {
-      resolvedCode = resolvedCode.replace(new RegExp(escapeRegExp(match), 'g'), undefinedLiteral)
      continue
    }

-    if (typeof tagValue === 'string') {
-      const trimmed = tagValue.trimStart()
-      if (trimmed.startsWith('{') || trimmed.startsWith('[')) {
-        try {
-          tagValue = JSON.parse(tagValue)
-        } catch {
-          // Keep as string if not valid JSON
-        }
+    if (
+      typeof tagValue === 'string' &&
+      tagValue.length > 100 &&
+      (tagValue.startsWith('{') || tagValue.startsWith('['))
+    ) {
+      try {
+        tagValue = JSON.parse(tagValue)
+      } catch {
+        // Keep as-is
      }
    }

-    const safeVarName = `__tag_${tagName.replace(/_/g, '_1').replace(/\./g, '_0')}`
+    const safeVarName = `__tag_${tagName.replace(/[^a-zA-Z0-9_]/g, '_')}`
    contextVariables[safeVarName] = tagValue
    resolvedCode = resolvedCode.replace(new RegExp(escapeRegExp(match), 'g'), safeVarName)
  }
@@ -536,27 +537,18 @@ function resolveTagVariables(
 */
 function resolveCodeVariables(
  code: string,
-  params: Record<string, unknown>,
+  params: Record<string, any>,
  envVars: Record<string, string> = {},
-  blockData: Record<string, unknown> = {},
+  blockData: Record<string, any> = {},
  blockNameMapping: Record<string, string> = {},
-  blockOutputSchemas: Record<string, OutputSchema> = {},
-  workflowVariables: Record<string, unknown> = {},
-  language = 'javascript'
-): { resolvedCode: string; contextVariables: Record<string, unknown> } {
+  workflowVariables: Record<string, any> = {}
+): { resolvedCode: string; contextVariables: Record<string, any> } {
  let resolvedCode = code
-  const contextVariables: Record<string, unknown> = {}
+  const contextVariables: Record<string, any> = {}

  resolvedCode = resolveWorkflowVariables(resolvedCode, workflowVariables, contextVariables)
  resolvedCode = resolveEnvironmentVariables(resolvedCode, params, envVars, contextVariables)
-  resolvedCode = resolveTagVariables(
-    resolvedCode,
-    blockData,
-    blockNameMapping,
-    blockOutputSchemas,
-    contextVariables,
-    language
-  )
+  resolvedCode = resolveTagVariables(resolvedCode, blockData, blockNameMapping, contextVariables)

  return { resolvedCode, contextVariables }
 }
@@ -593,7 +585,6 @@ export async function POST(req: NextRequest) {
      envVars = {},
      blockData = {},
      blockNameMapping = {},
-      blockOutputSchemas = {},
      workflowVariables = {},
      workflowId,
      isCustomTool = false,
@@ -610,21 +601,20 @@ export async function POST(req: NextRequest) {
      isCustomTool,
    })

-    const lang = isValidCodeLanguage(language) ? language : DEFAULT_CODE_LANGUAGE
-
+    // Resolve variables in the code with workflow environment variables
    const codeResolution = resolveCodeVariables(
      code,
      executionParams,
      envVars,
      blockData,
      blockNameMapping,
-      blockOutputSchemas,
-      workflowVariables,
-      lang
+      workflowVariables
    )
    resolvedCode = codeResolution.resolvedCode
    const contextVariables = codeResolution.contextVariables

+    const lang = isValidCodeLanguage(language) ? language : DEFAULT_CODE_LANGUAGE
+
    let jsImports = ''
    let jsRemainingCode = resolvedCode
    let hasImports = false
@@ -680,11 +670,7 @@ export async function POST(req: NextRequest) {
        prologue += `const environmentVariables = JSON.parse(${JSON.stringify(JSON.stringify(envVars))});\n`
        prologueLineCount++
        for (const [k, v] of Object.entries(contextVariables)) {
-          if (v === undefined) {
-            prologue += `const ${k} = undefined;\n`
-          } else {
-            prologue += `const ${k} = JSON.parse(${JSON.stringify(JSON.stringify(v))});\n`
-          }
+          prologue += `const ${k} = JSON.parse(${JSON.stringify(JSON.stringify(v))});\n`
          prologueLineCount++
        }

@@ -755,11 +741,7 @@ export async function POST(req: NextRequest) {
      prologue += `environmentVariables = json.loads(${JSON.stringify(JSON.stringify(envVars))})\n`
      prologueLineCount++
      for (const [k, v] of Object.entries(contextVariables)) {
-        if (v === undefined) {
-          prologue += `${k} = None\n`
-        } else {
-          prologue += `${k} = json.loads(${JSON.stringify(JSON.stringify(v))})\n`
-        }
+        prologue += `${k} = json.loads(${JSON.stringify(JSON.stringify(v))})\n`
        prologueLineCount++
      }
      const wrapped = [
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx
@@ -151,29 +151,6 @@ export const ActionBar = memo(
          </Tooltip.Root>
        )}

-        {isSubflowBlock && (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <Button
-                variant='ghost'
-                onClick={(e) => {
-                  e.stopPropagation()
-                  if (!disabled) {
-                    collaborativeBatchToggleBlockEnabled([blockId])
-                  }
-                }}
-                className={ACTION_BUTTON_STYLES}
-                disabled={disabled}
-              >
-                {isEnabled ? <Circle className={ICON_SIZE} /> : <CircleOff className={ICON_SIZE} />}
-              </Button>
-            </Tooltip.Trigger>
-            <Tooltip.Content side='top'>
-              {getTooltipMessage(isEnabled ? 'Disable Block' : 'Enable Block')}
-            </Tooltip.Content>
-          </Tooltip.Root>
-        )}
-
        {!isStartBlock && !isResponseBlock && (
          <Tooltip.Root>
            <Tooltip.Trigger asChild>
@@ -245,6 +222,29 @@ export const ActionBar = memo(
          </Tooltip.Root>
        )}

+        {isSubflowBlock && (
+          <Tooltip.Root>
+            <Tooltip.Trigger asChild>
+              <Button
+                variant='ghost'
+                onClick={(e) => {
+                  e.stopPropagation()
+                  if (!disabled) {
+                    collaborativeBatchToggleBlockEnabled([blockId])
+                  }
+                }}
+                className={ACTION_BUTTON_STYLES}
+                disabled={disabled}
+              >
+                {isEnabled ? <Circle className={ICON_SIZE} /> : <CircleOff className={ICON_SIZE} />}
+              </Button>
+            </Tooltip.Trigger>
+            <Tooltip.Content side='top'>
+              {getTooltipMessage(isEnabled ? 'Disable Block' : 'Enable Block')}
+            </Tooltip.Content>
+          </Tooltip.Root>
+        )}
+
        <Tooltip.Root>
          <Tooltip.Trigger asChild>
            <Button
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/copilot-message.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/copilot-message.tsx
@@ -78,7 +78,6 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
      mode,
      setMode,
      isAborting,
-      maskCredentialValue,
    } = useCopilotStore()

    const messageCheckpoints = isUser ? allMessageCheckpoints[message.id] || [] : []
@@ -211,10 +210,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
          const isLastTextBlock =
            index === message.contentBlocks!.length - 1 && block.type === 'text'
          const parsed = parseSpecialTags(block.content)
-          // Mask credential IDs in the displayed content
-          const cleanBlockContent = maskCredentialValue(
-            parsed.cleanContent.replace(/\n{3,}/g, '\n\n')
-          )
+          const cleanBlockContent = parsed.cleanContent.replace(/\n{3,}/g, '\n\n')

          if (!cleanBlockContent.trim()) return null

@@ -242,7 +238,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
          return (
            <div key={blockKey} className='w-full'>
              <ThinkingBlock
-                content={maskCredentialValue(block.content)}
+                content={block.content}
                isStreaming={isActivelyStreaming}
                hasFollowingContent={hasFollowingContent}
                hasSpecialTags={hasSpecialTags}
@@ -265,7 +261,7 @@ const CopilotMessage: FC<CopilotMessageProps> = memo(
        }
        return null
      })
-    }, [message.contentBlocks, isActivelyStreaming, parsedTags, isLastMessage, maskCredentialValue])
+    }, [message.contentBlocks, isActivelyStreaming, parsedTags, isLastMessage])

    if (isUser) {
      return (
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
@@ -782,7 +782,6 @@ const SubagentContentRenderer = memo(function SubagentContentRenderer({
  const [isExpanded, setIsExpanded] = useState(true)
  const [duration, setDuration] = useState(0)
  const startTimeRef = useRef<number>(Date.now())
-  const maskCredentialValue = useCopilotStore((s) => s.maskCredentialValue)
  const wasStreamingRef = useRef(false)

  // Only show streaming animations for current message
@@ -817,16 +816,14 @@ const SubagentContentRenderer = memo(function SubagentContentRenderer({
      currentText += parsed.cleanContent
    } else if (block.type === 'subagent_tool_call' && block.toolCall) {
      if (currentText.trim()) {
-        // Mask any credential IDs in the accumulated text before displaying
-        segments.push({ type: 'text', content: maskCredentialValue(currentText) })
+        segments.push({ type: 'text', content: currentText })
        currentText = ''
      }
      segments.push({ type: 'tool', block })
    }
  }
  if (currentText.trim()) {
-    // Mask any credential IDs in the accumulated text before displaying
-    segments.push({ type: 'text', content: maskCredentialValue(currentText) })
+    segments.push({ type: 'text', content: currentText })
  }

  const allParsed = parseSpecialTags(allRawText)
@@ -955,7 +952,6 @@ const WorkflowEditSummary = memo(function WorkflowEditSummary({
  toolCall: CopilotToolCall
 }) {
  const blocks = useWorkflowStore((s) => s.blocks)
-  const maskCredentialValue = useCopilotStore((s) => s.maskCredentialValue)

  const cachedBlockInfoRef = useRef<Record<string, { name: string; type: string }>>({})

@@ -987,7 +983,6 @@ const WorkflowEditSummary = memo(function WorkflowEditSummary({
    title: string
    value: any
    isPassword?: boolean
-    isCredential?: boolean
  }

  interface BlockChange {
@@ -1096,7 +1091,6 @@ const WorkflowEditSummary = memo(function WorkflowEditSummary({
              title: subBlockConfig.title ?? subBlockConfig.id,
              value,
              isPassword: subBlockConfig.password === true,
-              isCredential: subBlockConfig.type === 'oauth-input',
            })
          }
        }
@@ -1178,15 +1172,8 @@ const WorkflowEditSummary = memo(function WorkflowEditSummary({
        {subBlocksToShow && subBlocksToShow.length > 0 && (
          <div className='border-[var(--border-1)] border-t px-2.5 py-1.5'>
            {subBlocksToShow.map((sb) => {
-              // Mask password fields and credential IDs
-              let displayValue: string
-              if (sb.isPassword) {
-                displayValue = '•••'
-              } else {
-                // Get display value first, then mask any credential IDs that might be in it
-                const rawValue = getDisplayValue(sb.value)
-                displayValue = maskCredentialValue(rawValue)
-              }
+              // Mask password fields like the canvas does
+              const displayValue = sb.isPassword ? '•••' : getDisplayValue(sb.value)
              return (
                <div key={sb.id} className='flex items-start gap-1.5 py-0.5 text-[11px]'>
                  <span
@@ -1425,13 +1412,10 @@ function RunSkipButtons({
    setIsProcessing(true)
    setButtonsHidden(true)
    try {
-      // Add to auto-allowed list - this also executes all pending integration tools of this type
+      // Add to auto-allowed list first
      await addAutoAllowedTool(toolCall.name)
-      // For client tools with interrupts (not integration tools), we still need to call handleRun
-      // since executeIntegrationTool only works for server-side tools
-      if (!isIntegrationTool(toolCall.name)) {
-        await handleRun(toolCall, setToolCallState, onStateChange, editedParams)
-      }
+      // Then execute
+      await handleRun(toolCall, setToolCallState, onStateChange, editedParams)
    } finally {
      setIsProcessing(false)
      actionInProgressRef.current = false
@@ -1454,10 +1438,10 @@ function RunSkipButtons({

  if (buttonsHidden) return null

-  // Show "Always Allow" for all tools that require confirmation
-  const showAlwaysAllow = true
+  // Hide "Always Allow" for integration tools (only show for client tools with interrupts)
+  const showAlwaysAllow = !isIntegrationTool(toolCall.name)

-  // Standardized buttons for all interrupt tools: Allow, Always Allow, Skip
+  // Standardized buttons for all interrupt tools: Allow, (Always Allow for client tools only), Skip
  return (
    <div className='mt-[10px] flex gap-[6px]'>
      <Button onClick={onRun} disabled={isProcessing} variant='tertiary'>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-copilot-initialization.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-copilot-initialization.ts
@@ -105,10 +105,10 @@ export function useCopilotInitialization(props: UseCopilotInitializationProps) {
    isSendingMessage,
  ])

-  /** Load auto-allowed tools once on mount - runs immediately, independent of workflow */
+  /** Load auto-allowed tools once on mount */
  const hasLoadedAutoAllowedToolsRef = useRef(false)
  useEffect(() => {
-    if (!hasLoadedAutoAllowedToolsRef.current) {
+    if (hasMountedRef.current && !hasLoadedAutoAllowedToolsRef.current) {
      hasLoadedAutoAllowedToolsRef.current = true
      loadAutoAllowedTools().catch((err) => {
        logger.warn('[Copilot] Failed to load auto-allowed tools', err)
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
@@ -1312,16 +1312,15 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
    if (currentLoop && isLoopBlock) {
      containingLoopBlockId = blockId
      const loopType = currentLoop.loopType || 'for'
+      const contextualTags: string[] = ['index']
+      if (loopType === 'forEach') {
+        contextualTags.push('currentItem')
+        contextualTags.push('items')
+      }

      const loopBlock = blocks[blockId]
      if (loopBlock) {
        const loopBlockName = loopBlock.name || loopBlock.type
-        const normalizedLoopName = normalizeName(loopBlockName)
-        const contextualTags: string[] = [`${normalizedLoopName}.index`]
-        if (loopType === 'forEach') {
-          contextualTags.push(`${normalizedLoopName}.currentItem`)
-          contextualTags.push(`${normalizedLoopName}.items`)
-        }

        loopBlockGroup = {
          blockName: loopBlockName,
@@ -1329,23 +1328,21 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
          blockType: 'loop',
          tags: contextualTags,
          distance: 0,
-          isContextual: true,
        }
      }
    } else if (containingLoop) {
      const [loopId, loop] = containingLoop
      containingLoopBlockId = loopId
      const loopType = loop.loopType || 'for'
+      const contextualTags: string[] = ['index']
+      if (loopType === 'forEach') {
+        contextualTags.push('currentItem')
+        contextualTags.push('items')
+      }

      const containingLoopBlock = blocks[loopId]
      if (containingLoopBlock) {
        const loopBlockName = containingLoopBlock.name || containingLoopBlock.type
-        const normalizedLoopName = normalizeName(loopBlockName)
-        const contextualTags: string[] = [`${normalizedLoopName}.index`]
-        if (loopType === 'forEach') {
-          contextualTags.push(`${normalizedLoopName}.currentItem`)
-          contextualTags.push(`${normalizedLoopName}.items`)
-        }

        loopBlockGroup = {
          blockName: loopBlockName,
@@ -1353,7 +1350,6 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
          blockType: 'loop',
          tags: contextualTags,
          distance: 0,
-          isContextual: true,
        }
      }
    }
@@ -1367,16 +1363,15 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
      const [parallelId, parallel] = containingParallel
      containingParallelBlockId = parallelId
      const parallelType = parallel.parallelType || 'count'
+      const contextualTags: string[] = ['index']
+      if (parallelType === 'collection') {
+        contextualTags.push('currentItem')
+        contextualTags.push('items')
+      }

      const containingParallelBlock = blocks[parallelId]
      if (containingParallelBlock) {
        const parallelBlockName = containingParallelBlock.name || containingParallelBlock.type
-        const normalizedParallelName = normalizeName(parallelBlockName)
-        const contextualTags: string[] = [`${normalizedParallelName}.index`]
-        if (parallelType === 'collection') {
-          contextualTags.push(`${normalizedParallelName}.currentItem`)
-          contextualTags.push(`${normalizedParallelName}.items`)
-        }

        parallelBlockGroup = {
          blockName: parallelBlockName,
@@ -1384,7 +1379,6 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
          blockType: 'parallel',
          tags: contextualTags,
          distance: 0,
-          isContextual: true,
        }
      }
    }
@@ -1651,29 +1645,38 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
  const nestedBlockTagGroups: NestedBlockTagGroup[] = useMemo(() => {
    return filteredBlockTagGroups.map((group: BlockTagGroup) => {
      const normalizedBlockName = normalizeName(group.blockName)
+
+      // Handle loop/parallel contextual tags (index, currentItem, items)
      const directTags: NestedTag[] = []
      const tagsForTree: string[] = []

      group.tags.forEach((tag: string) => {
        const tagParts = tag.split('.')

-        if (tagParts.length === 1) {
+        // Loop/parallel contextual tags without block prefix
+        if (
+          (group.blockType === 'loop' || group.blockType === 'parallel') &&
+          tagParts.length === 1
+        ) {
          directTags.push({
            key: tag,
            display: tag,
            fullTag: tag,
          })
        } else if (tagParts.length === 2) {
+          // Direct property like blockname.property
          directTags.push({
            key: tagParts[1],
            display: tagParts[1],
            fullTag: tag,
          })
        } else {
+          // Nested property - add to tree builder
          tagsForTree.push(tag)
        }
      })

+      // Build recursive tree from nested tags
      const nestedTags = [...directTags, ...buildNestedTagTree(tagsForTree, normalizedBlockName)]

      return {
@@ -1797,19 +1800,13 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
          processedTag = tag
        }
      } else if (
-        blockGroup?.isContextual &&
+        blockGroup &&
        (blockGroup.blockType === 'loop' || blockGroup.blockType === 'parallel')
      ) {
-        const tagParts = tag.split('.')
-        if (tagParts.length === 1) {
-          processedTag = blockGroup.blockType
+        if (!tag.includes('.') && ['index', 'currentItem', 'items'].includes(tag)) {
+          processedTag = `${blockGroup.blockType}.${tag}`
        } else {
-          const lastPart = tagParts[tagParts.length - 1]
-          if (['index', 'currentItem', 'items'].includes(lastPart)) {
-            processedTag = `${blockGroup.blockType}.${lastPart}`
-          } else {
-            processedTag = tag
-          }
+          processedTag = tag
        }
      }

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts
@@ -7,8 +7,6 @@ export interface BlockTagGroup {
  blockType: string
  tags: string[]
  distance: number
-  /** True if this is a contextual group (loop/parallel iteration context available inside the subflow) */
-  isContextual?: boolean
 }

 /**
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/avatars/avatars.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/avatars/avatars.tsx
@@ -11,7 +11,7 @@ import { useSidebarStore } from '@/stores/sidebar/store'
 * Avatar display configuration for responsive layout.
 */
 const AVATAR_CONFIG = {
-  MIN_COUNT: 4,
+  MIN_COUNT: 3,
  MAX_COUNT: 12,
  WIDTH_PER_AVATAR: 20,
 } as const
@@ -106,9 +106,7 @@ export function Avatars({ workflowId }: AvatarsProps) {
  }, [presenceUsers, currentWorkflowId, workflowId, currentSocketId])

  /**
-   * Calculate visible users and overflow count.
-   * Shows up to maxVisible avatars, with overflow indicator for any remaining.
-   * Users are reversed so new avatars appear on the left (keeping right side stable).
+   * Calculate visible users and overflow count
   */
  const { visibleUsers, overflowCount } = useMemo(() => {
    if (workflowUsers.length === 0) {
@@ -118,8 +116,7 @@ export function Avatars({ workflowId }: AvatarsProps) {
    const visible = workflowUsers.slice(0, maxVisible)
    const overflow = Math.max(0, workflowUsers.length - maxVisible)

-    // Reverse so rightmost avatars stay stable as new ones are revealed on the left
-    return { visibleUsers: [...visible].reverse(), overflowCount: overflow }
+    return { visibleUsers: visible, overflowCount: overflow }
  }, [workflowUsers, maxVisible])

  if (visibleUsers.length === 0) {
@@ -142,8 +139,9 @@ export function Avatars({ workflowId }: AvatarsProps) {
          </Tooltip.Content>
        </Tooltip.Root>
      )}
+
      {visibleUsers.map((user, index) => (
-        <UserAvatar key={user.socketId} user={user} index={index} />
+        <UserAvatar key={user.socketId} user={user} index={overflowCount > 0 ? index + 1 : index} />
      ))}
    </div>
  )
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
@@ -347,7 +347,7 @@ export function WorkflowItem({
            ) : (
              <div
                className={clsx(
-                  'min-w-0 truncate font-medium',
+                  'min-w-0 flex-1 truncate font-medium',
                  active
                    ? 'text-[var(--text-primary)]'
                    : 'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)]'
--- a/apps/sim/blocks/blocks/gmail.ts
+++ b/apps/sim/blocks/blocks/gmail.ts
@@ -242,9 +242,15 @@ Return ONLY the email body - no explanations, no extra text.`,
      id: 'messageId',
      title: 'Message ID',
      type: 'short-input',
-      placeholder: 'Read specific email by ID (overrides label/folder)',
-      condition: { field: 'operation', value: 'read_gmail' },
-      mode: 'advanced',
+      placeholder: 'Enter message ID to read (optional)',
+      condition: {
+        field: 'operation',
+        value: 'read_gmail',
+        and: {
+          field: 'folder',
+          value: '',
+        },
+      },
    },
    // Search Fields
    {
--- a/apps/sim/blocks/blocks/router.ts
+++ b/apps/sim/blocks/blocks/router.ts
@@ -129,9 +129,12 @@ ROUTING RULES:
 3. If the context is even partially related to a route's description, select that route
 4. ONLY output NO_MATCH if the context is completely unrelated to ALL route descriptions

-Respond with a JSON object containing:
- route: EXACTLY one route ID (copied exactly as shown above) OR "NO_MATCH"
- reasoning: A brief explanation (1-2 sentences) of why you chose this route`
+OUTPUT FORMAT:
+- Output EXACTLY one route ID (copied exactly as shown above) OR "NO_MATCH"
+- No explanation, no punctuation, no additional text
+- Just the route ID or NO_MATCH
+
+Your response:`
 }

 /**
@@ -269,7 +272,6 @@ interface RouterV2Response extends ToolResponse {
      total: number
    }
    selectedRoute: string
-    reasoning: string
    selectedPath: {
      blockId: string
      blockType: string
@@ -353,7 +355,6 @@ export const RouterV2Block: BlockConfig<RouterV2Response> = {
    tokens: { type: 'json', description: 'Token usage' },
    cost: { type: 'json', description: 'Cost information' },
    selectedRoute: { type: 'string', description: 'Selected route ID' },
-    reasoning: { type: 'string', description: 'Explanation of why this route was chosen' },
    selectedPath: { type: 'json', description: 'Selected routing path' },
  },
 }
--- a/apps/sim/executor/constants.ts
+++ b/apps/sim/executor/constants.ts
@@ -120,12 +120,6 @@ export const SPECIAL_REFERENCE_PREFIXES = [
  REFERENCE.PREFIX.VARIABLE,
 ] as const

-export const RESERVED_BLOCK_NAMES = [
-  REFERENCE.PREFIX.LOOP,
-  REFERENCE.PREFIX.PARALLEL,
-  REFERENCE.PREFIX.VARIABLE,
-] as const
-
 export const LOOP_REFERENCE = {
  ITERATION: 'iteration',
  INDEX: 'index',
--- a/apps/sim/executor/dag/builder.test.ts
+++ b/apps/sim/executor/dag/builder.test.ts
@@ -24,71 +24,6 @@ function createBlock(id: string, metadataId: string): SerializedBlock {
  }
 }

-describe('DAGBuilder disabled subflow validation', () => {
-  it('skips validation for disabled loops with no blocks inside', () => {
-    const workflow: SerializedWorkflow = {
-      version: '1',
-      blocks: [
-        createBlock('start', BlockType.STARTER),
-        { ...createBlock('loop-block', BlockType.FUNCTION), enabled: false },
-      ],
-      connections: [],
-      loops: {
-        'loop-1': {
-          id: 'loop-1',
-          nodes: [], // Empty loop - would normally throw
-          iterations: 3,
-        },
-      },
-    }
-
-    const builder = new DAGBuilder()
-    // Should not throw even though loop has no blocks inside
-    expect(() => builder.build(workflow)).not.toThrow()
-  })
-
-  it('skips validation for disabled parallels with no blocks inside', () => {
-    const workflow: SerializedWorkflow = {
-      version: '1',
-      blocks: [createBlock('start', BlockType.STARTER)],
-      connections: [],
-      loops: {},
-      parallels: {
-        'parallel-1': {
-          id: 'parallel-1',
-          nodes: [], // Empty parallel - would normally throw
-        },
-      },
-    }
-
-    const builder = new DAGBuilder()
-    // Should not throw even though parallel has no blocks inside
-    expect(() => builder.build(workflow)).not.toThrow()
-  })
-
-  it('skips validation for loops where all inner blocks are disabled', () => {
-    const workflow: SerializedWorkflow = {
-      version: '1',
-      blocks: [
-        createBlock('start', BlockType.STARTER),
-        { ...createBlock('inner-block', BlockType.FUNCTION), enabled: false },
-      ],
-      connections: [],
-      loops: {
-        'loop-1': {
-          id: 'loop-1',
-          nodes: ['inner-block'], // Has node but it's disabled
-          iterations: 3,
-        },
-      },
-    }
-
-    const builder = new DAGBuilder()
-    // Should not throw - loop is effectively disabled since all inner blocks are disabled
-    expect(() => builder.build(workflow)).not.toThrow()
-  })
-})
-
 describe('DAGBuilder human-in-the-loop transformation', () => {
  it('creates trigger nodes and rewires edges for pause blocks', () => {
    const workflow: SerializedWorkflow = {
--- a/apps/sim/executor/dag/builder.ts
+++ b/apps/sim/executor/dag/builder.ts
@@ -136,18 +136,17 @@ export class DAGBuilder {
    nodes: string[] | undefined,
    type: 'Loop' | 'Parallel'
  ): void {
-    const sentinelStartId =
-      type === 'Loop' ? buildSentinelStartId(id) : buildParallelSentinelStartId(id)
-    const sentinelStartNode = dag.nodes.get(sentinelStartId)
-
-    if (!sentinelStartNode) return
-
    if (!nodes || nodes.length === 0) {
      throw new Error(
        `${type} has no blocks inside. Add at least one block to the ${type.toLowerCase()}.`
      )
    }

+    const sentinelStartId =
+      type === 'Loop' ? buildSentinelStartId(id) : buildParallelSentinelStartId(id)
+    const sentinelStartNode = dag.nodes.get(sentinelStartId)
+    if (!sentinelStartNode) return
+
    const hasConnections = Array.from(sentinelStartNode.outgoingEdges.values()).some((edge) =>
      nodes.includes(extractBaseBlockId(edge.target))
    )
--- a/apps/sim/executor/execution/edge-manager.test.ts
+++ b/apps/sim/executor/execution/edge-manager.test.ts
--- a/apps/sim/executor/execution/edge-manager.ts
+++ b/apps/sim/executor/execution/edge-manager.ts
@@ -20,13 +20,21 @@ export class EdgeManager {
    const activatedTargets: string[] = []
    const edgesToDeactivate: Array<{ target: string; handle?: string }> = []

-    for (const [, edge] of node.outgoingEdges) {
+    // First pass: categorize edges as activating or deactivating
+    // Don't modify incomingEdges yet - we need the original state for deactivation checks
+    for (const [edgeId, edge] of node.outgoingEdges) {
      if (skipBackwardsEdge && this.isBackwardsEdge(edge.sourceHandle)) {
        continue
      }

-      if (!this.shouldActivateEdge(edge, output)) {
-        if (!this.isLoopEdge(edge.sourceHandle)) {
+      const shouldActivate = this.shouldActivateEdge(edge, output)
+      if (!shouldActivate) {
+        const isLoopEdge =
+          edge.sourceHandle === EDGE.LOOP_CONTINUE ||
+          edge.sourceHandle === EDGE.LOOP_CONTINUE_ALT ||
+          edge.sourceHandle === EDGE.LOOP_EXIT
+
+        if (!isLoopEdge) {
          edgesToDeactivate.push({ target: edge.target, handle: edge.sourceHandle })
        }
        continue
@@ -35,19 +43,13 @@ export class EdgeManager {
      activatedTargets.push(edge.target)
    }

-    const cascadeTargets = new Set<string>()
+    // Second pass: process deactivations while incomingEdges is still intact
+    // This ensures hasActiveIncomingEdges can find all potential sources
    for (const { target, handle } of edgesToDeactivate) {
-      this.deactivateEdgeAndDescendants(node.id, target, handle, cascadeTargets)
-    }
-
-    if (activatedTargets.length === 0) {
-      for (const { target } of edgesToDeactivate) {
-        if (this.isTerminalControlNode(target)) {
-          cascadeTargets.add(target)
-        }
-      }
+      this.deactivateEdgeAndDescendants(node.id, target, handle)
    }

+    // Third pass: update incomingEdges for activated targets
    for (const targetId of activatedTargets) {
      const targetNode = this.dag.nodes.get(targetId)
      if (!targetNode) {
@@ -57,25 +59,28 @@ export class EdgeManager {
      targetNode.incomingEdges.delete(node.id)
    }

+    // Fourth pass: check readiness after all edge processing is complete
    for (const targetId of activatedTargets) {
-      if (this.isTargetReady(targetId)) {
+      const targetNode = this.dag.nodes.get(targetId)
+      if (targetNode && this.isNodeReady(targetNode)) {
        readyNodes.push(targetId)
      }
    }

-    for (const targetId of cascadeTargets) {
-      if (!readyNodes.includes(targetId) && !activatedTargets.includes(targetId)) {
-        if (this.isTargetReady(targetId)) {
-          readyNodes.push(targetId)
-        }
-      }
-    }
-
    return readyNodes
  }

  isNodeReady(node: DAGNode): boolean {
-    return node.incomingEdges.size === 0 || this.countActiveIncomingEdges(node) === 0
+    if (node.incomingEdges.size === 0) {
+      return true
+    }
+
+    const activeIncomingCount = this.countActiveIncomingEdges(node)
+    if (activeIncomingCount > 0) {
+      return false
+    }
+
+    return true
  }

  restoreIncomingEdge(targetNodeId: string, sourceNodeId: string): void {
@@ -94,10 +99,13 @@ export class EdgeManager {

  /**
   * Clear deactivated edges for a set of nodes (used when restoring loop state for next iteration).
+   * This ensures error/success edges can be re-evaluated on each iteration.
   */
  clearDeactivatedEdgesForNodes(nodeIds: Set<string>): void {
    const edgesToRemove: string[] = []
    for (const edgeKey of this.deactivatedEdges) {
+      // Edge key format is "sourceId-targetId-handle"
+      // Check if either source or target is in the nodeIds set
      for (const nodeId of nodeIds) {
        if (edgeKey.startsWith(`${nodeId}-`) || edgeKey.includes(`-${nodeId}-`)) {
          edgesToRemove.push(edgeKey)
@@ -110,44 +118,6 @@ export class EdgeManager {
    }
  }

-  private isTargetReady(targetId: string): boolean {
-    const targetNode = this.dag.nodes.get(targetId)
-    return targetNode ? this.isNodeReady(targetNode) : false
-  }
-
-  private isLoopEdge(handle?: string): boolean {
-    return (
-      handle === EDGE.LOOP_CONTINUE ||
-      handle === EDGE.LOOP_CONTINUE_ALT ||
-      handle === EDGE.LOOP_EXIT
-    )
-  }
-
-  private isControlEdge(handle?: string): boolean {
-    return (
-      handle === EDGE.LOOP_CONTINUE ||
-      handle === EDGE.LOOP_CONTINUE_ALT ||
-      handle === EDGE.LOOP_EXIT ||
-      handle === EDGE.PARALLEL_EXIT
-    )
-  }
-
-  private isBackwardsEdge(sourceHandle?: string): boolean {
-    return sourceHandle === EDGE.LOOP_CONTINUE || sourceHandle === EDGE.LOOP_CONTINUE_ALT
-  }
-
-  private isTerminalControlNode(nodeId: string): boolean {
-    const node = this.dag.nodes.get(nodeId)
-    if (!node || node.outgoingEdges.size === 0) return false
-
-    for (const [, edge] of node.outgoingEdges) {
-      if (!this.isControlEdge(edge.sourceHandle)) {
-        return false
-      }
-    }
-    return true
-  }
-
  private shouldActivateEdge(edge: DAGEdge, output: NormalizedBlockOutput): boolean {
    const handle = edge.sourceHandle

@@ -189,12 +159,14 @@ export class EdgeManager {
    }
  }

+  private isBackwardsEdge(sourceHandle?: string): boolean {
+    return sourceHandle === EDGE.LOOP_CONTINUE || sourceHandle === EDGE.LOOP_CONTINUE_ALT
+  }
+
  private deactivateEdgeAndDescendants(
    sourceId: string,
    targetId: string,
-    sourceHandle?: string,
-    cascadeTargets?: Set<string>,
-    isCascade = false
+    sourceHandle?: string
  ): void {
    const edgeKey = this.createEdgeKey(sourceId, targetId, sourceHandle)
    if (this.deactivatedEdges.has(edgeKey)) {
@@ -202,46 +174,38 @@ export class EdgeManager {
    }

    this.deactivatedEdges.add(edgeKey)
-
    const targetNode = this.dag.nodes.get(targetId)
    if (!targetNode) return

-    if (isCascade && this.isTerminalControlNode(targetId)) {
-      cascadeTargets?.add(targetId)
-    }
-
-    if (this.hasActiveIncomingEdges(targetNode, edgeKey)) {
-      return
-    }
-
-    for (const [, outgoingEdge] of targetNode.outgoingEdges) {
-      if (!this.isControlEdge(outgoingEdge.sourceHandle)) {
-        this.deactivateEdgeAndDescendants(
-          targetId,
-          outgoingEdge.target,
-          outgoingEdge.sourceHandle,
-          cascadeTargets,
-          true
-        )
+    // Check if target has other active incoming edges
+    // Pass the specific edge key being deactivated, not just source ID,
+    // to handle multiple edges from same source to same target (e.g., condition branches)
+    const hasOtherActiveIncoming = this.hasActiveIncomingEdges(targetNode, edgeKey)
+    if (!hasOtherActiveIncoming) {
+      for (const [_, outgoingEdge] of targetNode.outgoingEdges) {
+        this.deactivateEdgeAndDescendants(targetId, outgoingEdge.target, outgoingEdge.sourceHandle)
      }
    }
  }

  /**
   * Checks if a node has any active incoming edges besides the one being excluded.
+   * This properly handles the case where multiple edges from the same source go to
+   * the same target (e.g., multiple condition branches pointing to one block).
   */
  private hasActiveIncomingEdges(node: DAGNode, excludeEdgeKey: string): boolean {
    for (const incomingSourceId of node.incomingEdges) {
      const incomingNode = this.dag.nodes.get(incomingSourceId)
      if (!incomingNode) continue

-      for (const [, incomingEdge] of incomingNode.outgoingEdges) {
+      for (const [_, incomingEdge] of incomingNode.outgoingEdges) {
        if (incomingEdge.target === node.id) {
          const incomingEdgeKey = this.createEdgeKey(
            incomingSourceId,
            node.id,
            incomingEdge.sourceHandle
          )
+          // Skip the specific edge being excluded, but check other edges from same source
          if (incomingEdgeKey === excludeEdgeKey) continue
          if (!this.deactivatedEdges.has(incomingEdgeKey)) {
            return true
--- a/apps/sim/executor/execution/engine.test.ts
+++ b/apps/sim/executor/execution/engine.test.ts
@@ -554,413 +554,6 @@ describe('ExecutionEngine', () => {
    })
  })

-  describe('Error handling in execution', () => {
-    it('should fail execution when a single node throws an error', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const errorNode = createMockNode('error-node', 'function')
-      startNode.outgoingEdges.set('edge1', { target: 'error-node' })
-
-      const dag = createMockDAG([startNode, errorNode])
-      const context = createMockContext()
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return ['error-node']
-        return []
-      })
-
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'error-node') {
-            throw new Error('Block execution failed')
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      await expect(engine.run('start')).rejects.toThrow('Block execution failed')
-    })
-
-    it('should stop parallel branches when one branch throws an error', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const parallelNodes = Array.from({ length: 5 }, (_, i) =>
-        createMockNode(`parallel${i}`, 'function')
-      )
-
-      parallelNodes.forEach((_, i) => {
-        startNode.outgoingEdges.set(`edge${i}`, { target: `parallel${i}` })
-      })
-
-      const dag = createMockDAG([startNode, ...parallelNodes])
-      const context = createMockContext()
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return parallelNodes.map((_, i) => `parallel${i}`)
-        return []
-      })
-
-      const executedNodes: string[] = []
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          executedNodes.push(nodeId)
-          if (nodeId === 'parallel0') {
-            await new Promise((resolve) => setTimeout(resolve, 10))
-            throw new Error('Parallel branch failed')
-          }
-          await new Promise((resolve) => setTimeout(resolve, 100))
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      await expect(engine.run('start')).rejects.toThrow('Parallel branch failed')
-    })
-
-    it('should capture only the first error when multiple parallel branches fail', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const parallelNodes = Array.from({ length: 3 }, (_, i) =>
-        createMockNode(`parallel${i}`, 'function')
-      )
-
-      parallelNodes.forEach((_, i) => {
-        startNode.outgoingEdges.set(`edge${i}`, { target: `parallel${i}` })
-      })
-
-      const dag = createMockDAG([startNode, ...parallelNodes])
-      const context = createMockContext()
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return parallelNodes.map((_, i) => `parallel${i}`)
-        return []
-      })
-
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'parallel0') {
-            await new Promise((resolve) => setTimeout(resolve, 10))
-            throw new Error('First error')
-          }
-          if (nodeId === 'parallel1') {
-            await new Promise((resolve) => setTimeout(resolve, 20))
-            throw new Error('Second error')
-          }
-          if (nodeId === 'parallel2') {
-            await new Promise((resolve) => setTimeout(resolve, 30))
-            throw new Error('Third error')
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      await expect(engine.run('start')).rejects.toThrow('First error')
-    })
-
-    it('should wait for ongoing executions to complete before throwing error', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const fastErrorNode = createMockNode('fast-error', 'function')
-      const slowNode = createMockNode('slow', 'function')
-
-      startNode.outgoingEdges.set('edge1', { target: 'fast-error' })
-      startNode.outgoingEdges.set('edge2', { target: 'slow' })
-
-      const dag = createMockDAG([startNode, fastErrorNode, slowNode])
-      const context = createMockContext()
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return ['fast-error', 'slow']
-        return []
-      })
-
-      let slowNodeCompleted = false
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'fast-error') {
-            await new Promise((resolve) => setTimeout(resolve, 10))
-            throw new Error('Fast error')
-          }
-          if (nodeId === 'slow') {
-            await new Promise((resolve) => setTimeout(resolve, 50))
-            slowNodeCompleted = true
-            return { nodeId, output: {}, isFinalOutput: false }
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      await expect(engine.run('start')).rejects.toThrow('Fast error')
-
-      expect(slowNodeCompleted).toBe(true)
-    })
-
-    it('should not queue new nodes after an error occurs', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const errorNode = createMockNode('error-node', 'function')
-      const afterErrorNode = createMockNode('after-error', 'function')
-
-      startNode.outgoingEdges.set('edge1', { target: 'error-node' })
-      errorNode.outgoingEdges.set('edge2', { target: 'after-error' })
-
-      const dag = createMockDAG([startNode, errorNode, afterErrorNode])
-      const context = createMockContext()
-
-      const queuedNodes: string[] = []
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') {
-          queuedNodes.push('error-node')
-          return ['error-node']
-        }
-        if (node.id === 'error-node') {
-          queuedNodes.push('after-error')
-          return ['after-error']
-        }
-        return []
-      })
-
-      const executedNodes: string[] = []
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          executedNodes.push(nodeId)
-          if (nodeId === 'error-node') {
-            throw new Error('Node error')
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      await expect(engine.run('start')).rejects.toThrow('Node error')
-
-      expect(executedNodes).not.toContain('after-error')
-    })
-
-    it('should populate error result with metadata when execution fails', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const errorNode = createMockNode('error-node', 'function')
-      startNode.outgoingEdges.set('edge1', { target: 'error-node' })
-
-      const dag = createMockDAG([startNode, errorNode])
-      const context = createMockContext()
-      context.blockLogs.push({
-        blockId: 'start',
-        blockName: 'Start',
-        blockType: 'starter',
-        startedAt: new Date().toISOString(),
-        endedAt: new Date().toISOString(),
-        durationMs: 10,
-        success: true,
-      })
-
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return ['error-node']
-        return []
-      })
-
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'error-node') {
-            const error = new Error('Execution failed') as any
-            error.executionResult = {
-              success: false,
-              output: { partial: 'data' },
-              logs: context.blockLogs,
-              metadata: context.metadata,
-            }
-            throw error
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      try {
-        await engine.run('start')
-        expect.fail('Should have thrown')
-      } catch (error: any) {
-        expect(error.executionResult).toBeDefined()
-        expect(error.executionResult.metadata.endTime).toBeDefined()
-        expect(error.executionResult.metadata.duration).toBeDefined()
-      }
-    })
-
-    it('should prefer cancellation status over error when both occur', async () => {
-      const abortController = new AbortController()
-
-      const startNode = createMockNode('start', 'starter')
-      const errorNode = createMockNode('error-node', 'function')
-      startNode.outgoingEdges.set('edge1', { target: 'error-node' })
-
-      const dag = createMockDAG([startNode, errorNode])
-      const context = createMockContext({ abortSignal: abortController.signal })
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return ['error-node']
-        return []
-      })
-
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'error-node') {
-            abortController.abort()
-            throw new Error('Node error')
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-      const result = await engine.run('start')
-
-      expect(result.status).toBe('cancelled')
-      expect(result.success).toBe(false)
-    })
-
-    it('should stop loop iteration when error occurs in loop body', async () => {
-      const loopStartNode = createMockNode('loop-start', 'loop_sentinel')
-      loopStartNode.metadata = { isSentinel: true, sentinelType: 'start', loopId: 'loop1' }
-
-      const loopBodyNode = createMockNode('loop-body', 'function')
-      loopBodyNode.metadata = { isLoopNode: true, loopId: 'loop1' }
-
-      const loopEndNode = createMockNode('loop-end', 'loop_sentinel')
-      loopEndNode.metadata = { isSentinel: true, sentinelType: 'end', loopId: 'loop1' }
-
-      const afterLoopNode = createMockNode('after-loop', 'function')
-
-      loopStartNode.outgoingEdges.set('edge1', { target: 'loop-body' })
-      loopBodyNode.outgoingEdges.set('edge2', { target: 'loop-end' })
-      loopEndNode.outgoingEdges.set('loop_continue', {
-        target: 'loop-start',
-        sourceHandle: 'loop_continue',
-      })
-      loopEndNode.outgoingEdges.set('loop_complete', {
-        target: 'after-loop',
-        sourceHandle: 'loop_complete',
-      })
-
-      const dag = createMockDAG([loopStartNode, loopBodyNode, loopEndNode, afterLoopNode])
-      const context = createMockContext()
-
-      let iterationCount = 0
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'loop-start') return ['loop-body']
-        if (node.id === 'loop-body') return ['loop-end']
-        if (node.id === 'loop-end') {
-          iterationCount++
-          if (iterationCount < 5) return ['loop-start']
-          return ['after-loop']
-        }
-        return []
-      })
-
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'loop-body' && iterationCount >= 2) {
-            throw new Error('Loop body error on iteration 3')
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      await expect(engine.run('loop-start')).rejects.toThrow('Loop body error on iteration 3')
-
-      expect(iterationCount).toBeLessThanOrEqual(3)
-    })
-
-    it('should handle error that is not an Error instance', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const errorNode = createMockNode('error-node', 'function')
-      startNode.outgoingEdges.set('edge1', { target: 'error-node' })
-
-      const dag = createMockDAG([startNode, errorNode])
-      const context = createMockContext()
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return ['error-node']
-        return []
-      })
-
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'error-node') {
-            throw 'String error message'
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      await expect(engine.run('start')).rejects.toThrow('String error message')
-    })
-
-    it('should preserve partial output when error occurs after some blocks complete', async () => {
-      const startNode = createMockNode('start', 'starter')
-      const successNode = createMockNode('success', 'function')
-      const errorNode = createMockNode('error-node', 'function')
-
-      startNode.outgoingEdges.set('edge1', { target: 'success' })
-      successNode.outgoingEdges.set('edge2', { target: 'error-node' })
-
-      const dag = createMockDAG([startNode, successNode, errorNode])
-      const context = createMockContext()
-      const edgeManager = createMockEdgeManager((node) => {
-        if (node.id === 'start') return ['success']
-        if (node.id === 'success') return ['error-node']
-        return []
-      })
-
-      const nodeOrchestrator = {
-        executionCount: 0,
-        executeNode: vi.fn().mockImplementation(async (_ctx: ExecutionContext, nodeId: string) => {
-          if (nodeId === 'success') {
-            return { nodeId, output: { successData: 'preserved' }, isFinalOutput: false }
-          }
-          if (nodeId === 'error-node') {
-            throw new Error('Late error')
-          }
-          return { nodeId, output: {}, isFinalOutput: false }
-        }),
-        handleNodeCompletion: vi.fn(),
-      } as unknown as MockNodeOrchestrator
-
-      const engine = new ExecutionEngine(context, dag, edgeManager, nodeOrchestrator)
-
-      try {
-        await engine.run('start')
-        expect.fail('Should have thrown')
-      } catch (error: any) {
-        // Verify the error was thrown
-        expect(error.message).toBe('Late error')
-        // The partial output should be available in executionResult if attached
-        if (error.executionResult) {
-          expect(error.executionResult.output).toBeDefined()
-        }
-      }
-    })
-  })
-
  describe('Cancellation flag behavior', () => {
    it('should set cancelledFlag when abort signal fires', async () => {
      const abortController = new AbortController()
--- a/apps/sim/executor/execution/engine.ts
+++ b/apps/sim/executor/execution/engine.ts
@@ -25,8 +25,6 @@ export class ExecutionEngine {
  private pausedBlocks: Map<string, PauseMetadata> = new Map()
  private allowResumeTriggers: boolean
  private cancelledFlag = false
-  private errorFlag = false
-  private executionError: Error | null = null
  private lastCancellationCheck = 0
  private readonly useRedisCancellation: boolean
  private readonly CANCELLATION_CHECK_INTERVAL_MS = 500
@@ -105,7 +103,7 @@ export class ExecutionEngine {
      this.initializeQueue(triggerBlockId)

      while (this.hasWork()) {
-        if ((await this.checkCancellation()) || this.errorFlag) {
+        if (await this.checkCancellation()) {
          break
        }
        await this.processQueue()
@@ -115,11 +113,6 @@ export class ExecutionEngine {
        await this.waitForAllExecutions()
      }

-      // Rethrow the captured error so it's handled by the catch block
-      if (this.errorFlag && this.executionError) {
-        throw this.executionError
-      }
-
      if (this.pausedBlocks.size > 0) {
        return this.buildPausedResult(startTime)
      }
@@ -203,17 +196,11 @@ export class ExecutionEngine {
  }

  private trackExecution(promise: Promise<void>): void {
-    const trackedPromise = promise
-      .catch((error) => {
-        if (!this.errorFlag) {
-          this.errorFlag = true
-          this.executionError = error instanceof Error ? error : new Error(String(error))
-        }
-      })
-      .finally(() => {
-        this.executing.delete(trackedPromise)
-      })
-    this.executing.add(trackedPromise)
+    this.executing.add(promise)
+    promise.catch(() => {})
+    promise.finally(() => {
+      this.executing.delete(promise)
+    })
  }

  private async waitForAnyExecution(): Promise<void> {
@@ -328,7 +315,7 @@ export class ExecutionEngine {

  private async processQueue(): Promise<void> {
    while (this.readyQueue.length > 0) {
-      if ((await this.checkCancellation()) || this.errorFlag) {
+      if (await this.checkCancellation()) {
        break
      }
      const nodeId = this.dequeue()
@@ -337,7 +324,7 @@ export class ExecutionEngine {
      this.trackExecution(promise)
    }

-    if (this.executing.size > 0 && !this.cancelledFlag && !this.errorFlag) {
+    if (this.executing.size > 0 && !this.cancelledFlag) {
      await this.waitForAnyExecution()
    }
  }
--- a/apps/sim/executor/handlers/agent/agent-handler.ts
+++ b/apps/sim/executor/handlers/agent/agent-handler.ts
@@ -305,7 +305,7 @@ export class AgentBlockHandler implements BlockHandler {
      base.executeFunction = async (callParams: Record<string, any>) => {
        const mergedParams = mergeToolParameters(userProvidedParams, callParams)

-        const { blockData, blockNameMapping, blockOutputSchemas } = collectBlockData(ctx)
+        const { blockData, blockNameMapping } = collectBlockData(ctx)

        const result = await executeTool(
          'function_execute',
@@ -317,7 +317,6 @@ export class AgentBlockHandler implements BlockHandler {
            workflowVariables: ctx.workflowVariables || {},
            blockData,
            blockNameMapping,
-            blockOutputSchemas,
            isCustomTool: true,
            _context: {
              workflowId: ctx.workflowId,
--- a/apps/sim/executor/handlers/condition/condition-handler.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.ts
@@ -26,7 +26,7 @@ export async function evaluateConditionExpression(
    const contextSetup = `const context = ${JSON.stringify(evalContext)};`
    const code = `${contextSetup}\nreturn Boolean(${conditionExpression})`

-    const { blockData, blockNameMapping, blockOutputSchemas } = collectBlockData(ctx)
+    const { blockData, blockNameMapping } = collectBlockData(ctx)

    const result = await executeTool(
      'function_execute',
@@ -37,7 +37,6 @@ export async function evaluateConditionExpression(
        workflowVariables: ctx.workflowVariables || {},
        blockData,
        blockNameMapping,
-        blockOutputSchemas,
        _context: {
          workflowId: ctx.workflowId,
          workspaceId: ctx.workspaceId,
--- a/apps/sim/executor/handlers/function/function-handler.test.ts
+++ b/apps/sim/executor/handlers/function/function-handler.test.ts
@@ -75,12 +75,7 @@ describe('FunctionBlockHandler', () => {
      workflowVariables: {},
      blockData: {},
      blockNameMapping: {},
-      blockOutputSchemas: {},
-      _context: {
-        workflowId: mockContext.workflowId,
-        workspaceId: mockContext.workspaceId,
-        isDeployedContext: mockContext.isDeployedContext,
-      },
+      _context: { workflowId: mockContext.workflowId, workspaceId: mockContext.workspaceId },
    }
    const expectedOutput: any = { result: 'Success' }

@@ -89,8 +84,8 @@ describe('FunctionBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'function_execute',
      expectedToolParams,
-      false,
-      mockContext
+      false, // skipPostProcess
+      mockContext // execution context
    )
    expect(result).toEqual(expectedOutput)
  })
@@ -112,12 +107,7 @@ describe('FunctionBlockHandler', () => {
      workflowVariables: {},
      blockData: {},
      blockNameMapping: {},
-      blockOutputSchemas: {},
-      _context: {
-        workflowId: mockContext.workflowId,
-        workspaceId: mockContext.workspaceId,
-        isDeployedContext: mockContext.isDeployedContext,
-      },
+      _context: { workflowId: mockContext.workflowId, workspaceId: mockContext.workspaceId },
    }
    const expectedOutput: any = { result: 'Success' }

@@ -126,8 +116,8 @@ describe('FunctionBlockHandler', () => {
    expect(mockExecuteTool).toHaveBeenCalledWith(
      'function_execute',
      expectedToolParams,
-      false,
-      mockContext
+      false, // skipPostProcess
+      mockContext // execution context
    )
    expect(result).toEqual(expectedOutput)
  })
@@ -142,12 +132,7 @@ describe('FunctionBlockHandler', () => {
      workflowVariables: {},
      blockData: {},
      blockNameMapping: {},
-      blockOutputSchemas: {},
-      _context: {
-        workflowId: mockContext.workflowId,
-        workspaceId: mockContext.workspaceId,
-        isDeployedContext: mockContext.isDeployedContext,
-      },
+      _context: { workflowId: mockContext.workflowId, workspaceId: mockContext.workspaceId },
    }

    await handler.execute(mockContext, mockBlock, inputs)
--- a/apps/sim/executor/handlers/function/function-handler.ts
+++ b/apps/sim/executor/handlers/function/function-handler.ts
@@ -23,7 +23,7 @@ export class FunctionBlockHandler implements BlockHandler {
      ? inputs.code.map((c: { content: string }) => c.content).join('\n')
      : inputs.code

-    const { blockData, blockNameMapping, blockOutputSchemas } = collectBlockData(ctx)
+    const { blockData, blockNameMapping } = collectBlockData(ctx)

    const result = await executeTool(
      'function_execute',
@@ -35,7 +35,6 @@ export class FunctionBlockHandler implements BlockHandler {
        workflowVariables: ctx.workflowVariables || {},
        blockData,
        blockNameMapping,
-        blockOutputSchemas,
        _context: {
          workflowId: ctx.workflowId,
          workspaceId: ctx.workspaceId,
--- a/apps/sim/executor/handlers/router/router-handler.test.ts
+++ b/apps/sim/executor/handlers/router/router-handler.test.ts
@@ -1,7 +1,7 @@
 import '@sim/testing/mocks/executor'

 import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
-import { generateRouterPrompt, generateRouterV2Prompt } from '@/blocks/blocks/router'
+import { generateRouterPrompt } from '@/blocks/blocks/router'
 import { BlockType } from '@/executor/constants'
 import { RouterBlockHandler } from '@/executor/handlers/router/router-handler'
 import type { ExecutionContext } from '@/executor/types'
@@ -9,7 +9,6 @@ import { getProviderFromModel } from '@/providers/utils'
 import type { SerializedBlock, SerializedWorkflow } from '@/serializer/types'

 const mockGenerateRouterPrompt = generateRouterPrompt as Mock
-const mockGenerateRouterV2Prompt = generateRouterV2Prompt as Mock
 const mockGetProviderFromModel = getProviderFromModel as Mock
 const mockFetch = global.fetch as unknown as Mock

@@ -45,7 +44,7 @@ describe('RouterBlockHandler', () => {
      metadata: { id: BlockType.ROUTER, name: 'Test Router' },
      position: { x: 50, y: 50 },
      config: { tool: BlockType.ROUTER, params: {} },
-      inputs: { prompt: 'string', model: 'string' },
+      inputs: { prompt: 'string', model: 'string' }, // Using ParamType strings
      outputs: {},
      enabled: true,
    }
@@ -73,11 +72,14 @@ describe('RouterBlockHandler', () => {
      workflow: mockWorkflow as SerializedWorkflow,
    }

+    // Reset mocks using vi
    vi.clearAllMocks()

+    // Default mock implementations
    mockGetProviderFromModel.mockReturnValue('openai')
    mockGenerateRouterPrompt.mockReturnValue('Generated System Prompt')

+    // Set up fetch mock to return a successful response
    mockFetch.mockImplementation(() => {
      return Promise.resolve({
        ok: true,
@@ -145,6 +147,7 @@ describe('RouterBlockHandler', () => {
      })
    )

+    // Verify the request body contains the expected data
    const fetchCallArgs = mockFetch.mock.calls[0]
    const requestBody = JSON.parse(fetchCallArgs[1].body)
    expect(requestBody).toMatchObject({
@@ -177,6 +180,7 @@ describe('RouterBlockHandler', () => {
    const inputs = { prompt: 'Test' }
    mockContext.workflow!.blocks = [mockBlock, mockTargetBlock2]

+    // Expect execute to throw because getTargetBlocks (called internally) will throw
    await expect(handler.execute(mockContext, mockBlock, inputs)).rejects.toThrow(
      'Target block target-block-1 not found'
    )
@@ -186,6 +190,7 @@ describe('RouterBlockHandler', () => {
  it('should throw error if LLM response is not a valid target block ID', async () => {
    const inputs = { prompt: 'Test', apiKey: 'test-api-key' }

+    // Override fetch mock to return an invalid block ID
    mockFetch.mockImplementationOnce(() => {
      return Promise.resolve({
        ok: true,
@@ -223,6 +228,7 @@ describe('RouterBlockHandler', () => {
  it('should handle server error responses', async () => {
    const inputs = { prompt: 'Test error handling.', apiKey: 'test-api-key' }

+    // Override fetch mock to return an error
    mockFetch.mockImplementationOnce(() => {
      return Promise.resolve({
        ok: false,
@@ -270,12 +276,13 @@ describe('RouterBlockHandler', () => {

    mockGetProviderFromModel.mockReturnValue('vertex')

+    // Mock the database query for Vertex credential
    const mockDb = await import('@sim/db')
    const mockAccount = {
      id: 'test-vertex-credential-id',
      accessToken: 'mock-access-token',
      refreshToken: 'mock-refresh-token',
-      expiresAt: new Date(Date.now() + 3600000),
+      expiresAt: new Date(Date.now() + 3600000), // 1 hour from now
    }
    vi.spyOn(mockDb.db.query.account, 'findFirst').mockResolvedValue(mockAccount as any)

@@ -293,287 +300,3 @@ describe('RouterBlockHandler', () => {
    expect(requestBody.apiKey).toBe('mock-access-token')
  })
 })
-
-describe('RouterBlockHandler V2', () => {
-  let handler: RouterBlockHandler
-  let mockRouterV2Block: SerializedBlock
-  let mockContext: ExecutionContext
-  let mockWorkflow: Partial<SerializedWorkflow>
-  let mockTargetBlock1: SerializedBlock
-  let mockTargetBlock2: SerializedBlock
-
-  beforeEach(() => {
-    mockTargetBlock1 = {
-      id: 'target-block-1',
-      metadata: { id: 'agent', name: 'Support Agent' },
-      position: { x: 100, y: 100 },
-      config: { tool: 'agent', params: {} },
-      inputs: {},
-      outputs: {},
-      enabled: true,
-    }
-    mockTargetBlock2 = {
-      id: 'target-block-2',
-      metadata: { id: 'agent', name: 'Sales Agent' },
-      position: { x: 100, y: 150 },
-      config: { tool: 'agent', params: {} },
-      inputs: {},
-      outputs: {},
-      enabled: true,
-    }
-    mockRouterV2Block = {
-      id: 'router-v2-block-1',
-      metadata: { id: BlockType.ROUTER_V2, name: 'Test Router V2' },
-      position: { x: 50, y: 50 },
-      config: { tool: BlockType.ROUTER_V2, params: {} },
-      inputs: {},
-      outputs: {},
-      enabled: true,
-    }
-    mockWorkflow = {
-      blocks: [mockRouterV2Block, mockTargetBlock1, mockTargetBlock2],
-      connections: [
-        {
-          source: mockRouterV2Block.id,
-          target: mockTargetBlock1.id,
-          sourceHandle: 'router-route-support',
-        },
-        {
-          source: mockRouterV2Block.id,
-          target: mockTargetBlock2.id,
-          sourceHandle: 'router-route-sales',
-        },
-      ],
-    }
-
-    handler = new RouterBlockHandler({})
-
-    mockContext = {
-      workflowId: 'test-workflow-id',
-      blockStates: new Map(),
-      blockLogs: [],
-      metadata: { duration: 0 },
-      environmentVariables: {},
-      decisions: { router: new Map(), condition: new Map() },
-      loopExecutions: new Map(),
-      completedLoops: new Set(),
-      executedBlocks: new Set(),
-      activeExecutionPath: new Set(),
-      workflow: mockWorkflow as SerializedWorkflow,
-    }
-
-    vi.clearAllMocks()
-
-    mockGetProviderFromModel.mockReturnValue('openai')
-    mockGenerateRouterV2Prompt.mockReturnValue('Generated V2 System Prompt')
-  })
-
-  it('should handle router_v2 blocks', () => {
-    expect(handler.canHandle(mockRouterV2Block)).toBe(true)
-  })
-
-  it('should execute router V2 and return reasoning', async () => {
-    const inputs = {
-      context: 'I need help with a billing issue',
-      model: 'gpt-4o',
-      apiKey: 'test-api-key',
-      routes: JSON.stringify([
-        { id: 'route-support', title: 'Support', value: 'Customer support inquiries' },
-        { id: 'route-sales', title: 'Sales', value: 'Sales and pricing questions' },
-      ]),
-    }
-
-    mockFetch.mockImplementationOnce(() => {
-      return Promise.resolve({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            content: JSON.stringify({
-              route: 'route-support',
-              reasoning: 'The user mentioned a billing issue which is a customer support matter.',
-            }),
-            model: 'gpt-4o',
-            tokens: { input: 150, output: 25, total: 175 },
-          }),
-      })
-    })
-
-    const result = await handler.execute(mockContext, mockRouterV2Block, inputs)
-
-    expect(result).toMatchObject({
-      context: 'I need help with a billing issue',
-      model: 'gpt-4o',
-      selectedRoute: 'route-support',
-      reasoning: 'The user mentioned a billing issue which is a customer support matter.',
-      selectedPath: {
-        blockId: 'target-block-1',
-        blockType: 'agent',
-        blockTitle: 'Support Agent',
-      },
-    })
-  })
-
-  it('should include responseFormat in provider request', async () => {
-    const inputs = {
-      context: 'Test context',
-      model: 'gpt-4o',
-      apiKey: 'test-api-key',
-      routes: JSON.stringify([{ id: 'route-1', title: 'Route 1', value: 'Description 1' }]),
-    }
-
-    mockFetch.mockImplementationOnce(() => {
-      return Promise.resolve({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            content: JSON.stringify({ route: 'route-1', reasoning: 'Test reasoning' }),
-            model: 'gpt-4o',
-            tokens: { input: 100, output: 20, total: 120 },
-          }),
-      })
-    })
-
-    await handler.execute(mockContext, mockRouterV2Block, inputs)
-
-    const fetchCallArgs = mockFetch.mock.calls[0]
-    const requestBody = JSON.parse(fetchCallArgs[1].body)
-
-    expect(requestBody.responseFormat).toEqual({
-      name: 'router_response',
-      schema: {
-        type: 'object',
-        properties: {
-          route: {
-            type: 'string',
-            description: 'The selected route ID or NO_MATCH',
-          },
-          reasoning: {
-            type: 'string',
-            description: 'Brief explanation of why this route was chosen',
-          },
-        },
-        required: ['route', 'reasoning'],
-        additionalProperties: false,
-      },
-      strict: true,
-    })
-  })
-
-  it('should handle NO_MATCH response with reasoning', async () => {
-    const inputs = {
-      context: 'Random unrelated query',
-      model: 'gpt-4o',
-      apiKey: 'test-api-key',
-      routes: JSON.stringify([{ id: 'route-1', title: 'Route 1', value: 'Specific topic' }]),
-    }
-
-    mockFetch.mockImplementationOnce(() => {
-      return Promise.resolve({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            content: JSON.stringify({
-              route: 'NO_MATCH',
-              reasoning: 'The query does not relate to any available route.',
-            }),
-            model: 'gpt-4o',
-            tokens: { input: 100, output: 20, total: 120 },
-          }),
-      })
-    })
-
-    await expect(handler.execute(mockContext, mockRouterV2Block, inputs)).rejects.toThrow(
-      'Router could not determine a matching route: The query does not relate to any available route.'
-    )
-  })
-
-  it('should throw error for invalid route ID in response', async () => {
-    const inputs = {
-      context: 'Test context',
-      model: 'gpt-4o',
-      apiKey: 'test-api-key',
-      routes: JSON.stringify([{ id: 'route-1', title: 'Route 1', value: 'Description' }]),
-    }
-
-    mockFetch.mockImplementationOnce(() => {
-      return Promise.resolve({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            content: JSON.stringify({ route: 'invalid-route', reasoning: 'Some reasoning' }),
-            model: 'gpt-4o',
-            tokens: { input: 100, output: 20, total: 120 },
-          }),
-      })
-    })
-
-    await expect(handler.execute(mockContext, mockRouterV2Block, inputs)).rejects.toThrow(
-      /Router could not determine a valid route/
-    )
-  })
-
-  it('should handle routes passed as array instead of JSON string', async () => {
-    const inputs = {
-      context: 'Test context',
-      model: 'gpt-4o',
-      apiKey: 'test-api-key',
-      routes: [{ id: 'route-1', title: 'Route 1', value: 'Description' }],
-    }
-
-    mockFetch.mockImplementationOnce(() => {
-      return Promise.resolve({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            content: JSON.stringify({ route: 'route-1', reasoning: 'Matched route 1' }),
-            model: 'gpt-4o',
-            tokens: { input: 100, output: 20, total: 120 },
-          }),
-      })
-    })
-
-    const result = await handler.execute(mockContext, mockRouterV2Block, inputs)
-
-    expect(result.selectedRoute).toBe('route-1')
-    expect(result.reasoning).toBe('Matched route 1')
-  })
-
-  it('should throw error when no routes are defined', async () => {
-    const inputs = {
-      context: 'Test context',
-      model: 'gpt-4o',
-      apiKey: 'test-api-key',
-      routes: '[]',
-    }
-
-    await expect(handler.execute(mockContext, mockRouterV2Block, inputs)).rejects.toThrow(
-      'No routes defined for router'
-    )
-  })
-
-  it('should handle fallback when JSON parsing fails', async () => {
-    const inputs = {
-      context: 'Test context',
-      model: 'gpt-4o',
-      apiKey: 'test-api-key',
-      routes: JSON.stringify([{ id: 'route-1', title: 'Route 1', value: 'Description' }]),
-    }
-
-    mockFetch.mockImplementationOnce(() => {
-      return Promise.resolve({
-        ok: true,
-        json: () =>
-          Promise.resolve({
-            content: 'route-1',
-            model: 'gpt-4o',
-            tokens: { input: 100, output: 5, total: 105 },
-          }),
-      })
-    })
-
-    const result = await handler.execute(mockContext, mockRouterV2Block, inputs)
-
-    expect(result.selectedRoute).toBe('route-1')
-    expect(result.reasoning).toBe('')
-  })
-})
--- a/apps/sim/executor/handlers/router/router-handler.ts
+++ b/apps/sim/executor/handlers/router/router-handler.ts
@@ -238,25 +238,6 @@ export class RouterBlockHandler implements BlockHandler {
        apiKey: finalApiKey,
        workflowId: ctx.workflowId,
        workspaceId: ctx.workspaceId,
-        responseFormat: {
-          name: 'router_response',
-          schema: {
-            type: 'object',
-            properties: {
-              route: {
-                type: 'string',
-                description: 'The selected route ID or NO_MATCH',
-              },
-              reasoning: {
-                type: 'string',
-                description: 'Brief explanation of why this route was chosen',
-              },
-            },
-            required: ['route', 'reasoning'],
-            additionalProperties: false,
-          },
-          strict: true,
-        },
      }

      if (providerId === 'vertex') {
@@ -296,31 +277,16 @@ export class RouterBlockHandler implements BlockHandler {

      const result = await response.json()

-      let chosenRouteId: string
-      let reasoning = ''
-
-      try {
-        const parsedResponse = JSON.parse(result.content)
-        chosenRouteId = parsedResponse.route?.trim() || ''
-        reasoning = parsedResponse.reasoning || ''
-      } catch (_parseError) {
-        logger.error('Router response was not valid JSON despite responseFormat', {
-          content: result.content,
-        })
-        chosenRouteId = result.content.trim()
-      }
+      const chosenRouteId = result.content.trim()

      if (chosenRouteId === 'NO_MATCH' || chosenRouteId.toUpperCase() === 'NO_MATCH') {
        logger.info('Router determined no route matches the context, routing to error path')
-        throw new Error(
-          reasoning
-            ? `Router could not determine a matching route: ${reasoning}`
-            : 'Router could not determine a matching route for the given context'
-        )
+        throw new Error('Router could not determine a matching route for the given context')
      }

      const chosenRoute = routes.find((r) => r.id === chosenRouteId)

+      // Throw error if LLM returns invalid route ID - this routes through error path
      if (!chosenRoute) {
        const availableRoutes = routes.map((r) => ({ id: r.id, title: r.title }))
        logger.error(
@@ -332,6 +298,7 @@ export class RouterBlockHandler implements BlockHandler {
        )
      }

+      // Find the target block connected to this route's handle
      const connection = ctx.workflow?.connections.find(
        (conn) => conn.source === block.id && conn.sourceHandle === `router-${chosenRoute.id}`
      )
@@ -367,7 +334,6 @@ export class RouterBlockHandler implements BlockHandler {
          total: cost.total,
        },
        selectedRoute: chosenRoute.id,
-        reasoning,
        selectedPath: targetBlock
          ? {
              blockId: targetBlock.id,
@@ -387,7 +353,7 @@ export class RouterBlockHandler implements BlockHandler {
  }

  /**
-   * Parse routes from input (can be JSON string or array)
+   * Parse routes from input (can be JSON string or array).
   */
  private parseRoutes(input: any): RouteDefinition[] {
    try {
--- a/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
+++ b/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
@@ -204,21 +204,26 @@ describe('WorkflowBlockHandler', () => {
      })
    })

-    it('should throw error for failed child output so BlockExecutor can check error port', () => {
+    it('should map failed child output correctly', () => {
      const childResult = {
        success: false,
        error: 'Child workflow failed',
      }

-      expect(() =>
-        (handler as any).mapChildOutputToParent(childResult, 'child-id', 'Child Workflow', 100)
-      ).toThrow('Error in child workflow "Child Workflow": Child workflow failed')
+      const result = (handler as any).mapChildOutputToParent(
+        childResult,
+        'child-id',
+        'Child Workflow',
+        100
+      )

-      try {
-        ;(handler as any).mapChildOutputToParent(childResult, 'child-id', 'Child Workflow', 100)
-      } catch (error: any) {
-        expect(error.childTraceSpans).toEqual([])
-      }
+      expect(result).toEqual({
+        success: false,
+        childWorkflowName: 'Child Workflow',
+        result: {},
+        error: 'Child workflow failed',
+        childTraceSpans: [],
+      })
    })

    it('should handle nested response structures', () => {
--- a/apps/sim/executor/handlers/workflow/workflow-handler.ts
+++ b/apps/sim/executor/handlers/workflow/workflow-handler.ts
@@ -144,11 +144,6 @@ export class WorkflowBlockHandler implements BlockHandler {
      const workflowMetadata = workflows[workflowId]
      const childWorkflowName = workflowMetadata?.name || workflowId

-      const originalError = error.message || 'Unknown error'
-      const wrappedError = new Error(
-        `Error in child workflow "${childWorkflowName}": ${originalError}`
-      )
-
      if (error.executionResult?.logs) {
        const executionResult = error.executionResult as ExecutionResult

@@ -164,12 +159,28 @@ export class WorkflowBlockHandler implements BlockHandler {
        )

        logger.info(`Captured ${childTraceSpans.length} child trace spans from failed execution`)
-        ;(wrappedError as any).childTraceSpans = childTraceSpans
-      } else if (error.childTraceSpans && Array.isArray(error.childTraceSpans)) {
-        ;(wrappedError as any).childTraceSpans = error.childTraceSpans
+
+        return {
+          success: false,
+          childWorkflowName,
+          result: {},
+          error: error.message || 'Child workflow execution failed',
+          childTraceSpans: childTraceSpans,
+        } as Record<string, any>
      }

-      throw wrappedError
+      if (error.childTraceSpans && Array.isArray(error.childTraceSpans)) {
+        return {
+          success: false,
+          childWorkflowName,
+          result: {},
+          error: error.message || 'Child workflow execution failed',
+          childTraceSpans: error.childTraceSpans,
+        } as Record<string, any>
+      }
+
+      const originalError = error.message || 'Unknown error'
+      throw new Error(`Error in child workflow "${childWorkflowName}": ${originalError}`)
    }
  }

@@ -441,13 +452,17 @@ export class WorkflowBlockHandler implements BlockHandler {

    if (!success) {
      logger.warn(`Child workflow ${childWorkflowName} failed`)
-      const error = new Error(
-        `Error in child workflow "${childWorkflowName}": ${childResult.error || 'Child workflow execution failed'}`
-      )
-      ;(error as any).childTraceSpans = childTraceSpans || []
-      throw error
+      // Return failure with child trace spans so they can be displayed
+      return {
+        success: false,
+        childWorkflowName,
+        result,
+        error: childResult.error || 'Child workflow execution failed',
+        childTraceSpans: childTraceSpans || [],
+      } as Record<string, any>
    }

+    // Success case
    return {
      success: true,
      childWorkflowName,
--- a/apps/sim/executor/utils/block-data.ts
+++ b/apps/sim/executor/utils/block-data.ts
@@ -1,43 +1,24 @@
-import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { normalizeName } from '@/executor/constants'
 import type { ExecutionContext } from '@/executor/types'
-import type { OutputSchema } from '@/executor/utils/block-reference'

 export interface BlockDataCollection {
-  blockData: Record<string, unknown>
+  blockData: Record<string, any>
  blockNameMapping: Record<string, string>
-  blockOutputSchemas: Record<string, OutputSchema>
 }

 export function collectBlockData(ctx: ExecutionContext): BlockDataCollection {
-  const blockData: Record<string, unknown> = {}
+  const blockData: Record<string, any> = {}
  const blockNameMapping: Record<string, string> = {}
-  const blockOutputSchemas: Record<string, OutputSchema> = {}

  for (const [id, state] of ctx.blockStates.entries()) {
    if (state.output !== undefined) {
      blockData[id] = state.output
-    }
-
-    const workflowBlock = ctx.workflow?.blocks?.find((b) => b.id === id)
-    if (!workflowBlock) continue
-
-    if (workflowBlock.metadata?.name) {
-      blockNameMapping[normalizeName(workflowBlock.metadata.name)] = id
-    }
-
-    const blockType = workflowBlock.metadata?.id
-    if (blockType) {
-      const params = workflowBlock.config?.params as Record<string, unknown> | undefined
-      const subBlocks = params
-        ? Object.fromEntries(Object.entries(params).map(([k, v]) => [k, { value: v }]))
-        : undefined
-      const schema = getBlockOutputs(blockType, subBlocks)
-      if (schema && Object.keys(schema).length > 0) {
-        blockOutputSchemas[id] = schema
+      const workflowBlock = ctx.workflow?.blocks?.find((b) => b.id === id)
+      if (workflowBlock?.metadata?.name) {
+        blockNameMapping[normalizeName(workflowBlock.metadata.name)] = id
      }
    }
  }

-  return { blockData, blockNameMapping, blockOutputSchemas }
+  return { blockData, blockNameMapping }
 }
--- a/apps/sim/executor/utils/block-reference.test.ts
+++ b/apps/sim/executor/utils/block-reference.test.ts
@@ -1,255 +0,0 @@
-/**
- * @vitest-environment node
- */
-import { describe, expect, it } from 'vitest'
-import {
-  type BlockReferenceContext,
-  InvalidFieldError,
-  resolveBlockReference,
-} from './block-reference'
-
-describe('resolveBlockReference', () => {
-  const createContext = (
-    overrides: Partial<BlockReferenceContext> = {}
-  ): BlockReferenceContext => ({
-    blockNameMapping: { start: 'block-1', agent: 'block-2' },
-    blockData: {},
-    blockOutputSchemas: {},
-    ...overrides,
-  })
-
-  describe('block name resolution', () => {
-    it('should return undefined when block name does not exist', () => {
-      const ctx = createContext()
-      const result = resolveBlockReference('unknown', ['field'], ctx)
-      expect(result).toBeUndefined()
-    })
-
-    it('should normalize block name before lookup', () => {
-      const ctx = createContext({
-        blockNameMapping: { myblock: 'block-1' },
-        blockData: { 'block-1': { value: 'test' } },
-      })
-
-      const result = resolveBlockReference('MyBlock', ['value'], ctx)
-      expect(result).toEqual({ value: 'test', blockId: 'block-1' })
-    })
-
-    it('should handle block names with spaces', () => {
-      const ctx = createContext({
-        blockNameMapping: { myblock: 'block-1' },
-        blockData: { 'block-1': { value: 'test' } },
-      })
-
-      const result = resolveBlockReference('My Block', ['value'], ctx)
-      expect(result).toEqual({ value: 'test', blockId: 'block-1' })
-    })
-  })
-
-  describe('field resolution', () => {
-    it('should return entire block output when no path specified', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { input: 'hello', other: 'data' } },
-      })
-
-      const result = resolveBlockReference('start', [], ctx)
-      expect(result).toEqual({
-        value: { input: 'hello', other: 'data' },
-        blockId: 'block-1',
-      })
-    })
-
-    it('should resolve simple field path', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { input: 'hello' } },
-      })
-
-      const result = resolveBlockReference('start', ['input'], ctx)
-      expect(result).toEqual({ value: 'hello', blockId: 'block-1' })
-    })
-
-    it('should resolve nested field path', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { response: { data: { name: 'test' } } } },
-      })
-
-      const result = resolveBlockReference('start', ['response', 'data', 'name'], ctx)
-      expect(result).toEqual({ value: 'test', blockId: 'block-1' })
-    })
-
-    it('should resolve array index path', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { items: ['a', 'b', 'c'] } },
-      })
-
-      const result = resolveBlockReference('start', ['items', '1'], ctx)
-      expect(result).toEqual({ value: 'b', blockId: 'block-1' })
-    })
-
-    it('should return undefined value when field exists but has no value', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { input: undefined } },
-        blockOutputSchemas: {
-          'block-1': { input: { type: 'string' } },
-        },
-      })
-
-      const result = resolveBlockReference('start', ['input'], ctx)
-      expect(result).toEqual({ value: undefined, blockId: 'block-1' })
-    })
-
-    it('should return null value when field has null', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { input: null } },
-      })
-
-      const result = resolveBlockReference('start', ['input'], ctx)
-      expect(result).toEqual({ value: null, blockId: 'block-1' })
-    })
-  })
-
-  describe('schema validation', () => {
-    it('should throw InvalidFieldError when field not in schema', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { existing: 'value' } },
-        blockOutputSchemas: {
-          'block-1': {
-            input: { type: 'string' },
-            conversationId: { type: 'string' },
-          },
-        },
-      })
-
-      expect(() => resolveBlockReference('start', ['invalid'], ctx)).toThrow(InvalidFieldError)
-      expect(() => resolveBlockReference('start', ['invalid'], ctx)).toThrow(
-        /"invalid" doesn't exist on block "start"/
-      )
-    })
-
-    it('should include available fields in error message', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': {} },
-        blockOutputSchemas: {
-          'block-1': {
-            input: { type: 'string' },
-            conversationId: { type: 'string' },
-            files: { type: 'files' },
-          },
-        },
-      })
-
-      try {
-        resolveBlockReference('start', ['typo'], ctx)
-        expect.fail('Should have thrown')
-      } catch (error) {
-        expect(error).toBeInstanceOf(InvalidFieldError)
-        const fieldError = error as InvalidFieldError
-        expect(fieldError.availableFields).toContain('input')
-        expect(fieldError.availableFields).toContain('conversationId')
-        expect(fieldError.availableFields).toContain('files')
-      }
-    })
-
-    it('should allow valid field even when value is undefined', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': {} },
-        blockOutputSchemas: {
-          'block-1': { input: { type: 'string' } },
-        },
-      })
-
-      const result = resolveBlockReference('start', ['input'], ctx)
-      expect(result).toEqual({ value: undefined, blockId: 'block-1' })
-    })
-
-    it('should validate path when block has no output yet', () => {
-      const ctx = createContext({
-        blockData: {},
-        blockOutputSchemas: {
-          'block-1': { input: { type: 'string' } },
-        },
-      })
-
-      expect(() => resolveBlockReference('start', ['invalid'], ctx)).toThrow(InvalidFieldError)
-    })
-
-    it('should return undefined for valid field when block has no output', () => {
-      const ctx = createContext({
-        blockData: {},
-        blockOutputSchemas: {
-          'block-1': { input: { type: 'string' } },
-        },
-      })
-
-      const result = resolveBlockReference('start', ['input'], ctx)
-      expect(result).toEqual({ value: undefined, blockId: 'block-1' })
-    })
-  })
-
-  describe('without schema (pass-through mode)', () => {
-    it('should return undefined value without throwing when no schema', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { existing: 'value' } },
-      })
-
-      const result = resolveBlockReference('start', ['missing'], ctx)
-      expect(result).toEqual({ value: undefined, blockId: 'block-1' })
-    })
-  })
-
-  describe('file type handling', () => {
-    it('should allow file property access', () => {
-      const ctx = createContext({
-        blockData: {
-          'block-1': {
-            files: [{ name: 'test.txt', url: 'http://example.com/file' }],
-          },
-        },
-        blockOutputSchemas: {
-          'block-1': { files: { type: 'files' } },
-        },
-      })
-
-      const result = resolveBlockReference('start', ['files', '0', 'name'], ctx)
-      expect(result).toEqual({ value: 'test.txt', blockId: 'block-1' })
-    })
-
-    it('should validate file property names', () => {
-      const ctx = createContext({
-        blockData: { 'block-1': { files: [] } },
-        blockOutputSchemas: {
-          'block-1': { files: { type: 'files' } },
-        },
-      })
-
-      expect(() => resolveBlockReference('start', ['files', '0', 'invalid'], ctx)).toThrow(
-        InvalidFieldError
-      )
-    })
-  })
-})
-
-describe('InvalidFieldError', () => {
-  it('should have correct properties', () => {
-    const error = new InvalidFieldError('myBlock', 'invalid.path', ['field1', 'field2'])
-
-    expect(error.blockName).toBe('myBlock')
-    expect(error.fieldPath).toBe('invalid.path')
-    expect(error.availableFields).toEqual(['field1', 'field2'])
-    expect(error.name).toBe('InvalidFieldError')
-  })
-
-  it('should format message correctly', () => {
-    const error = new InvalidFieldError('start', 'typo', ['input', 'files'])
-
-    expect(error.message).toBe(
-      '"typo" doesn\'t exist on block "start". Available fields: input, files'
-    )
-  })
-
-  it('should handle empty available fields', () => {
-    const error = new InvalidFieldError('start', 'field', [])
-
-    expect(error.message).toBe('"field" doesn\'t exist on block "start". Available fields: none')
-  })
-})
--- a/apps/sim/executor/utils/block-reference.ts
+++ b/apps/sim/executor/utils/block-reference.ts
@@ -1,210 +0,0 @@
-import { USER_FILE_ACCESSIBLE_PROPERTIES } from '@/lib/workflows/types'
-import { normalizeName } from '@/executor/constants'
-import { navigatePath } from '@/executor/variables/resolvers/reference'
-
-export type OutputSchema = Record<string, { type?: string; description?: string } | unknown>
-
-export interface BlockReferenceContext {
-  blockNameMapping: Record<string, string>
-  blockData: Record<string, unknown>
-  blockOutputSchemas?: Record<string, OutputSchema>
-}
-
-export interface BlockReferenceResult {
-  value: unknown
-  blockId: string
-}
-
-export class InvalidFieldError extends Error {
-  constructor(
-    public readonly blockName: string,
-    public readonly fieldPath: string,
-    public readonly availableFields: string[]
-  ) {
-    super(
-      `"${fieldPath}" doesn't exist on block "${blockName}". ` +
-        `Available fields: ${availableFields.length > 0 ? availableFields.join(', ') : 'none'}`
-    )
-    this.name = 'InvalidFieldError'
-  }
-}
-
-function isFileType(value: unknown): boolean {
-  if (typeof value !== 'object' || value === null) return false
-  const typed = value as { type?: string }
-  return typed.type === 'file[]' || typed.type === 'files'
-}
-
-function isArrayType(value: unknown): value is { type: 'array'; items?: unknown } {
-  if (typeof value !== 'object' || value === null) return false
-  return (value as { type?: string }).type === 'array'
-}
-
-function getArrayItems(schema: unknown): unknown {
-  if (typeof schema !== 'object' || schema === null) return undefined
-  return (schema as { items?: unknown }).items
-}
-
-function getProperties(schema: unknown): Record<string, unknown> | undefined {
-  if (typeof schema !== 'object' || schema === null) return undefined
-  const props = (schema as { properties?: unknown }).properties
-  return typeof props === 'object' && props !== null
-    ? (props as Record<string, unknown>)
-    : undefined
-}
-
-function lookupField(schema: unknown, fieldName: string): unknown | undefined {
-  if (typeof schema !== 'object' || schema === null) return undefined
-  const typed = schema as Record<string, unknown>
-
-  if (fieldName in typed) {
-    return typed[fieldName]
-  }
-
-  const props = getProperties(schema)
-  if (props && fieldName in props) {
-    return props[fieldName]
-  }
-
-  return undefined
-}
-
-function isPathInSchema(schema: OutputSchema | undefined, pathParts: string[]): boolean {
-  if (!schema || pathParts.length === 0) {
-    return true
-  }
-
-  let current: unknown = schema
-
-  for (let i = 0; i < pathParts.length; i++) {
-    const part = pathParts[i]
-
-    if (current === null || current === undefined) {
-      return false
-    }
-
-    if (/^\d+$/.test(part)) {
-      if (isFileType(current)) {
-        const nextPart = pathParts[i + 1]
-        return (
-          !nextPart ||
-          USER_FILE_ACCESSIBLE_PROPERTIES.includes(
-            nextPart as (typeof USER_FILE_ACCESSIBLE_PROPERTIES)[number]
-          )
-        )
-      }
-      if (isArrayType(current)) {
-        current = getArrayItems(current)
-      }
-      continue
-    }
-
-    const arrayMatch = part.match(/^([^[]+)\[(\d+)\]$/)
-    if (arrayMatch) {
-      const [, prop] = arrayMatch
-      const fieldDef = lookupField(current, prop)
-      if (!fieldDef) return false
-
-      if (isFileType(fieldDef)) {
-        const nextPart = pathParts[i + 1]
-        return (
-          !nextPart ||
-          USER_FILE_ACCESSIBLE_PROPERTIES.includes(
-            nextPart as (typeof USER_FILE_ACCESSIBLE_PROPERTIES)[number]
-          )
-        )
-      }
-
-      current = isArrayType(fieldDef) ? getArrayItems(fieldDef) : fieldDef
-      continue
-    }
-
-    if (
-      isFileType(current) &&
-      USER_FILE_ACCESSIBLE_PROPERTIES.includes(
-        part as (typeof USER_FILE_ACCESSIBLE_PROPERTIES)[number]
-      )
-    ) {
-      return true
-    }
-
-    const fieldDef = lookupField(current, part)
-    if (fieldDef !== undefined) {
-      if (isFileType(fieldDef)) {
-        const nextPart = pathParts[i + 1]
-        if (!nextPart) return true
-        if (/^\d+$/.test(nextPart)) {
-          const afterIndex = pathParts[i + 2]
-          return (
-            !afterIndex ||
-            USER_FILE_ACCESSIBLE_PROPERTIES.includes(
-              afterIndex as (typeof USER_FILE_ACCESSIBLE_PROPERTIES)[number]
-            )
-          )
-        }
-        return USER_FILE_ACCESSIBLE_PROPERTIES.includes(
-          nextPart as (typeof USER_FILE_ACCESSIBLE_PROPERTIES)[number]
-        )
-      }
-      current = fieldDef
-      continue
-    }
-
-    if (isArrayType(current)) {
-      const items = getArrayItems(current)
-      const itemField = lookupField(items, part)
-      if (itemField !== undefined) {
-        current = itemField
-        continue
-      }
-    }
-
-    return false
-  }
-
-  return true
-}
-
-function getSchemaFieldNames(schema: OutputSchema | undefined): string[] {
-  if (!schema) return []
-  return Object.keys(schema)
-}
-
-export function resolveBlockReference(
-  blockName: string,
-  pathParts: string[],
-  context: BlockReferenceContext
-): BlockReferenceResult | undefined {
-  const normalizedName = normalizeName(blockName)
-  const blockId = context.blockNameMapping[normalizedName]
-
-  if (!blockId) {
-    return undefined
-  }
-
-  const blockOutput = context.blockData[blockId]
-  const schema = context.blockOutputSchemas?.[blockId]
-
-  if (blockOutput === undefined) {
-    if (schema && pathParts.length > 0) {
-      if (!isPathInSchema(schema, pathParts)) {
-        throw new InvalidFieldError(blockName, pathParts.join('.'), getSchemaFieldNames(schema))
-      }
-    }
-    return { value: undefined, blockId }
-  }
-
-  if (pathParts.length === 0) {
-    return { value: blockOutput, blockId }
-  }
-
-  const value = navigatePath(blockOutput, pathParts)
-
-  if (value === undefined && schema) {
-    if (!isPathInSchema(schema, pathParts)) {
-      throw new InvalidFieldError(blockName, pathParts.join('.'), getSchemaFieldNames(schema))
-    }
-  }
-
-  return { value, blockId }
-}
--- a/apps/sim/executor/variables/resolvers/block.ts
+++ b/apps/sim/executor/variables/resolvers/block.ts
@@ -1,15 +1,11 @@
 import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
+import { USER_FILE_ACCESSIBLE_PROPERTIES } from '@/lib/workflows/types'
 import {
  isReference,
  normalizeName,
  parseReferencePath,
  SPECIAL_REFERENCE_PREFIXES,
 } from '@/executor/constants'
-import {
-  InvalidFieldError,
-  type OutputSchema,
-  resolveBlockReference,
-} from '@/executor/utils/block-reference'
 import {
  navigatePath,
  type ResolutionContext,
@@ -18,6 +14,123 @@ import {
 import type { SerializedBlock, SerializedWorkflow } from '@/serializer/types'
 import { getTool } from '@/tools/utils'

+function isPathInOutputSchema(
+  outputs: Record<string, any> | undefined,
+  pathParts: string[]
+): boolean {
+  if (!outputs || pathParts.length === 0) {
+    return true
+  }
+
+  const isFileArrayType = (value: any): boolean =>
+    value?.type === 'file[]' || value?.type === 'files'
+
+  let current: any = outputs
+  for (let i = 0; i < pathParts.length; i++) {
+    const part = pathParts[i]
+
+    const arrayMatch = part.match(/^([^[]+)\[(\d+)\]$/)
+    if (arrayMatch) {
+      const [, prop] = arrayMatch
+      let fieldDef: any
+
+      if (prop in current) {
+        fieldDef = current[prop]
+      } else if (current.properties && prop in current.properties) {
+        fieldDef = current.properties[prop]
+      } else if (current.type === 'array' && current.items) {
+        if (current.items.properties && prop in current.items.properties) {
+          fieldDef = current.items.properties[prop]
+        } else if (prop in current.items) {
+          fieldDef = current.items[prop]
+        }
+      }
+
+      if (!fieldDef) {
+        return false
+      }
+
+      if (isFileArrayType(fieldDef)) {
+        if (i + 1 < pathParts.length) {
+          return USER_FILE_ACCESSIBLE_PROPERTIES.includes(pathParts[i + 1] as any)
+        }
+        return true
+      }
+
+      if (fieldDef.type === 'array' && fieldDef.items) {
+        current = fieldDef.items
+        continue
+      }
+
+      current = fieldDef
+      continue
+    }
+
+    if (/^\d+$/.test(part)) {
+      if (isFileArrayType(current)) {
+        if (i + 1 < pathParts.length) {
+          const nextPart = pathParts[i + 1]
+          return USER_FILE_ACCESSIBLE_PROPERTIES.includes(nextPart as any)
+        }
+        return true
+      }
+      continue
+    }
+
+    if (current === null || current === undefined) {
+      return false
+    }
+
+    if (part in current) {
+      const nextCurrent = current[part]
+      if (nextCurrent?.type === 'file[]' && i + 1 < pathParts.length) {
+        const nextPart = pathParts[i + 1]
+        if (/^\d+$/.test(nextPart) && i + 2 < pathParts.length) {
+          const propertyPart = pathParts[i + 2]
+          return USER_FILE_ACCESSIBLE_PROPERTIES.includes(propertyPart as any)
+        }
+      }
+      current = nextCurrent
+      continue
+    }
+
+    if (current.properties && part in current.properties) {
+      current = current.properties[part]
+      continue
+    }
+
+    if (current.type === 'array' && current.items) {
+      if (current.items.properties && part in current.items.properties) {
+        current = current.items.properties[part]
+        continue
+      }
+      if (part in current.items) {
+        current = current.items[part]
+        continue
+      }
+    }
+
+    if (isFileArrayType(current) && USER_FILE_ACCESSIBLE_PROPERTIES.includes(part as any)) {
+      return true
+    }
+
+    if ('type' in current && typeof current.type === 'string') {
+      if (!current.properties && !current.items) {
+        return false
+      }
+    }
+
+    return false
+  }
+
+  return true
+}
+
+function getSchemaFieldNames(outputs: Record<string, any> | undefined): string[] {
+  if (!outputs) return []
+  return Object.keys(outputs)
+}
+
 export class BlockResolver implements Resolver {
  private nameToBlockId: Map<string, string>
  private blockById: Map<string, SerializedBlock>
@@ -57,94 +170,83 @@ export class BlockResolver implements Resolver {
      return undefined
    }

-    const block = this.blockById.get(blockId)!
+    const block = this.blockById.get(blockId)
    const output = this.getBlockOutput(blockId, context)

-    const blockData: Record<string, unknown> = {}
-    const blockOutputSchemas: Record<string, OutputSchema> = {}
-
-    if (output !== undefined) {
-      blockData[blockId] = output
-    }
-
-    const blockType = block.metadata?.id
-    const params = block.config?.params as Record<string, unknown> | undefined
-    const subBlocks = params
-      ? Object.fromEntries(Object.entries(params).map(([k, v]) => [k, { value: v }]))
-      : undefined
-    const toolId = block.config?.tool
-    const toolConfig = toolId ? getTool(toolId) : undefined
-    const outputSchema =
-      toolConfig?.outputs ?? (blockType ? getBlockOutputs(blockType, subBlocks) : block.outputs)
-
-    if (outputSchema && Object.keys(outputSchema).length > 0) {
-      blockOutputSchemas[blockId] = outputSchema
-    }
-
-    try {
-      const result = resolveBlockReference(blockName, pathParts, {
-        blockNameMapping: Object.fromEntries(this.nameToBlockId),
-        blockData,
-        blockOutputSchemas,
-      })!
-
-      if (result.value !== undefined) {
-        return result.value
-      }
-
-      return this.handleBackwardsCompat(block, output, pathParts)
-    } catch (error) {
-      if (error instanceof InvalidFieldError) {
-        const fallback = this.handleBackwardsCompat(block, output, pathParts)
-        if (fallback !== undefined) {
-          return fallback
-        }
-        throw new Error(error.message)
-      }
-      throw error
-    }
-  }
-
-  private handleBackwardsCompat(
-    block: SerializedBlock,
-    output: unknown,
-    pathParts: string[]
-  ): unknown {
-    if (output === undefined || pathParts.length === 0) {
+    if (output === undefined) {
      return undefined
    }
+    if (pathParts.length === 0) {
+      return output
+    }

+    // Try the original path first
+    let result = navigatePath(output, pathParts)
+
+    // If successful, return it immediately
+    if (result !== undefined) {
+      return result
+    }
+
+    // Response block backwards compatibility:
+    // Old: <responseBlock.response.data> -> New: <responseBlock.data>
+    // Only apply fallback if:
+    // 1. Block type is 'response'
+    // 2. Path starts with 'response.'
+    // 3. Output doesn't have a 'response' key (confirming it's the new format)
    if (
-      block.metadata?.id === 'response' &&
+      block?.metadata?.id === 'response' &&
      pathParts[0] === 'response' &&
-      (output as Record<string, unknown>)?.response === undefined
+      output?.response === undefined
    ) {
      const adjustedPathParts = pathParts.slice(1)
      if (adjustedPathParts.length === 0) {
        return output
      }
-      const fallbackResult = navigatePath(output, adjustedPathParts)
-      if (fallbackResult !== undefined) {
-        return fallbackResult
+      result = navigatePath(output, adjustedPathParts)
+      if (result !== undefined) {
+        return result
      }
    }

+    // Workflow block backwards compatibility:
+    // Old: <workflowBlock.result.response.data> -> New: <workflowBlock.result.data>
+    // Only apply fallback if:
+    // 1. Block type is 'workflow' or 'workflow_input'
+    // 2. Path starts with 'result.response.'
+    // 3. output.result.response doesn't exist (confirming child used new format)
    const isWorkflowBlock =
-      block.metadata?.id === 'workflow' || block.metadata?.id === 'workflow_input'
-    const outputRecord = output as Record<string, Record<string, unknown> | undefined>
+      block?.metadata?.id === 'workflow' || block?.metadata?.id === 'workflow_input'
    if (
      isWorkflowBlock &&
      pathParts[0] === 'result' &&
      pathParts[1] === 'response' &&
-      outputRecord?.result?.response === undefined
+      output?.result?.response === undefined
    ) {
      const adjustedPathParts = ['result', ...pathParts.slice(2)]
-      const fallbackResult = navigatePath(output, adjustedPathParts)
-      if (fallbackResult !== undefined) {
-        return fallbackResult
+      result = navigatePath(output, adjustedPathParts)
+      if (result !== undefined) {
+        return result
      }
    }

+    const blockType = block?.metadata?.id
+    const params = block?.config?.params as Record<string, unknown> | undefined
+    const subBlocks = params
+      ? Object.fromEntries(Object.entries(params).map(([k, v]) => [k, { value: v }]))
+      : undefined
+    const toolId = block?.config?.tool
+    const toolConfig = toolId ? getTool(toolId) : undefined
+    const outputSchema =
+      toolConfig?.outputs ?? (blockType ? getBlockOutputs(blockType, subBlocks) : block?.outputs)
+    const schemaFields = getSchemaFieldNames(outputSchema)
+    if (schemaFields.length > 0 && !isPathInOutputSchema(outputSchema, pathParts)) {
+      throw new Error(
+        `"${pathParts.join('.')}" doesn't exist on block "${blockName}". ` +
+          `Available fields: ${schemaFields.join(', ')}`
+      )
+    }
+
    return undefined
  }

--- a/apps/sim/executor/variables/resolvers/loop.test.ts
+++ b/apps/sim/executor/variables/resolvers/loop.test.ts
@@ -1,7 +1,6 @@
 import { loggerMock } from '@sim/testing'
 import { describe, expect, it, vi } from 'vitest'
 import type { LoopScope } from '@/executor/execution/state'
-import { InvalidFieldError } from '@/executor/utils/block-reference'
 import { LoopResolver } from './loop'
 import type { ResolutionContext } from './reference'

@@ -63,12 +62,7 @@ function createTestContext(

 describe('LoopResolver', () => {
  describe('canResolve', () => {
-    it.concurrent('should return true for bare loop reference', () => {
-      const resolver = new LoopResolver(createTestWorkflow())
-      expect(resolver.canResolve('<loop>')).toBe(true)
-    })
-
-    it.concurrent('should return true for known loop properties', () => {
+    it.concurrent('should return true for loop references', () => {
      const resolver = new LoopResolver(createTestWorkflow())
      expect(resolver.canResolve('<loop.index>')).toBe(true)
      expect(resolver.canResolve('<loop.iteration>')).toBe(true)
@@ -84,13 +78,6 @@ describe('LoopResolver', () => {
      expect(resolver.canResolve('<loop.items.0>')).toBe(true)
    })

-    it.concurrent('should return true for unknown loop properties (validates in resolve)', () => {
-      const resolver = new LoopResolver(createTestWorkflow())
-      expect(resolver.canResolve('<loop.results>')).toBe(true)
-      expect(resolver.canResolve('<loop.output>')).toBe(true)
-      expect(resolver.canResolve('<loop.unknownProperty>')).toBe(true)
-    })
-
    it.concurrent('should return false for non-loop references', () => {
      const resolver = new LoopResolver(createTestWorkflow())
      expect(resolver.canResolve('<block.output>')).toBe(false)
@@ -194,34 +181,20 @@ describe('LoopResolver', () => {
  })

  describe('edge cases', () => {
-    it.concurrent('should return context object for bare loop reference', () => {
-      const resolver = new LoopResolver(createTestWorkflow())
-      const loopScope = createLoopScope({ iteration: 2, item: 'test', items: ['a', 'b', 'c'] })
-      const ctx = createTestContext('block-1', loopScope)
-
-      expect(resolver.resolve('<loop>', ctx)).toEqual({
-        index: 2,
-        currentItem: 'test',
-        items: ['a', 'b', 'c'],
-      })
-    })
-
-    it.concurrent('should return minimal context object for for-loop (no items)', () => {
-      const resolver = new LoopResolver(createTestWorkflow())
-      const loopScope = createLoopScope({ iteration: 5 })
-      const ctx = createTestContext('block-1', loopScope)
-
-      expect(resolver.resolve('<loop>', ctx)).toEqual({
-        index: 5,
-      })
-    })
-
-    it.concurrent('should throw InvalidFieldError for unknown loop property', () => {
+    it.concurrent('should return undefined for invalid loop reference (missing property)', () => {
      const resolver = new LoopResolver(createTestWorkflow())
      const loopScope = createLoopScope({ iteration: 0 })
      const ctx = createTestContext('block-1', loopScope)

-      expect(() => resolver.resolve('<loop.unknownProperty>', ctx)).toThrow(InvalidFieldError)
+      expect(resolver.resolve('<loop>', ctx)).toBeUndefined()
+    })
+
+    it.concurrent('should return undefined for unknown loop property', () => {
+      const resolver = new LoopResolver(createTestWorkflow())
+      const loopScope = createLoopScope({ iteration: 0 })
+      const ctx = createTestContext('block-1', loopScope)
+
+      expect(resolver.resolve('<loop.unknownProperty>', ctx)).toBeUndefined()
    })

    it.concurrent('should handle iteration index 0 correctly', () => {
--- a/apps/sim/executor/variables/resolvers/loop.ts
+++ b/apps/sim/executor/variables/resolvers/loop.ts
@@ -1,6 +1,5 @@
 import { createLogger } from '@sim/logger'
 import { isReference, parseReferencePath, REFERENCE } from '@/executor/constants'
-import { InvalidFieldError } from '@/executor/utils/block-reference'
 import { extractBaseBlockId } from '@/executor/utils/subflow-utils'
 import {
  navigatePath,
@@ -14,8 +13,6 @@ const logger = createLogger('LoopResolver')
 export class LoopResolver implements Resolver {
  constructor(private workflow: SerializedWorkflow) {}

-  private static KNOWN_PROPERTIES = ['iteration', 'index', 'item', 'currentItem', 'items']
-
  canResolve(reference: string): boolean {
    if (!isReference(reference)) {
      return false
@@ -30,15 +27,16 @@ export class LoopResolver implements Resolver {

  resolve(reference: string, context: ResolutionContext): any {
    const parts = parseReferencePath(reference)
-    if (parts.length === 0) {
-      logger.warn('Invalid loop reference', { reference })
+    if (parts.length < 2) {
+      logger.warn('Invalid loop reference - missing property', { reference })
      return undefined
    }

-    const loopId = this.findLoopForBlock(context.currentNodeId)
+    const [_, property, ...pathParts] = parts
    let loopScope = context.loopScope

    if (!loopScope) {
+      const loopId = this.findLoopForBlock(context.currentNodeId)
      if (!loopId) {
        return undefined
      }
@@ -50,27 +48,6 @@ export class LoopResolver implements Resolver {
      return undefined
    }

-    const isForEach = loopId ? this.isForEachLoop(loopId) : loopScope.items !== undefined
-
-    if (parts.length === 1) {
-      const result: Record<string, any> = {
-        index: loopScope.iteration,
-      }
-      if (loopScope.item !== undefined) {
-        result.currentItem = loopScope.item
-      }
-      if (loopScope.items !== undefined) {
-        result.items = loopScope.items
-      }
-      return result
-    }
-
-    const [_, property, ...pathParts] = parts
-    if (!LoopResolver.KNOWN_PROPERTIES.includes(property)) {
-      const availableFields = isForEach ? ['index', 'currentItem', 'items'] : ['index']
-      throw new InvalidFieldError('loop', property, availableFields)
-    }
-
    let value: any
    switch (property) {
      case 'iteration':
@@ -84,8 +61,12 @@ export class LoopResolver implements Resolver {
      case 'items':
        value = loopScope.items
        break
+      default:
+        logger.warn('Unknown loop property', { property })
+        return undefined
    }

+    // If there are additional path parts, navigate deeper
    if (pathParts.length > 0) {
      return navigatePath(value, pathParts)
    }
@@ -104,9 +85,4 @@ export class LoopResolver implements Resolver {

    return undefined
  }
-
-  private isForEachLoop(loopId: string): boolean {
-    const loopConfig = this.workflow.loops?.[loopId]
-    return loopConfig?.loopType === 'forEach'
-  }
 }
--- a/apps/sim/executor/variables/resolvers/parallel.test.ts
+++ b/apps/sim/executor/variables/resolvers/parallel.test.ts
@@ -1,6 +1,5 @@
 import { loggerMock } from '@sim/testing'
 import { describe, expect, it, vi } from 'vitest'
-import { InvalidFieldError } from '@/executor/utils/block-reference'
 import { ParallelResolver } from './parallel'
 import type { ResolutionContext } from './reference'

@@ -82,12 +81,7 @@ function createTestContext(

 describe('ParallelResolver', () => {
  describe('canResolve', () => {
-    it.concurrent('should return true for bare parallel reference', () => {
-      const resolver = new ParallelResolver(createTestWorkflow())
-      expect(resolver.canResolve('<parallel>')).toBe(true)
-    })
-
-    it.concurrent('should return true for known parallel properties', () => {
+    it.concurrent('should return true for parallel references', () => {
      const resolver = new ParallelResolver(createTestWorkflow())
      expect(resolver.canResolve('<parallel.index>')).toBe(true)
      expect(resolver.canResolve('<parallel.currentItem>')).toBe(true)
@@ -100,16 +94,6 @@ describe('ParallelResolver', () => {
      expect(resolver.canResolve('<parallel.items.0>')).toBe(true)
    })

-    it.concurrent(
-      'should return true for unknown parallel properties (validates in resolve)',
-      () => {
-        const resolver = new ParallelResolver(createTestWorkflow())
-        expect(resolver.canResolve('<parallel.results>')).toBe(true)
-        expect(resolver.canResolve('<parallel.output>')).toBe(true)
-        expect(resolver.canResolve('<parallel.unknownProperty>')).toBe(true)
-      }
-    )
-
    it.concurrent('should return false for non-parallel references', () => {
      const resolver = new ParallelResolver(createTestWorkflow())
      expect(resolver.canResolve('<block.output>')).toBe(false)
@@ -270,40 +254,24 @@ describe('ParallelResolver', () => {
  })

  describe('edge cases', () => {
-    it.concurrent('should return context object for bare parallel reference', () => {
-      const workflow = createTestWorkflow({
-        'parallel-1': { nodes: ['block-1'], distribution: ['a', 'b', 'c'] },
-      })
-      const resolver = new ParallelResolver(workflow)
-      const ctx = createTestContext('block-1₍1₎')
+    it.concurrent(
+      'should return undefined for invalid parallel reference (missing property)',
+      () => {
+        const resolver = new ParallelResolver(createTestWorkflow())
+        const ctx = createTestContext('block-1₍0₎')

-      expect(resolver.resolve('<parallel>', ctx)).toEqual({
-        index: 1,
-        currentItem: 'b',
-        items: ['a', 'b', 'c'],
-      })
-    })
+        expect(resolver.resolve('<parallel>', ctx)).toBeUndefined()
+      }
+    )

-    it.concurrent('should return minimal context object when no distribution', () => {
-      const workflow = createTestWorkflow({
-        'parallel-1': { nodes: ['block-1'] },
-      })
-      const resolver = new ParallelResolver(workflow)
-      const ctx = createTestContext('block-1₍0₎')
-
-      const result = resolver.resolve('<parallel>', ctx)
-      expect(result).toHaveProperty('index', 0)
-      expect(result).toHaveProperty('items')
-    })
-
-    it.concurrent('should throw InvalidFieldError for unknown parallel property', () => {
+    it.concurrent('should return undefined for unknown parallel property', () => {
      const workflow = createTestWorkflow({
        'parallel-1': { nodes: ['block-1'], distribution: ['a'] },
      })
      const resolver = new ParallelResolver(workflow)
      const ctx = createTestContext('block-1₍0₎')

-      expect(() => resolver.resolve('<parallel.unknownProperty>', ctx)).toThrow(InvalidFieldError)
+      expect(resolver.resolve('<parallel.unknownProperty>', ctx)).toBeUndefined()
    })

    it.concurrent('should return undefined when block is not in any parallel', () => {
--- a/apps/sim/executor/variables/resolvers/parallel.ts
+++ b/apps/sim/executor/variables/resolvers/parallel.ts
@@ -1,6 +1,5 @@
 import { createLogger } from '@sim/logger'
 import { isReference, parseReferencePath, REFERENCE } from '@/executor/constants'
-import { InvalidFieldError } from '@/executor/utils/block-reference'
 import { extractBaseBlockId, extractBranchIndex } from '@/executor/utils/subflow-utils'
 import {
  navigatePath,
@@ -14,8 +13,6 @@ const logger = createLogger('ParallelResolver')
 export class ParallelResolver implements Resolver {
  constructor(private workflow: SerializedWorkflow) {}

-  private static KNOWN_PROPERTIES = ['index', 'currentItem', 'items']
-
  canResolve(reference: string): boolean {
    if (!isReference(reference)) {
      return false
@@ -30,11 +27,12 @@ export class ParallelResolver implements Resolver {

  resolve(reference: string, context: ResolutionContext): any {
    const parts = parseReferencePath(reference)
-    if (parts.length === 0) {
-      logger.warn('Invalid parallel reference', { reference })
+    if (parts.length < 2) {
+      logger.warn('Invalid parallel reference - missing property', { reference })
      return undefined
    }

+    const [_, property, ...pathParts] = parts
    const parallelId = this.findParallelForBlock(context.currentNodeId)
    if (!parallelId) {
      return undefined
@@ -51,33 +49,11 @@ export class ParallelResolver implements Resolver {
      return undefined
    }

+    // First try to get items from the parallel scope (resolved at runtime)
+    // This is the same pattern as LoopResolver reading from loopScope.items
    const parallelScope = context.executionContext.parallelExecutions?.get(parallelId)
    const distributionItems = parallelScope?.items ?? this.getDistributionItems(parallelConfig)

-    if (parts.length === 1) {
-      const result: Record<string, any> = {
-        index: branchIndex,
-      }
-      if (distributionItems !== undefined) {
-        result.items = distributionItems
-        if (Array.isArray(distributionItems)) {
-          result.currentItem = distributionItems[branchIndex]
-        } else if (typeof distributionItems === 'object' && distributionItems !== null) {
-          const keys = Object.keys(distributionItems)
-          const key = keys[branchIndex]
-          result.currentItem = key !== undefined ? distributionItems[key] : undefined
-        }
-      }
-      return result
-    }
-
-    const [_, property, ...pathParts] = parts
-    if (!ParallelResolver.KNOWN_PROPERTIES.includes(property)) {
-      const isCollection = parallelConfig.parallelType === 'collection'
-      const availableFields = isCollection ? ['index', 'currentItem', 'items'] : ['index']
-      throw new InvalidFieldError('parallel', property, availableFields)
-    }
-
    let value: any
    switch (property) {
      case 'index':
@@ -97,8 +73,12 @@ export class ParallelResolver implements Resolver {
      case 'items':
        value = distributionItems
        break
+      default:
+        logger.warn('Unknown parallel property', { property })
+        return undefined
    }

+    // If there are additional path parts, navigate deeper
    if (pathParts.length > 0) {
      return navigatePath(value, pathParts)
    }
--- a/apps/sim/executor/variables/resolvers/reference.ts
+++ b/apps/sim/executor/variables/resolvers/reference.ts
@@ -27,28 +27,23 @@ export function navigatePath(obj: any, path: string[]): any {
      return undefined
    }

-    const arrayMatch = part.match(/^([^[]+)(\[.+)$/)
+    // Handle array indexing like "items[0]" or just numeric indices
+    const arrayMatch = part.match(/^([^[]+)\[(\d+)\](.*)$/)
    if (arrayMatch) {
-      const [, prop, bracketsPart] = arrayMatch
+      // Handle complex array access like "items[0]"
+      const [, prop, index] = arrayMatch
      current = current[prop]
      if (current === undefined || current === null) {
        return undefined
      }
-
-      const indices = bracketsPart.match(/\[(\d+)\]/g)
-      if (indices) {
-        for (const indexMatch of indices) {
-          if (current === null || current === undefined) {
-            return undefined
-          }
-          const idx = Number.parseInt(indexMatch.slice(1, -1), 10)
-          current = Array.isArray(current) ? current[idx] : undefined
-        }
-      }
+      const idx = Number.parseInt(index, 10)
+      current = Array.isArray(current) ? current[idx] : undefined
    } else if (/^\d+$/.test(part)) {
+      // Handle plain numeric index
      const index = Number.parseInt(part, 10)
      current = Array.isArray(current) ? current[index] : undefined
    } else {
+      // Handle regular property access
      current = current[part]
    }
  }
--- a/apps/sim/hooks/use-collaborative-workflow.ts
+++ b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -5,7 +5,7 @@ import { useShallow } from 'zustand/react/shallow'
 import { useSession } from '@/lib/auth/auth-client'
 import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
-import { normalizeName, RESERVED_BLOCK_NAMES } from '@/executor/constants'
+import { normalizeName } from '@/executor/constants'
 import { useUndoRedo } from '@/hooks/use-undo-redo'
 import {
  BLOCK_OPERATIONS,
@@ -740,16 +740,6 @@ export function useCollaborativeWorkflow() {
        return { success: false, error: 'Block name cannot be empty' }
      }

-      if ((RESERVED_BLOCK_NAMES as readonly string[]).includes(normalizedNewName)) {
-        logger.error(`Cannot rename block to reserved name: "${trimmedName}"`)
-        useNotificationStore.getState().addNotification({
-          level: 'error',
-          message: `"${trimmedName}" is a reserved name and cannot be used`,
-          workflowId: activeWorkflowId || undefined,
-        })
-        return { success: false, error: `"${trimmedName}" is a reserved name` }
-      }
-
      const currentBlocks = useWorkflowStore.getState().blocks
      const conflictingBlock = Object.entries(currentBlocks).find(
        ([blockId, block]) => blockId !== id && normalizeName(block.name) === normalizedNewName
--- a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
@@ -14,7 +14,7 @@ import { validateWorkflowState } from '@/lib/workflows/sanitization/validation'
 import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
 import { getAllBlocks, getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
-import { EDGE, normalizeName, RESERVED_BLOCK_NAMES } from '@/executor/constants'
+import { EDGE, normalizeName } from '@/executor/constants'
 import { getUserPermissionConfig } from '@/executor/utils/permission-check'
 import { generateLoopBlocks, generateParallelBlocks } from '@/stores/workflows/workflow/utils'
 import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
@@ -63,7 +63,6 @@ type SkippedItemType =
  | 'invalid_subflow_parent'
  | 'nested_subflow_not_allowed'
  | 'duplicate_block_name'
-  | 'reserved_block_name'
  | 'duplicate_trigger'
  | 'duplicate_single_instance_block'

@@ -1684,8 +1683,7 @@ function applyOperationsToWorkflowState(
          }
        }
        if (params?.name !== undefined) {
-          const normalizedName = normalizeName(params.name)
-          if (!normalizedName) {
+          if (!normalizeName(params.name)) {
            logSkippedItem(skippedItems, {
              type: 'missing_required_params',
              operationType: 'edit',
@@ -1693,14 +1691,6 @@ function applyOperationsToWorkflowState(
              reason: `Cannot rename to empty name`,
              details: { requestedName: params.name },
            })
-          } else if ((RESERVED_BLOCK_NAMES as readonly string[]).includes(normalizedName)) {
-            logSkippedItem(skippedItems, {
-              type: 'reserved_block_name',
-              operationType: 'edit',
-              blockId: block_id,
-              reason: `Cannot rename to "${params.name}" - this is a reserved name`,
-              details: { requestedName: params.name },
-            })
          } else {
            const conflictingBlock = findBlockWithDuplicateNormalizedName(
              modifiedState.blocks,
@@ -1921,8 +1911,7 @@ function applyOperationsToWorkflowState(
      }

      case 'add': {
-        const addNormalizedName = params?.name ? normalizeName(params.name) : ''
-        if (!params?.type || !params?.name || !addNormalizedName) {
+        if (!params?.type || !params?.name || !normalizeName(params.name)) {
          logSkippedItem(skippedItems, {
            type: 'missing_required_params',
            operationType: 'add',
@@ -1933,17 +1922,6 @@ function applyOperationsToWorkflowState(
          break
        }

-        if ((RESERVED_BLOCK_NAMES as readonly string[]).includes(addNormalizedName)) {
-          logSkippedItem(skippedItems, {
-            type: 'reserved_block_name',
-            operationType: 'add',
-            blockId: block_id,
-            reason: `Block name "${params.name}" is a reserved name and cannot be used`,
-            details: { requestedName: params.name },
-          })
-          break
-        }
-
        const conflictingBlock = findBlockWithDuplicateNormalizedName(
          modifiedState.blocks,
          params.name,
@@ -2490,17 +2468,16 @@ async function validateWorkflowSelectorIds(
    const result = await validateSelectorIds(selector.selectorType, selector.value, context)

    if (result.invalid.length > 0) {
-      // Include warning info (like available credentials) in the error message for better LLM feedback
-      const warningInfo = result.warning ? `. ${result.warning}` : ''
      errors.push({
        blockId: selector.blockId,
        blockType: selector.blockType,
        field: selector.fieldName,
        value: selector.value,
-        error: `Invalid ${selector.selectorType} ID(s): ${result.invalid.join(', ')} - ID(s) do not exist or user doesn't have access${warningInfo}`,
+        error: `Invalid ${selector.selectorType} ID(s): ${result.invalid.join(', ')} - ID(s) do not exist`,
      })
-    } else if (result.warning) {
-      // Log warnings that don't have errors (shouldn't happen for credentials but may for other selectors)
+    }
+
+    if (result.warning) {
      logger.warn(result.warning, {
        blockId: selector.blockId,
        fieldName: selector.fieldName,
--- a/apps/sim/lib/copilot/validation/selector-validator.ts
+++ b/apps/sim/lib/copilot/validation/selector-validator.ts
@@ -39,31 +39,6 @@ export async function validateSelectorIds(
          .from(account)
          .where(and(inArray(account.id, idsArray), eq(account.userId, context.userId)))
        existingIds = results.map((r) => r.id)
-
-        // If any IDs are invalid, fetch user's available credentials to include in error message
-        const existingSet = new Set(existingIds)
-        const invalidIds = idsArray.filter((id) => !existingSet.has(id))
-        if (invalidIds.length > 0) {
-          // Fetch all of the user's credentials to provide helpful feedback
-          const allUserCredentials = await db
-            .select({ id: account.id, providerId: account.providerId })
-            .from(account)
-            .where(eq(account.userId, context.userId))
-
-          const availableCredentials = allUserCredentials
-            .map((c) => `${c.id} (${c.providerId})`)
-            .join(', ')
-          const noCredentialsMessage = 'User has no credentials configured.'
-
-          return {
-            valid: existingIds,
-            invalid: invalidIds,
-            warning:
-              allUserCredentials.length > 0
-                ? `Available credentials for this user: ${availableCredentials}`
-                : noCredentialsMessage,
-          }
-        }
        break
      }

--- a/apps/sim/lib/core/idempotency/cleanup.ts
+++ b/apps/sim/lib/core/idempotency/cleanup.ts
@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
 import { idempotencyKey } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, count, inArray, like, lt, max, min, sql } from 'drizzle-orm'
+import { and, eq, lt } from 'drizzle-orm'

 const logger = createLogger('IdempotencyCleanup')

@@ -19,8 +19,7 @@ export interface CleanupOptions {
  batchSize?: number

  /**
-   * Specific namespace prefix to clean up (e.g., 'webhook', 'polling')
-   * Keys are prefixed with namespace, so this filters by key prefix
+   * Specific namespace to clean up, or undefined to clean all namespaces
   */
  namespace?: string
 }
@@ -54,17 +53,13 @@ export async function cleanupExpiredIdempotencyKeys(

    while (hasMore) {
      try {
-        // Build where condition - filter by cutoff date and optionally by namespace prefix
        const whereCondition = namespace
-          ? and(
-              lt(idempotencyKey.createdAt, cutoffDate),
-              like(idempotencyKey.key, `${namespace}:%`)
-            )
+          ? and(lt(idempotencyKey.createdAt, cutoffDate), eq(idempotencyKey.namespace, namespace))
          : lt(idempotencyKey.createdAt, cutoffDate)

-        // Find keys to delete with limit
+        // First, find IDs to delete with limit
        const toDelete = await db
-          .select({ key: idempotencyKey.key })
+          .select({ key: idempotencyKey.key, namespace: idempotencyKey.namespace })
          .from(idempotencyKey)
          .where(whereCondition)
          .limit(batchSize)
@@ -73,13 +68,14 @@ export async function cleanupExpiredIdempotencyKeys(
          break
        }

-        // Delete the found records by key
+        // Delete the found records
        const deleteResult = await db
          .delete(idempotencyKey)
          .where(
-            inArray(
-              idempotencyKey.key,
-              toDelete.map((item) => item.key)
+            and(
+              ...toDelete.map((item) =>
+                and(eq(idempotencyKey.key, item.key), eq(idempotencyKey.namespace, item.namespace))
+              )
            )
          )
          .returning({ key: idempotencyKey.key })
@@ -130,7 +126,6 @@ export async function cleanupExpiredIdempotencyKeys(

 /**
 * Get statistics about idempotency key usage
- * Uses SQL aggregations to avoid loading all keys into memory
 */
 export async function getIdempotencyKeyStats(): Promise<{
  totalKeys: number
@@ -139,35 +134,34 @@ export async function getIdempotencyKeyStats(): Promise<{
  newestKey: Date | null
 }> {
  try {
-    // Get total count and date range in a single query
-    const [statsResult] = await db
+    const allKeys = await db
      .select({
-        totalKeys: count(),
-        oldestKey: min(idempotencyKey.createdAt),
-        newestKey: max(idempotencyKey.createdAt),
+        namespace: idempotencyKey.namespace,
+        createdAt: idempotencyKey.createdAt,
      })
      .from(idempotencyKey)

-    // Get counts by namespace prefix using SQL substring
-    // Extracts everything before the first ':' as the namespace
-    const namespaceStats = await db
-      .select({
-        namespace: sql<string>`split_part(${idempotencyKey.key}, ':', 1)`.as('namespace'),
-        count: count(),
-      })
-      .from(idempotencyKey)
-      .groupBy(sql`split_part(${idempotencyKey.key}, ':', 1)`)
-
+    const totalKeys = allKeys.length
    const keysByNamespace: Record<string, number> = {}
-    for (const row of namespaceStats) {
-      keysByNamespace[row.namespace || 'unknown'] = row.count
+    let oldestKey: Date | null = null
+    let newestKey: Date | null = null
+
+    for (const key of allKeys) {
+      keysByNamespace[key.namespace] = (keysByNamespace[key.namespace] || 0) + 1
+
+      if (!oldestKey || key.createdAt < oldestKey) {
+        oldestKey = key.createdAt
+      }
+      if (!newestKey || key.createdAt > newestKey) {
+        newestKey = key.createdAt
+      }
    }

    return {
-      totalKeys: statsResult?.totalKeys ?? 0,
+      totalKeys,
      keysByNamespace,
-      oldestKey: statsResult?.oldestKey ?? null,
-      newestKey: statsResult?.newestKey ?? null,
+      oldestKey,
+      newestKey,
    }
  } catch (error) {
    logger.error('Failed to get idempotency key stats:', error)
--- a/apps/sim/lib/core/idempotency/service.ts
+++ b/apps/sim/lib/core/idempotency/service.ts
@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto'
 import { db } from '@sim/db'
 import { idempotencyKey } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { eq } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { getRedisClient } from '@/lib/core/config/redis'
 import { getStorageMethod, type StorageMethod } from '@/lib/core/storage'
 import { extractProviderIdentifierFromBody } from '@/lib/webhooks/provider-utils'
@@ -124,7 +124,12 @@ export class IdempotencyService {
    const existing = await db
      .select({ result: idempotencyKey.result, createdAt: idempotencyKey.createdAt })
      .from(idempotencyKey)
-      .where(eq(idempotencyKey.key, normalizedKey))
+      .where(
+        and(
+          eq(idempotencyKey.key, normalizedKey),
+          eq(idempotencyKey.namespace, this.config.namespace)
+        )
+      )
      .limit(1)

    if (existing.length > 0) {
@@ -219,12 +224,11 @@ export class IdempotencyService {
      .insert(idempotencyKey)
      .values({
        key: normalizedKey,
+        namespace: this.config.namespace,
        result: inProgressResult,
        createdAt: new Date(),
      })
-      .onConflictDoNothing({
-        target: [idempotencyKey.key],
-      })
+      .onConflictDoNothing()
      .returning({ key: idempotencyKey.key })

    if (insertResult.length > 0) {
@@ -239,7 +243,12 @@ export class IdempotencyService {
    const existing = await db
      .select({ result: idempotencyKey.result })
      .from(idempotencyKey)
-      .where(eq(idempotencyKey.key, normalizedKey))
+      .where(
+        and(
+          eq(idempotencyKey.key, normalizedKey),
+          eq(idempotencyKey.namespace, this.config.namespace)
+        )
+      )
      .limit(1)

    const existingResult =
@@ -271,7 +280,12 @@ export class IdempotencyService {
        const existing = await db
          .select({ result: idempotencyKey.result })
          .from(idempotencyKey)
-          .where(eq(idempotencyKey.key, normalizedKey))
+          .where(
+            and(
+              eq(idempotencyKey.key, normalizedKey),
+              eq(idempotencyKey.namespace, this.config.namespace)
+            )
+          )
          .limit(1)
        currentResult = existing.length > 0 ? (existing[0].result as ProcessingResult) : null
      }
@@ -325,11 +339,12 @@ export class IdempotencyService {
      .insert(idempotencyKey)
      .values({
        key: normalizedKey,
+        namespace: this.config.namespace,
        result: result,
        createdAt: new Date(),
      })
      .onConflictDoUpdate({
-        target: [idempotencyKey.key],
+        target: [idempotencyKey.key, idempotencyKey.namespace],
        set: {
          result: result,
          createdAt: new Date(),
--- a/apps/sim/lib/execution/isolated-vm-worker.cjs
+++ b/apps/sim/lib/execution/isolated-vm-worker.cjs
@@ -130,11 +130,7 @@ async function executeCode(request) {
    await jail.set('environmentVariables', new ivm.ExternalCopy(envVars).copyInto())

    for (const [key, value] of Object.entries(contextVariables)) {
-      if (value === undefined) {
-        await jail.set(key, undefined)
-      } else {
-        await jail.set(key, new ivm.ExternalCopy(value).copyInto())
-      }
+      await jail.set(key, new ivm.ExternalCopy(value).copyInto())
    }

    const fetchCallback = new ivm.Reference(async (url, optionsJson) => {
--- a/apps/sim/stores/panel/copilot/store.ts
+++ b/apps/sim/stores/panel/copilot/store.ts
@@ -771,50 +771,12 @@ function deepClone<T>(obj: T): T {
  }
 }

-/**
- * Recursively masks credential IDs in any value (string, object, or array).
- * Used during serialization to ensure sensitive IDs are never persisted.
- */
-function maskCredentialIdsInValue(value: any, credentialIds: Set<string>): any {
-  if (!value || credentialIds.size === 0) return value
-
-  if (typeof value === 'string') {
-    let masked = value
-    // Sort by length descending to mask longer IDs first
-    const sortedIds = Array.from(credentialIds).sort((a, b) => b.length - a.length)
-    for (const id of sortedIds) {
-      if (id && masked.includes(id)) {
-        masked = masked.split(id).join('••••••••')
-      }
-    }
-    return masked
-  }
-
-  if (Array.isArray(value)) {
-    return value.map((item) => maskCredentialIdsInValue(item, credentialIds))
-  }
-
-  if (typeof value === 'object') {
-    const masked: any = {}
-    for (const key of Object.keys(value)) {
-      masked[key] = maskCredentialIdsInValue(value[key], credentialIds)
-    }
-    return masked
-  }
-
-  return value
-}
-
 /**
 * Serializes messages for database storage.
 * Deep clones all fields to ensure proper JSON serialization.
- * Masks sensitive credential IDs before persisting.
 * This ensures they render identically when loaded back.
 */
 function serializeMessagesForDB(messages: CopilotMessage[]): any[] {
-  // Get credential IDs to mask
-  const credentialIds = useCopilotStore.getState().sensitiveCredentialIds
-
  const result = messages
    .map((msg) => {
      // Deep clone the entire message to ensure all nested data is serializable
@@ -862,8 +824,7 @@ function serializeMessagesForDB(messages: CopilotMessage[]): any[] {
        serialized.errorType = msg.errorType
      }

-      // Mask credential IDs in the serialized message before persisting
-      return maskCredentialIdsInValue(serialized, credentialIds)
+      return serialized
    })
    .filter((msg) => {
      // Filter out empty assistant messages
@@ -1359,16 +1320,7 @@ const sseHandlers: Record<string, SSEHandler> = {
          typeof def.hasInterrupt === 'function'
            ? !!def.hasInterrupt(args || {})
            : !!def.hasInterrupt
-        // Check if tool is auto-allowed - if so, execute even if it has an interrupt
-        const { autoAllowedTools } = get()
-        const isAutoAllowed = name ? autoAllowedTools.includes(name) : false
-        if ((!hasInterrupt || isAutoAllowed) && typeof def.execute === 'function') {
-          if (isAutoAllowed && hasInterrupt) {
-            logger.info('[toolCallsById] Auto-executing tool with interrupt (auto-allowed)', {
-              id,
-              name,
-            })
-          }
+        if (!hasInterrupt && typeof def.execute === 'function') {
          const ctx = createExecutionContext({ toolCallId: id, toolName: name || 'unknown_tool' })
          // Defer executing transition by a tick to let pending render
          setTimeout(() => {
@@ -1474,23 +1426,11 @@ const sseHandlers: Record<string, SSEHandler> = {
      logger.warn('tool_call registry auto-exec check failed', { id, name, error: e })
    }

-    // Class-based auto-exec for non-interrupt tools or auto-allowed tools
+    // Class-based auto-exec for non-interrupt tools
    try {
      const inst = getClientTool(id) as any
      const hasInterrupt = !!inst?.getInterruptDisplays?.()
-      // Check if tool is auto-allowed - if so, execute even if it has an interrupt
-      const { autoAllowedTools: classAutoAllowed } = get()
-      const isClassAutoAllowed = name ? classAutoAllowed.includes(name) : false
-      if (
-        (!hasInterrupt || isClassAutoAllowed) &&
-        (typeof inst?.execute === 'function' || typeof inst?.handleAccept === 'function')
-      ) {
-        if (isClassAutoAllowed && hasInterrupt) {
-          logger.info('[toolCallsById] Auto-executing class tool with interrupt (auto-allowed)', {
-            id,
-            name,
-          })
-        }
+      if (!hasInterrupt && typeof inst?.execute === 'function') {
        setTimeout(() => {
          // Guard against duplicate execution - check if already executing or terminal
          const currentState = get().toolCallsById[id]?.state
@@ -1509,12 +1449,7 @@ const sseHandlers: Record<string, SSEHandler> = {

          Promise.resolve()
            .then(async () => {
-              // Use handleAccept for tools with interrupts, execute for others
-              if (hasInterrupt && typeof inst?.handleAccept === 'function') {
-                await inst.handleAccept(args || {})
-              } else {
-                await inst.execute(args || {})
-              }
+              await inst.execute(args || {})
              // Success/error will be synced via registerToolStateSync
            })
            .catch(() => {
@@ -1539,35 +1474,20 @@ const sseHandlers: Record<string, SSEHandler> = {
      }
    } catch {}

-    // Integration tools: Check auto-allowed or stay in pending state until user confirms
+    // Integration tools: Stay in pending state until user confirms via buttons
    // This handles tools like google_calendar_*, exa_*, gmail_read, etc. that aren't in the client registry
    // Only relevant if mode is 'build' (agent)
-    const { mode, workflowId, autoAllowedTools, executeIntegrationTool } = get()
+    const { mode, workflowId } = get()
    if (mode === 'build' && workflowId) {
      // Check if tool was NOT found in client registry
      const def = name ? getTool(name) : undefined
      const inst = getClientTool(id) as any
      if (!def && !inst && name) {
-        // Check if this integration tool is auto-allowed - if so, execute it immediately
-        if (autoAllowedTools.includes(name)) {
-          logger.info('[build mode] Auto-executing integration tool (auto-allowed)', { id, name })
-          // Defer to allow pending state to render briefly
-          setTimeout(() => {
-            executeIntegrationTool(id).catch((err) => {
-              logger.error('[build mode] Auto-execute integration tool failed', {
-                id,
-                name,
-                error: err,
-              })
-            })
-          }, 0)
-        } else {
-          // Integration tools stay in pending state until user confirms
-          logger.info('[build mode] Integration tool awaiting user confirmation', {
-            id,
-            name,
-          })
-        }
+        // Integration tools stay in pending state until user confirms
+        logger.info('[build mode] Integration tool awaiting user confirmation', {
+          id,
+          name,
+        })
      }
    }
  },
@@ -2056,10 +1976,6 @@ const subAgentSSEHandlers: Record<string, SSEHandler> = {
    }

    // Execute client tools in parallel (non-blocking) - same pattern as main tool_call handler
-    // Check if tool is auto-allowed
-    const { autoAllowedTools: subAgentAutoAllowed } = get()
-    const isSubAgentAutoAllowed = name ? subAgentAutoAllowed.includes(name) : false
-
    try {
      const def = getTool(name)
      if (def) {
@@ -2067,15 +1983,8 @@ const subAgentSSEHandlers: Record<string, SSEHandler> = {
          typeof def.hasInterrupt === 'function'
            ? !!def.hasInterrupt(args || {})
            : !!def.hasInterrupt
-        // Auto-execute if no interrupt OR if auto-allowed
-        if (!hasInterrupt || isSubAgentAutoAllowed) {
-          if (isSubAgentAutoAllowed && hasInterrupt) {
-            logger.info('[SubAgent] Auto-executing tool with interrupt (auto-allowed)', {
-              id,
-              name,
-            })
-          }
-          // Auto-execute tools - non-blocking
+        if (!hasInterrupt) {
+          // Auto-execute tools without interrupts - non-blocking
          const ctx = createExecutionContext({ toolCallId: id, toolName: name })
          Promise.resolve()
            .then(() => def.execute(ctx, args || {}))
@@ -2092,22 +2001,9 @@ const subAgentSSEHandlers: Record<string, SSEHandler> = {
        const instance = getClientTool(id)
        if (instance) {
          const hasInterruptDisplays = !!instance.getInterruptDisplays?.()
-          // Auto-execute if no interrupt OR if auto-allowed
-          if (!hasInterruptDisplays || isSubAgentAutoAllowed) {
-            if (isSubAgentAutoAllowed && hasInterruptDisplays) {
-              logger.info('[SubAgent] Auto-executing class tool with interrupt (auto-allowed)', {
-                id,
-                name,
-              })
-            }
+          if (!hasInterruptDisplays) {
            Promise.resolve()
-              .then(() => {
-                // Use handleAccept for tools with interrupts, execute for others
-                if (hasInterruptDisplays && typeof instance.handleAccept === 'function') {
-                  return instance.handleAccept(args || {})
-                }
-                return instance.execute(args || {})
-              })
+              .then(() => instance.execute(args || {}))
              .catch((execErr: any) => {
                logger.error('[SubAgent] Class tool execution failed', {
                  id,
@@ -2336,7 +2232,6 @@ const initialState = {
  autoAllowedTools: [] as string[],
  messageQueue: [] as import('./types').QueuedMessage[],
  suppressAbortContinueOption: false,
-  sensitiveCredentialIds: new Set<string>(),
 }

 export const useCopilotStore = create<CopilotStore>()(
@@ -2719,12 +2614,6 @@ export const useCopilotStore = create<CopilotStore>()(
        }))
      }

-      // Load sensitive credential IDs for masking before streaming starts
-      await get().loadSensitiveCredentialIds()
-
-      // Ensure auto-allowed tools are loaded before tool calls arrive
-      await get().loadAutoAllowedTools()
-
      let newMessages: CopilotMessage[]
      if (revertState) {
        const currentMessages = get().messages
@@ -3787,16 +3676,6 @@ export const useCopilotStore = create<CopilotStore>()(

      const { id, name, params } = toolCall

-      // Guard against double execution - skip if already executing or in terminal state
-      if (toolCall.state === ClientToolCallState.executing || isTerminalState(toolCall.state)) {
-        logger.info('[executeIntegrationTool] Skipping - already executing or terminal', {
-          id,
-          name,
-          state: toolCall.state,
-        })
-        return
-      }
-
      // Set to executing state
      const executingMap = { ...get().toolCallsById }
      executingMap[id] = {
@@ -3945,46 +3824,6 @@ export const useCopilotStore = create<CopilotStore>()(
          const data = await res.json()
          set({ autoAllowedTools: data.autoAllowedTools || [] })
          logger.info('[AutoAllowedTools] Added tool', { toolId })
-
-          // Auto-execute all pending tools of the same type
-          const { toolCallsById, executeIntegrationTool } = get()
-          const pendingToolCalls = Object.values(toolCallsById).filter(
-            (tc) => tc.name === toolId && tc.state === ClientToolCallState.pending
-          )
-          if (pendingToolCalls.length > 0) {
-            const isIntegrationTool = !CLASS_TOOL_METADATA[toolId]
-            logger.info('[AutoAllowedTools] Auto-executing pending tools', {
-              toolId,
-              count: pendingToolCalls.length,
-              isIntegrationTool,
-            })
-            for (const tc of pendingToolCalls) {
-              if (isIntegrationTool) {
-                // Integration tools use executeIntegrationTool
-                executeIntegrationTool(tc.id).catch((err) => {
-                  logger.error('[AutoAllowedTools] Auto-execute pending integration tool failed', {
-                    toolCallId: tc.id,
-                    toolId,
-                    error: err,
-                  })
-                })
-              } else {
-                // Client tools with interrupts use handleAccept
-                const inst = getClientTool(tc.id) as any
-                if (inst && typeof inst.handleAccept === 'function') {
-                  Promise.resolve()
-                    .then(() => inst.handleAccept(tc.params || {}))
-                    .catch((err: any) => {
-                      logger.error('[AutoAllowedTools] Auto-execute pending client tool failed', {
-                        toolCallId: tc.id,
-                        toolId,
-                        error: err,
-                      })
-                    })
-                }
-              }
-            }
-          }
        }
      } catch (err) {
        logger.error('[AutoAllowedTools] Failed to add tool', { toolId, error: err })
@@ -4014,57 +3853,6 @@ export const useCopilotStore = create<CopilotStore>()(
      return autoAllowedTools.includes(toolId)
    },

-    // Credential masking
-    loadSensitiveCredentialIds: async () => {
-      try {
-        const res = await fetch('/api/copilot/execute-copilot-server-tool', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ toolName: 'get_credentials', payload: {} }),
-        })
-        if (!res.ok) {
-          logger.warn('[loadSensitiveCredentialIds] Failed to fetch credentials', {
-            status: res.status,
-          })
-          return
-        }
-        const json = await res.json()
-        // Credentials are at result.oauth.connected.credentials
-        const credentials = json?.result?.oauth?.connected?.credentials || []
-        logger.info('[loadSensitiveCredentialIds] Response', {
-          hasResult: !!json?.result,
-          credentialCount: credentials.length,
-        })
-        const ids = new Set<string>()
-        for (const cred of credentials) {
-          if (cred?.id) {
-            ids.add(cred.id)
-          }
-        }
-        set({ sensitiveCredentialIds: ids })
-        logger.info('[loadSensitiveCredentialIds] Loaded credential IDs', {
-          count: ids.size,
-        })
-      } catch (err) {
-        logger.warn('[loadSensitiveCredentialIds] Error loading credentials', err)
-      }
-    },
-
-    maskCredentialValue: (value: string) => {
-      const { sensitiveCredentialIds } = get()
-      if (!value || sensitiveCredentialIds.size === 0) return value
-
-      let masked = value
-      // Sort by length descending to mask longer IDs first
-      const sortedIds = Array.from(sensitiveCredentialIds).sort((a, b) => b.length - a.length)
-      for (const id of sortedIds) {
-        if (id && masked.includes(id)) {
-          masked = masked.split(id).join('••••••••')
-        }
-      }
-      return masked
-    },
-
    // Message queue actions
    addToQueue: (message, options) => {
      const queuedMessage: import('./types').QueuedMessage = {
--- a/apps/sim/stores/panel/copilot/types.ts
+++ b/apps/sim/stores/panel/copilot/types.ts
@@ -156,9 +156,6 @@ export interface CopilotState {

  // Message queue for messages sent while another is in progress
  messageQueue: QueuedMessage[]
-
-  // Credential IDs to mask in UI (for sensitive data protection)
-  sensitiveCredentialIds: Set<string>
 }

 export interface CopilotActions {
@@ -238,10 +235,6 @@ export interface CopilotActions {
  removeAutoAllowedTool: (toolId: string) => Promise<void>
  isToolAutoAllowed: (toolId: string) => boolean

-  // Credential masking
-  loadSensitiveCredentialIds: () => Promise<void>
-  maskCredentialValue: (value: string) => string
-
  // Message queue actions
  addToQueue: (
    message: string,
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -7,7 +7,7 @@ import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
 import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
-import { normalizeName, RESERVED_BLOCK_NAMES } from '@/executor/constants'
+import { normalizeName } from '@/executor/constants'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { filterNewEdges, getUniqueBlockName, mergeSubblockState } from '@/stores/workflows/utils'
@@ -726,11 +726,6 @@ export const useWorkflowStore = create<WorkflowStore>()(
          return { success: false, changedSubblocks: [] }
        }

-        if ((RESERVED_BLOCK_NAMES as readonly string[]).includes(normalizedNewName)) {
-          logger.error(`Cannot rename block to reserved name: "${name}"`)
-          return { success: false, changedSubblocks: [] }
-        }
-
        const newState = {
          blocks: {
            ...get().blocks,
--- a/apps/sim/tools/function/execute.test.ts
+++ b/apps/sim/tools/function/execute.test.ts
@@ -56,7 +56,6 @@ describe('Function Execute Tool', () => {
        workflowVariables: {},
        blockData: {},
        blockNameMapping: {},
-        blockOutputSchemas: {},
        isCustomTool: false,
        language: 'javascript',
        timeout: 5000,
@@ -84,7 +83,6 @@ describe('Function Execute Tool', () => {
        workflowVariables: {},
        blockData: {},
        blockNameMapping: {},
-        blockOutputSchemas: {},
        isCustomTool: false,
        language: 'javascript',
        workflowId: undefined,
@@ -103,7 +101,6 @@ describe('Function Execute Tool', () => {
        workflowVariables: {},
        blockData: {},
        blockNameMapping: {},
-        blockOutputSchemas: {},
        isCustomTool: false,
        language: 'javascript',
        workflowId: undefined,
--- a/apps/sim/tools/function/execute.ts
+++ b/apps/sim/tools/function/execute.ts
@@ -53,13 +53,6 @@ export const functionExecuteTool: ToolConfig<CodeExecutionInput, CodeExecutionOu
      description: 'Mapping of block names to block IDs',
      default: {},
    },
-    blockOutputSchemas: {
-      type: 'object',
-      required: false,
-      visibility: 'hidden',
-      description: 'Mapping of block IDs to their output schemas for validation',
-      default: {},
-    },
    workflowVariables: {
      type: 'object',
      required: false,
@@ -88,7 +81,6 @@ export const functionExecuteTool: ToolConfig<CodeExecutionInput, CodeExecutionOu
        workflowVariables: params.workflowVariables || {},
        blockData: params.blockData || {},
        blockNameMapping: params.blockNameMapping || {},
-        blockOutputSchemas: params.blockOutputSchemas || {},
        workflowId: params._context?.workflowId,
        isCustomTool: params.isCustomTool || false,
      }
--- a/apps/sim/tools/function/types.ts
+++ b/apps/sim/tools/function/types.ts
@@ -11,7 +11,6 @@ export interface CodeExecutionInput {
  workflowVariables?: Record<string, unknown>
  blockData?: Record<string, unknown>
  blockNameMapping?: Record<string, string>
-  blockOutputSchemas?: Record<string, Record<string, unknown>>
  _context?: {
    workflowId?: string
  }
--- a/helm/sim/templates/deployment-app.yaml
+++ b/helm/sim/templates/deployment-app.yaml
@@ -110,22 +110,12 @@ spec:
          {{- end }}
          {{- include "sim.resources" .Values.app | nindent 10 }}
          {{- include "sim.securityContext" .Values.app | nindent 10 }}
-          {{- if or .Values.extraVolumeMounts .Values.app.extraVolumeMounts }}
+          {{- with .Values.extraVolumeMounts }}
          volumeMounts:
-            {{- with .Values.extraVolumeMounts }}
            {{- toYaml . | nindent 12 }}
-            {{- end }}
-            {{- with .Values.app.extraVolumeMounts }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
          {{- end }}
-      {{- if or .Values.extraVolumes .Values.app.extraVolumes }}
+      {{- with .Values.extraVolumes }}
      volumes:
-        {{- with .Values.extraVolumes }}
        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- with .Values.app.extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
      {{- end }}
 {{- end }}
--- a/helm/sim/templates/deployment-ollama.yaml
+++ b/helm/sim/templates/deployment-ollama.yaml
@@ -92,7 +92,6 @@ spec:
            {{- toYaml .Values.ollama.readinessProbe | nindent 12 }}
          {{- end }}
          {{- include "sim.resources" .Values.ollama | nindent 10 }}
-          {{- if or .Values.ollama.persistence.enabled .Values.extraVolumeMounts .Values.ollama.extraVolumeMounts }}
          volumeMounts:
            {{- if .Values.ollama.persistence.enabled }}
            - name: ollama-data
@@ -101,22 +100,13 @@ spec:
            {{- with .Values.extraVolumeMounts }}
            {{- toYaml . | nindent 12 }}
            {{- end }}
-            {{- with .Values.ollama.extraVolumeMounts }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
-          {{- end }}
-      {{- if or .Values.ollama.persistence.enabled .Values.extraVolumes .Values.ollama.extraVolumes }}
+      {{- if .Values.ollama.persistence.enabled }}
      volumes:
-        {{- if .Values.ollama.persistence.enabled }}
        - name: ollama-data
          persistentVolumeClaim:
            claimName: {{ include "sim.fullname" . }}-ollama-data
-        {{- end }}
        {{- with .Values.extraVolumes }}
        {{- toYaml . | nindent 8 }}
        {{- end }}
-        {{- with .Values.ollama.extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
      {{- end }}
 {{- end }}
--- a/helm/sim/templates/deployment-realtime.yaml
+++ b/helm/sim/templates/deployment-realtime.yaml
@@ -84,22 +84,12 @@ spec:
          {{- end }}
          {{- include "sim.resources" .Values.realtime | nindent 10 }}
          {{- include "sim.securityContext" .Values.realtime | nindent 10 }}
-          {{- if or .Values.extraVolumeMounts .Values.realtime.extraVolumeMounts }}
+          {{- with .Values.extraVolumeMounts }}
          volumeMounts:
-            {{- with .Values.extraVolumeMounts }}
            {{- toYaml . | nindent 12 }}
-            {{- end }}
-            {{- with .Values.realtime.extraVolumeMounts }}
-            {{- toYaml . | nindent 12 }}
-            {{- end }}
          {{- end }}
-      {{- if or .Values.extraVolumes .Values.realtime.extraVolumes }}
+      {{- with .Values.extraVolumes }}
      volumes:
-        {{- with .Values.extraVolumes }}
        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- with .Values.realtime.extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
      {{- end }}
 {{- end }}
--- a/helm/sim/values.yaml
+++ b/helm/sim/values.yaml
@@ -224,10 +224,6 @@ app:
    timeoutSeconds: 5
    failureThreshold: 3

-  # Additional volumes for app deployment (e.g., branding assets, custom configs)
-  extraVolumes: []
-  extraVolumeMounts: []
-
 # Realtime socket server configuration
 realtime:
  # Enable/disable the realtime service
@@ -305,10 +301,6 @@ realtime:
    timeoutSeconds: 5
    failureThreshold: 3

-  # Additional volumes for realtime deployment
-  extraVolumes: []
-  extraVolumeMounts: []
-
 # Database migrations job configuration
 migrations:
  # Enable/disable migrations job
@@ -547,10 +539,6 @@ ollama:
    timeoutSeconds: 5
    failureThreshold: 3

-  # Additional volumes for ollama deployment
-  extraVolumes: []
-  extraVolumeMounts: []
-
 # Ingress configuration
 ingress:
  # Enable/disable ingress
--- a/packages/db/migrations/0147_rare_firebrand.sql
+++ b/packages/db/migrations/0147_rare_firebrand.sql
@@ -1,4 +0,0 @@
-DROP INDEX "idempotency_key_namespace_unique";--> statement-breakpoint
-DROP INDEX "idempotency_key_namespace_idx";--> statement-breakpoint
-ALTER TABLE "idempotency_key" ADD PRIMARY KEY ("key");--> statement-breakpoint
-ALTER TABLE "idempotency_key" DROP COLUMN "namespace";
--- a/packages/db/migrations/meta/0147_snapshot.json
+++ b/packages/db/migrations/meta/0147_snapshot.json
--- a/packages/db/migrations/meta/_journal.json
+++ b/packages/db/migrations/meta/_journal.json
@@ -1023,13 +1023,6 @@
      "when": 1768867605608,
      "tag": "0146_cultured_ikaris",
      "breakpoints": true
-    },
-    {
-      "idx": 147,
-      "version": "7",
-      "when": 1769134350805,
-      "tag": "0147_rare_firebrand",
-      "breakpoints": true
    }
  ]
 }
--- a/packages/db/schema.ts
+++ b/packages/db/schema.ts
@@ -1656,13 +1656,20 @@ export const workflowDeploymentVersion = pgTable(
 export const idempotencyKey = pgTable(
  'idempotency_key',
  {
-    key: text('key').primaryKey(),
+    key: text('key').notNull(),
+    namespace: text('namespace').notNull().default('default'),
    result: json('result').notNull(),
    createdAt: timestamp('created_at').notNull().defaultNow(),
  },
  (table) => ({
+    // Primary key is combination of key and namespace
+    keyNamespacePk: uniqueIndex('idempotency_key_namespace_unique').on(table.key, table.namespace),
+
    // Index for cleanup operations by creation time
    createdAtIdx: index('idempotency_key_created_at_idx').on(table.createdAt),
+
+    // Index for namespace-based queries
+    namespaceIdx: index('idempotency_key_namespace_idx').on(table.namespace),
  })
 )
Author	SHA1	Message	Date
Waleed	cc2be33d6b	v0.5.67: loading, password reset, ui improvements, helm updates (#2928 ) * fix(zustand): updated to useShallow from deprecated createWithEqualityFn (#2919) * fix(logger): use direct env access for webpack inlining (#2920) * fix(notifications): text overflow with line-clamp (#2921) * chore(helm): add env vars for Vertex AI, orgs, and telemetry (#2922) * fix(auth): improve reset password flow and consolidate brand detection (#2924) * fix(auth): improve reset password flow and consolidate brand detection * fix(auth): set errorHandled for EMAIL_NOT_VERIFIED to prevent duplicate error * fix(auth): clear success message on login errors * chore(auth): fix import order per lint * fix(action-bar): duplicate subflows with children (#2923) * fix(action-bar): duplicate subflows with children * fix(action-bar): add validateTriggerPaste for subflow duplicate * fix(resolver): agent response format, input formats, root level (#2925) * fix(resolvers): agent response format, input formats, root level * fix response block initial seeding * fix tests * fix(messages-input): fix cursor alignment and auto-resize with overlay (#2926) * fix(messages-input): fix cursor alignment and auto-resize with overlay * fixed remaining zustand warnings * fix(stores): remove dead code causing log spam on startup (#2927) * fix(stores): remove dead code causing log spam on startup * fix(stores): replace custom tools zustand store with react query cache * improvement(ui): use BrandedButton and BrandedLink components (#2930) - Refactor auth forms to use BrandedButton component - Add BrandedLink component for changelog page - Reduce code duplication in login, signup, reset-password forms - Update star count default value * fix(custom-tools): remove unsafe title fallback in getCustomTool (#2929) * fix(custom-tools): remove unsafe title fallback in getCustomTool * fix(custom-tools): restore title fallback in getCustomTool lookup Custom tools are referenced by title (custom_${title}), not database ID. The title fallback is required for client-side tool resolution to work. * fix(null-bodies): empty bodies handling (#2931) * fix(null-statuses): empty bodies handling * address bugbot comment * fix(token-refresh): microsoft, notion, x, linear (#2933) * fix(microsoft): proactive refresh needed * fix(x): missing token refresh flag * notion and linear missing flag too * address bugbot comment * fix(auth): handle EMAIL_NOT_VERIFIED in onError callback (#2932) * fix(auth): handle EMAIL_NOT_VERIFIED in onError callback * refactor(auth): extract redirectToVerify helper to reduce duplication * fix(workflow-selector): use dedicated selector for workflow dropdown (#2934) * feat(workflow-block): preview (#2935) * improvement(copilot): tool configs to show nested props (#2936) * fix(auth): add genericOAuth providers to trustedProviders (#2937) --------- Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com> Co-authored-by: Emir Karabeg <78010029+emir-karabeg@users.noreply.github.com>	2026-01-21 22:53:25 -08:00
Vikhyath Mondreti	45371e521e	v0.5.66: external http requests fix, ring highlighting	2026-01-21 02:55:39 -08:00
Waleed	0ce0f98aa5	v0.5.65: gemini updates, textract integration, ui updates (#2909 ) * fix(google): wrap primitive tool responses for Gemini API compatibility (#2900) * fix(canonical): copilot path + update parent (#2901) * fix(rss): add top-level title, link, pubDate fields to RSS trigger output (#2902) * fix(rss): add top-level title, link, pubDate fields to RSS trigger output * fix(imap): add top-level fields to IMAP trigger output * improvement(browseruse): add profile id param (#2903) * improvement(browseruse): add profile id param * make request a stub since we have directExec * improvement(executor): upgraded abort controller to handle aborts for loops and parallels (#2880) * improvement(executor): upgraded abort controller to handle aborts for loops and parallels * comments * improvement(files): update execution for passing base64 strings (#2906) * progress * improvement(execution): update execution for passing base64 strings * fix types * cleanup comments * path security vuln * reject promise correctly * fix redirect case * remove proxy routes * fix tests * use ipaddr * feat(tools): added textract, added v2 for mistral, updated tag dropdown (#2904) * feat(tools): added textract * cleanup * ack pr comments * reorder * removed upload for textract async version * fix additional fields dropdown in editor, update parser to leave validation to be done on the server * added mistral v2, files v2, and finalized textract * updated the rest of the old file patterns, updated mistral outputs for v2 * updated tag dropdown to parse non-operation fields as well * updated extension finder * cleanup * added description for inputs to workflow * use helper for internal route check * fix tag dropdown merge conflict change * remove duplicate code --------- Co-authored-by: Vikhyath Mondreti <vikhyath@simstudio.ai> * fix(ui): change add inputs button to match output selector (#2907) * fix(canvas): removed invite to workspace from canvas popover (#2908) * fix(canvas): removed invite to workspace * removed unused props * fix(copilot): legacy tool display names (#2911) * fix(a2a): canonical merge (#2912) * fix canonical merge * fix empty array case * fix(change-detection): copilot diffs have extra field (#2913) * improvement(logs): improved logs ui bugs, added subflow disable UI (#2910) * improvement(logs): improved logs ui bugs, added subflow disable UI * added duplicate to action bar for subflows * feat(broadcast): email v0.5 (#2905) --------- Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com> Co-authored-by: Vikhyath Mondreti <vikhyath@simstudio.ai> Co-authored-by: Emir Karabeg <78010029+emir-karabeg@users.noreply.github.com>	2026-01-20 23:54:55 -08:00
Waleed	dff1c9d083	v0.5.64: unsubscribe, search improvements, metrics, additional SSO configuration	2026-01-20 00:34:11 -08:00
Vikhyath Mondreti	b09f683072	v0.5.63: ui and performance improvements, more google tools	2026-01-18 15:22:42 -08:00
Vikhyath Mondreti	a8bb0db660	v0.5.62: webhook bug fixes, seeding default subblock values, block selection fixes	2026-01-16 20:27:06 -08:00
Waleed	af82820a28	v0.5.61: webhook improvements, workflow controls, react query for deployment status, chat fixes, reducto and pulse OCR, linear fixes	2026-01-16 18:06:23 -08:00
Waleed	4372841797	v0.5.60: invitation flow improvements, chat fixes, a2a improvements, additional copilot actions	2026-01-15 00:02:18 -08:00
Waleed	5e8c843241	v0.5.59: a2a support, documentation	2026-01-13 13:21:21 -08:00
Waleed	7bf3d73ee6	v0.5.58: export folders, new tools, permissions groups enhancements	2026-01-13 00:56:59 -08:00
Vikhyath Mondreti	7ffc11a738	v0.5.57: subagents, context menu improvements, bug fixes	2026-01-11 11:38:40 -08:00
Waleed	be578e2ed7	v0.5.56: batch operations, access control and permission groups, billing fixes	2026-01-10 00:31:34 -08:00
Waleed	f415e5edc4	v0.5.55: polling groups, bedrock provider, devcontainer fixes, workflow preview enhancements	2026-01-08 23:36:56 -08:00
Waleed	13a6e6c3fa	v0.5.54: seo, model blacklist, helm chart updates, fireflies integration, autoconnect improvements, billing fixes	2026-01-07 16:09:45 -08:00
Waleed	f5ab7f21ae	v0.5.53: hotkey improvements, added redis fallback, fixes for workflow tool	2026-01-06 23:34:52 -08:00
Waleed	bfb6fffe38	v0.5.52: new port-based router block, combobox expression and variable support	2026-01-06 16:14:10 -08:00
Waleed	4fbec0a43f	v0.5.51: triggers, kb, condition block improvements, supabase and grain integration updates	2026-01-06 14:26:46 -08:00
Waleed	585f5e365b	v0.5.50: import improvements, ui upgrades, kb styling and performance improvements	2026-01-05 00:35:55 -08:00
Waleed	3792bdd252	v0.5.49: hitl improvements, new email styles, imap trigger, logs context menu (#2672 ) * feat(logs-context-menu): consolidated logs utils and types, added logs record context menu (#2659) * feat(email): welcome email; improvement(emails): ui/ux (#2658) * feat(email): welcome email; improvement(emails): ui/ux * improvement(emails): links, accounts, preview * refactor(emails): file structure and wrapper components * added envvar for personal emails sent, added isHosted gate * fixed failing tests, added env mock * fix: removed comment --------- Co-authored-by: waleed <walif6@gmail.com> * fix(logging): hitl + trigger dev crash protection (#2664) * hitl gaps * deal with trigger worker crashes * cleanup import strcuture * feat(imap): added support for imap trigger (#2663) * feat(tools): added support for imap trigger * feat(imap): added parity, tested * ack PR comments * final cleanup * feat(i18n): update translations (#2665) Co-authored-by: waleedlatif1 <waleedlatif1@users.noreply.github.com> * fix(grain): updated grain trigger to auto-establish trigger (#2666) Co-authored-by: aadamgough <adam@sim.ai> * feat(admin): routes to manage deployments (#2667) * feat(admin): routes to manage deployments * fix naming fo deployed by * feat(time-picker): added timepicker emcn component, added to playground, added searchable prop for dropdown, added more timezones for schedule, updated license and notice date (#2668) * feat(time-picker): added timepicker emcn component, added to playground, added searchable prop for dropdown, added more timezones for schedule, updated license and notice date * removed unused params, cleaned up redundant utils * improvement(invite): aligned styling (#2669) * improvement(invite): aligned with rest of app * fix(invite): error handling * fix: addressed comments --------- Co-authored-by: Emir Karabeg <78010029+emir-karabeg@users.noreply.github.com> Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com> Co-authored-by: waleedlatif1 <waleedlatif1@users.noreply.github.com> Co-authored-by: Adam Gough <77861281+aadamgough@users.noreply.github.com> Co-authored-by: aadamgough <adam@sim.ai>	2026-01-03 13:19:18 -08:00
Waleed	eb5d1f3e5b	v0.5.48: copy-paste workflow blocks, docs updates, mcp tool fixes	2025-12-31 18:00:04 -08:00
Waleed	54ab82c8dd	v0.5.47: deploy workflow as mcp, kb chunks tokenizer, UI improvements, jira service management tools	2025-12-30 23:18:58 -08:00
Waleed	f895bf469b	v0.5.46: build improvements, greptile, light mode improvements	2025-12-29 02:17:52 -08:00
Waleed	dd3209af06	v0.5.45: light mode fixes, realtime usage indicator, docker build improvements	2025-12-27 19:57:42 -08:00
Waleed	b6ba3b50a7	v0.5.44: keyboard shortcuts, autolayout, light mode, byok, testing improvements	2025-12-26 21:25:19 -08:00
Waleed	b304233062	v0.5.43: export logs, circleback, grain, vertex, code hygiene, schedule improvements	2025-12-23 19:19:18 -08:00
Vikhyath Mondreti	57e4b49bd6	v0.5.42: fix memory migration	2025-12-23 01:24:54 -08:00
Vikhyath Mondreti	e12dd204ed	v0.5.41: memory fixes, copilot improvements, knowledgebase improvements, LLM providers standardization	2025-12-23 00:15:18 -08:00
Vikhyath Mondreti	3d9d9cbc54	v0.5.40: supabase ops to allow non-public schemas, jira uuid	2025-12-21 22:28:05 -08:00
Waleed	0f4ec962ad	v0.5.39: notion, workflow variables fixes	2025-12-20 20:44:00 -08:00
Waleed	4827866f9a	v0.5.38: snap to grid, copilot ux improvements, billing line items	2025-12-20 17:24:38 -08:00
Waleed	3e697d9ed9	v0.5.37: redaction utils consolidation, logs updates, autoconnect improvements, additional kb tag types	2025-12-19 22:31:55 -08:00
Martin Yankov	4431a1a484	fix(helm): add custom egress rules to realtime network policy (#2481 ) The realtime service network policy was missing the custom egress rules section that allows configuration of additional egress rules via values.yaml. This caused the realtime pods to be unable to connect to external databases (e.g., PostgreSQL on port 5432) when using external database configurations. The app network policy already had this section, but the realtime network policy was missing it, creating an inconsistency and preventing the realtime service from accessing external databases configured via networkPolicy.egress values. This fix adds the same custom egress rules template section to the realtime network policy, matching the app network policy behavior and allowing users to configure database connectivity via values.yaml.	2025-12-19 18:59:08 -08:00
Waleed	4d1a9a3f22	v0.5.36: hitl improvements, opengraph, slack fixes, one-click unsubscribe, auth checks, new db indexes	2025-12-19 01:27:49 -08:00
Vikhyath Mondreti	eb07a080fb	v0.5.35: helm updates, copilot improvements, 404 for docs, salesforce fixes, subflow resize clamping	2025-12-18 16:23:19 -08:00