fix(workflows): honor explicit canonical modes

Author: Bill Leoutsakos

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

@@ -105,6 +105,7 @@ import {
   type CanonicalIndex,
   type CanonicalModeOverrides,
   evaluateSubBlockCondition,
+  getCanonicalSubBlocksForSurface,
   isCanonicalPair,
   reindexToolCanonicalModes,
   resolveCanonicalMode,
@@ -526,13 +527,14 @@ export const ToolInput = memo(function ToolInput({
     for (const [toolIndex, tool] of selectedTools.entries()) {
       const blockConfig = allBlocks.find((b: { type: string }) => b.type === tool.type)
       if (!blockConfig?.subBlocks) continue
-      const toolCanonical = buildCanonicalIndex(blockConfig.subBlocks)
+      const actionSubBlocks = getCanonicalSubBlocksForSurface(blockConfig.subBlocks, false)
+      const toolCanonical = buildCanonicalIndex(actionSubBlocks)
       const scopedOverrides = scopeCanonicalModesForTool(
         canonicalModeOverrides,
         toolIndex,
         tool.type
       )
-      const reactiveSubBlock = blockConfig.subBlocks.find(
+      const reactiveSubBlock = actionSubBlocks.find(
         (sb: { reactiveCondition?: unknown }) => sb.reactiveCondition
       )
       const reactiveCond = reactiveSubBlock?.reactiveCondition as
@@ -1744,14 +1746,17 @@ export const ToolInput = memo(function ToolInput({
                 )
               : null
 
-          const toolCanonicalIndex: CanonicalIndex | null = toolBlock?.subBlocks
-            ? buildCanonicalIndex(toolBlock.subBlocks)
+          const toolActionSubBlocks = toolBlock?.subBlocks
+            ? getCanonicalSubBlocksForSurface(toolBlock.subBlocks, false)
+            : null
+          const toolCanonicalIndex: CanonicalIndex | null = toolActionSubBlocks
+            ? buildCanonicalIndex(toolActionSubBlocks)
             : null
 
           const toolContextValues = toolCanonicalIndex
             ? buildPreviewContextValues(tool.params || {}, {
                 blockType: tool.type,
-                subBlocks: toolBlock!.subBlocks,
+                subBlocks: toolActionSubBlocks!,
                 canonicalIndex: toolCanonicalIndex,
                 values: { operation: tool.operation, ...tool.params },
                 overrides: toolScopedOverrides,

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

@@ -1,7 +1,12 @@
 import { useCallback, useMemo } from 'react'
 import { isEqual } from 'es-toolkit'
 import { useStoreWithEqualityFn } from 'zustand/traditional'
-import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
+import {
+  buildCanonicalIndex,
+  getCanonicalSubBlocksForSurface,
+  isPureTriggerBlockConfig,
+  resolveDependencyValue,
+} from '@/lib/workflows/subblocks/visibility'
 import { getBlock } from '@/blocks/registry'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
@@ -22,10 +27,15 @@ export function useCanonicalSubBlockValue<T = unknown>(
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
   const blockState = useWorkflowStore((state) => state.blocks[blockId])
   const blockConfig = blockState?.type ? getBlock(blockState.type) : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
+  const canonicalIndex = useMemo(() => {
+    const subBlocks = blockConfig?.subBlocks || []
+    return buildCanonicalIndex(
+      getCanonicalSubBlocksForSurface(
+        subBlocks,
+        Boolean(blockState?.triggerMode) || isPureTriggerBlockConfig(blockConfig ?? undefined)
+      )
+    )
+  }, [blockConfig?.subBlocks, blockState?.triggerMode])
   const canonicalModeOverrides = blockState?.data?.canonicalModes
 
   return useStoreWithEqualityFn(

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

@@ -5,7 +5,9 @@ import { isEqual } from 'es-toolkit'
 import { useStoreWithEqualityFn } from 'zustand/traditional'
 import {
   buildCanonicalIndex,
+  getCanonicalSubBlocksForSurface,
   isNonEmptyValue,
+  isPureTriggerBlockConfig,
   normalizeDependencyValue,
   parseDependsOn,
   resolveDependencyValue,
@@ -41,10 +43,15 @@ export function useDependsOnGate(
     : blockState?.type
       ? getBlock(blockState.type)
       : null
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
+  const canonicalIndex = useMemo(() => {
+    const subBlocks = blockConfig?.subBlocks || []
+    return buildCanonicalIndex(
+      getCanonicalSubBlocksForSurface(
+        subBlocks,
+        Boolean(blockState?.triggerMode) || isPureTriggerBlockConfig(blockConfig ?? undefined)
+      )
+    )
+  }, [blockConfig?.subBlocks, blockState?.triggerMode])
   const canonicalModeOverrides = blockState?.data?.canonicalModes
 
   // Parse dependsOn config to get all/any field lists

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

@@ -2,7 +2,12 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { getErrorMessage } from '@sim/utils/errors'
 import { isEqual } from 'es-toolkit'
 import { useStoreWithEqualityFn } from 'zustand/traditional'
-import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
+import {
+  buildCanonicalIndex,
+  getCanonicalSubBlocksForSurface,
+  isPureTriggerBlockConfig,
+  resolveDependencyValue,
+} from '@/lib/workflows/subblocks/visibility'
 import { getBlock } from '@/blocks/registry'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
@@ -73,10 +78,15 @@ export function useFetchedOptions({
   const blockState = useWorkflowStore((state) => state.blocks[blockId])
   const blockConfig = blockState?.type ? getBlock(blockState.type) : null
   const canonicalModeOverrides = blockState?.data?.canonicalModes
-  const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
-  )
+  const canonicalIndex = useMemo(() => {
+    const subBlocks = blockConfig?.subBlocks || []
+    return buildCanonicalIndex(
+      getCanonicalSubBlocksForSurface(
+        subBlocks,
+        Boolean(blockState?.triggerMode) || isPureTriggerBlockConfig(blockConfig ?? undefined)
+      )
+    )
+  }, [blockConfig?.subBlocks, blockState?.triggerMode])
 
   const dependencyValues = useStoreWithEqualityFn(
     useSubBlockStore,

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

@@ -23,11 +23,12 @@ import { isRetryEligibleBlock } from '@/lib/workflows/blocks/retry-eligibility'
 import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
+  getCanonicalSubBlocksForSurface,
   hasAdvancedValues,
   isCanonicalPair,
+  isPureTriggerBlockConfig,
   isStandaloneAdvancedMode,
   resolveCanonicalMode,
-  shouldUseSubBlockForTriggerModeCanonicalIndex,
 } from '@/lib/workflows/subblocks/visibility'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import {
@@ -159,9 +160,11 @@ export function Editor() {
 
   const subBlocksForCanonical = useMemo(() => {
     const subBlocks = blockConfig?.subBlocks || []
-    if (!triggerMode) return subBlocks
-    return subBlocks.filter(shouldUseSubBlockForTriggerModeCanonicalIndex)
-  }, [blockConfig?.subBlocks, triggerMode])
+    return getCanonicalSubBlocksForSurface(
+      subBlocks,
+      triggerMode || isPureTriggerBlockConfig(blockConfig ?? undefined)
+    )
+  }, [blockConfig, triggerMode])
 
   const canonicalIndex = useMemo(
     () => buildCanonicalIndex(subBlocksForCanonical),

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

@@ -2,12 +2,13 @@ import { useCallback, useMemo } from 'react'
 import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
+  getCanonicalSubBlocksForSurface,
+  isPureTriggerBlockConfig,
   isSubBlockFeatureEnabled,
   isSubBlockHidden,
   isSubBlockVisibleForMode,
   isSubBlockVisibleForTriggerMode,
   isToolInputOnlySubBlock,
-  shouldUseSubBlockForTriggerModeCanonicalIndex,
 } from '@/lib/workflows/subblocks/visibility'
 import type { BlockConfig, SubBlockConfig } from '@/blocks/types'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
@@ -43,9 +44,17 @@ export function useEditorSubblockLayout(
   )
   const { config: permissionConfig } = usePermissionConfig()
 
+  const canonicalSubBlocks = useMemo(() => {
+    const subBlocks = config?.subBlocks || []
+    return getCanonicalSubBlocksForSurface(
+      subBlocks,
+      displayTriggerMode || isPureTriggerBlockConfig(config)
+    )
+  }, [config?.subBlocks, displayTriggerMode])
+
   // Evaluate reactive conditions (hooks-based, must be called before useMemo)
   const hiddenByReactiveCondition = useReactiveConditions(
-    config?.subBlocks || [],
+    canonicalSubBlocks,
     blockId,
     activeWorkflowId,
     blockDataFromStore?.canonicalModes
@@ -102,10 +111,7 @@ export function useEditorSubblockLayout(
       {}
     )
 
-    const subBlocksForCanonical = displayTriggerMode
-      ? (config.subBlocks || []).filter(shouldUseSubBlockForTriggerModeCanonicalIndex)
-      : config.subBlocks || []
-    const canonicalIndex = buildCanonicalIndex(subBlocksForCanonical)
+    const canonicalIndex = buildCanonicalIndex(canonicalSubBlocks)
     const effectiveAdvanced = displayAdvancedMode
     const canonicalModeOverrides = blockData?.canonicalModes
 
@@ -169,5 +175,6 @@ export function useEditorSubblockLayout(
     blockDataFromStore,
     hiddenByReactiveCondition,
     permissionConfig.disableSkills,
+    canonicalSubBlocks,
   ])
 }

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

@@ -64,7 +64,9 @@ import {
 } from '@/lib/workflows/subblocks/display'
 import {
   buildCanonicalIndex,
+  getCanonicalSubBlocksForSurface,
   hasAdvancedValues,
+  isPureTriggerBlockConfig,
   resolveDependencyValue,
 } from '@/lib/workflows/subblocks/visibility'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
@@ -791,11 +793,22 @@ export const WorkflowBlock = memo(function WorkflowBlock({
     ])
   }
 
-  const canonicalIndex = useMemo(() => buildCanonicalIndex(config.subBlocks), [config.subBlocks])
+  const canonicalSubBlocks = useMemo(
+    () =>
+      getCanonicalSubBlocksForSurface(
+        config.subBlocks,
+        displayTriggerMode || isPureTriggerBlockConfig(config)
+      ),
+    [config.subBlocks, displayTriggerMode]
+  )
+  const canonicalIndex = useMemo(
+    () => buildCanonicalIndex(canonicalSubBlocks),
+    [canonicalSubBlocks]
+  )
   const canonicalModeOverrides = currentStoreBlock?.data?.canonicalModes
 
   const hiddenByReactiveCondition = useReactiveConditions(
-    config.subBlocks,
+    canonicalSubBlocks,
     id,
     activeWorkflowId,
     canonicalModeOverrides
@@ -832,7 +845,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
 
     const effectiveAdvanced = canEditWorkflow
       ? displayAdvancedMode
-      : displayAdvancedMode || hasAdvancedValues(config.subBlocks, rawValues, canonicalIndex)
+      : displayAdvancedMode || hasAdvancedValues(canonicalSubBlocks, rawValues, canonicalIndex)
     const effectiveTrigger = displayTriggerMode
     const canvasPresentation = resolveCanvasBlockPresentation(config, name, rawValues)
 
@@ -919,8 +932,8 @@ export const WorkflowBlock = memo(function WorkflowBlock({
     )
     return canEditWorkflow
       ? displayAdvancedMode
-      : displayAdvancedMode || hasAdvancedValues(config.subBlocks, rawValues, canonicalIndex)
-  }, [subBlockState, displayAdvancedMode, config.subBlocks, canonicalIndex, canEditWorkflow])
+      : displayAdvancedMode || hasAdvancedValues(canonicalSubBlocks, rawValues, canonicalIndex)
+  }, [subBlockState, displayAdvancedMode, canonicalSubBlocks, canonicalIndex, canEditWorkflow])
 
   const shouldShowDefaultHandles = showsCanvasDefaultHandles(config, type, displayTriggerMode)
 

apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx

@@ -32,7 +32,9 @@ import { extractReferencePrefixes } from '@/lib/workflows/sanitization/reference
 import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
+  getCanonicalSubBlocksForSurface,
   hasAdvancedValues,
+  isPureTriggerBlockConfig,
   isSubBlockFeatureEnabled,
   isSubBlockVisibleForMode,
   isToolInputOnlySubBlock,
@@ -1055,9 +1057,15 @@ function PreviewEditorContent({
     }, {})
   }, [subBlockValues])
 
+  const isPureTriggerBlock = isPureTriggerBlockConfig(blockConfig)
+  const triggerCanonicalSurface = block.triggerMode === true || isPureTriggerBlock
+  const canonicalSubBlocks = useMemo(
+    () => getCanonicalSubBlocksForSurface(blockConfig?.subBlocks || [], triggerCanonicalSurface),
+    [blockConfig?.subBlocks, triggerCanonicalSurface]
+  )
   const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
+    () => buildCanonicalIndex(canonicalSubBlocks),
+    [canonicalSubBlocks]
   )
 
   const isSubflow = block.type === 'loop' || block.type === 'parallel'
@@ -1115,9 +1123,8 @@ function PreviewEditorContent({
   const canonicalModeOverrides = block.data?.canonicalModes
   const effectiveAdvanced =
     (block.advancedMode ?? false) ||
-    hasAdvancedValues(blockConfig.subBlocks, rawValues, canonicalIndex)
+    hasAdvancedValues(canonicalSubBlocks, rawValues, canonicalIndex)
 
-  const isPureTriggerBlock = blockConfig.triggers?.enabled && blockConfig.category === 'triggers'
   const effectiveTrigger = block.triggerMode === true
 
   const visibleSubBlocks = blockConfig.subBlocks.filter((subBlock) => {