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/components/tools/sub-block-renderer.tsx

@@ -1,6 +1,7 @@
 'use client'
 
 import { useCallback, useEffect, useRef } from 'react'
+import type { CanonicalModeOverrides } from '@/lib/workflows/subblocks/visibility'
 import {
   buildToolSubBlockId,
   resolveToolParamSync,
@@ -21,6 +22,7 @@ interface ToolSubBlockRendererProps {
   /** The tool's block type (e.g. `gmail`), so its params' selectors resolve dependencies. */
   toolType: string
   toolParams: Record<string, string> | undefined
+  canonicalModeOverrides?: CanonicalModeOverrides
   onParamChange: (toolIndex: number, paramId: string, value: string) => void
   disabled: boolean
   canonicalToggle?: {
@@ -59,6 +61,7 @@ export function ToolSubBlockRenderer({
   effectiveParamId,
   toolType,
   toolParams,
+  canonicalModeOverrides,
   onParamChange,
   disabled,
   canonicalToggle,
@@ -132,7 +135,7 @@ export function ToolSubBlockRenderer({
   }
 
   return (
-    <DependencyBlockTypeProvider value={toolType}>
+    <DependencyBlockTypeProvider value={{ blockType: toolType, canonicalModeOverrides }}>
       <SubBlock
         blockId={blockId}
         config={config}

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

@@ -2,12 +2,82 @@
  * @vitest-environment node
  */
 import { describe, expect, it } from 'vitest'
+import {
+  buildCanonicalIndex,
+  getCanonicalSubBlocksForSurface,
+  resolveDependencyValue,
+  scopeCanonicalModesForTool,
+} from '@/lib/workflows/subblocks/visibility'
 import type { StoredTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/types'
 import {
   isCustomToolAlreadySelected,
   isMcpToolAlreadySelected,
   isWorkflowAlreadySelected,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/utils'
+import { getDependencyCanonicalModeOverrides } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-dependency-block-type'
+import { TableBlock } from '@/blocks/blocks/table'
+
+describe('nested tool dependency modes', () => {
+  const tableCanonicalIndex = buildCanonicalIndex(
+    getCanonicalSubBlocksForSurface(TableBlock.subBlocks, false)
+  )
+
+  it.each([
+    [0, 'advanced', 'dormant-basic', '', ''],
+    [1, 'basic', '', 'dormant-advanced', ''],
+  ] as const)(
+    'honors the explicit mode for same-type tool instance %s',
+    (toolIndex, mode, basicValue, advancedValue, expected) => {
+      const hostOverrides = {
+        '0:tableId': 'advanced' as const,
+        '1:tableId': 'basic' as const,
+      }
+      const scopedOverrides = scopeCanonicalModesForTool(hostOverrides, toolIndex, 'table')
+      const dependencyOverrides = getDependencyCanonicalModeOverrides(
+        { blockType: 'table', canonicalModeOverrides: scopedOverrides },
+        hostOverrides
+      )
+
+      expect(dependencyOverrides?.tableId).toBe(mode)
+      expect(
+        resolveDependencyValue(
+          'tableId',
+          { tableSelector: basicValue, manualTableId: advancedValue },
+          tableCanonicalIndex,
+          dependencyOverrides
+        )
+      ).toBe(expected)
+    }
+  )
+
+  it('preserves legacy type-scoped modes and missing-mode inference', () => {
+    const values = { tableSelector: 'legacy-basic', manualTableId: '' }
+    const legacyScoped = scopeCanonicalModesForTool({ 'table:tableId': 'advanced' }, 3, 'table')
+
+    expect(
+      resolveDependencyValue(
+        'tableId',
+        values,
+        tableCanonicalIndex,
+        getDependencyCanonicalModeOverrides(
+          { blockType: 'table', canonicalModeOverrides: legacyScoped },
+          undefined
+        )
+      )
+    ).toBe('')
+    expect(
+      resolveDependencyValue(
+        'tableId',
+        values,
+        tableCanonicalIndex,
+        getDependencyCanonicalModeOverrides(
+          { blockType: 'table', canonicalModeOverrides: undefined },
+          { '0:tableId': 'advanced' }
+        )
+      )
+    ).toBe('legacy-basic')
+  })
+})
 
 describe('isMcpToolAlreadySelected', () => {
   describe('basic functionality', () => {

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,
@@ -2149,6 +2154,7 @@ export const ToolInput = memo(function ToolInput({
                             effectiveParamId={effectiveParamId}
                             toolType={tool.type}
                             toolParams={tool.params}
+                            canonicalModeOverrides={toolScopedOverrides}
                             onParamChange={handleParamChange}
                             disabled={disabled}
                             canonicalToggle={canonicalToggleProp}

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-dependency-block-type.ts

@@ -1,19 +1,24 @@
 'use client'
 
 import { createContext, useContext } from 'react'
+import type { CanonicalModeOverrides } from '@/lib/workflows/subblocks/visibility'
 
-const DependencyBlockTypeContext = createContext<string | null>(null)
+export interface DependencyBlockContextValue {
+  blockType: string
+  canonicalModeOverrides?: CanonicalModeOverrides
+}
 
-/**
- * Provider set by tool-input param rendering (value = the tool's block type, e.g. `gmail`).
- */
+const DependencyBlockTypeContext = createContext<DependencyBlockContextValue | null>(null)
+
+/** Provides a nested tool's block type and already-scoped canonical modes. */
 export const DependencyBlockTypeProvider = DependencyBlockTypeContext.Provider
 
-/**
- * The block type whose config should drive dependency (`dependsOn`) canonical resolution
- * for the current subblock. Null for normal blocks (resolve against the host block). Set
- * to the tool's type for tool-input params, so a nested tool's selector resolves its
- * parents against the TOOL's config (e.g. a Gmail tool's `credential` -> `oauthCredential`,
- * which the host Agent block's subblocks don't define) and can fetch its options.
- */
-export const useDependencyBlockType = () => useContext(DependencyBlockTypeContext)
+export const useDependencyBlockContext = () => useContext(DependencyBlockTypeContext)
+
+export function getDependencyCanonicalModeOverrides(
+  context: DependencyBlockContextValue | null,
+  hostOverrides: CanonicalModeOverrides | undefined
+): CanonicalModeOverrides | undefined {
+  // A nested tool with no scoped mode must use legacy inference, not another tool's host keys.
+  return context ? context.canonicalModeOverrides : hostOverrides
+}

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,
@@ -15,7 +17,10 @@ import type { SubBlockConfig } from '@/blocks/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
-import { useDependencyBlockType } from './use-dependency-block-type'
+import {
+  getDependencyCanonicalModeOverrides,
+  useDependencyBlockContext,
+} from './use-dependency-block-type'
 
 /**
  * Centralized dependsOn gating for sub-block components.
@@ -35,17 +40,26 @@ export function useDependsOnGate(
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
   const blockState = useWorkflowStore((state) => state.blocks[blockId])
 
-  const dependencyBlockType = useDependencyBlockType()
+  const dependencyBlockContext = useDependencyBlockContext()
+  const dependencyBlockType = dependencyBlockContext?.blockType
   const blockConfig = dependencyBlockType
     ? getBlock(dependencyBlockType)
     : 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 = getDependencyCanonicalModeOverrides(
+    dependencyBlockContext,
+    blockState?.data?.canonicalModes
   )
-  const canonicalModeOverrides = blockState?.data?.canonicalModes
 
   // Parse dependsOn config to get all/any field lists
   const { allFields, anyFields, allDependsOnFields } = useMemo(

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),