fix(selectors): respect trigger credentials in trigger mode

Author: Bill Leoutsakos

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

@@ -131,6 +131,7 @@ export function useFetchedOptions({
       workflowId: activeWorkflowId ?? undefined,
       workspaceId: workspaceId ?? undefined,
       canonicalModes: block.data?.canonicalModes,
+      triggerMode: block.triggerMode,
     })
     if (selectorExcludeSelf && activeWorkflowId) context.excludeWorkflowId = activeWorkflowId
     return context

apps/sim/ee/workspace-forking/lib/mapping/dependent-reconfigs.ts

@@ -75,6 +75,8 @@ interface EmitAnchoredParams {
   targetWorkflowId: string
   /** Canonical-mode overrides for resolving the active parent member (undefined -> value heuristic). */
   canonicalModes?: CanonicalModeOverrides
+  /** Applies trigger-only canonical precedence for a top-level trigger-mode block. */
+  triggerMode?: boolean
   /** Memoized so the deterministic target block id is derived at most once per block. */
   resolveTargetBlockId: () => string
   /** Map a dependent's config id to its wire `subBlockKey` (identity, or nested `tools[i].id`). */
@@ -117,6 +119,7 @@ function emitAnchoredDependents(params: EmitAnchoredParams): void {
     blockName,
     targetWorkflowId,
     canonicalModes,
+    triggerMode,
     resolveTargetBlockId,
     makeSubBlockKey,
     makeTitle,
@@ -127,6 +130,7 @@ function emitAnchoredDependents(params: EmitAnchoredParams): void {
   } = params
   const fullContext = buildSelectorContextFromBlock(contextBlockType, contextSubBlocks, {
     canonicalModes,
+    triggerMode,
   })
   const canonicalIndex = buildCanonicalIndex(config.subBlocks)
   const gates = createCanonicalModeGates(config.subBlocks, values, canonicalModes)
@@ -327,6 +331,7 @@ export function collectForkDependentReconfigs(
         blockName: block.name,
         targetWorkflowId: item.targetWorkflowId,
         canonicalModes: block.data?.canonicalModes,
+        triggerMode: block.triggerMode,
         resolveTargetBlockId: resolveBlockId,
         makeSubBlockKey: (id) => id,
         makeTitle: (dependent) => dependent.title ?? dependent.id ?? '',

apps/sim/hooks/queries/dynamic-subblock-options.ts

@@ -89,6 +89,7 @@ export function useDynamicSubBlockOptionDisplayName({
       workflowId: activeWorkflowId ?? undefined,
       workspaceId,
       canonicalModes: block.data?.canonicalModes,
+      triggerMode: block.triggerMode,
     })
   }, [block, liveValues, activeWorkflowId, workspaceId])
 

apps/sim/lib/workflows/comparison/resolve-values.ts

@@ -179,6 +179,7 @@ function extractSelectorContext(
     workflowId,
     workspaceId,
     canonicalModes: block.data?.canonicalModes,
+    triggerMode: block.triggerMode,
   })
 }
 

apps/sim/lib/workflows/subblocks/context.test.ts

@@ -152,6 +152,54 @@ describe('buildSelectorContextFromBlock', () => {
     ).toBe('advanced-team')
   })
 
+  it('preserves Gmail action credential resolution in basic and advanced modes', () => {
+    const subBlocks = {
+      credential: { id: 'credential', type: 'oauth-input', value: 'action-basic' },
+      manualCredential: {
+        id: 'manualCredential',
+        type: 'short-input',
+        value: 'action-advanced',
+      },
+    }
+
+    expect(buildSelectorContextFromBlock('gmail', subBlocks).oauthCredential).toBe('action-basic')
+    expect(
+      buildSelectorContextFromBlock('gmail', subBlocks, {
+        canonicalModes: { oauthCredential: 'advanced' },
+      }).oauthCredential
+    ).toBe('action-advanced')
+  })
+
+  it('uses the trigger credential when a Gmail action block is converted to trigger mode', () => {
+    const ctx = buildSelectorContextFromBlock(
+      'gmail',
+      {
+        credential: { id: 'credential', type: 'oauth-input', value: 'dormant-action' },
+        triggerCredentials: {
+          id: 'triggerCredentials',
+          type: 'oauth-input',
+          value: 'active-trigger',
+        },
+      },
+      { triggerMode: true }
+    )
+
+    expect(ctx.oauthCredential).toBe('active-trigger')
+  })
+
+  it('does not leak a dormant Gmail action credential when the trigger credential is blank', () => {
+    const ctx = buildSelectorContextFromBlock(
+      'gmail',
+      {
+        credential: { id: 'credential', type: 'oauth-input', value: 'dormant-action' },
+        triggerCredentials: { id: 'triggerCredentials', type: 'oauth-input', value: '' },
+      },
+      { triggerMode: true }
+    )
+
+    expect(ctx.oauthCredential).toBeUndefined()
+  })
+
   it('should ignore subblock keys not in SELECTOR_CONTEXT_FIELDS', () => {
     const ctx = buildSelectorContextFromBlock('knowledge', {
       operation: { id: 'operation', type: 'dropdown', value: 'search' },

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

@@ -5,6 +5,7 @@ import {
   buildCanonicalIndex,
   buildSubBlockValues,
   type CanonicalModeOverrides,
+  evaluateSubBlockCondition,
   resolveActiveCanonicalValue,
 } from './visibility'
 
@@ -66,7 +67,12 @@ export const SELECTOR_CONTEXT_FIELDS = new Set<keyof SelectorContext>([
 export function buildSelectorContextFromBlock(
   blockType: string,
   subBlocks: Record<string, SubBlockState | { value?: unknown }>,
-  opts?: { workflowId?: string; workspaceId?: string; canonicalModes?: CanonicalModeOverrides }
+  opts?: {
+    workflowId?: string
+    workspaceId?: string
+    canonicalModes?: CanonicalModeOverrides
+    triggerMode?: boolean
+  }
 ): SelectorContext {
   const context: SelectorContext = {}
   if (opts?.workflowId) context.workflowId = opts.workflowId
@@ -78,6 +84,13 @@ export function buildSelectorContextFromBlock(
   const canonicalIndex = buildCanonicalIndex(blockConfig.subBlocks)
   const values = buildSubBlockValues(subBlocks)
   const resolvedGroups = new Set<string>()
+  const visibleTriggerSubBlocks = opts?.triggerMode
+    ? blockConfig.subBlocks.filter(
+        (subBlock) =>
+          (subBlock.mode === 'trigger' || subBlock.mode === 'trigger-advanced') &&
+          evaluateSubBlockCondition(subBlock.condition, values)
+      )
+    : []
 
   const setField = (key: string, value: unknown) => {
     if (value === null || value === undefined) return
@@ -88,6 +101,14 @@ export function buildSelectorContextFromBlock(
     }
   }
 
+  if (opts?.triggerMode) {
+    const triggerCanonicalIndex = buildCanonicalIndex(visibleTriggerSubBlocks)
+    for (const group of Object.values(triggerCanonicalIndex.groupsById)) {
+      resolvedGroups.add(group.canonicalId)
+      setField(group.canonicalId, resolveActiveCanonicalValue(group, values, opts.canonicalModes))
+    }
+  }
+
   for (const [subBlockId, subBlock] of Object.entries(subBlocks)) {
     const canonicalId = canonicalIndex.canonicalIdBySubBlockId[subBlockId]
     if (canonicalId) {
@@ -110,9 +131,10 @@ export function buildSelectorContextFromBlock(
   //
   // Only fills a gap: a block that does declare the canonical id has already set it above,
   // including the basic/advanced active-member resolution this loop cannot express.
-  if (!context.oauthCredential) {
+  if (!context.oauthCredential && !resolvedGroups.has('oauthCredential')) {
+    const credentialConfigs = opts?.triggerMode ? visibleTriggerSubBlocks : blockConfig.subBlocks
     for (const [subBlockId, subBlock] of Object.entries(subBlocks)) {
-      if (blockConfig.subBlocks.find((cfg) => cfg.id === subBlockId)?.type !== 'oauth-input') {
+      if (credentialConfigs.find((cfg) => cfg.id === subBlockId)?.type !== 'oauth-input') {
         continue
       }
       const value = subBlock?.value