Fix error swallow

.claude/commands/add-trigger.md

@@ -552,53 +552,6 @@ All fields automatically have:
 - `mode: 'trigger'` - Only shown in trigger mode
 - `condition: { field: 'selectedTriggerId', value: triggerId }` - Only shown when this trigger is selected
 
-## Trigger Outputs & Webhook Input Formatting
-
-### Important: Two Sources of Truth
-
-There are two related but separate concerns:
-
-1. **Trigger `outputs`** - Schema/contract defining what fields SHOULD be available. Used by UI for tag dropdown.
-2. **`formatWebhookInput`** - Implementation that transforms raw webhook payload into actual data. Located in `apps/sim/lib/webhooks/utils.server.ts`.
-
-**These MUST be aligned.** The fields returned by `formatWebhookInput` should match what's defined in trigger `outputs`. If they differ:
-- Tag dropdown shows fields that don't exist (broken variable resolution)
-- Or actual data has fields not shown in dropdown (users can't discover them)
-
-### When to Add a formatWebhookInput Handler
-
-- **Simple providers**: If the raw webhook payload structure already matches your outputs, you don't need a handler. The generic fallback returns `body` directly.
-- **Complex providers**: If you need to transform, flatten, extract nested data, compute fields, or handle conditional logic, add a handler.
-
-### Adding a Handler
-
-In `apps/sim/lib/webhooks/utils.server.ts`, add a handler block:
-
-```typescript
-if (foundWebhook.provider === '{service}') {
-  // Transform raw webhook body to match trigger outputs
-  return {
-    eventType: body.type,
-    resourceId: body.data?.id || '',
-    timestamp: body.created_at,
-    resource: body.data,
-  }
-}
-```
-
-**Key rules:**
-- Return fields that match your trigger `outputs` definition exactly
-- No wrapper objects like `webhook: { data: ... }` or `{service}: { ... }`
-- No duplication (don't spread body AND add individual fields)
-- Use `null` for missing optional data, not empty objects with empty strings
-
-### Verify Alignment
-
-Run the alignment checker:
-```bash
-bunx scripts/check-trigger-alignment.ts {service}
-```
-
 ## Trigger Outputs
 
 Trigger outputs use the same schema as block outputs (NOT tool outputs).
@@ -696,11 +649,6 @@ export const {service}WebhookTrigger: TriggerConfig = {
 - [ ] Added `delete{Service}Webhook` function to `provider-subscriptions.ts`
 - [ ] Added provider to `cleanupExternalWebhook` function
 
-### Webhook Input Formatting
-- [ ] Added handler in `apps/sim/lib/webhooks/utils.server.ts` (if custom formatting needed)
-- [ ] Handler returns fields matching trigger `outputs` exactly
-- [ ] Run `bunx scripts/check-trigger-alignment.ts {service}` to verify alignment
-
 ### Testing
 - [ ] Run `bun run type-check` to verify no TypeScript errors
 - [ ] Restart dev server to pick up new triggers

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

@@ -356,9 +356,6 @@ const WorkflowContent = React.memo(() => {
   /** Stores source node/handle info when a connection drag starts for drop-on-block detection. */
   const connectionSourceRef = useRef<{ nodeId: string; handleId: string } | null>(null)
 
-  /** Tracks whether onConnect successfully handled the connection (ReactFlow pattern). */
-  const connectionCompletedRef = useRef(false)
-
   /** Stores start positions for multi-node drag undo/redo recording. */
   const multiNodeDragStartRef = useRef<Map<string, { x: number; y: number; parentId?: string }>>(
     new Map()
@@ -2217,8 +2214,7 @@ const WorkflowContent = React.memo(() => {
   )
 
   /**
-   * Captures the source handle when a connection drag starts.
-   * Resets connectionCompletedRef to track if onConnect handles this connection.
+   * Captures the source handle when a connection drag starts
    */
   const onConnectStart = useCallback((_event: any, params: any) => {
     const handleId: string | undefined = params?.handleId
@@ -2227,7 +2223,6 @@ const WorkflowContent = React.memo(() => {
       nodeId: params?.nodeId,
       handleId: params?.handleId,
     }
-    connectionCompletedRef.current = false
   }, [])
 
   /** Handles new edge connections with container boundary validation. */
@@ -2288,7 +2283,6 @@ const WorkflowContent = React.memo(() => {
               isInsideContainer: true,
             },
           })
-          connectionCompletedRef.current = true
           return
         }
 
@@ -2317,7 +2311,6 @@ const WorkflowContent = React.memo(() => {
               }
             : undefined,
         })
-        connectionCompletedRef.current = true
       }
     },
     [addEdge, getNodes, blocks]
@@ -2326,9 +2319,8 @@ const WorkflowContent = React.memo(() => {
   /**
    * Handles connection drag end. Detects if the edge was dropped over a block
    * and automatically creates a connection to that block's target handle.
-   *
-   * Uses connectionCompletedRef to check if onConnect already handled this connection
-   * (ReactFlow pattern for distinguishing handle-to-handle vs handle-to-body drops).
+   * Only creates a connection if ReactFlow didn't already handle it (e.g., when
+   * dropping on the block body instead of a handle).
    */
   const onConnectEnd = useCallback(
     (event: MouseEvent | TouchEvent) => {
@@ -2340,12 +2332,6 @@ const WorkflowContent = React.memo(() => {
         return
       }
 
-      // If onConnect already handled this connection, skip (handle-to-handle case)
-      if (connectionCompletedRef.current) {
-        connectionSourceRef.current = null
-        return
-      }
-
       // Get cursor position in flow coordinates
       const clientPos = 'changedTouches' in event ? event.changedTouches[0] : event
       const flowPosition = screenToFlowPosition({
@@ -2356,14 +2342,25 @@ const WorkflowContent = React.memo(() => {
       // Find node under cursor
       const targetNode = findNodeAtPosition(flowPosition)
 
-      // Create connection if valid target found (handle-to-body case)
+      // Create connection if valid target found AND edge doesn't already exist
+      // ReactFlow's onConnect fires first when dropping on a handle, so we check
+      // if that connection already exists to avoid creating duplicates.
+      // IMPORTANT: We must read directly from the store (not React state) because
+      // the store update from ReactFlow's onConnect may not have triggered a
+      // React re-render yet when this callback runs (typically 1-2ms later).
       if (targetNode && targetNode.id !== source.nodeId) {
-        onConnect({
-          source: source.nodeId,
-          sourceHandle: source.handleId,
-          target: targetNode.id,
-          targetHandle: 'target',
-        })
+        const currentEdges = useWorkflowStore.getState().edges
+        const edgeAlreadyExists = currentEdges.some(
+          (e) => e.source === source.nodeId && e.target === targetNode.id
+        )
+        if (!edgeAlreadyExists) {
+          onConnect({
+            source: source.nodeId,
+            sourceHandle: source.handleId,
+            target: targetNode.id,
+            targetHandle: 'target',
+          })
+        }
       }
 
       connectionSourceRef.current = null

apps/sim/blocks/registry.ts

@@ -313,26 +313,6 @@ export const getBlock = (type: string): BlockConfig | undefined => {
   return registry[normalized]
 }
 
-export const getLatestBlock = (baseType: string): BlockConfig | undefined => {
-  const normalized = baseType.replace(/-/g, '_')
-
-  const versionedKeys = Object.keys(registry).filter((key) => {
-    const match = key.match(new RegExp(`^${normalized}_v(\\d+)$`))
-    return match !== null
-  })
-
-  if (versionedKeys.length > 0) {
-    const sorted = versionedKeys.sort((a, b) => {
-      const versionA = Number.parseInt(a.match(/_v(\d+)$/)?.[1] || '0', 10)
-      const versionB = Number.parseInt(b.match(/_v(\d+)$/)?.[1] || '0', 10)
-      return versionB - versionA
-    })
-    return registry[sorted[0]]
-  }
-
-  return registry[normalized]
-}
-
 export const getBlockByToolName = (toolName: string): BlockConfig | undefined => {
   return Object.values(registry).find((block) => block.tools?.access?.includes(toolName))
 }

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

@@ -378,10 +378,21 @@ function buildManualTriggerOutput(
 }
 
 function buildIntegrationTriggerOutput(
-  _finalInput: unknown,
+  finalInput: unknown,
   workflowInput: unknown
 ): NormalizedBlockOutput {
-  return isPlainObject(workflowInput) ? (workflowInput as 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 {
+    base.input = finalInput
+  }
+
+  return mergeFilesIntoOutput(base, workflowInput)
 }
 
 function extractSubBlocks(block: SerializedBlock): Record<string, unknown> | undefined {

apps/sim/hooks/use-collaborative-workflow.ts

@@ -22,7 +22,7 @@ import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { filterNewEdges, mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
+import { mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState, Loop, Parallel, Position } from '@/stores/workflows/workflow/types'
 
@@ -242,10 +242,7 @@ export function useCollaborativeWorkflow() {
             case EDGES_OPERATIONS.BATCH_ADD_EDGES: {
               const { edges } = payload
               if (Array.isArray(edges) && edges.length > 0) {
-                const newEdges = filterNewEdges(edges, workflowStore.edges)
-                if (newEdges.length > 0) {
-                  workflowStore.batchAddEdges(newEdges)
-                }
+                workflowStore.batchAddEdges(edges)
               }
               break
             }
@@ -979,9 +976,6 @@ export function useCollaborativeWorkflow() {
 
       if (edges.length === 0) return false
 
-      const newEdges = filterNewEdges(edges, workflowStore.edges)
-      if (newEdges.length === 0) return false
-
       const operationId = crypto.randomUUID()
 
       addToQueue({
@@ -989,16 +983,16 @@ export function useCollaborativeWorkflow() {
         operation: {
           operation: EDGES_OPERATIONS.BATCH_ADD_EDGES,
           target: OPERATION_TARGETS.EDGES,
-          payload: { edges: newEdges },
+          payload: { edges },
         },
         workflowId: activeWorkflowId || '',
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchAddEdges(newEdges)
+      workflowStore.batchAddEdges(edges)
 
       if (!options?.skipUndoRedo) {
-        newEdges.forEach((edge) => undoRedo.recordAddEdge(edge.id))
+        edges.forEach((edge) => undoRedo.recordAddEdge(edge.id))
       }
 
       return true

apps/sim/lib/logs/get-trigger-options.ts

@@ -1,4 +1,4 @@
-import { getLatestBlock } from '@/blocks/registry'
+import { getBlock } from '@/blocks/registry'
 import { getAllTriggers } from '@/triggers'
 
 export interface TriggerOption {
@@ -49,13 +49,22 @@ export function getTriggerOptions(): TriggerOption[] {
       continue
     }
 
-    const block = getLatestBlock(provider)
+    const block = getBlock(provider)
 
-    providerMap.set(provider, {
-      value: provider,
-      label: block?.name || formatProviderName(provider),
-      color: block?.bgColor || '#6b7280',
-    })
+    if (block) {
+      providerMap.set(provider, {
+        value: provider,
+        label: block.name, // Use block's display name (e.g., "Slack", "GitHub")
+        color: block.bgColor || '#6b7280', // Use block's hex color, fallback to gray
+      })
+    } else {
+      const label = formatProviderName(provider)
+      providerMap.set(provider, {
+        value: provider,
+        label,
+        color: '#6b7280', // gray fallback
+      })
+    }
   }
 
   const integrationOptions = Array.from(providerMap.values()).sort((a, b) =>

apps/sim/lib/workflows/comparison/compare.test.ts

@@ -2290,7 +2290,7 @@ describe('hasWorkflowChanged', () => {
           block1: createBlock('block1', {
             type: 'starter',
             subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
               webhookId: { value: null },
             },
           }),
@@ -2302,7 +2302,7 @@ describe('hasWorkflowChanged', () => {
           block1: createBlock('block1', {
             type: 'starter',
             subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
               webhookId: { value: 'wh_123456' },
             },
           }),
@@ -2318,7 +2318,7 @@ describe('hasWorkflowChanged', () => {
           block1: createBlock('block1', {
             type: 'starter',
             subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
               triggerPath: { value: '' },
             },
           }),
@@ -2330,7 +2330,7 @@ describe('hasWorkflowChanged', () => {
           block1: createBlock('block1', {
             type: 'starter',
             subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
               triggerPath: { value: '/api/webhooks/abc123' },
             },
           }),
@@ -2346,7 +2346,7 @@ describe('hasWorkflowChanged', () => {
           block1: createBlock('block1', {
             type: 'starter',
             subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
               webhookId: { value: null },
               triggerPath: { value: '' },
             },
@@ -2359,7 +2359,7 @@ describe('hasWorkflowChanged', () => {
           block1: createBlock('block1', {
             type: 'starter',
             subBlocks: {
-              model: { value: 'gpt-4' },
+              triggerConfig: { value: { event: 'push' } },
               webhookId: { value: 'wh_123456' },
               triggerPath: { value: '/api/webhooks/abc123' },
             },
@@ -2371,18 +2371,14 @@ describe('hasWorkflowChanged', () => {
     })
 
     it.concurrent(
-      'should detect change when actual config differs but runtime metadata also differs',
+      'should detect change when triggerConfig differs but runtime metadata also differs',
       () => {
-        // Test that when a real config field changes along with runtime metadata,
-        // the change is still detected. Using 'model' as the config field since
-        // triggerConfig is now excluded from comparison (individual trigger fields
-        // are compared separately).
         const deployedState = createWorkflowState({
           blocks: {
             block1: createBlock('block1', {
               type: 'starter',
               subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
                 webhookId: { value: null },
               },
             }),
@@ -2394,7 +2390,7 @@ describe('hasWorkflowChanged', () => {
             block1: createBlock('block1', {
               type: 'starter',
               subBlocks: {
-                model: { value: 'gpt-4o' },
+                triggerConfig: { value: { event: 'pull_request' } },
                 webhookId: { value: 'wh_123456' },
               },
             }),
@@ -2406,12 +2402,8 @@ describe('hasWorkflowChanged', () => {
     )
 
     it.concurrent(
-      'should not detect change when triggerConfig differs (individual fields compared separately)',
+      'should not detect change when runtime metadata is added to current state',
       () => {
-        // triggerConfig is excluded from comparison because:
-        // 1. Individual trigger fields are stored as separate subblocks and compared individually
-        // 2. The client populates triggerConfig with default values from trigger definitions,
-        //    which aren't present in the deployed state, causing false positive change detection
         const deployedState = createWorkflowState({
           blocks: {
             block1: createBlock('block1', {
@@ -2428,36 +2420,7 @@ describe('hasWorkflowChanged', () => {
             block1: createBlock('block1', {
               type: 'starter',
               subBlocks: {
-                triggerConfig: { value: { event: 'pull_request', extraField: true } },
-              },
-            }),
-          },
-        })
-
-        expect(hasWorkflowChanged(currentState, deployedState)).toBe(false)
-      }
-    )
-
-    it.concurrent(
-      'should not detect change when runtime metadata is added to current state',
-      () => {
-        const deployedState = createWorkflowState({
-          blocks: {
-            block1: createBlock('block1', {
-              type: 'starter',
-              subBlocks: {
-                model: { value: 'gpt-4' },
-              },
-            }),
-          },
-        })
-
-        const currentState = createWorkflowState({
-          blocks: {
-            block1: createBlock('block1', {
-              type: 'starter',
-              subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
                 webhookId: { value: 'wh_123456' },
                 triggerPath: { value: '/api/webhooks/abc123' },
               },
@@ -2477,7 +2440,7 @@ describe('hasWorkflowChanged', () => {
             block1: createBlock('block1', {
               type: 'starter',
               subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
                 webhookId: { value: 'wh_old123' },
                 triggerPath: { value: '/api/webhooks/old' },
               },
@@ -2490,7 +2453,7 @@ describe('hasWorkflowChanged', () => {
             block1: createBlock('block1', {
               type: 'starter',
               subBlocks: {
-                model: { value: 'gpt-4' },
+                triggerConfig: { value: { event: 'push' } },
               },
             }),
           },

apps/sim/stores/workflows/utils.ts

@@ -1,19 +1,5 @@
 import type { Edge } from 'reactflow'
 import { v4 as uuidv4 } from 'uuid'
-
-export function filterNewEdges(edgesToAdd: Edge[], currentEdges: Edge[]): Edge[] {
-  return edgesToAdd.filter((edge) => {
-    if (edge.source === edge.target) return false
-    return !currentEdges.some(
-      (e) =>
-        e.source === edge.source &&
-        e.sourceHandle === edge.sourceHandle &&
-        e.target === edge.target &&
-        e.targetHandle === edge.targetHandle
-    )
-  })
-}
-
 import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { getBlock } from '@/blocks'
 import { normalizeName } from '@/executor/constants'

apps/sim/stores/workflows/workflow/store.test.ts

@@ -297,7 +297,7 @@ describe('workflow store', () => {
       expectEdgeConnects(edges, 'block-1', 'block-2')
     })
 
-    it('should not add duplicate connections', () => {
+    it('should not add duplicate edges', () => {
       const { addBlock, batchAddEdges } = useWorkflowStore.getState()
 
       addBlock('block-1', 'starter', 'Start', { x: 0, y: 0 })
@@ -309,6 +309,17 @@ describe('workflow store', () => {
       const state = useWorkflowStore.getState()
       expectEdgeCount(state, 1)
     })
+
+    it('should prevent self-referencing edges', () => {
+      const { addBlock, batchAddEdges } = useWorkflowStore.getState()
+
+      addBlock('block-1', 'function', 'Self', { x: 0, y: 0 })
+
+      batchAddEdges([{ id: 'e1', source: 'block-1', target: 'block-1' }])
+
+      const state = useWorkflowStore.getState()
+      expectEdgeCount(state, 0)
+    })
   })
 
   describe('batchRemoveEdges', () => {

apps/sim/stores/workflows/workflow/store.ts

@@ -9,12 +9,7 @@ import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import {
-  filterNewEdges,
-  getUniqueBlockName,
-  mergeSubblockState,
-  normalizeName,
-} from '@/stores/workflows/utils'
+import { getUniqueBlockName, mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
 import type {
   Position,
   SubBlockState,
@@ -501,11 +496,25 @@ export const useWorkflowStore = create<WorkflowStore>()(
 
       batchAddEdges: (edges: Edge[]) => {
         const currentEdges = get().edges
-        const filtered = filterNewEdges(edges, currentEdges)
         const newEdges = [...currentEdges]
+        const existingEdgeIds = new Set(currentEdges.map((e) => e.id))
+        // Track existing connections to prevent duplicates (same source->target)
+        const existingConnections = new Set(currentEdges.map((e) => `${e.source}->${e.target}`))
 
-        for (const edge of filtered) {
+        for (const edge of edges) {
+          // Skip if edge ID already exists
+          if (existingEdgeIds.has(edge.id)) continue
+
+          // Skip self-referencing edges
+          if (edge.source === edge.target) continue
+
+          // Skip if connection already exists (same source and target)
+          const connectionKey = `${edge.source}->${edge.target}`
+          if (existingConnections.has(connectionKey)) continue
+
+          // Skip if would create a cycle
           if (wouldCreateCycle([...newEdges], edge.source, edge.target)) continue
+
           newEdges.push({
             id: edge.id || crypto.randomUUID(),
             source: edge.source,
@@ -515,6 +524,8 @@ export const useWorkflowStore = create<WorkflowStore>()(
             type: edge.type || 'default',
             data: edge.data || {},
           })
+          existingEdgeIds.add(edge.id)
+          existingConnections.add(connectionKey)
         }
 
         const blocks = get().blocks

apps/sim/triggers/circleback/utils.ts

@@ -96,3 +96,23 @@ export function buildMeetingOutputs(): Record<string, TriggerOutput> {
     },
   } as Record<string, TriggerOutput>
 }
+
+/**
+ * Build output schema for generic webhook events
+ */
+export function buildGenericOutputs(): Record<string, TriggerOutput> {
+  return {
+    payload: {
+      type: 'object',
+      description: 'Raw webhook payload',
+    },
+    headers: {
+      type: 'object',
+      description: 'Request headers',
+    },
+    timestamp: {
+      type: 'string',
+      description: 'ISO8601 received timestamp',
+    },
+  } as Record<string, TriggerOutput>
+}

apps/sim/triggers/circleback/webhook.ts

@@ -1,6 +1,6 @@
 import { CirclebackIcon } from '@/components/icons'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildMeetingOutputs, circlebackSetupInstructions, circlebackTriggerOptions } from './utils'
+import { buildGenericOutputs, circlebackSetupInstructions, circlebackTriggerOptions } from './utils'
 
 export const circlebackWebhookTrigger: TriggerConfig = {
   id: 'circleback_webhook',
@@ -74,7 +74,7 @@ export const circlebackWebhookTrigger: TriggerConfig = {
     },
   ],
 
-  outputs: buildMeetingOutputs(),
+  outputs: buildGenericOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/constants.ts

@@ -31,14 +31,8 @@ export const TRIGGER_PERSISTED_SUBBLOCK_IDS: string[] = [
 /**
  * Trigger-related subblock IDs that represent runtime metadata. They should remain
  * in the workflow state but must not be modified or cleared by diff operations.
- *
- * Note: 'triggerConfig' is included because it's an aggregate of individual trigger
- * field subblocks. Those individual fields are compared separately, so comparing
- * triggerConfig would be redundant. Additionally, the client populates triggerConfig
- * with default values from the trigger definition on load, which aren't present in
- * the deployed state, causing false positive change detection.
  */
-export const TRIGGER_RUNTIME_SUBBLOCK_IDS: string[] = ['webhookId', 'triggerPath', 'triggerConfig']
+export const TRIGGER_RUNTIME_SUBBLOCK_IDS: string[] = ['webhookId', 'triggerPath']
 
 /**
  * Maximum number of consecutive failures before a trigger (schedule/webhook) is auto-disabled.

apps/sim/triggers/github/issue_closed.ts

@@ -116,11 +116,6 @@ export const githubIssueClosedTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description:
-        'GitHub event type from X-GitHub-Event header (e.g., issues, pull_request, push)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (opened, closed, reopened, edited, etc.)',

apps/sim/triggers/github/issue_comment.ts

@@ -117,10 +117,6 @@ export const githubIssueCommentTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., issue_comment)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (created, edited, deleted)',

apps/sim/triggers/github/issue_opened.ts

@@ -137,11 +137,6 @@ export const githubIssueOpenedTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description:
-        'GitHub event type from X-GitHub-Event header (e.g., issues, pull_request, push)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (opened, closed, reopened, edited, etc.)',

apps/sim/triggers/github/pr_closed.ts

@@ -117,10 +117,6 @@ export const githubPRClosedTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (opened, closed, synchronize, reopened, edited, etc.)',

apps/sim/triggers/github/pr_comment.ts

@@ -117,10 +117,6 @@ export const githubPRCommentTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., issue_comment)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (created, edited, deleted)',

apps/sim/triggers/github/pr_merged.ts

@@ -116,10 +116,6 @@ export const githubPRMergedTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (opened, closed, synchronize, reopened, edited, etc.)',

apps/sim/triggers/github/pr_opened.ts

@@ -116,10 +116,6 @@ export const githubPROpenedTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (opened, closed, synchronize, reopened, edited, etc.)',

apps/sim/triggers/github/pr_reviewed.ts

@@ -117,10 +117,6 @@ export const githubPRReviewedTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., pull_request_review)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (submitted, edited, dismissed)',

apps/sim/triggers/github/push.ts

@@ -116,14 +116,6 @@ export const githubPushTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., push)',
-    },
-    branch: {
-      type: 'string',
-      description: 'Branch name derived from ref (e.g., main from refs/heads/main)',
-    },
     ref: {
       type: 'string',
       description: 'Git reference that was pushed (e.g., refs/heads/main)',

apps/sim/triggers/github/release_published.ts

@@ -116,10 +116,6 @@ export const githubReleasePublishedTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., release)',
-    },
     action: {
       type: 'string',
       description:

apps/sim/triggers/github/workflow_run.ts

@@ -117,10 +117,6 @@ export const githubWorkflowRunTrigger: TriggerConfig = {
   ],
 
   outputs: {
-    event_type: {
-      type: 'string',
-      description: 'GitHub event type from X-GitHub-Event header (e.g., workflow_run)',
-    },
     action: {
       type: 'string',
       description: 'Action performed (requested, in_progress, completed)',

apps/sim/triggers/jira/utils.ts

@@ -265,6 +265,11 @@ function buildBaseWebhookOutputs(): Record<string, TriggerOutput> {
         },
       },
     },
+
+    webhook: {
+      type: 'json',
+      description: 'Webhook metadata including provider, path, and raw payload',
+    },
   }
 }
 

apps/sim/triggers/lemlist/email_bounced.ts

@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailBouncedOutputs,
+  buildActivityOutputs,
   buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailBouncedTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_email_bounced'),
   }),
 
-  outputs: buildEmailBouncedOutputs(),
+  outputs: buildActivityOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/email_clicked.ts

@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailClickedOutputs,
+  buildActivityOutputs,
   buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailClickedTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_email_clicked'),
   }),
 
-  outputs: buildEmailClickedOutputs(),
+  outputs: buildActivityOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/email_opened.ts

@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailOpenedOutputs,
+  buildActivityOutputs,
   buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailOpenedTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_email_opened'),
   }),
 
-  outputs: buildEmailOpenedOutputs(),
+  outputs: buildActivityOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/email_replied.ts

@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailRepliedOutputs,
+  buildEmailReplyOutputs,
   buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
@@ -30,7 +30,7 @@ export const lemlistEmailRepliedTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_email_replied'),
   }),
 
-  outputs: buildEmailRepliedOutputs(),
+  outputs: buildEmailReplyOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/email_sent.ts

@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildEmailSentOutputs,
+  buildActivityOutputs,
   buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistEmailSentTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_email_sent'),
   }),
 
-  outputs: buildEmailSentOutputs(),
+  outputs: buildActivityOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/interested.ts

@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildInterestOutputs,
+  buildActivityOutputs,
   buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistInterestedTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_interested'),
   }),
 
-  outputs: buildInterestOutputs(),
+  outputs: buildActivityOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/linkedin_replied.ts

@@ -2,7 +2,7 @@ import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
   buildLemlistExtraFields,
-  buildLinkedInRepliedOutputs,
+  buildLinkedInReplyOutputs,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
 } from '@/triggers/lemlist/utils'
@@ -27,7 +27,7 @@ export const lemlistLinkedInRepliedTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_linkedin_replied'),
   }),
 
-  outputs: buildLinkedInRepliedOutputs(),
+  outputs: buildLinkedInReplyOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/not_interested.ts

@@ -1,7 +1,7 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
-  buildInterestOutputs,
+  buildActivityOutputs,
   buildLemlistExtraFields,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
@@ -27,7 +27,7 @@ export const lemlistNotInterestedTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_not_interested'),
   }),
 
-  outputs: buildInterestOutputs(),
+  outputs: buildActivityOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/lemlist/utils.ts

@@ -66,254 +66,203 @@ export function buildLemlistExtraFields(triggerId: string) {
 }
 
 /**
- * Core fields present in ALL Lemlist webhook payloads
- * See: https://help.lemlist.com/en/articles/9423940-use-the-api-to-list-activity-types
+ * Base activity outputs shared across all Lemlist triggers
  */
-const coreOutputs = {
-  _id: {
-    type: 'string',
-    description: 'Unique activity identifier',
-  },
-  type: {
-    type: 'string',
-    description: 'Activity type (e.g., emailsSent, emailsReplied)',
-  },
-  createdAt: {
-    type: 'string',
-    description: 'Activity creation timestamp (ISO 8601)',
-  },
-  teamId: {
-    type: 'string',
-    description: 'Lemlist team identifier',
-  },
-  leadId: {
-    type: 'string',
-    description: 'Lead identifier',
-  },
-  campaignId: {
-    type: 'string',
-    description: 'Campaign identifier',
-  },
-  campaignName: {
-    type: 'string',
-    description: 'Campaign name',
-  },
-} as const
-
-/**
- * Lead fields present in webhook payloads
- */
-const leadOutputs = {
-  email: {
-    type: 'string',
-    description: 'Lead email address',
-  },
-  firstName: {
-    type: 'string',
-    description: 'Lead first name',
-  },
-  lastName: {
-    type: 'string',
-    description: 'Lead last name',
-  },
-  companyName: {
-    type: 'string',
-    description: 'Lead company name',
-  },
-  linkedinUrl: {
-    type: 'string',
-    description: 'Lead LinkedIn profile URL',
-  },
-} as const
-
-/**
- * Sequence/campaign tracking fields for email activities
- */
-const sequenceOutputs = {
-  sequenceId: {
-    type: 'string',
-    description: 'Sequence identifier',
-  },
-  sequenceStep: {
-    type: 'number',
-    description: 'Current step in the sequence (0-indexed)',
-  },
-  totalSequenceStep: {
-    type: 'number',
-    description: 'Total number of steps in the sequence',
-  },
-  isFirst: {
-    type: 'boolean',
-    description: 'Whether this is the first activity of this type for this step',
-  },
-} as const
-
-/**
- * Sender information fields
- */
-const senderOutputs = {
-  sendUserId: {
-    type: 'string',
-    description: 'Sender user identifier',
-  },
-  sendUserEmail: {
-    type: 'string',
-    description: 'Sender email address',
-  },
-  sendUserName: {
-    type: 'string',
-    description: 'Sender display name',
-  },
-} as const
-
-/**
- * Email content fields
- */
-const emailContentOutputs = {
-  subject: {
-    type: 'string',
-    description: 'Email subject line',
-  },
-  text: {
-    type: 'string',
-    description: 'Email body content (HTML)',
-  },
-  messageId: {
-    type: 'string',
-    description: 'Email message ID (RFC 2822 format)',
-  },
-  emailId: {
-    type: 'string',
-    description: 'Lemlist email identifier',
-  },
-} as const
-
-/**
- * Build outputs for email sent events
- */
-export function buildEmailSentOutputs(): Record<string, TriggerOutput> {
+function buildBaseActivityOutputs(): Record<string, TriggerOutput> {
   return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    ...emailContentOutputs,
-  } as Record<string, TriggerOutput>
+    type: {
+      type: 'string',
+      description: 'Activity type (emailsReplied, linkedinReplied, interested, emailsOpened, etc.)',
+    },
+    _id: {
+      type: 'string',
+      description: 'Unique activity identifier',
+    },
+    leadId: {
+      type: 'string',
+      description: 'Associated lead ID',
+    },
+    campaignId: {
+      type: 'string',
+      description: 'Campaign ID',
+    },
+    campaignName: {
+      type: 'string',
+      description: 'Campaign name',
+    },
+    sequenceId: {
+      type: 'string',
+      description: 'Sequence ID within the campaign',
+    },
+    stepId: {
+      type: 'string',
+      description: 'Step ID that triggered this activity',
+    },
+    createdAt: {
+      type: 'string',
+      description: 'When the activity occurred (ISO 8601)',
+    },
+  }
 }
 
 /**
- * Build outputs for email replied events
+ * Lead outputs - information about the lead
  */
-export function buildEmailRepliedOutputs(): Record<string, TriggerOutput> {
+function buildLeadOutputs(): Record<string, TriggerOutput> {
   return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    ...emailContentOutputs,
-  } as Record<string, TriggerOutput>
+    lead: {
+      _id: {
+        type: 'string',
+        description: 'Lead unique identifier',
+      },
+      email: {
+        type: 'string',
+        description: 'Lead email address',
+      },
+      firstName: {
+        type: 'string',
+        description: 'Lead first name',
+      },
+      lastName: {
+        type: 'string',
+        description: 'Lead last name',
+      },
+      companyName: {
+        type: 'string',
+        description: 'Lead company name',
+      },
+      phone: {
+        type: 'string',
+        description: 'Lead phone number',
+      },
+      linkedinUrl: {
+        type: 'string',
+        description: 'Lead LinkedIn profile URL',
+      },
+      picture: {
+        type: 'string',
+        description: 'Lead profile picture URL',
+      },
+      icebreaker: {
+        type: 'string',
+        description: 'Personalized icebreaker text',
+      },
+      timezone: {
+        type: 'string',
+        description: 'Lead timezone (e.g., America/New_York)',
+      },
+      isUnsubscribed: {
+        type: 'boolean',
+        description: 'Whether the lead is unsubscribed',
+      },
+    },
+  }
 }
 
 /**
- * Build outputs for email opened events
+ * Standard activity outputs (activity + lead data)
  */
-export function buildEmailOpenedOutputs(): Record<string, TriggerOutput> {
+export function buildActivityOutputs(): Record<string, TriggerOutput> {
   return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all activity-specific data',
+    },
+  }
+}
+
+/**
+ * Email-specific outputs (includes message content for replies)
+ */
+export function buildEmailReplyOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
     messageId: {
       type: 'string',
-      description: 'Email message ID that was opened',
+      description: 'Email message ID',
     },
-  } as Record<string, TriggerOutput>
-}
-
-/**
- * Build outputs for email clicked events
- */
-export function buildEmailClickedOutputs(): Record<string, TriggerOutput> {
-  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    messageId: {
+    subject: {
       type: 'string',
-      description: 'Email message ID containing the clicked link',
+      description: 'Email subject line',
     },
-    clickedUrl: {
-      type: 'string',
-      description: 'URL that was clicked',
-    },
-  } as Record<string, TriggerOutput>
-}
-
-/**
- * Build outputs for email bounced events
- */
-export function buildEmailBouncedOutputs(): Record<string, TriggerOutput> {
-  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    messageId: {
-      type: 'string',
-      description: 'Email message ID that bounced',
-    },
-    errorMessage: {
-      type: 'string',
-      description: 'Bounce error message',
-    },
-  } as Record<string, TriggerOutput>
-}
-
-/**
- * Build outputs for LinkedIn replied events
- */
-export function buildLinkedInRepliedOutputs(): Record<string, TriggerOutput> {
-  return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
     text: {
       type: 'string',
-      description: 'LinkedIn message content',
+      description: 'Email reply text content',
     },
-  } as Record<string, TriggerOutput>
+    html: {
+      type: 'string',
+      description: 'Email reply HTML content',
+    },
+    sentAt: {
+      type: 'string',
+      description: 'When the reply was sent',
+    },
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all email data',
+    },
+  }
 }
 
 /**
- * Build outputs for interested/not interested events
+ * LinkedIn-specific outputs (includes message content)
  */
-export function buildInterestOutputs(): Record<string, TriggerOutput> {
+export function buildLinkedInReplyOutputs(): Record<string, TriggerOutput> {
   return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-  } as Record<string, TriggerOutput>
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    messageId: {
+      type: 'string',
+      description: 'LinkedIn message ID',
+    },
+    text: {
+      type: 'string',
+      description: 'LinkedIn message text content',
+    },
+    sentAt: {
+      type: 'string',
+      description: 'When the message was sent',
+    },
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all LinkedIn data',
+    },
+  }
 }
 
 /**
- * Build outputs for generic webhook (all events)
- * Includes all possible fields across event types
+ * All outputs for generic webhook (activity + lead + all possible fields)
  */
-export function buildLemlistOutputs(): Record<string, TriggerOutput> {
+export function buildAllOutputs(): Record<string, TriggerOutput> {
   return {
-    ...coreOutputs,
-    ...leadOutputs,
-    ...sequenceOutputs,
-    ...senderOutputs,
-    ...emailContentOutputs,
-    clickedUrl: {
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    messageId: {
       type: 'string',
-      description: 'URL that was clicked (for emailsClicked events)',
+      description: 'Message ID (for email/LinkedIn events)',
     },
-    errorMessage: {
+    subject: {
       type: 'string',
-      description: 'Error message (for bounce/failed events)',
+      description: 'Email subject (for email events)',
     },
-  } as Record<string, TriggerOutput>
+    text: {
+      type: 'string',
+      description: 'Message text content',
+    },
+    html: {
+      type: 'string',
+      description: 'Message HTML content (for email events)',
+    },
+    sentAt: {
+      type: 'string',
+      description: 'When the message was sent',
+    },
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all data',
+    },
+  }
 }

apps/sim/triggers/lemlist/webhook.ts

@@ -1,8 +1,8 @@
 import { LemlistIcon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
 import {
+  buildAllOutputs,
   buildLemlistExtraFields,
-  buildLemlistOutputs,
   lemlistSetupInstructions,
   lemlistTriggerOptions,
 } from '@/triggers/lemlist/utils'
@@ -27,7 +27,7 @@ export const lemlistWebhookTrigger: TriggerConfig = {
     extraFields: buildLemlistExtraFields('lemlist_webhook'),
   }),
 
-  outputs: buildLemlistOutputs(),
+  outputs: buildAllOutputs(),
 
   webhook: {
     method: 'POST',

apps/sim/triggers/telegram/webhook.ts

@@ -110,7 +110,6 @@ export const telegramWebhookTrigger: TriggerConfig = {
     },
     sender: {
       id: { type: 'number', description: 'Sender user ID' },
-      username: { type: 'string', description: 'Sender username (if available)' },
       firstName: { type: 'string', description: 'Sender first name' },
       lastName: { type: 'string', description: 'Sender last name' },
       languageCode: { type: 'string', description: 'Sender language code (if available)' },

apps/sim/triggers/typeform/webhook.ts

@@ -136,8 +136,6 @@ export const typeformWebhookTrigger: TriggerConfig = {
         'Array of respondent answers (only includes answered questions). Each answer contains type, value, and field reference.',
     },
     definition: {
-      description:
-        'Form definition (only included when "Include Form Definition" is enabled in trigger settings)',
       id: {
         type: 'string',
         description: 'Form ID',

apps/sim/triggers/webflow/collection_item_changed.ts

@@ -96,6 +96,10 @@ export const webflowCollectionItemChangedTrigger: TriggerConfig = {
       type: 'string',
       description: 'The site ID where the event occurred',
     },
+    workspaceId: {
+      type: 'string',
+      description: 'The workspace ID where the event occurred',
+    },
     collectionId: {
       type: 'string',
       description: 'The collection ID where the item was changed',

apps/sim/triggers/webflow/collection_item_created.ts

@@ -109,6 +109,10 @@ export const webflowCollectionItemCreatedTrigger: TriggerConfig = {
       type: 'string',
       description: 'The site ID where the event occurred',
     },
+    workspaceId: {
+      type: 'string',
+      description: 'The workspace ID where the event occurred',
+    },
     collectionId: {
       type: 'string',
       description: 'The collection ID where the item was created',

apps/sim/triggers/webflow/collection_item_deleted.ts

@@ -97,6 +97,10 @@ export const webflowCollectionItemDeletedTrigger: TriggerConfig = {
       type: 'string',
       description: 'The site ID where the event occurred',
     },
+    workspaceId: {
+      type: 'string',
+      description: 'The workspace ID where the event occurred',
+    },
     collectionId: {
       type: 'string',
       description: 'The collection ID where the item was deleted',

apps/sim/triggers/webflow/form_submission.ts

@@ -76,9 +76,9 @@ export const webflowFormSubmissionTrigger: TriggerConfig = {
       type: 'string',
       description: 'The site ID where the form was submitted',
     },
-    formId: {
+    workspaceId: {
       type: 'string',
-      description: 'The form ID',
+      description: 'The workspace ID where the event occurred',
     },
     name: {
       type: 'string',

bun.lock

@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "simstudio",