fix(external-triggers): not passing payload through + incorrect server-side resolver logic

apps/sim/executor/utils/start-block.ts

@@ -76,7 +76,13 @@ export function buildResolutionFromBlock(block: SerializedBlock): ExecutorStartR
     return null
   }
 
-  const path = classifyStartBlockType(type)
+  const category = block.metadata?.category
+  const triggerModeEnabled = block.config?.params?.triggerMode === true
+
+  const path = classifyStartBlockType(type, {
+    category,
+    triggerModeEnabled,
+  })
   if (!path) {
     return null
   }
@@ -342,11 +348,11 @@ function buildManualTriggerOutput(
   finalInput: unknown,
   workflowInput: unknown
 ): NormalizedBlockOutput {
-  const finalObject = isPlainObject(finalInput) ? finalInput : undefined
+  const finalObject = isPlainObject(finalInput)
+    ? (finalInput as Record<string, unknown>)
+    : undefined
 
-  const output: NormalizedBlockOutput = finalObject
-    ? { ...(finalObject as Record<string, unknown>) }
-    : { input: finalInput }
+  const output: NormalizedBlockOutput = finalObject ? { ...finalObject } : { input: finalInput }
 
   if (!Object.hasOwn(output, 'input')) {
     output.input = getRawInputCandidate(workflowInput)
@@ -355,6 +361,28 @@ function buildManualTriggerOutput(
   return mergeFilesIntoOutput(output, workflowInput)
 }
 
+function buildIntegrationTriggerOutput(
+  finalInput: unknown,
+  workflowInput: unknown
+): NormalizedBlockOutput {
+  const base: NormalizedBlockOutput = isPlainObject(workflowInput)
+    ? ({ ...(workflowInput as Record<string, unknown>) } as NormalizedBlockOutput)
+    : {}
+
+  if (isPlainObject(finalInput)) {
+    Object.assign(base, finalInput as Record<string, unknown>)
+    base.input = { ...(finalInput as Record<string, unknown>) }
+  } else if (!Object.hasOwn(base, 'input')) {
+    base.input = finalInput
+  }
+
+  if (!Object.hasOwn(base, 'input')) {
+    base.input = getRawInputCandidate(workflowInput)
+  }
+
+  return mergeFilesIntoOutput(base, workflowInput)
+}
+
 function extractSubBlocks(block: SerializedBlock): Record<string, unknown> | undefined {
   const metadata = block.metadata
   if (!metadata || typeof metadata !== 'object') {
@@ -398,6 +426,9 @@ export function buildStartBlockOutput(options: StartBlockOutputOptions): Normali
     case StartBlockPath.SPLIT_MANUAL:
       return buildManualTriggerOutput(finalInput, workflowInput)
 
+    case StartBlockPath.EXTERNAL_TRIGGER:
+      return buildIntegrationTriggerOutput(finalInput, workflowInput)
+
     case StartBlockPath.LEGACY_STARTER:
       return buildLegacyStarterOutput(
         finalInput,

apps/sim/lib/workflows/triggers.ts

@@ -23,6 +23,7 @@ export enum StartBlockPath {
   SPLIT_API = 'legacy_api_trigger',
   SPLIT_CHAT = 'legacy_chat_trigger',
   SPLIT_MANUAL = 'legacy_manual_trigger',
+  EXTERNAL_TRIGGER = 'external_trigger',
 }
 
 type StartExecutionKind = 'chat' | 'manual' | 'api'
@@ -66,7 +67,15 @@ export interface StartBlockCandidate<T extends BlockWithType> {
   path: StartBlockPath
 }
 
-export function classifyStartBlockType(type: string): StartBlockPath | null {
+type ClassifyStartOptions = {
+  category?: string
+  triggerModeEnabled?: boolean
+}
+
+export function classifyStartBlockType(
+  type: string,
+  opts?: ClassifyStartOptions
+): StartBlockPath | null {
   switch (type) {
     case TRIGGER_TYPES.START:
       return StartBlockPath.UNIFIED
@@ -80,13 +89,21 @@ export function classifyStartBlockType(type: string): StartBlockPath | null {
       return StartBlockPath.SPLIT_CHAT
     case TRIGGER_TYPES.MANUAL:
       return StartBlockPath.SPLIT_MANUAL
+    case TRIGGER_TYPES.WEBHOOK:
+    case TRIGGER_TYPES.SCHEDULE:
+      return StartBlockPath.EXTERNAL_TRIGGER
     default:
+      if (opts?.category === 'triggers' || opts?.triggerModeEnabled) {
+        return StartBlockPath.EXTERNAL_TRIGGER
+      }
       return null
   }
 }
 
 export function classifyStartBlock<T extends BlockWithType>(block: T): StartBlockPath | null {
-  return classifyStartBlockType(block.type)
+  const category = (block as any)?.category as string | undefined
+  const triggerModeEnabled = Boolean((block as any)?.triggers?.enabled)
+  return classifyStartBlockType(block.type, { category, triggerModeEnabled })
 }
 
 export function isLegacyStartPath(path: StartBlockPath): boolean {