diff --git a/.agents/skills/add-trigger/SKILL.md b/.agents/skills/add-trigger/SKILL.md
index fbf27ef625d..fd6df46e505 100644
--- a/.agents/skills/add-trigger/SKILL.md
+++ b/.agents/skills/add-trigger/SKILL.md
@@ -3,63 +3,57 @@ name: add-trigger
 description: Create or update Sim webhook triggers using the generic trigger builder, service-specific setup instructions, outputs, and registry wiring. Use when working in `apps/sim/triggers/{service}/` or adding webhook support to an integration.
 ---
 
-# Add Trigger Skill
+# Add Trigger
 
 You are an expert at creating webhook triggers for Sim. You understand the trigger system, the generic `buildTriggerSubBlocks` helper, and how triggers connect to blocks.
 
 ## Your Task
 
-When the user asks you to create triggers for a service:
 1. Research what webhook events the service supports
 2. Create the trigger files using the generic builder
-3. Register triggers and connect them to the block
+3. Create a provider handler if custom auth, formatting, or subscriptions are needed
+4. Register triggers and connect them to the block
 
 ## Directory Structure
 
 ```
 apps/sim/triggers/{service}/
 ├── index.ts              # Barrel exports
-├── utils.ts              # Service-specific helpers (trigger options, setup instructions, extra fields)
+├── utils.ts              # Service-specific helpers (options, instructions, extra fields, outputs)
 ├── {event_a}.ts          # Primary trigger (includes dropdown)
 ├── {event_b}.ts          # Secondary trigger (no dropdown)
-├── {event_c}.ts          # Secondary trigger (no dropdown)
 └── webhook.ts            # Generic webhook trigger (optional, for "all events")
+
+apps/sim/lib/webhooks/
+├── provider-subscription-utils.ts  # Shared subscription helpers (getProviderConfig, getNotificationUrl)
+├── providers/
+│   ├── {service}.ts       # Provider handler (auth, formatInput, matchEvent, subscriptions)
+│   ├── types.ts           # WebhookProviderHandler interface
+│   ├── utils.ts           # Shared helpers (createHmacVerifier, verifyTokenAuth, skipByEventTypes)
+│   └── registry.ts        # Handler map + default handler
 ```
 
-## Step 1: Create utils.ts
+## Step 1: Create `utils.ts`
 
-This file contains service-specific helpers used by all triggers.
+This file contains all service-specific helpers used by triggers.
 
 ```typescript
 import type { SubBlockConfig } from '@/blocks/types'
 import type { TriggerOutput } from '@/triggers/types'
 
-/**
- * Dropdown options for the trigger type selector.
- * These appear in the primary trigger's dropdown.
- */
 export const {service}TriggerOptions = [
   { label: 'Event A', id: '{service}_event_a' },
   { label: 'Event B', id: '{service}_event_b' },
-  { label: 'Event C', id: '{service}_event_c' },
-  { label: 'Generic Webhook (All Events)', id: '{service}_webhook' },
 ]
 
-/**
- * Generates HTML setup instructions for the trigger.
- * Displayed to users to help them configure webhooks in the external service.
- */
 export function {service}SetupInstructions(eventType: string): string {
   const instructions = [
     'Copy the <strong>Webhook URL</strong> above',
     'Go to <strong>{Service} Settings > Webhooks</strong>',
-    'Click <strong>Add Webhook</strong>',
-    'Paste the webhook URL',
     `Select the <strong>${eventType}</strong> event type`,
-    'Save the webhook configuration',
+    'Paste the webhook URL and save',
     'Click "Save" above to activate your trigger',
   ]
-
   return instructions
     .map((instruction, index) =>
       `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
@@ -67,10 +61,6 @@ export function {service}SetupInstructions(eventType: string): string {
     .join('')
 }
 
-/**
- * Service-specific extra fields to add to triggers.
- * These are inserted between webhookUrl and triggerSave.
- */
 export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
   return [
     {
@@ -78,53 +68,34 @@ export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
       title: 'Project ID (Optional)',
       type: 'short-input',
       placeholder: 'Leave empty for all projects',
-      description: 'Optionally filter to a specific project',
       mode: 'trigger',
       condition: { field: 'selectedTriggerId', value: triggerId },
     },
   ]
 }
 
-/**
- * Build outputs for this trigger type.
- * Outputs define what data is available to downstream blocks.
- */
 export function build{Service}Outputs(): Record<string, TriggerOutput> {
   return {
-    eventType: { type: 'string', description: 'The type of event that triggered this workflow' },
+    eventType: { type: 'string', description: 'The type of event' },
     resourceId: { type: 'string', description: 'ID of the affected resource' },
-    timestamp: { type: 'string', description: 'When the event occurred (ISO 8601)' },
-    // Nested outputs for complex data
     resource: {
       id: { type: 'string', description: 'Resource ID' },
       name: { type: 'string', description: 'Resource name' },
-      status: { type: 'string', description: 'Current status' },
     },
-    webhook: { type: 'json', description: 'Full webhook payload' },
   }
 }
 ```
 
-## Step 2: Create the Primary Trigger
+## Step 2: Create Trigger Files
 
-The **primary trigger** is the first one listed. It MUST include `includeDropdown: true` so users can switch between trigger types.
+**Primary trigger** — MUST include `includeDropdown: true`:
 
 ```typescript
 import { {Service}Icon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
-import {
-  build{Service}ExtraFields,
-  build{Service}Outputs,
-  {service}SetupInstructions,
-  {service}TriggerOptions,
-} from '@/triggers/{service}/utils'
+import { build{Service}ExtraFields, build{Service}Outputs, {service}SetupInstructions, {service}TriggerOptions } from '@/triggers/{service}/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
-/**
- * {Service} Event A Trigger
- *
- * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
- */
 export const {service}EventATrigger: TriggerConfig = {
   id: '{service}_event_a',
   name: '{Service} Event A',
@@ -132,496 +103,222 @@ export const {service}EventATrigger: TriggerConfig = {
   description: 'Trigger workflow when Event A occurs',
   version: '1.0.0',
   icon: {Service}Icon,
-
   subBlocks: buildTriggerSubBlocks({
     triggerId: '{service}_event_a',
     triggerOptions: {service}TriggerOptions,
-    includeDropdown: true,  // PRIMARY TRIGGER - includes dropdown
+    includeDropdown: true,
     setupInstructions: {service}SetupInstructions('Event A'),
     extraFields: build{Service}ExtraFields('{service}_event_a'),
   }),
-
   outputs: build{Service}Outputs(),
-
-  webhook: {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  },
+  webhook: { method: 'POST', headers: { 'Content-Type': 'application/json' } },
 }
 ```
 
-## Step 3: Create Secondary Triggers
-
-Secondary triggers do NOT include the dropdown (it's already in the primary trigger).
+**Secondary triggers** — NO `includeDropdown` (it's already in the primary):
 
 ```typescript
-import { {Service}Icon } from '@/components/icons'
-import { buildTriggerSubBlocks } from '@/triggers'
-import {
-  build{Service}ExtraFields,
-  build{Service}Outputs,
-  {service}SetupInstructions,
-  {service}TriggerOptions,
-} from '@/triggers/{service}/utils'
-import type { TriggerConfig } from '@/triggers/types'
-
-/**
- * {Service} Event B Trigger
- */
 export const {service}EventBTrigger: TriggerConfig = {
-  id: '{service}_event_b',
-  name: '{Service} Event B',
-  provider: '{service}',
-  description: 'Trigger workflow when Event B occurs',
-  version: '1.0.0',
-  icon: {Service}Icon,
-
-  subBlocks: buildTriggerSubBlocks({
-    triggerId: '{service}_event_b',
-    triggerOptions: {service}TriggerOptions,
-    // NO includeDropdown - secondary trigger
-    setupInstructions: {service}SetupInstructions('Event B'),
-    extraFields: build{Service}ExtraFields('{service}_event_b'),
-  }),
-
-  outputs: build{Service}Outputs(),
-
-  webhook: {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  },
+  // Same as above but: id: '{service}_event_b', no includeDropdown
 }
 ```
 
-## Step 4: Create index.ts Barrel Export
+## Step 3: Register and Wire
+
+### `apps/sim/triggers/{service}/index.ts`
 
 ```typescript
 export { {service}EventATrigger } from './event_a'
 export { {service}EventBTrigger } from './event_b'
-export { {service}EventCTrigger } from './event_c'
-export { {service}WebhookTrigger } from './webhook'
 ```
 
-## Step 5: Register Triggers
-
-### Trigger Registry (`apps/sim/triggers/registry.ts`)
+### `apps/sim/triggers/registry.ts`
 
 ```typescript
-// Add import
-import {
-  {service}EventATrigger,
-  {service}EventBTrigger,
-  {service}EventCTrigger,
-  {service}WebhookTrigger,
-} from '@/triggers/{service}'
-
-// Add to TRIGGER_REGISTRY
+import { {service}EventATrigger, {service}EventBTrigger } from '@/triggers/{service}'
+
 export const TRIGGER_REGISTRY: TriggerRegistry = {
-  // ... existing triggers ...
+  // ... existing ...
   {service}_event_a: {service}EventATrigger,
   {service}_event_b: {service}EventBTrigger,
-  {service}_event_c: {service}EventCTrigger,
-  {service}_webhook: {service}WebhookTrigger,
 }
 ```
 
-## Step 6: Connect Triggers to Block
-
-In the block file (`apps/sim/blocks/blocks/{service}.ts`):
+### Block file (`apps/sim/blocks/blocks/{service}.ts`)
 
 ```typescript
-import { {Service}Icon } from '@/components/icons'
 import { getTrigger } from '@/triggers'
-import type { BlockConfig } from '@/blocks/types'
 
 export const {Service}Block: BlockConfig = {
-  type: '{service}',
-  name: '{Service}',
-  // ... other config ...
-
-  // Enable triggers and list available trigger IDs
+  // ...
   triggers: {
     enabled: true,
-    available: [
-      '{service}_event_a',
-      '{service}_event_b',
-      '{service}_event_c',
-      '{service}_webhook',
-    ],
+    available: ['{service}_event_a', '{service}_event_b'],
   },
-
   subBlocks: [
-    // Regular tool subBlocks first
-    { id: 'operation', /* ... */ },
-    { id: 'credential', /* ... */ },
-    // ... other tool fields ...
-
-    // Then spread ALL trigger subBlocks
+    // Regular tool subBlocks first...
     ...getTrigger('{service}_event_a').subBlocks,
     ...getTrigger('{service}_event_b').subBlocks,
-    ...getTrigger('{service}_event_c').subBlocks,
-    ...getTrigger('{service}_webhook').subBlocks,
   ],
-
-  // ... tools config ...
 }
 ```
 
-## Automatic Webhook Registration (Preferred)
-
-If the service's API supports programmatic webhook creation, implement automatic webhook registration instead of requiring users to manually configure webhooks. This provides a much better user experience.
+## Provider Handler
 
-### When to Use Automatic Registration
+All provider-specific webhook logic lives in a single handler file: `apps/sim/lib/webhooks/providers/{service}.ts`.
 
-Check the service's API documentation for endpoints like:
-- `POST /webhooks` or `POST /hooks` - Create webhook
-- `DELETE /webhooks/{id}` - Delete webhook
+### When to Create a Handler
 
-Services that support this pattern include: Grain, Lemlist, Calendly, Airtable, Webflow, Typeform, etc.
+| Behavior | Method | Examples |
+|---|---|---|
+| HMAC signature auth | `verifyAuth` via `createHmacVerifier` | Ashby, Jira, Linear, Typeform |
+| Custom token auth | `verifyAuth` via `verifyTokenAuth` | Generic, Google Forms |
+| Event filtering | `matchEvent` | GitHub, Jira, Attio, HubSpot |
+| Idempotency dedup | `extractIdempotencyId` | Slack, Stripe, Linear, Jira |
+| Custom input formatting | `formatInput` | Slack, Teams, Attio, Ashby |
+| Auto webhook creation | `createSubscription` | Ashby, Grain, Calendly, Airtable |
+| Auto webhook deletion | `deleteSubscription` | Ashby, Grain, Calendly, Airtable |
+| Challenge/verification | `handleChallenge` | Slack, WhatsApp, Teams |
+| Custom success response | `formatSuccessResponse` | Slack, Twilio Voice, Teams |
 
-### Implementation Steps
+If none apply, you don't need a handler. The default handler provides bearer token auth.
 
-#### 1. Add API Key to Extra Fields
-
-Update your `build{Service}ExtraFields` function to include an API key field:
+### Example Handler
 
 ```typescript
-export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
-  return [
-    {
-      id: 'apiKey',
-      title: 'API Key',
-      type: 'short-input',
-      placeholder: 'Enter your {Service} API key',
-      description: 'Required to create the webhook in {Service}.',
-      password: true,
-      required: true,
-      mode: 'trigger',
-      condition: { field: 'selectedTriggerId', value: triggerId },
-    },
-    // Other optional fields (e.g., campaign filter, project filter)
-    {
-      id: 'projectId',
-      title: 'Project ID (Optional)',
-      type: 'short-input',
-      placeholder: 'Leave empty for all projects',
-      mode: 'trigger',
-      condition: { field: 'selectedTriggerId', value: triggerId },
-    },
-  ]
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type { EventMatchContext, FormatInputContext, FormatInputResult, WebhookProviderHandler } from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:{Service}')
+
+function validate{Service}Signature(secret: string, signature: string, body: string): boolean {
+  if (!secret || !signature || !body) return false
+  const computed = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+  return safeCompare(computed, signature)
 }
-```
-
-#### 2. Update Setup Instructions for Automatic Creation
-
-Change instructions to indicate automatic webhook creation:
-
-```typescript
-export function {service}SetupInstructions(eventType: string): string {
-  const instructions = [
-    'Enter your {Service} API Key above.',
-    'You can find your API key in {Service} at <strong>Settings > API</strong>.',
-    `Click <strong>"Save Configuration"</strong> to automatically create the webhook in {Service} for <strong>${eventType}</strong> events.`,
-    'The webhook will be automatically deleted when you remove this trigger.',
-  ]
 
-  return instructions
-    .map((instruction, index) =>
-      `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
-    )
-    .join('')
-}
-```
-
-#### 3. Add Webhook Creation to API Route
-
-In `apps/sim/app/api/webhooks/route.ts`, add provider-specific logic after the database save:
-
-```typescript
-// --- {Service} specific logic ---
-if (savedWebhook && provider === '{service}') {
-  logger.info(`[${requestId}] {Service} provider detected. Creating webhook subscription.`)
-  try {
-    const result = await create{Service}WebhookSubscription(
-      {
-        id: savedWebhook.id,
-        path: savedWebhook.path,
-        providerConfig: savedWebhook.providerConfig,
-      },
-      requestId
-    )
-
-    if (result) {
-      // Update the webhook record with the external webhook ID
-      const updatedConfig = {
-        ...(savedWebhook.providerConfig as Record<string, any>),
-        externalId: result.id,
-      }
-      await db
-        .update(webhook)
-        .set({
-          providerConfig: updatedConfig,
-          updatedAt: new Date(),
-        })
-        .where(eq(webhook.id, savedWebhook.id))
-
-      savedWebhook.providerConfig = updatedConfig
-      logger.info(`[${requestId}] Successfully created {Service} webhook`, {
-        externalHookId: result.id,
-        webhookId: savedWebhook.id,
-      })
-    }
-  } catch (err) {
-    logger.error(
-      `[${requestId}] Error creating {Service} webhook subscription, rolling back webhook`,
-      err
-    )
-    await db.delete(webhook).where(eq(webhook.id, savedWebhook.id))
-    return NextResponse.json(
-      {
-        error: 'Failed to create webhook in {Service}',
-        details: err instanceof Error ? err.message : 'Unknown error',
-      },
-      { status: 500 }
-    )
-  }
-}
-// --- End {Service} specific logic ---
-```
-
-Then add the helper function at the end of the file:
-
-```typescript
-async function create{Service}WebhookSubscription(
-  webhookData: any,
-  requestId: string
-): Promise<{ id: string } | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { apiKey, triggerId, projectId } = providerConfig || {}
-
-    if (!apiKey) {
-      throw new Error('{Service} API Key is required.')
-    }
-
-    // Map trigger IDs to service event types
-    const eventTypeMap: Record<string, string | undefined> = {
-      {service}_event_a: 'eventA',
-      {service}_event_b: 'eventB',
-      {service}_webhook: undefined, // Generic - no filter
-    }
-
-    const eventType = eventTypeMap[triggerId]
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const requestBody: Record<string, any> = {
-      url: notificationUrl,
-    }
-
-    if (eventType) {
-      requestBody.eventType = eventType
-    }
+export const {service}Handler: WebhookProviderHandler = {
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'X-{Service}-Signature',
+    validateFn: validate{Service}Signature,
+    providerLabel: '{Service}',
+  }),
 
-    if (projectId) {
-      requestBody.projectId = projectId
+  async matchEvent({ body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (triggerId && triggerId !== '{service}_webhook') {
+      const { is{Service}EventMatch } = await import('@/triggers/{service}/utils')
+      if (!is{Service}EventMatch(triggerId, body as Record<string, unknown>)) return false
     }
+    return true
+  },
 
-    const response = await fetch('https://api.{service}.com/webhooks', {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return {
+      input: {
+        eventType: b.type,
+        resourceId: (b.data as Record<string, unknown>)?.id || '',
+        resource: b.data,
       },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await response.json()
-
-    if (!response.ok) {
-      const errorMessage = responseBody.message || 'Unknown API error'
-      let userFriendlyMessage = 'Failed to create webhook in {Service}'
-
-      if (response.status === 401) {
-        userFriendlyMessage = 'Invalid API Key. Please verify and try again.'
-      } else if (errorMessage) {
-        userFriendlyMessage = `{Service} error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
     }
+  },
 
-    return { id: responseBody.id }
-  } catch (error: any) {
-    logger.error(`Exception during {Service} webhook creation`, { error: error.message })
-    throw error
-  }
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    return obj.id && obj.type ? `${obj.type}:${obj.id}` : null
+  },
 }
 ```
 
-#### 4. Add Webhook Deletion to Provider Subscriptions
-
-In `apps/sim/lib/webhooks/provider-subscriptions.ts`:
+### Register the Handler
 
-1. Add a logger:
-```typescript
-const {service}Logger = createLogger('{Service}Webhook')
-```
-
-2. Add the delete function:
-```typescript
-export async function delete{Service}Webhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const apiKey = config.apiKey as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!apiKey || !externalId) {
-      {service}Logger.warn(`[${requestId}] Missing apiKey or externalId, skipping cleanup`)
-      return
-    }
-
-    const response = await fetch(`https://api.{service}.com/webhooks/${externalId}`, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-      },
-    })
-
-    if (!response.ok && response.status !== 404) {
-      {service}Logger.warn(`[${requestId}] Failed to delete webhook (non-fatal): ${response.status}`)
-    } else {
-      {service}Logger.info(`[${requestId}] Successfully deleted webhook ${externalId}`)
-    }
-  } catch (error) {
-    {service}Logger.warn(`[${requestId}] Error deleting webhook (non-fatal)`, error)
-  }
-}
-```
+In `apps/sim/lib/webhooks/providers/registry.ts`:
 
-3. Add to `cleanupExternalWebhook`:
 ```typescript
-export async function cleanupExternalWebhook(...): Promise<void> {
-  // ... existing providers ...
-  } else if (webhook.provider === '{service}') {
-    await delete{Service}Webhook(webhook, requestId)
-  }
-}
-```
-
-### Key Points for Automatic Registration
-
-- **API Key visibility**: Always use `password: true` for API key fields
-- **Error handling**: Roll back the database webhook if external creation fails
-- **External ID storage**: Save the external webhook ID in `providerConfig.externalId`
-- **Graceful cleanup**: Don't fail webhook deletion if cleanup fails (use non-fatal logging)
-- **User-friendly errors**: Map HTTP status codes to helpful error messages
+import { {service}Handler } from '@/lib/webhooks/providers/{service}'
 
-## The buildTriggerSubBlocks Helper
-
-This is the generic helper from `@/triggers` that creates consistent trigger subBlocks.
-
-### Function Signature
-
-```typescript
-interface BuildTriggerSubBlocksOptions {
-  triggerId: string                              // e.g., 'service_event_a'
-  triggerOptions: Array<{ label: string; id: string }>  // Dropdown options
-  includeDropdown?: boolean                      // true only for primary trigger
-  setupInstructions: string                      // HTML instructions
-  extraFields?: SubBlockConfig[]                 // Service-specific fields
-  webhookPlaceholder?: string                    // Custom placeholder text
+const PROVIDER_HANDLERS: Record<string, WebhookProviderHandler> = {
+  // ... existing (alphabetical) ...
+  {service}: {service}Handler,
 }
-
-function buildTriggerSubBlocks(options: BuildTriggerSubBlocksOptions): SubBlockConfig[]
 ```
 
-### What It Creates
+## Output Alignment (Critical)
 
-The helper creates this structure:
-1. **Dropdown** (only if `includeDropdown: true`) - Trigger type selector
-2. **Webhook URL** - Read-only field with copy button
-3. **Extra Fields** - Your service-specific fields (filters, options, etc.)
-4. **Save Button** - Activates the trigger
-5. **Instructions** - Setup guide for users
+There are two sources of truth that **MUST be aligned**:
 
-All fields automatically have:
-- `mode: 'trigger'` - Only shown in trigger mode
-- `condition: { field: 'selectedTriggerId', value: triggerId }` - Only shown when this trigger is selected
+1. **Trigger `outputs`** — schema defining what fields SHOULD be available (UI tag dropdown)
+2. **`formatInput` on the handler** — implementation that transforms raw payload into actual data
 
-## Trigger Outputs & Webhook Input Formatting
+If they differ: the tag dropdown shows fields that don't exist, or actual data has fields users can't discover.
 
-### Important: Two Sources of Truth
+**Rules for `formatInput`:**
+- Return `{ input: { ... } }` where inner keys match trigger `outputs` exactly
+- Return `{ input: ..., skip: { message: '...' } }` to skip execution
+- No wrapper objects or duplication
+- Use `null` for missing optional data
 
-There are two related but separate concerns:
+## Automatic Webhook Registration
 
-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`.
+If the service API supports programmatic webhook creation, implement `createSubscription` and `deleteSubscription` on the handler. The orchestration layer calls these automatically — **no code touches `route.ts`, `provider-subscriptions.ts`, or `deploy.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
+```typescript
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type { DeleteSubscriptionContext, SubscriptionContext, SubscriptionResult } from '@/lib/webhooks/providers/types'
 
-- **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.
+export const {service}Handler: WebhookProviderHandler = {
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const config = getProviderConfig(ctx.webhook)
+    const apiKey = config.apiKey as string
+    if (!apiKey) throw new Error('{Service} API Key is required.')
 
-### Adding a Handler
+    const res = await fetch('https://api.{service}.com/webhooks', {
+      method: 'POST',
+      headers: { Authorization: `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
+      body: JSON.stringify({ url: getNotificationUrl(ctx.webhook) }),
+    })
 
-In `apps/sim/lib/webhooks/utils.server.ts`, add a handler block:
+    if (!res.ok) throw new Error(`{Service} error: ${res.status}`)
+    const { id } = (await res.json()) as { id: string }
+    return { providerConfigUpdates: { externalId: id } }
+  },
 
-```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,
-  }
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const config = getProviderConfig(ctx.webhook)
+    const { apiKey, externalId } = config as { apiKey?: string; externalId?: string }
+    if (!apiKey || !externalId) return
+    await fetch(`https://api.{service}.com/webhooks/${externalId}`, {
+      method: 'DELETE',
+      headers: { Authorization: `Bearer ${apiKey}` },
+    }).catch(() => {})
+  },
 }
 ```
 
-**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
+**Key points:**
+- Throw from `createSubscription` — orchestration rolls back the DB webhook
+- Never throw from `deleteSubscription` — log non-fatally
+- Return `{ providerConfigUpdates: { externalId } }` — orchestration merges into `providerConfig`
+- Add `apiKey` field to `build{Service}ExtraFields` with `password: true`
 
-### Verify Alignment
-
-Run the alignment checker:
-```bash
-bunx scripts/check-trigger-alignment.ts {service}
-```
-
-## Trigger Outputs
+## Trigger Outputs Schema
 
 Trigger outputs use the same schema as block outputs (NOT tool outputs).
 
-**Supported:**
-- `type` and `description` for simple fields
-- Nested object structure for complex data
-
-**NOT Supported:**
-- `optional: true` (tool outputs only)
-- `items` property (tool outputs only)
+**Supported:** `type` + `description` for leaf fields, nested objects for complex data.
+**NOT supported:** `optional: true`, `items` (those are tool-output-only features).
 
 ```typescript
 export function buildOutputs(): Record<string, TriggerOutput> {
   return {
-    // Simple fields
     eventType: { type: 'string', description: 'Event type' },
     timestamp: { type: 'string', description: 'When it occurred' },
-
-    // Complex data - use type: 'json'
     payload: { type: 'json', description: 'Full event payload' },
-
-    // Nested structure
     resource: {
       id: { type: 'string', description: 'Resource ID' },
       name: { type: 'string', description: 'Resource name' },
@@ -630,79 +327,32 @@ export function buildOutputs(): Record<string, TriggerOutput> {
 }
 ```
 
-## Generic Webhook Trigger Pattern
-
-For services with many event types, create a generic webhook that accepts all events:
-
-```typescript
-export const {service}WebhookTrigger: TriggerConfig = {
-  id: '{service}_webhook',
-  name: '{Service} Webhook (All Events)',
-  // ...
-
-  subBlocks: buildTriggerSubBlocks({
-    triggerId: '{service}_webhook',
-    triggerOptions: {service}TriggerOptions,
-    setupInstructions: {service}SetupInstructions('All Events'),
-    extraFields: [
-      // Event type filter (optional)
-      {
-        id: 'eventTypes',
-        title: 'Event Types',
-        type: 'dropdown',
-        multiSelect: true,
-        options: [
-          { label: 'Event A', id: 'event_a' },
-          { label: 'Event B', id: 'event_b' },
-        ],
-        placeholder: 'Leave empty for all events',
-        mode: 'trigger',
-        condition: { field: 'selectedTriggerId', value: '{service}_webhook' },
-      },
-      // Plus any other service-specific fields
-      ...build{Service}ExtraFields('{service}_webhook'),
-    ],
-  }),
-}
-```
-
-## Checklist Before Finishing
-
-### Utils
-- [ ] Created `{service}TriggerOptions` array with all trigger IDs
-- [ ] Created `{service}SetupInstructions` function with clear steps
-- [ ] Created `build{Service}ExtraFields` for service-specific fields
-- [ ] Created output builders for each trigger type
+## Checklist
 
-### Triggers
-- [ ] Primary trigger has `includeDropdown: true`
-- [ ] Secondary triggers do NOT have `includeDropdown`
+### Trigger Definition
+- [ ] Created `utils.ts` with options, instructions, extra fields, and output builders
+- [ ] Primary trigger has `includeDropdown: true`; secondary triggers do NOT
 - [ ] All triggers use `buildTriggerSubBlocks` helper
-- [ ] All triggers have proper outputs defined
 - [ ] Created `index.ts` barrel export
 
 ### Registration
-- [ ] All triggers imported in `triggers/registry.ts`
-- [ ] All triggers added to `TRIGGER_REGISTRY`
-- [ ] Block has `triggers.enabled: true`
-- [ ] Block has all trigger IDs in `triggers.available`
+- [ ] All triggers in `triggers/registry.ts` → `TRIGGER_REGISTRY`
+- [ ] Block has `triggers.enabled: true` and lists all trigger IDs in `triggers.available`
 - [ ] Block spreads all trigger subBlocks: `...getTrigger('id').subBlocks`
 
-### Automatic Webhook Registration (if supported)
-- [ ] Added API key field to `build{Service}ExtraFields` with `password: true`
-- [ ] Updated setup instructions for automatic webhook creation
-- [ ] Added provider-specific logic to `apps/sim/app/api/webhooks/route.ts`
-- [ ] Added `create{Service}WebhookSubscription` helper function
-- [ ] Added `delete{Service}Webhook` function to `provider-subscriptions.ts`
-- [ ] Added provider to `cleanupExternalWebhook` function
+### Provider Handler (if needed)
+- [ ] Handler file at `apps/sim/lib/webhooks/providers/{service}.ts`
+- [ ] Registered in `providers/registry.ts` (alphabetical)
+- [ ] Signature validator is a private function inside the handler file
+- [ ] `formatInput` output keys match trigger `outputs` exactly
+- [ ] Event matching uses dynamic `await import()` for trigger utils
 
-### 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
+### Auto Registration (if supported)
+- [ ] `createSubscription` and `deleteSubscription` on the handler
+- [ ] NO changes to `route.ts`, `provider-subscriptions.ts`, or `deploy.ts`
+- [ ] API key field uses `password: true`
 
 ### Testing
-- [ ] Run `bun run type-check` to verify no TypeScript errors
-- [ ] Restart dev server to pick up new triggers
-- [ ] Test trigger UI shows correctly in the block
-- [ ] Test automatic webhook creation works (if applicable)
+- [ ] `bun run type-check` passes
+- [ ] Manually verify `formatInput` output keys match trigger `outputs` keys
+- [ ] Trigger UI shows correctly in the block
diff --git a/.agents/skills/validate-trigger/SKILL.md b/.agents/skills/validate-trigger/SKILL.md
new file mode 100644
index 00000000000..ff1eb775b44
--- /dev/null
+++ b/.agents/skills/validate-trigger/SKILL.md
@@ -0,0 +1,212 @@
+---
+name: validate-trigger
+description: Audit an existing Sim webhook trigger against the service's webhook API docs and repository conventions, then report and fix issues across trigger definitions, provider handler, output alignment, registration, and security. Use when validating or repairing a trigger under `apps/sim/triggers/{service}/` or `apps/sim/lib/webhooks/providers/{service}.ts`.
+---
+
+# Validate Trigger
+
+You are an expert auditor for Sim webhook triggers. Your job is to validate that an existing trigger implementation is correct, complete, secure, and aligned across all layers.
+
+## Your Task
+
+1. Read the service's webhook/API documentation (via WebFetch)
+2. Read every trigger file, provider handler, and registry entry
+3. Cross-reference against the API docs and Sim conventions
+4. Report all issues grouped by severity (critical, warning, suggestion)
+5. Fix all issues after reporting them
+
+## Step 1: Gather All Files
+
+Read **every** file for the trigger — do not skip any:
+
+```
+apps/sim/triggers/{service}/           # All trigger files, utils.ts, index.ts
+apps/sim/lib/webhooks/providers/{service}.ts  # Provider handler (if exists)
+apps/sim/lib/webhooks/providers/registry.ts   # Handler registry
+apps/sim/triggers/registry.ts                 # Trigger registry
+apps/sim/blocks/blocks/{service}.ts           # Block definition (trigger wiring)
+```
+
+Also read for reference:
+```
+apps/sim/lib/webhooks/providers/types.ts            # WebhookProviderHandler interface
+apps/sim/lib/webhooks/providers/utils.ts            # Shared helpers (createHmacVerifier, etc.)
+apps/sim/lib/webhooks/provider-subscription-utils.ts    # Subscription helpers
+apps/sim/lib/webhooks/processor.ts                  # Central webhook processor
+```
+
+## Step 2: Pull API Documentation
+
+Fetch the service's official webhook documentation. This is the **source of truth** for:
+- Webhook event types and payload shapes
+- Signature/auth verification method (HMAC algorithm, header names, secret format)
+- Challenge/verification handshake requirements
+- Webhook subscription API (create/delete endpoints, if applicable)
+- Retry behavior and delivery guarantees
+
+## Step 3: Validate Trigger Definitions
+
+### utils.ts
+- [ ] `{service}TriggerOptions` lists all trigger IDs accurately
+- [ ] `{service}SetupInstructions` provides clear, correct steps for the service
+- [ ] `build{Service}ExtraFields` includes relevant filter/config fields with correct `condition`
+- [ ] Output builders expose all meaningful fields from the webhook payload
+- [ ] Output builders do NOT use `optional: true` or `items` (tool-output-only features)
+- [ ] Nested output objects correctly model the payload structure
+
+### Trigger Files
+- [ ] Exactly one primary trigger has `includeDropdown: true`
+- [ ] All secondary triggers do NOT have `includeDropdown`
+- [ ] All triggers use `buildTriggerSubBlocks` helper (not hand-rolled subBlocks)
+- [ ] Every trigger's `id` matches the convention `{service}_{event_name}`
+- [ ] Every trigger's `provider` matches the service name used in the handler registry
+- [ ] `index.ts` barrel exports all triggers
+
+### Trigger ↔ Provider Alignment (CRITICAL)
+- [ ] Every trigger ID referenced in `matchEvent` logic exists in `{service}TriggerOptions`
+- [ ] Event matching logic in the provider correctly maps trigger IDs to service event types
+- [ ] Event matching logic in `is{Service}EventMatch` (if exists) correctly identifies events per the API docs
+
+## Step 4: Validate Provider Handler
+
+### Auth Verification
+- [ ] `verifyAuth` correctly validates webhook signatures per the service's documentation
+- [ ] HMAC algorithm matches (SHA-1, SHA-256, SHA-512)
+- [ ] Signature header name matches the API docs exactly
+- [ ] Signature format is handled (raw hex, `sha256=` prefix, base64, etc.)
+- [ ] Uses `safeCompare` for timing-safe comparison (no `===`)
+- [ ] If `webhookSecret` is required, handler rejects when it's missing (fail-closed)
+- [ ] Signature is computed over raw body (not parsed JSON)
+
+### Event Matching
+- [ ] `matchEvent` returns `boolean` (not `NextResponse` or other values)
+- [ ] Challenge/verification events are excluded from matching (e.g., `endpoint.url_validation`)
+- [ ] When `triggerId` is a generic webhook ID, all events pass through
+- [ ] When `triggerId` is specific, only matching events pass
+- [ ] Event matching logic uses dynamic `await import()` for trigger utils (avoids circular deps)
+
+### formatInput (CRITICAL)
+- [ ] Every key in the `formatInput` return matches a key in the trigger `outputs` schema
+- [ ] Every key in the trigger `outputs` schema is populated by `formatInput`
+- [ ] No extra undeclared keys that users can't discover in the UI
+- [ ] No wrapper objects (`webhook: { ... }`, `{service}: { ... }`)
+- [ ] Nested output paths exist at the correct depth (e.g., `resource.id` actually has `resource: { id: ... }`)
+- [ ] `null` is used for missing optional fields (not empty strings or empty objects)
+- [ ] Returns `{ input: { ... } }` — not a bare object
+
+### Idempotency
+- [ ] `extractIdempotencyId` returns a stable, unique key per delivery
+- [ ] Uses provider-specific delivery IDs when available (e.g., `X-Request-Id`, `Linear-Delivery`, `svix-id`)
+- [ ] Falls back to content-based ID (e.g., `${type}:${id}`) when no delivery header exists
+- [ ] Does NOT include timestamps in the idempotency key (would break dedup on retries)
+
+### Challenge Handling (if applicable)
+- [ ] `handleChallenge` correctly implements the service's URL verification handshake
+- [ ] Returns the expected response format per the API docs
+- [ ] Env-backed secrets are resolved via `resolveEnvVarsInObject` if needed
+
+## Step 5: Validate Automatic Subscription Lifecycle
+
+If the service supports programmatic webhook creation:
+
+### createSubscription
+- [ ] Calls the correct API endpoint to create a webhook
+- [ ] Sends the correct event types/filters
+- [ ] Passes the notification URL from `getNotificationUrl(ctx.webhook)`
+- [ ] Returns `{ providerConfigUpdates: { externalId } }` with the external webhook ID
+- [ ] Throws on failure (orchestration handles rollback)
+- [ ] Provides user-friendly error messages (401 → "Invalid API Key", etc.)
+
+### deleteSubscription
+- [ ] Calls the correct API endpoint to delete the webhook
+- [ ] Handles 404 gracefully (webhook already deleted)
+- [ ] Never throws — catches errors and logs non-fatally
+- [ ] Skips gracefully when `apiKey` or `externalId` is missing
+
+### Orchestration Isolation
+- [ ] NO provider-specific logic in `route.ts`, `provider-subscriptions.ts`, or `deploy.ts`
+- [ ] All subscription logic lives on the handler (`createSubscription`/`deleteSubscription`)
+
+## Step 6: Validate Registration and Block Wiring
+
+### Trigger Registry (`triggers/registry.ts`)
+- [ ] All triggers are imported and registered
+- [ ] Registry keys match trigger IDs exactly
+- [ ] No orphaned entries (triggers that don't exist)
+
+### Provider Handler Registry (`providers/registry.ts`)
+- [ ] Handler is imported and registered (if handler exists)
+- [ ] Registry key matches the `provider` field on the trigger configs
+- [ ] Entries are in alphabetical order
+
+### Block Wiring (`blocks/blocks/{service}.ts`)
+- [ ] Block has `triggers.enabled: true`
+- [ ] `triggers.available` lists all trigger IDs
+- [ ] All trigger subBlocks are spread into `subBlocks`: `...getTrigger('id').subBlocks`
+- [ ] No trigger IDs in `triggers.available` that aren't in the registry
+- [ ] No trigger subBlocks spread that aren't in `triggers.available`
+
+## Step 7: Validate Security
+
+- [ ] Webhook secrets are never logged (not even at debug level)
+- [ ] Auth verification runs before any event processing
+- [ ] No secret comparison uses `===` (must use `safeCompare` or `crypto.timingSafeEqual`)
+- [ ] Timestamp/replay protection is reasonable (not too tight for retries, not too loose for security)
+- [ ] Raw body is used for signature verification (not re-serialized JSON)
+
+## Step 8: Report and Fix
+
+### Report Format
+
+Group findings by severity:
+
+**Critical** (runtime errors, security issues, or data loss):
+- Wrong HMAC algorithm or header name
+- `formatInput` keys don't match trigger `outputs`
+- Missing `verifyAuth` when the service sends signed webhooks
+- `matchEvent` returns non-boolean values
+- Provider-specific logic leaking into shared orchestration files
+- Trigger IDs mismatch between trigger files, registry, and block
+- `createSubscription` calling wrong API endpoint
+- Auth comparison using `===` instead of `safeCompare`
+
+**Warning** (convention violations or usability issues):
+- Missing `extractIdempotencyId` when the service provides delivery IDs
+- Timestamps in idempotency keys (breaks dedup on retries)
+- Missing challenge handling when the service requires URL verification
+- Output schema missing fields that `formatInput` returns (undiscoverable data)
+- Overly tight timestamp skew window that rejects legitimate retries
+- `matchEvent` not filtering challenge/verification events
+- Setup instructions missing important steps
+
+**Suggestion** (minor improvements):
+- More specific output field descriptions
+- Additional output fields that could be exposed
+- Better error messages in `createSubscription`
+- Logging improvements
+
+### Fix All Issues
+
+After reporting, fix every **critical** and **warning** issue. Apply **suggestions** where they don't add unnecessary complexity.
+
+### Validation Output
+
+After fixing, confirm:
+1. `bun run type-check` passes
+2. Re-read all modified files to verify fixes are correct
+3. Provider handler tests pass (if they exist): `bun test {service}`
+
+## Checklist Summary
+
+- [ ] Read all trigger files, provider handler, types, registries, and block
+- [ ] Pulled and read official webhook/API documentation
+- [ ] Validated trigger definitions: options, instructions, extra fields, outputs
+- [ ] Validated primary/secondary trigger distinction (`includeDropdown`)
+- [ ] Validated provider handler: auth, matchEvent, formatInput, idempotency
+- [ ] Validated output alignment: every `outputs` key ↔ every `formatInput` key
+- [ ] Validated subscription lifecycle: createSubscription, deleteSubscription, no shared-file edits
+- [ ] Validated registration: trigger registry, handler registry, block wiring
+- [ ] Validated security: safe comparison, no secret logging, replay protection
+- [ ] Reported all issues grouped by severity
+- [ ] Fixed all critical and warning issues
+- [ ] `bun run type-check` passes after fixes
diff --git a/.claude/commands/add-trigger.md b/.claude/commands/add-trigger.md
index d252bf61666..9cbeca68a3e 100644
--- a/.claude/commands/add-trigger.md
+++ b/.claude/commands/add-trigger.md
@@ -3,63 +3,57 @@ description: Create webhook triggers for a Sim integration using the generic tri
 argument-hint: <service-name>
 ---
 
-# Add Trigger Skill
+# Add Trigger
 
 You are an expert at creating webhook triggers for Sim. You understand the trigger system, the generic `buildTriggerSubBlocks` helper, and how triggers connect to blocks.
 
 ## Your Task
 
-When the user asks you to create triggers for a service:
 1. Research what webhook events the service supports
 2. Create the trigger files using the generic builder
-3. Register triggers and connect them to the block
+3. Create a provider handler if custom auth, formatting, or subscriptions are needed
+4. Register triggers and connect them to the block
 
 ## Directory Structure
 
 ```
 apps/sim/triggers/{service}/
 ├── index.ts              # Barrel exports
-├── utils.ts              # Service-specific helpers (trigger options, setup instructions, extra fields)
+├── utils.ts              # Service-specific helpers (options, instructions, extra fields, outputs)
 ├── {event_a}.ts          # Primary trigger (includes dropdown)
 ├── {event_b}.ts          # Secondary trigger (no dropdown)
-├── {event_c}.ts          # Secondary trigger (no dropdown)
 └── webhook.ts            # Generic webhook trigger (optional, for "all events")
+
+apps/sim/lib/webhooks/
+├── provider-subscription-utils.ts  # Shared subscription helpers (getProviderConfig, getNotificationUrl)
+├── providers/
+│   ├── {service}.ts       # Provider handler (auth, formatInput, matchEvent, subscriptions)
+│   ├── types.ts           # WebhookProviderHandler interface
+│   ├── utils.ts           # Shared helpers (createHmacVerifier, verifyTokenAuth, skipByEventTypes)
+│   └── registry.ts        # Handler map + default handler
 ```
 
-## Step 1: Create utils.ts
+## Step 1: Create `utils.ts`
 
-This file contains service-specific helpers used by all triggers.
+This file contains all service-specific helpers used by triggers.
 
 ```typescript
 import type { SubBlockConfig } from '@/blocks/types'
 import type { TriggerOutput } from '@/triggers/types'
 
-/**
- * Dropdown options for the trigger type selector.
- * These appear in the primary trigger's dropdown.
- */
 export const {service}TriggerOptions = [
   { label: 'Event A', id: '{service}_event_a' },
   { label: 'Event B', id: '{service}_event_b' },
-  { label: 'Event C', id: '{service}_event_c' },
-  { label: 'Generic Webhook (All Events)', id: '{service}_webhook' },
 ]
 
-/**
- * Generates HTML setup instructions for the trigger.
- * Displayed to users to help them configure webhooks in the external service.
- */
 export function {service}SetupInstructions(eventType: string): string {
   const instructions = [
     'Copy the <strong>Webhook URL</strong> above',
     'Go to <strong>{Service} Settings > Webhooks</strong>',
-    'Click <strong>Add Webhook</strong>',
-    'Paste the webhook URL',
     `Select the <strong>${eventType}</strong> event type`,
-    'Save the webhook configuration',
+    'Paste the webhook URL and save',
     'Click "Save" above to activate your trigger',
   ]
-
   return instructions
     .map((instruction, index) =>
       `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
@@ -67,10 +61,6 @@ export function {service}SetupInstructions(eventType: string): string {
     .join('')
 }
 
-/**
- * Service-specific extra fields to add to triggers.
- * These are inserted between webhookUrl and triggerSave.
- */
 export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
   return [
     {
@@ -78,53 +68,34 @@ export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
       title: 'Project ID (Optional)',
       type: 'short-input',
       placeholder: 'Leave empty for all projects',
-      description: 'Optionally filter to a specific project',
       mode: 'trigger',
       condition: { field: 'selectedTriggerId', value: triggerId },
     },
   ]
 }
 
-/**
- * Build outputs for this trigger type.
- * Outputs define what data is available to downstream blocks.
- */
 export function build{Service}Outputs(): Record<string, TriggerOutput> {
   return {
-    eventType: { type: 'string', description: 'The type of event that triggered this workflow' },
+    eventType: { type: 'string', description: 'The type of event' },
     resourceId: { type: 'string', description: 'ID of the affected resource' },
-    timestamp: { type: 'string', description: 'When the event occurred (ISO 8601)' },
-    // Nested outputs for complex data
     resource: {
       id: { type: 'string', description: 'Resource ID' },
       name: { type: 'string', description: 'Resource name' },
-      status: { type: 'string', description: 'Current status' },
     },
-    webhook: { type: 'json', description: 'Full webhook payload' },
   }
 }
 ```
 
-## Step 2: Create the Primary Trigger
+## Step 2: Create Trigger Files
 
-The **primary trigger** is the first one listed. It MUST include `includeDropdown: true` so users can switch between trigger types.
+**Primary trigger** — MUST include `includeDropdown: true`:
 
 ```typescript
 import { {Service}Icon } from '@/components/icons'
 import { buildTriggerSubBlocks } from '@/triggers'
-import {
-  build{Service}ExtraFields,
-  build{Service}Outputs,
-  {service}SetupInstructions,
-  {service}TriggerOptions,
-} from '@/triggers/{service}/utils'
+import { build{Service}ExtraFields, build{Service}Outputs, {service}SetupInstructions, {service}TriggerOptions } from '@/triggers/{service}/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
-/**
- * {Service} Event A Trigger
- *
- * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
- */
 export const {service}EventATrigger: TriggerConfig = {
   id: '{service}_event_a',
   name: '{Service} Event A',
@@ -132,496 +103,222 @@ export const {service}EventATrigger: TriggerConfig = {
   description: 'Trigger workflow when Event A occurs',
   version: '1.0.0',
   icon: {Service}Icon,
-
   subBlocks: buildTriggerSubBlocks({
     triggerId: '{service}_event_a',
     triggerOptions: {service}TriggerOptions,
-    includeDropdown: true,  // PRIMARY TRIGGER - includes dropdown
+    includeDropdown: true,
     setupInstructions: {service}SetupInstructions('Event A'),
     extraFields: build{Service}ExtraFields('{service}_event_a'),
   }),
-
   outputs: build{Service}Outputs(),
-
-  webhook: {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  },
+  webhook: { method: 'POST', headers: { 'Content-Type': 'application/json' } },
 }
 ```
 
-## Step 3: Create Secondary Triggers
-
-Secondary triggers do NOT include the dropdown (it's already in the primary trigger).
+**Secondary triggers** — NO `includeDropdown` (it's already in the primary):
 
 ```typescript
-import { {Service}Icon } from '@/components/icons'
-import { buildTriggerSubBlocks } from '@/triggers'
-import {
-  build{Service}ExtraFields,
-  build{Service}Outputs,
-  {service}SetupInstructions,
-  {service}TriggerOptions,
-} from '@/triggers/{service}/utils'
-import type { TriggerConfig } from '@/triggers/types'
-
-/**
- * {Service} Event B Trigger
- */
 export const {service}EventBTrigger: TriggerConfig = {
-  id: '{service}_event_b',
-  name: '{Service} Event B',
-  provider: '{service}',
-  description: 'Trigger workflow when Event B occurs',
-  version: '1.0.0',
-  icon: {Service}Icon,
-
-  subBlocks: buildTriggerSubBlocks({
-    triggerId: '{service}_event_b',
-    triggerOptions: {service}TriggerOptions,
-    // NO includeDropdown - secondary trigger
-    setupInstructions: {service}SetupInstructions('Event B'),
-    extraFields: build{Service}ExtraFields('{service}_event_b'),
-  }),
-
-  outputs: build{Service}Outputs(),
-
-  webhook: {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  },
+  // Same as above but: id: '{service}_event_b', no includeDropdown
 }
 ```
 
-## Step 4: Create index.ts Barrel Export
+## Step 3: Register and Wire
+
+### `apps/sim/triggers/{service}/index.ts`
 
 ```typescript
 export { {service}EventATrigger } from './event_a'
 export { {service}EventBTrigger } from './event_b'
-export { {service}EventCTrigger } from './event_c'
-export { {service}WebhookTrigger } from './webhook'
 ```
 
-## Step 5: Register Triggers
-
-### Trigger Registry (`apps/sim/triggers/registry.ts`)
+### `apps/sim/triggers/registry.ts`
 
 ```typescript
-// Add import
-import {
-  {service}EventATrigger,
-  {service}EventBTrigger,
-  {service}EventCTrigger,
-  {service}WebhookTrigger,
-} from '@/triggers/{service}'
-
-// Add to TRIGGER_REGISTRY
+import { {service}EventATrigger, {service}EventBTrigger } from '@/triggers/{service}'
+
 export const TRIGGER_REGISTRY: TriggerRegistry = {
-  // ... existing triggers ...
+  // ... existing ...
   {service}_event_a: {service}EventATrigger,
   {service}_event_b: {service}EventBTrigger,
-  {service}_event_c: {service}EventCTrigger,
-  {service}_webhook: {service}WebhookTrigger,
 }
 ```
 
-## Step 6: Connect Triggers to Block
-
-In the block file (`apps/sim/blocks/blocks/{service}.ts`):
+### Block file (`apps/sim/blocks/blocks/{service}.ts`)
 
 ```typescript
-import { {Service}Icon } from '@/components/icons'
 import { getTrigger } from '@/triggers'
-import type { BlockConfig } from '@/blocks/types'
 
 export const {Service}Block: BlockConfig = {
-  type: '{service}',
-  name: '{Service}',
-  // ... other config ...
-
-  // Enable triggers and list available trigger IDs
+  // ...
   triggers: {
     enabled: true,
-    available: [
-      '{service}_event_a',
-      '{service}_event_b',
-      '{service}_event_c',
-      '{service}_webhook',
-    ],
+    available: ['{service}_event_a', '{service}_event_b'],
   },
-
   subBlocks: [
-    // Regular tool subBlocks first
-    { id: 'operation', /* ... */ },
-    { id: 'credential', /* ... */ },
-    // ... other tool fields ...
-
-    // Then spread ALL trigger subBlocks
+    // Regular tool subBlocks first...
     ...getTrigger('{service}_event_a').subBlocks,
     ...getTrigger('{service}_event_b').subBlocks,
-    ...getTrigger('{service}_event_c').subBlocks,
-    ...getTrigger('{service}_webhook').subBlocks,
   ],
-
-  // ... tools config ...
 }
 ```
 
-## Automatic Webhook Registration (Preferred)
-
-If the service's API supports programmatic webhook creation, implement automatic webhook registration instead of requiring users to manually configure webhooks. This provides a much better user experience.
+## Provider Handler
 
-### When to Use Automatic Registration
+All provider-specific webhook logic lives in a single handler file: `apps/sim/lib/webhooks/providers/{service}.ts`.
 
-Check the service's API documentation for endpoints like:
-- `POST /webhooks` or `POST /hooks` - Create webhook
-- `DELETE /webhooks/{id}` - Delete webhook
+### When to Create a Handler
 
-Services that support this pattern include: Grain, Lemlist, Calendly, Airtable, Webflow, Typeform, etc.
+| Behavior | Method | Examples |
+|---|---|---|
+| HMAC signature auth | `verifyAuth` via `createHmacVerifier` | Ashby, Jira, Linear, Typeform |
+| Custom token auth | `verifyAuth` via `verifyTokenAuth` | Generic, Google Forms |
+| Event filtering | `matchEvent` | GitHub, Jira, Attio, HubSpot |
+| Idempotency dedup | `extractIdempotencyId` | Slack, Stripe, Linear, Jira |
+| Custom input formatting | `formatInput` | Slack, Teams, Attio, Ashby |
+| Auto webhook creation | `createSubscription` | Ashby, Grain, Calendly, Airtable |
+| Auto webhook deletion | `deleteSubscription` | Ashby, Grain, Calendly, Airtable |
+| Challenge/verification | `handleChallenge` | Slack, WhatsApp, Teams |
+| Custom success response | `formatSuccessResponse` | Slack, Twilio Voice, Teams |
 
-### Implementation Steps
+If none apply, you don't need a handler. The default handler provides bearer token auth.
 
-#### 1. Add API Key to Extra Fields
-
-Update your `build{Service}ExtraFields` function to include an API key field:
+### Example Handler
 
 ```typescript
-export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
-  return [
-    {
-      id: 'apiKey',
-      title: 'API Key',
-      type: 'short-input',
-      placeholder: 'Enter your {Service} API key',
-      description: 'Required to create the webhook in {Service}.',
-      password: true,
-      required: true,
-      mode: 'trigger',
-      condition: { field: 'selectedTriggerId', value: triggerId },
-    },
-    // Other optional fields (e.g., campaign filter, project filter)
-    {
-      id: 'projectId',
-      title: 'Project ID (Optional)',
-      type: 'short-input',
-      placeholder: 'Leave empty for all projects',
-      mode: 'trigger',
-      condition: { field: 'selectedTriggerId', value: triggerId },
-    },
-  ]
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type { EventMatchContext, FormatInputContext, FormatInputResult, WebhookProviderHandler } from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:{Service}')
+
+function validate{Service}Signature(secret: string, signature: string, body: string): boolean {
+  if (!secret || !signature || !body) return false
+  const computed = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+  return safeCompare(computed, signature)
 }
-```
-
-#### 2. Update Setup Instructions for Automatic Creation
-
-Change instructions to indicate automatic webhook creation:
-
-```typescript
-export function {service}SetupInstructions(eventType: string): string {
-  const instructions = [
-    'Enter your {Service} API Key above.',
-    'You can find your API key in {Service} at <strong>Settings > API</strong>.',
-    `Click <strong>"Save Configuration"</strong> to automatically create the webhook in {Service} for <strong>${eventType}</strong> events.`,
-    'The webhook will be automatically deleted when you remove this trigger.',
-  ]
 
-  return instructions
-    .map((instruction, index) =>
-      `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
-    )
-    .join('')
-}
-```
-
-#### 3. Add Webhook Creation to API Route
-
-In `apps/sim/app/api/webhooks/route.ts`, add provider-specific logic after the database save:
-
-```typescript
-// --- {Service} specific logic ---
-if (savedWebhook && provider === '{service}') {
-  logger.info(`[${requestId}] {Service} provider detected. Creating webhook subscription.`)
-  try {
-    const result = await create{Service}WebhookSubscription(
-      {
-        id: savedWebhook.id,
-        path: savedWebhook.path,
-        providerConfig: savedWebhook.providerConfig,
-      },
-      requestId
-    )
-
-    if (result) {
-      // Update the webhook record with the external webhook ID
-      const updatedConfig = {
-        ...(savedWebhook.providerConfig as Record<string, any>),
-        externalId: result.id,
-      }
-      await db
-        .update(webhook)
-        .set({
-          providerConfig: updatedConfig,
-          updatedAt: new Date(),
-        })
-        .where(eq(webhook.id, savedWebhook.id))
-
-      savedWebhook.providerConfig = updatedConfig
-      logger.info(`[${requestId}] Successfully created {Service} webhook`, {
-        externalHookId: result.id,
-        webhookId: savedWebhook.id,
-      })
-    }
-  } catch (err) {
-    logger.error(
-      `[${requestId}] Error creating {Service} webhook subscription, rolling back webhook`,
-      err
-    )
-    await db.delete(webhook).where(eq(webhook.id, savedWebhook.id))
-    return NextResponse.json(
-      {
-        error: 'Failed to create webhook in {Service}',
-        details: err instanceof Error ? err.message : 'Unknown error',
-      },
-      { status: 500 }
-    )
-  }
-}
-// --- End {Service} specific logic ---
-```
-
-Then add the helper function at the end of the file:
-
-```typescript
-async function create{Service}WebhookSubscription(
-  webhookData: any,
-  requestId: string
-): Promise<{ id: string } | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { apiKey, triggerId, projectId } = providerConfig || {}
-
-    if (!apiKey) {
-      throw new Error('{Service} API Key is required.')
-    }
-
-    // Map trigger IDs to service event types
-    const eventTypeMap: Record<string, string | undefined> = {
-      {service}_event_a: 'eventA',
-      {service}_event_b: 'eventB',
-      {service}_webhook: undefined, // Generic - no filter
-    }
-
-    const eventType = eventTypeMap[triggerId]
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const requestBody: Record<string, any> = {
-      url: notificationUrl,
-    }
-
-    if (eventType) {
-      requestBody.eventType = eventType
-    }
+export const {service}Handler: WebhookProviderHandler = {
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'X-{Service}-Signature',
+    validateFn: validate{Service}Signature,
+    providerLabel: '{Service}',
+  }),
 
-    if (projectId) {
-      requestBody.projectId = projectId
+  async matchEvent({ body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (triggerId && triggerId !== '{service}_webhook') {
+      const { is{Service}EventMatch } = await import('@/triggers/{service}/utils')
+      if (!is{Service}EventMatch(triggerId, body as Record<string, unknown>)) return false
     }
+    return true
+  },
 
-    const response = await fetch('https://api.{service}.com/webhooks', {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return {
+      input: {
+        eventType: b.type,
+        resourceId: (b.data as Record<string, unknown>)?.id || '',
+        resource: b.data,
       },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await response.json()
-
-    if (!response.ok) {
-      const errorMessage = responseBody.message || 'Unknown API error'
-      let userFriendlyMessage = 'Failed to create webhook in {Service}'
-
-      if (response.status === 401) {
-        userFriendlyMessage = 'Invalid API Key. Please verify and try again.'
-      } else if (errorMessage) {
-        userFriendlyMessage = `{Service} error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
     }
+  },
 
-    return { id: responseBody.id }
-  } catch (error: any) {
-    logger.error(`Exception during {Service} webhook creation`, { error: error.message })
-    throw error
-  }
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    return obj.id && obj.type ? `${obj.type}:${obj.id}` : null
+  },
 }
 ```
 
-#### 4. Add Webhook Deletion to Provider Subscriptions
-
-In `apps/sim/lib/webhooks/provider-subscriptions.ts`:
+### Register the Handler
 
-1. Add a logger:
-```typescript
-const {service}Logger = createLogger('{Service}Webhook')
-```
-
-2. Add the delete function:
-```typescript
-export async function delete{Service}Webhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const apiKey = config.apiKey as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!apiKey || !externalId) {
-      {service}Logger.warn(`[${requestId}] Missing apiKey or externalId, skipping cleanup`)
-      return
-    }
-
-    const response = await fetch(`https://api.{service}.com/webhooks/${externalId}`, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-      },
-    })
-
-    if (!response.ok && response.status !== 404) {
-      {service}Logger.warn(`[${requestId}] Failed to delete webhook (non-fatal): ${response.status}`)
-    } else {
-      {service}Logger.info(`[${requestId}] Successfully deleted webhook ${externalId}`)
-    }
-  } catch (error) {
-    {service}Logger.warn(`[${requestId}] Error deleting webhook (non-fatal)`, error)
-  }
-}
-```
+In `apps/sim/lib/webhooks/providers/registry.ts`:
 
-3. Add to `cleanupExternalWebhook`:
 ```typescript
-export async function cleanupExternalWebhook(...): Promise<void> {
-  // ... existing providers ...
-  } else if (webhook.provider === '{service}') {
-    await delete{Service}Webhook(webhook, requestId)
-  }
-}
-```
-
-### Key Points for Automatic Registration
-
-- **API Key visibility**: Always use `password: true` for API key fields
-- **Error handling**: Roll back the database webhook if external creation fails
-- **External ID storage**: Save the external webhook ID in `providerConfig.externalId`
-- **Graceful cleanup**: Don't fail webhook deletion if cleanup fails (use non-fatal logging)
-- **User-friendly errors**: Map HTTP status codes to helpful error messages
+import { {service}Handler } from '@/lib/webhooks/providers/{service}'
 
-## The buildTriggerSubBlocks Helper
-
-This is the generic helper from `@/triggers` that creates consistent trigger subBlocks.
-
-### Function Signature
-
-```typescript
-interface BuildTriggerSubBlocksOptions {
-  triggerId: string                              // e.g., 'service_event_a'
-  triggerOptions: Array<{ label: string; id: string }>  // Dropdown options
-  includeDropdown?: boolean                      // true only for primary trigger
-  setupInstructions: string                      // HTML instructions
-  extraFields?: SubBlockConfig[]                 // Service-specific fields
-  webhookPlaceholder?: string                    // Custom placeholder text
+const PROVIDER_HANDLERS: Record<string, WebhookProviderHandler> = {
+  // ... existing (alphabetical) ...
+  {service}: {service}Handler,
 }
-
-function buildTriggerSubBlocks(options: BuildTriggerSubBlocksOptions): SubBlockConfig[]
 ```
 
-### What It Creates
+## Output Alignment (Critical)
 
-The helper creates this structure:
-1. **Dropdown** (only if `includeDropdown: true`) - Trigger type selector
-2. **Webhook URL** - Read-only field with copy button
-3. **Extra Fields** - Your service-specific fields (filters, options, etc.)
-4. **Save Button** - Activates the trigger
-5. **Instructions** - Setup guide for users
+There are two sources of truth that **MUST be aligned**:
 
-All fields automatically have:
-- `mode: 'trigger'` - Only shown in trigger mode
-- `condition: { field: 'selectedTriggerId', value: triggerId }` - Only shown when this trigger is selected
+1. **Trigger `outputs`** — schema defining what fields SHOULD be available (UI tag dropdown)
+2. **`formatInput` on the handler** — implementation that transforms raw payload into actual data
 
-## Trigger Outputs & Webhook Input Formatting
+If they differ: the tag dropdown shows fields that don't exist, or actual data has fields users can't discover.
 
-### Important: Two Sources of Truth
+**Rules for `formatInput`:**
+- Return `{ input: { ... } }` where inner keys match trigger `outputs` exactly
+- Return `{ input: ..., skip: { message: '...' } }` to skip execution
+- No wrapper objects or duplication
+- Use `null` for missing optional data
 
-There are two related but separate concerns:
+## Automatic Webhook Registration
 
-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`.
+If the service API supports programmatic webhook creation, implement `createSubscription` and `deleteSubscription` on the handler. The orchestration layer calls these automatically — **no code touches `route.ts`, `provider-subscriptions.ts`, or `deploy.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
+```typescript
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type { DeleteSubscriptionContext, SubscriptionContext, SubscriptionResult } from '@/lib/webhooks/providers/types'
 
-- **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.
+export const {service}Handler: WebhookProviderHandler = {
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const config = getProviderConfig(ctx.webhook)
+    const apiKey = config.apiKey as string
+    if (!apiKey) throw new Error('{Service} API Key is required.')
 
-### Adding a Handler
+    const res = await fetch('https://api.{service}.com/webhooks', {
+      method: 'POST',
+      headers: { Authorization: `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
+      body: JSON.stringify({ url: getNotificationUrl(ctx.webhook) }),
+    })
 
-In `apps/sim/lib/webhooks/utils.server.ts`, add a handler block:
+    if (!res.ok) throw new Error(`{Service} error: ${res.status}`)
+    const { id } = (await res.json()) as { id: string }
+    return { providerConfigUpdates: { externalId: id } }
+  },
 
-```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,
-  }
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const config = getProviderConfig(ctx.webhook)
+    const { apiKey, externalId } = config as { apiKey?: string; externalId?: string }
+    if (!apiKey || !externalId) return
+    await fetch(`https://api.{service}.com/webhooks/${externalId}`, {
+      method: 'DELETE',
+      headers: { Authorization: `Bearer ${apiKey}` },
+    }).catch(() => {})
+  },
 }
 ```
 
-**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
+**Key points:**
+- Throw from `createSubscription` — orchestration rolls back the DB webhook
+- Never throw from `deleteSubscription` — log non-fatally
+- Return `{ providerConfigUpdates: { externalId } }` — orchestration merges into `providerConfig`
+- Add `apiKey` field to `build{Service}ExtraFields` with `password: true`
 
-### Verify Alignment
-
-Run the alignment checker:
-```bash
-bunx scripts/check-trigger-alignment.ts {service}
-```
-
-## Trigger Outputs
+## Trigger Outputs Schema
 
 Trigger outputs use the same schema as block outputs (NOT tool outputs).
 
-**Supported:**
-- `type` and `description` for simple fields
-- Nested object structure for complex data
-
-**NOT Supported:**
-- `optional: true` (tool outputs only)
-- `items` property (tool outputs only)
+**Supported:** `type` + `description` for leaf fields, nested objects for complex data.
+**NOT supported:** `optional: true`, `items` (those are tool-output-only features).
 
 ```typescript
 export function buildOutputs(): Record<string, TriggerOutput> {
   return {
-    // Simple fields
     eventType: { type: 'string', description: 'Event type' },
     timestamp: { type: 'string', description: 'When it occurred' },
-
-    // Complex data - use type: 'json'
     payload: { type: 'json', description: 'Full event payload' },
-
-    // Nested structure
     resource: {
       id: { type: 'string', description: 'Resource ID' },
       name: { type: 'string', description: 'Resource name' },
@@ -630,79 +327,32 @@ export function buildOutputs(): Record<string, TriggerOutput> {
 }
 ```
 
-## Generic Webhook Trigger Pattern
-
-For services with many event types, create a generic webhook that accepts all events:
-
-```typescript
-export const {service}WebhookTrigger: TriggerConfig = {
-  id: '{service}_webhook',
-  name: '{Service} Webhook (All Events)',
-  // ...
-
-  subBlocks: buildTriggerSubBlocks({
-    triggerId: '{service}_webhook',
-    triggerOptions: {service}TriggerOptions,
-    setupInstructions: {service}SetupInstructions('All Events'),
-    extraFields: [
-      // Event type filter (optional)
-      {
-        id: 'eventTypes',
-        title: 'Event Types',
-        type: 'dropdown',
-        multiSelect: true,
-        options: [
-          { label: 'Event A', id: 'event_a' },
-          { label: 'Event B', id: 'event_b' },
-        ],
-        placeholder: 'Leave empty for all events',
-        mode: 'trigger',
-        condition: { field: 'selectedTriggerId', value: '{service}_webhook' },
-      },
-      // Plus any other service-specific fields
-      ...build{Service}ExtraFields('{service}_webhook'),
-    ],
-  }),
-}
-```
-
-## Checklist Before Finishing
-
-### Utils
-- [ ] Created `{service}TriggerOptions` array with all trigger IDs
-- [ ] Created `{service}SetupInstructions` function with clear steps
-- [ ] Created `build{Service}ExtraFields` for service-specific fields
-- [ ] Created output builders for each trigger type
+## Checklist
 
-### Triggers
-- [ ] Primary trigger has `includeDropdown: true`
-- [ ] Secondary triggers do NOT have `includeDropdown`
+### Trigger Definition
+- [ ] Created `utils.ts` with options, instructions, extra fields, and output builders
+- [ ] Primary trigger has `includeDropdown: true`; secondary triggers do NOT
 - [ ] All triggers use `buildTriggerSubBlocks` helper
-- [ ] All triggers have proper outputs defined
 - [ ] Created `index.ts` barrel export
 
 ### Registration
-- [ ] All triggers imported in `triggers/registry.ts`
-- [ ] All triggers added to `TRIGGER_REGISTRY`
-- [ ] Block has `triggers.enabled: true`
-- [ ] Block has all trigger IDs in `triggers.available`
+- [ ] All triggers in `triggers/registry.ts` → `TRIGGER_REGISTRY`
+- [ ] Block has `triggers.enabled: true` and lists all trigger IDs in `triggers.available`
 - [ ] Block spreads all trigger subBlocks: `...getTrigger('id').subBlocks`
 
-### Automatic Webhook Registration (if supported)
-- [ ] Added API key field to `build{Service}ExtraFields` with `password: true`
-- [ ] Updated setup instructions for automatic webhook creation
-- [ ] Added provider-specific logic to `apps/sim/app/api/webhooks/route.ts`
-- [ ] Added `create{Service}WebhookSubscription` helper function
-- [ ] Added `delete{Service}Webhook` function to `provider-subscriptions.ts`
-- [ ] Added provider to `cleanupExternalWebhook` function
+### Provider Handler (if needed)
+- [ ] Handler file at `apps/sim/lib/webhooks/providers/{service}.ts`
+- [ ] Registered in `providers/registry.ts` (alphabetical)
+- [ ] Signature validator is a private function inside the handler file
+- [ ] `formatInput` output keys match trigger `outputs` exactly
+- [ ] Event matching uses dynamic `await import()` for trigger utils
 
-### 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
+### Auto Registration (if supported)
+- [ ] `createSubscription` and `deleteSubscription` on the handler
+- [ ] NO changes to `route.ts`, `provider-subscriptions.ts`, or `deploy.ts`
+- [ ] API key field uses `password: true`
 
 ### Testing
-- [ ] Run `bun run type-check` to verify no TypeScript errors
-- [ ] Restart dev server to pick up new triggers
-- [ ] Test trigger UI shows correctly in the block
-- [ ] Test automatic webhook creation works (if applicable)
+- [ ] `bun run type-check` passes
+- [ ] Manually verify `formatInput` output keys match trigger `outputs` keys
+- [ ] Trigger UI shows correctly in the block
diff --git a/.claude/commands/validate-trigger.md b/.claude/commands/validate-trigger.md
new file mode 100644
index 00000000000..04bdc63c397
--- /dev/null
+++ b/.claude/commands/validate-trigger.md
@@ -0,0 +1,212 @@
+---
+description: Validate an existing Sim webhook trigger against provider API docs and repository conventions
+argument-hint: <service-name> [api-docs-url]
+---
+
+# Validate Trigger
+
+You are an expert auditor for Sim webhook triggers. Your job is to validate that an existing trigger implementation is correct, complete, secure, and aligned across all layers.
+
+## Your Task
+
+1. Read the service's webhook/API documentation (via WebFetch)
+2. Read every trigger file, provider handler, and registry entry
+3. Cross-reference against the API docs and Sim conventions
+4. Report all issues grouped by severity (critical, warning, suggestion)
+5. Fix all issues after reporting them
+
+## Step 1: Gather All Files
+
+Read **every** file for the trigger — do not skip any:
+
+```
+apps/sim/triggers/{service}/           # All trigger files, utils.ts, index.ts
+apps/sim/lib/webhooks/providers/{service}.ts  # Provider handler (if exists)
+apps/sim/lib/webhooks/providers/registry.ts   # Handler registry
+apps/sim/triggers/registry.ts                 # Trigger registry
+apps/sim/blocks/blocks/{service}.ts           # Block definition (trigger wiring)
+```
+
+Also read for reference:
+```
+apps/sim/lib/webhooks/providers/types.ts            # WebhookProviderHandler interface
+apps/sim/lib/webhooks/providers/utils.ts            # Shared helpers (createHmacVerifier, etc.)
+apps/sim/lib/webhooks/provider-subscription-utils.ts    # Subscription helpers
+apps/sim/lib/webhooks/processor.ts                  # Central webhook processor
+```
+
+## Step 2: Pull API Documentation
+
+Fetch the service's official webhook documentation. This is the **source of truth** for:
+- Webhook event types and payload shapes
+- Signature/auth verification method (HMAC algorithm, header names, secret format)
+- Challenge/verification handshake requirements
+- Webhook subscription API (create/delete endpoints, if applicable)
+- Retry behavior and delivery guarantees
+
+## Step 3: Validate Trigger Definitions
+
+### utils.ts
+- [ ] `{service}TriggerOptions` lists all trigger IDs accurately
+- [ ] `{service}SetupInstructions` provides clear, correct steps for the service
+- [ ] `build{Service}ExtraFields` includes relevant filter/config fields with correct `condition`
+- [ ] Output builders expose all meaningful fields from the webhook payload
+- [ ] Output builders do NOT use `optional: true` or `items` (tool-output-only features)
+- [ ] Nested output objects correctly model the payload structure
+
+### Trigger Files
+- [ ] Exactly one primary trigger has `includeDropdown: true`
+- [ ] All secondary triggers do NOT have `includeDropdown`
+- [ ] All triggers use `buildTriggerSubBlocks` helper (not hand-rolled subBlocks)
+- [ ] Every trigger's `id` matches the convention `{service}_{event_name}`
+- [ ] Every trigger's `provider` matches the service name used in the handler registry
+- [ ] `index.ts` barrel exports all triggers
+
+### Trigger ↔ Provider Alignment (CRITICAL)
+- [ ] Every trigger ID referenced in `matchEvent` logic exists in `{service}TriggerOptions`
+- [ ] Event matching logic in the provider correctly maps trigger IDs to service event types
+- [ ] Event matching logic in `is{Service}EventMatch` (if exists) correctly identifies events per the API docs
+
+## Step 4: Validate Provider Handler
+
+### Auth Verification
+- [ ] `verifyAuth` correctly validates webhook signatures per the service's documentation
+- [ ] HMAC algorithm matches (SHA-1, SHA-256, SHA-512)
+- [ ] Signature header name matches the API docs exactly
+- [ ] Signature format is handled (raw hex, `sha256=` prefix, base64, etc.)
+- [ ] Uses `safeCompare` for timing-safe comparison (no `===`)
+- [ ] If `webhookSecret` is required, handler rejects when it's missing (fail-closed)
+- [ ] Signature is computed over raw body (not parsed JSON)
+
+### Event Matching
+- [ ] `matchEvent` returns `boolean` (not `NextResponse` or other values)
+- [ ] Challenge/verification events are excluded from matching (e.g., `endpoint.url_validation`)
+- [ ] When `triggerId` is a generic webhook ID, all events pass through
+- [ ] When `triggerId` is specific, only matching events pass
+- [ ] Event matching logic uses dynamic `await import()` for trigger utils (avoids circular deps)
+
+### formatInput (CRITICAL)
+- [ ] Every key in the `formatInput` return matches a key in the trigger `outputs` schema
+- [ ] Every key in the trigger `outputs` schema is populated by `formatInput`
+- [ ] No extra undeclared keys that users can't discover in the UI
+- [ ] No wrapper objects (`webhook: { ... }`, `{service}: { ... }`)
+- [ ] Nested output paths exist at the correct depth (e.g., `resource.id` actually has `resource: { id: ... }`)
+- [ ] `null` is used for missing optional fields (not empty strings or empty objects)
+- [ ] Returns `{ input: { ... } }` — not a bare object
+
+### Idempotency
+- [ ] `extractIdempotencyId` returns a stable, unique key per delivery
+- [ ] Uses provider-specific delivery IDs when available (e.g., `X-Request-Id`, `Linear-Delivery`, `svix-id`)
+- [ ] Falls back to content-based ID (e.g., `${type}:${id}`) when no delivery header exists
+- [ ] Does NOT include timestamps in the idempotency key (would break dedup on retries)
+
+### Challenge Handling (if applicable)
+- [ ] `handleChallenge` correctly implements the service's URL verification handshake
+- [ ] Returns the expected response format per the API docs
+- [ ] Env-backed secrets are resolved via `resolveEnvVarsInObject` if needed
+
+## Step 5: Validate Automatic Subscription Lifecycle
+
+If the service supports programmatic webhook creation:
+
+### createSubscription
+- [ ] Calls the correct API endpoint to create a webhook
+- [ ] Sends the correct event types/filters
+- [ ] Passes the notification URL from `getNotificationUrl(ctx.webhook)`
+- [ ] Returns `{ providerConfigUpdates: { externalId } }` with the external webhook ID
+- [ ] Throws on failure (orchestration handles rollback)
+- [ ] Provides user-friendly error messages (401 → "Invalid API Key", etc.)
+
+### deleteSubscription
+- [ ] Calls the correct API endpoint to delete the webhook
+- [ ] Handles 404 gracefully (webhook already deleted)
+- [ ] Never throws — catches errors and logs non-fatally
+- [ ] Skips gracefully when `apiKey` or `externalId` is missing
+
+### Orchestration Isolation
+- [ ] NO provider-specific logic in `route.ts`, `provider-subscriptions.ts`, or `deploy.ts`
+- [ ] All subscription logic lives on the handler (`createSubscription`/`deleteSubscription`)
+
+## Step 6: Validate Registration and Block Wiring
+
+### Trigger Registry (`triggers/registry.ts`)
+- [ ] All triggers are imported and registered
+- [ ] Registry keys match trigger IDs exactly
+- [ ] No orphaned entries (triggers that don't exist)
+
+### Provider Handler Registry (`providers/registry.ts`)
+- [ ] Handler is imported and registered (if handler exists)
+- [ ] Registry key matches the `provider` field on the trigger configs
+- [ ] Entries are in alphabetical order
+
+### Block Wiring (`blocks/blocks/{service}.ts`)
+- [ ] Block has `triggers.enabled: true`
+- [ ] `triggers.available` lists all trigger IDs
+- [ ] All trigger subBlocks are spread into `subBlocks`: `...getTrigger('id').subBlocks`
+- [ ] No trigger IDs in `triggers.available` that aren't in the registry
+- [ ] No trigger subBlocks spread that aren't in `triggers.available`
+
+## Step 7: Validate Security
+
+- [ ] Webhook secrets are never logged (not even at debug level)
+- [ ] Auth verification runs before any event processing
+- [ ] No secret comparison uses `===` (must use `safeCompare` or `crypto.timingSafeEqual`)
+- [ ] Timestamp/replay protection is reasonable (not too tight for retries, not too loose for security)
+- [ ] Raw body is used for signature verification (not re-serialized JSON)
+
+## Step 8: Report and Fix
+
+### Report Format
+
+Group findings by severity:
+
+**Critical** (runtime errors, security issues, or data loss):
+- Wrong HMAC algorithm or header name
+- `formatInput` keys don't match trigger `outputs`
+- Missing `verifyAuth` when the service sends signed webhooks
+- `matchEvent` returns non-boolean values
+- Provider-specific logic leaking into shared orchestration files
+- Trigger IDs mismatch between trigger files, registry, and block
+- `createSubscription` calling wrong API endpoint
+- Auth comparison using `===` instead of `safeCompare`
+
+**Warning** (convention violations or usability issues):
+- Missing `extractIdempotencyId` when the service provides delivery IDs
+- Timestamps in idempotency keys (breaks dedup on retries)
+- Missing challenge handling when the service requires URL verification
+- Output schema missing fields that `formatInput` returns (undiscoverable data)
+- Overly tight timestamp skew window that rejects legitimate retries
+- `matchEvent` not filtering challenge/verification events
+- Setup instructions missing important steps
+
+**Suggestion** (minor improvements):
+- More specific output field descriptions
+- Additional output fields that could be exposed
+- Better error messages in `createSubscription`
+- Logging improvements
+
+### Fix All Issues
+
+After reporting, fix every **critical** and **warning** issue. Apply **suggestions** where they don't add unnecessary complexity.
+
+### Validation Output
+
+After fixing, confirm:
+1. `bun run type-check` passes
+2. Re-read all modified files to verify fixes are correct
+3. Provider handler tests pass (if they exist): `bun test {service}`
+
+## Checklist Summary
+
+- [ ] Read all trigger files, provider handler, types, registries, and block
+- [ ] Pulled and read official webhook/API documentation
+- [ ] Validated trigger definitions: options, instructions, extra fields, outputs
+- [ ] Validated primary/secondary trigger distinction (`includeDropdown`)
+- [ ] Validated provider handler: auth, matchEvent, formatInput, idempotency
+- [ ] Validated output alignment: every `outputs` key ↔ every `formatInput` key
+- [ ] Validated subscription lifecycle: createSubscription, deleteSubscription, no shared-file edits
+- [ ] Validated registration: trigger registry, handler registry, block wiring
+- [ ] Validated security: safe comparison, no secret logging, replay protection
+- [ ] Reported all issues grouped by severity
+- [ ] Fixed all critical and warning issues
+- [ ] `bun run type-check` passes after fixes
diff --git a/apps/docs/components/icons.tsx b/apps/docs/components/icons.tsx
index 6a2a66183fb..cbc3b5edd85 100644
--- a/apps/docs/components/icons.tsx
+++ b/apps/docs/components/icons.tsx
@@ -2132,7 +2132,15 @@ export function Mem0Icon(props: SVGProps<SVGSVGElement>) {
 
 export function ExtendIcon(props: SVGProps<SVGSVGElement>) {
   return (
-    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 33 18' fill='none'>
+    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 33 24' fill='none'>
+      <path
+        d='M6.3782 13.7746L4.28874 14.8056C4.11382 14.8899 4.11382 15.1367 4.28874 15.2211L15.8924 20.9462C16.1423 21.068 16.433 21.068 16.6797 20.9462L28.2864 15.2211C28.4582 15.1367 28.4582 14.8899 28.2864 14.8056L26.2 13.7746C27.3838 13.1937 28.5145 12.6378 29.4578 12.1787C30.2605 12.5722 31.0666 12.9689 31.8693 13.3625C32.3003 13.5749 32.5721 14.0123 32.5721 14.4932V15.5426C32.5721 16.0204 32.3003 16.4609 31.8693 16.6733C31.8693 16.6733 19.5816 22.7016 17.5542 23.6887C16.7296 24.0916 15.8955 24.1103 15.0615 23.7043C12.8123 22.6078 1.9646 17.2857 0.705842 16.6672C0.274806 16.4579 0 16.0174 0 15.5395V14.4899C4.1552e-05 14.012 0.271779 13.5715 0.702792 13.3591C1.43993 12.9968 2.2584 12.5973 3.12047 12.1756C4.06685 12.641 5.19446 13.1937 6.3782 13.7746Z'
+        fill='currentColor'
+      />
+      <path
+        d='M15.1021 6.30652C15.9017 5.92234 16.717 5.9348 17.5103 6.32207C20.1715 7.62145 22.8297 8.92398 25.4878 10.2265L22.249 11.8257L16.6797 9.07681C16.433 8.955 16.1423 8.955 15.8924 9.07681L10.3262 11.8257L7.0874 10.2265C11.2142 8.20664 15.0743 6.3201 15.1021 6.30652Z'
+        fill='currentColor'
+      />
       <path
         clipRule='evenodd'
         d='M16.2893 0C16.6984 1.91708e-05 17.1074 0.0970011 17.5103 0.293745C22.3018 2.63326 27.0841 4.98521 31.8693 7.33722C32.3003 7.54649 32.5721 7.9868 32.5721 8.46461V9.51422C32.5721 9.99522 32.3004 10.4357 31.8693 10.645C31.8693 10.645 19.5816 16.6732 17.5542 17.6634C17.1357 17.8696 16.692 17.9727 16.2859 17.9727C15.8799 17.9727 15.4707 17.8758 15.0615 17.6759C12.8124 16.5795 1.9646 11.2604 0.705842 10.6419C0.274826 10.4295 2.31482e-05 9.99216 0 9.51117V8.46461C4.59913e-05 7.98366 0.271816 7.54656 0.702792 7.33417C5.8977 4.7819 15.0599 0.301869 15.1021 0.281239C15.4957 0.0938275 15.8801 0 16.2893 0ZM16.2859 2.96124C16.1516 2.96126 16.0173 2.98909 15.8924 3.05153L4.28874 8.77696C4.11382 8.86442 4.11382 9.10831 4.28874 9.19577L15.8924 14.9209C16.0173 14.9802 16.1516 15.0115 16.2859 15.0115C16.4202 15.0115 16.5548 14.9802 16.6797 14.9209L28.2864 9.19577C28.4582 9.10831 28.4582 8.86442 28.2864 8.77696L16.6797 3.05153C16.5548 2.98906 16.4202 2.96124 16.2859 2.96124Z'
@@ -5930,6 +5938,33 @@ export function PulseIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+export function SixtyfourIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg {...props} viewBox='0 0 158 143' fill='none' xmlns='http://www.w3.org/2000/svg'>
+      <path
+        d='M32.3952 141.17L31.637 140.73V142.481L31.8417 142.603L32.3952 142.921L32.9487 142.603L33.1534 142.481V140.73L32.3952 141.17Z'
+        fill='currentColor'
+      />
+      <path
+        d='M33.1534 140.73V142.603H31.637V140.73L32.3952 141.17L33.1534 140.73Z'
+        fill='currentColor'
+      />
+      <path
+        d='M93.3271 105.608V106.564L94.0854 106.996L94.8436 106.564V105.608H93.3271Z'
+        fill='currentColor'
+      />
+      <path
+        d='M94.8436 105.608V106.564L94.0854 106.996L93.3271 106.564V105.608H94.8436Z'
+        fill='currentColor'
+      />
+      <path
+        d='M125.681 12.9895L94.836 30.755L63.9909 12.9895L32.3951 31.1872H32.3875V68.8565L0.79933 87.0542H0.791748V124.723L31.6369 142.481V140.73L2.30822 123.844V89.6701L31.6369 106.564V140.73L32.3951 141.17L33.1533 140.73V106.564L62.482 89.6701V123.844L33.1533 140.73V142.481L63.2402 125.163L93.3271 142.481L93.5318 142.603L94.0853 142.921L94.6388 142.603L94.8436 142.481L125.689 124.723V87.0542L126.235 86.7357L126.439 86.6144L157.284 68.8565V31.1872L125.681 12.9895ZM63.2326 84.8629L33.904 67.9769V33.8031L63.2326 50.6967V84.8629ZM64.7491 50.6967L94.0777 33.8031V67.9769L64.7491 84.8629V50.6967ZM124.172 123.844L94.8436 140.73V106.564L94.0853 106.996L93.3271 106.564V140.73L63.9985 123.844V89.6701L93.3271 106.564V105.608H94.8436V106.564L124.172 89.6701V123.844ZM124.923 84.8629L95.5942 67.9769V33.8031L124.923 50.6891V84.8629ZM155.768 67.9769L126.439 84.8629V50.6967L155.768 33.8031V67.9769Z'
+        fill='currentColor'
+      />
+    </svg>
+  )
+}
+
 export function SimilarwebIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
diff --git a/apps/docs/components/ui/icon-mapping.ts b/apps/docs/components/ui/icon-mapping.ts
index e4bef393eb4..c65d55ed9d4 100644
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -154,6 +154,7 @@ import {
   SftpIcon,
   ShopifyIcon,
   SimilarwebIcon,
+  SixtyfourIcon,
   SlackIcon,
   SmtpIcon,
   SQSIcon,
@@ -283,7 +284,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   langsmith: LangsmithIcon,
   launchdarkly: LaunchDarklyIcon,
   lemlist: LemlistIcon,
-  linear: LinearIcon,
+  linear_v2: LinearIcon,
   linkedin: LinkedInIcon,
   linkup: LinkupIcon,
   loops: LoopsIcon,
@@ -340,6 +341,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   sharepoint: MicrosoftSharepointIcon,
   shopify: ShopifyIcon,
   similarweb: SimilarwebIcon,
+  sixtyfour: SixtyfourIcon,
   slack: SlackIcon,
   smtp: SmtpIcon,
   sqs: SQSIcon,
diff --git a/apps/docs/content/docs/en/blocks/human-in-the-loop.mdx b/apps/docs/content/docs/en/blocks/human-in-the-loop.mdx
index e28f5d3e918..d4e4705e22b 100644
--- a/apps/docs/content/docs/en/blocks/human-in-the-loop.mdx
+++ b/apps/docs/content/docs/en/blocks/human-in-the-loop.mdx
@@ -93,17 +93,36 @@ Access resume data in downstream blocks using `<blockId.resumeInput.fieldName>`.
   <Tab>
     ### REST API
     
-    Programmatically resume workflows:
+    Programmatically resume workflows using the resume endpoint. The `contextId` is available from the block's `resumeEndpoint` output or from the paused execution detail.
     
     ```bash
-    POST /api/workflows/{workflowId}/executions/{executionId}/resume/{blockId}
+    POST /api/resume/{workflowId}/{executionId}/{contextId}
+    Content-Type: application/json
     
     {
-      "approved": true,
-      "comments": "Looks good to proceed"
+      "input": {
+        "approved": true,
+        "comments": "Looks good to proceed"
+      }
     }
     ```
     
+    The response includes a new `executionId` for the resumed execution:
+    
+    ```json
+    {
+      "status": "started",
+      "executionId": "<resumeExecutionId>",
+      "message": "Resume execution started."
+    }
+    ```
+    
+    To poll execution progress after resuming, connect to the SSE stream:
+    
+    ```bash
+    GET /api/workflows/{workflowId}/executions/{resumeExecutionId}/stream
+    ```
+    
     Build custom approval UIs or integrate with existing systems.
   </Tab>
   <Tab>
diff --git a/apps/docs/content/docs/en/tools/linear.mdx b/apps/docs/content/docs/en/tools/linear.mdx
index 2e6c87677e7..9a23938192e 100644
--- a/apps/docs/content/docs/en/tools/linear.mdx
+++ b/apps/docs/content/docs/en/tools/linear.mdx
@@ -6,7 +6,7 @@ description: Interact with Linear issues, projects, and more
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="linear"
+  type="linear_v2"
   color="#5E6AD2"
 />
 
diff --git a/apps/docs/content/docs/en/tools/meta.json b/apps/docs/content/docs/en/tools/meta.json
index cc194da1f25..a0f99bf6616 100644
--- a/apps/docs/content/docs/en/tools/meta.json
+++ b/apps/docs/content/docs/en/tools/meta.json
@@ -150,6 +150,7 @@
     "sharepoint",
     "shopify",
     "similarweb",
+    "sixtyfour",
     "slack",
     "smtp",
     "sqs",
diff --git a/apps/docs/content/docs/en/tools/sixtyfour.mdx b/apps/docs/content/docs/en/tools/sixtyfour.mdx
new file mode 100644
index 00000000000..41a55c58463
--- /dev/null
+++ b/apps/docs/content/docs/en/tools/sixtyfour.mdx
@@ -0,0 +1,128 @@
+---
+title: Sixtyfour AI
+description: Enrich leads and companies with AI-powered research
+---
+
+import { BlockInfoCard } from "@/components/ui/block-info-card"
+
+<BlockInfoCard 
+  type="sixtyfour"
+  color="#000000"
+/>
+
+## Usage Instructions
+
+Find emails, phone numbers, and enrich lead or company data with contact information, social profiles, and detailed research using Sixtyfour AI.
+
+
+
+## Tools
+
+### `sixtyfour_find_phone`
+
+Find phone numbers for a lead using Sixtyfour AI.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Sixtyfour API key |
+| `name` | string | Yes | Full name of the person |
+| `company` | string | No | Company name |
+| `linkedinUrl` | string | No | LinkedIn profile URL |
+| `domain` | string | No | Company website domain |
+| `email` | string | No | Email address |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `name` | string | Name of the person |
+| `company` | string | Company name |
+| `phone` | string | Phone number\(s\) found |
+| `linkedinUrl` | string | LinkedIn profile URL |
+
+### `sixtyfour_find_email`
+
+Find email addresses for a lead using Sixtyfour AI.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Sixtyfour API key |
+| `name` | string | Yes | Full name of the person |
+| `company` | string | No | Company name |
+| `linkedinUrl` | string | No | LinkedIn profile URL |
+| `domain` | string | No | Company website domain |
+| `phone` | string | No | Phone number |
+| `title` | string | No | Job title |
+| `mode` | string | No | Email discovery mode: PROFESSIONAL \(default\) or PERSONAL |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `name` | string | Name of the person |
+| `company` | string | Company name |
+| `title` | string | Job title |
+| `phone` | string | Phone number |
+| `linkedinUrl` | string | LinkedIn profile URL |
+| `emails` | json | Professional email addresses found |
+|   ↳ `address` | string | Email address |
+|   ↳ `status` | string | Validation status \(OK or UNKNOWN\) |
+|   ↳ `type` | string | Email type \(COMPANY or PERSONAL\) |
+| `personalEmails` | json | Personal email addresses found \(only in PERSONAL mode\) |
+|   ↳ `address` | string | Email address |
+|   ↳ `status` | string | Validation status \(OK or UNKNOWN\) |
+|   ↳ `type` | string | Email type \(COMPANY or PERSONAL\) |
+
+### `sixtyfour_enrich_lead`
+
+Enrich lead information with contact details, social profiles, and company data using Sixtyfour AI.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Sixtyfour API key |
+| `leadInfo` | string | Yes | Lead information as JSON object with key-value pairs \(e.g. name, company, title, linkedin\) |
+| `struct` | string | Yes | Fields to collect as JSON object. Keys are field names, values are descriptions \(e.g. \{"email": "The individual\'s email address", "phone": "Phone number"\}\) |
+| `researchPlan` | string | No | Optional research plan to guide enrichment strategy |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `notes` | string | Research notes about the lead |
+| `structuredData` | json | Enriched lead data matching the requested struct fields |
+| `references` | json | Source URLs and descriptions used for enrichment |
+| `confidenceScore` | number | Quality score for the returned data \(0-10\) |
+
+### `sixtyfour_enrich_company`
+
+Enrich company data with additional information and find associated people using Sixtyfour AI.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Sixtyfour API key |
+| `targetCompany` | string | Yes | Company data as JSON object \(e.g. \{"name": "Acme Inc", "domain": "acme.com"\}\) |
+| `struct` | string | Yes | Fields to collect as JSON object. Keys are field names, values are descriptions \(e.g. \{"website": "Company website URL", "num_employees": "Employee count"\}\) |
+| `findPeople` | boolean | No | Whether to find people associated with the company |
+| `fullOrgChart` | boolean | No | Whether to retrieve the full organizational chart |
+| `researchPlan` | string | No | Optional strategy describing how the agent should search for information |
+| `peopleFocusPrompt` | string | No | Description of people to find \(roles, responsibilities\) |
+| `leadStruct` | string | No | Custom schema for returned lead data as JSON object |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `notes` | string | Research notes about the company |
+| `structuredData` | json | Enriched company data matching the requested struct fields |
+| `references` | json | Source URLs and descriptions used for enrichment |
+| `confidenceScore` | number | Quality score for the returned data \(0-10\) |
+
+
diff --git a/apps/sim/app/(auth)/reset-password/reset-password-form.tsx b/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
index 0ff43b0561a..08ec08b65fc 100644
--- a/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
+++ b/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
@@ -97,49 +97,49 @@ export function SetNewPasswordForm({
 }: SetNewPasswordFormProps) {
   const [password, setPassword] = useState('')
   const [confirmPassword, setConfirmPassword] = useState('')
-  const [validationMessage, setValidationMessage] = useState('')
+  const [validationMessages, setValidationMessages] = useState<string[]>([])
   const [showPassword, setShowPassword] = useState(false)
   const [showConfirmPassword, setShowConfirmPassword] = useState(false)
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
 
+    const errors: string[] = []
+
     if (password.length < 8) {
-      setValidationMessage('Password must be at least 8 characters long')
-      return
+      errors.push('Password must be at least 8 characters long')
     }
 
     if (password.length > 100) {
-      setValidationMessage('Password must not exceed 100 characters')
-      return
+      errors.push('Password must not exceed 100 characters')
     }
 
     if (!/[A-Z]/.test(password)) {
-      setValidationMessage('Password must contain at least one uppercase letter')
-      return
+      errors.push('Password must contain at least one uppercase letter')
     }
 
     if (!/[a-z]/.test(password)) {
-      setValidationMessage('Password must contain at least one lowercase letter')
-      return
+      errors.push('Password must contain at least one lowercase letter')
     }
 
     if (!/[0-9]/.test(password)) {
-      setValidationMessage('Password must contain at least one number')
-      return
+      errors.push('Password must contain at least one number')
     }
 
     if (!/[^A-Za-z0-9]/.test(password)) {
-      setValidationMessage('Password must contain at least one special character')
-      return
+      errors.push('Password must contain at least one special character')
     }
 
     if (password !== confirmPassword) {
-      setValidationMessage('Passwords do not match')
+      errors.push('Passwords do not match')
+    }
+
+    if (errors.length > 0) {
+      setValidationMessages(errors)
       return
     }
 
-    setValidationMessage('')
+    setValidationMessages([])
     onSubmit(password)
   }
 
@@ -162,7 +162,10 @@ export function SetNewPasswordForm({
               onChange={(e) => setPassword(e.target.value)}
               required
               placeholder='Enter new password'
-              className={cn('pr-10', validationMessage && 'border-red-500 focus:border-red-500')}
+              className={cn(
+                'pr-10',
+                validationMessages.length > 0 && 'border-red-500 focus:border-red-500'
+              )}
             />
             <button
               type='button'
@@ -190,7 +193,10 @@ export function SetNewPasswordForm({
               onChange={(e) => setConfirmPassword(e.target.value)}
               required
               placeholder='Confirm new password'
-              className={cn('pr-10', validationMessage && 'border-red-500 focus:border-red-500')}
+              className={cn(
+                'pr-10',
+                validationMessages.length > 0 && 'border-red-500 focus:border-red-500'
+              )}
             />
             <button
               type='button'
@@ -203,9 +209,11 @@ export function SetNewPasswordForm({
           </div>
         </div>
 
-        {validationMessage && (
+        {validationMessages.length > 0 && (
           <div className='mt-1 space-y-1 text-red-400 text-xs'>
-            <p>{validationMessage}</p>
+            {validationMessages.map((error, index) => (
+              <p key={index}>{error}</p>
+            ))}
           </div>
         )}
 
diff --git a/apps/sim/app/(auth)/signup/signup-form.tsx b/apps/sim/app/(auth)/signup/signup-form.tsx
index 1b0bd50c05b..55736900724 100644
--- a/apps/sim/app/(auth)/signup/signup-form.tsx
+++ b/apps/sim/app/(auth)/signup/signup-form.tsx
@@ -228,18 +228,6 @@ function SignupFormContent({
         emailValidationErrors.length > 0 ||
         errors.length > 0
       ) {
-        if (nameValidationErrors.length > 0) {
-          setNameErrors([nameValidationErrors[0]])
-          setShowNameValidationError(true)
-        }
-        if (emailValidationErrors.length > 0) {
-          setEmailErrors([emailValidationErrors[0]])
-          setShowEmailValidationError(true)
-        }
-        if (errors.length > 0) {
-          setPasswordErrors([errors[0]])
-          setShowValidationError(true)
-        }
         setIsLoading(false)
         return
       }
@@ -261,6 +249,9 @@ function SignupFormContent({
           widget.execute()
           token = await widget.getResponsePromise()
         } catch {
+          captureEvent(posthog, 'signup_failed', {
+            error_code: 'captcha_client_failure',
+          })
           setFormError('Captcha verification failed. Please try again.')
           setIsLoading(false)
           return
@@ -284,7 +275,9 @@ function SignupFormContent({
             logger.error('Signup error:', ctx.error)
             const errorMessage: string[] = ['Failed to create account']
 
+            let errorCode = 'unknown'
             if (ctx.error.code?.includes('USER_ALREADY_EXISTS')) {
+              errorCode = 'user_already_exists'
               errorMessage.push(
                 'An account with this email already exists. Please sign in instead.'
               )
@@ -293,24 +286,30 @@ function SignupFormContent({
               ctx.error.code?.includes('BAD_REQUEST') ||
               ctx.error.message?.includes('Email and password sign up is not enabled')
             ) {
+              errorCode = 'signup_disabled'
               errorMessage.push('Email signup is currently disabled.')
               setEmailError(errorMessage[0])
             } else if (ctx.error.code?.includes('INVALID_EMAIL')) {
+              errorCode = 'invalid_email'
               errorMessage.push('Please enter a valid email address.')
               setEmailError(errorMessage[0])
             } else if (ctx.error.code?.includes('PASSWORD_TOO_SHORT')) {
+              errorCode = 'password_too_short'
               errorMessage.push('Password must be at least 8 characters long.')
               setPasswordErrors(errorMessage)
               setShowValidationError(true)
             } else if (ctx.error.code?.includes('PASSWORD_TOO_LONG')) {
+              errorCode = 'password_too_long'
               errorMessage.push('Password must be less than 128 characters long.')
               setPasswordErrors(errorMessage)
               setShowValidationError(true)
             } else if (ctx.error.code?.includes('network')) {
+              errorCode = 'network_error'
               errorMessage.push('Network error. Please check your connection and try again.')
               setPasswordErrors(errorMessage)
               setShowValidationError(true)
             } else if (ctx.error.code?.includes('rate limit')) {
+              errorCode = 'rate_limited'
               errorMessage.push('Too many requests. Please wait a moment before trying again.')
               setPasswordErrors(errorMessage)
               setShowValidationError(true)
@@ -318,6 +317,8 @@ function SignupFormContent({
               setPasswordErrors(errorMessage)
               setShowValidationError(true)
             }
+
+            captureEvent(posthog, 'signup_failed', { error_code: errorCode })
           },
         }
       )
@@ -400,7 +401,7 @@ function SignupFormContent({
                 />
                 <div
                   className={cn(
-                    'absolute right-0 left-0 z-10 grid transition-[grid-template-rows] duration-200 ease-out',
+                    'grid transition-[grid-template-rows] duration-200 ease-out',
                     showNameValidationError && nameErrors.length > 0
                       ? 'grid-rows-[1fr]'
                       : 'grid-rows-[0fr]'
@@ -438,7 +439,7 @@ function SignupFormContent({
                 />
                 <div
                   className={cn(
-                    'absolute right-0 left-0 z-10 grid transition-[grid-template-rows] duration-200 ease-out',
+                    'grid transition-[grid-template-rows] duration-200 ease-out',
                     (showEmailValidationError && emailErrors.length > 0) ||
                       (emailError && !showEmailValidationError)
                       ? 'grid-rows-[1fr]'
@@ -497,7 +498,7 @@ function SignupFormContent({
                 </div>
                 <div
                   className={cn(
-                    'absolute right-0 left-0 z-10 grid transition-[grid-template-rows] duration-200 ease-out',
+                    'grid transition-[grid-template-rows] duration-200 ease-out',
                     showValidationError && passwordErrors.length > 0
                       ? 'grid-rows-[1fr]'
                       : 'grid-rows-[0fr]'
diff --git a/apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx b/apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx
index 01067670a1d..3ed6c53bf67 100644
--- a/apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx
+++ b/apps/sim/app/(landing)/components/demo-request/demo-request-modal.tsx
@@ -13,6 +13,7 @@ import {
   Textarea,
 } from '@/components/emcn'
 import { Check } from '@/components/emcn/icons'
+import { captureClientEvent } from '@/lib/posthog/client'
 import {
   DEMO_REQUEST_COMPANY_SIZE_OPTIONS,
   type DemoRequestPayload,
@@ -163,6 +164,9 @@ export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalP
         }
 
         setSubmitSuccess(true)
+        captureClientEvent('landing_demo_request_submitted', {
+          company_size: parsed.data.companySize,
+        })
       } catch (error) {
         setSubmitError(
           error instanceof Error
diff --git a/apps/sim/app/(landing)/components/footer/footer-cta.tsx b/apps/sim/app/(landing)/components/footer/footer-cta.tsx
index c1c95a638da..f9af4ac4bcc 100644
--- a/apps/sim/app/(landing)/components/footer/footer-cta.tsx
+++ b/apps/sim/app/(landing)/components/footer/footer-cta.tsx
@@ -3,7 +3,9 @@
 import { useCallback, useRef, useState } from 'react'
 import { ArrowUp } from 'lucide-react'
 import Link from 'next/link'
+import { captureClientEvent } from '@/lib/posthog/client'
 import { useLandingSubmit } from '@/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
+import { trackLandingCta } from '@/app/(landing)/landing-analytics'
 import { useAnimatedPlaceholder } from '@/hooks/use-animated-placeholder'
 
 const MAX_HEIGHT = 120
@@ -21,6 +23,7 @@ export function FooterCTA() {
 
   const handleSubmit = useCallback(() => {
     if (isEmpty) return
+    captureClientEvent('landing_prompt_submitted', {})
     landingSubmit(inputValue)
   }, [isEmpty, inputValue, landingSubmit])
 
@@ -94,12 +97,22 @@ export function FooterCTA() {
           target='_blank'
           rel='noopener noreferrer'
           className={`${CTA_BUTTON} border-[var(--landing-border-strong)] text-[var(--landing-text)] transition-colors hover:bg-[var(--landing-bg-elevated)]`}
+          onClick={() =>
+            trackLandingCta({
+              label: 'Docs',
+              section: 'footer_cta',
+              destination: 'https://docs.sim.ai',
+            })
+          }
         >
           Docs
         </a>
         <Link
           href='/signup'
           className={`${CTA_BUTTON} gap-2 border-white bg-white text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]`}
+          onClick={() =>
+            trackLandingCta({ label: 'Get started', section: 'footer_cta', destination: '/signup' })
+          }
         >
           Get started
         </Link>
diff --git a/apps/sim/app/(landing)/components/hero/hero.tsx b/apps/sim/app/(landing)/components/hero/hero.tsx
index 775f241c337..7098c4abf71 100644
--- a/apps/sim/app/(landing)/components/hero/hero.tsx
+++ b/apps/sim/app/(landing)/components/hero/hero.tsx
@@ -3,6 +3,7 @@
 import dynamic from 'next/dynamic'
 import Link from 'next/link'
 import { DemoRequestModal } from '@/app/(landing)/components/demo-request/demo-request-modal'
+import { trackLandingCta } from '@/app/(landing)/landing-analytics'
 
 const LandingPreview = dynamic(
   () =>
@@ -57,6 +58,9 @@ export default function Hero() {
               type='button'
               className={`${CTA_BASE} border-[var(--landing-border-strong)] bg-transparent text-[var(--landing-text)] transition-colors hover:bg-[var(--landing-bg-elevated)]`}
               aria-label='Get a demo'
+              onClick={() =>
+                trackLandingCta({ label: 'Get a demo', section: 'hero', destination: 'demo_modal' })
+              }
             >
               Get a demo
             </button>
@@ -65,6 +69,9 @@ export default function Hero() {
             href='/signup'
             className={`${CTA_BASE} gap-2 border-white bg-white text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]`}
             aria-label='Get started with Sim'
+            onClick={() =>
+              trackLandingCta({ label: 'Get started', section: 'hero', destination: '/signup' })
+            }
           >
             Get started
           </Link>
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
index 35cb85c1654..aea260a3cb0 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
@@ -5,6 +5,7 @@ import { AnimatePresence, motion } from 'framer-motion'
 import { ArrowUp, Table } from 'lucide-react'
 import { Blimp, Checkbox, ChevronDown } from '@/components/emcn'
 import { TypeBoolean, TypeNumber, TypeText } from '@/components/emcn/icons'
+import { captureClientEvent } from '@/lib/posthog/client'
 import { useLandingSubmit } from '@/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel'
 import { EASE_OUT } from '@/app/(landing)/components/landing-preview/components/landing-preview-workflow/workflow-data'
 import { useAnimatedPlaceholder } from '@/hooks/use-animated-placeholder'
@@ -151,6 +152,7 @@ export const LandingPreviewHome = memo(function LandingPreviewHome({
 
   const handleSubmit = useCallback(() => {
     if (isEmpty) return
+    captureClientEvent('landing_prompt_submitted', {})
     landingSubmit(inputValue)
   }, [isEmpty, inputValue, landingSubmit])
 
diff --git a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx
index 4ca06238463..ef5929963e7 100644
--- a/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx
+++ b/apps/sim/app/(landing)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx
@@ -9,6 +9,7 @@ import { createPortal } from 'react-dom'
 import { Blimp, BubbleChatPreview, ChevronDown, MoreHorizontal, Play } from '@/components/emcn'
 import { AgentIcon, HubspotIcon, OpenAIIcon, SalesforceIcon } from '@/components/icons'
 import { LandingPromptStorage } from '@/lib/core/utils/browser-storage'
+import { captureClientEvent } from '@/lib/posthog/client'
 import {
   EASE_OUT,
   type EditorPromptData,
@@ -147,6 +148,7 @@ export const LandingPreviewPanel = memo(function LandingPreviewPanel({
 
   const handleSubmit = useCallback(() => {
     if (isEmpty) return
+    captureClientEvent('landing_prompt_submitted', {})
     landingSubmit(inputValue)
   }, [isEmpty, inputValue, landingSubmit])
 
diff --git a/apps/sim/app/(landing)/components/navbar/navbar.tsx b/apps/sim/app/(landing)/components/navbar/navbar.tsx
index 0cc2a8c306a..8f595d69078 100644
--- a/apps/sim/app/(landing)/components/navbar/navbar.tsx
+++ b/apps/sim/app/(landing)/components/navbar/navbar.tsx
@@ -13,6 +13,7 @@ import {
 } from '@/app/(landing)/components/navbar/components/blog-dropdown'
 import { DocsDropdown } from '@/app/(landing)/components/navbar/components/docs-dropdown'
 import { GitHubStars } from '@/app/(landing)/components/navbar/components/github-stars'
+import { trackLandingCta } from '@/app/(landing)/landing-analytics'
 import { getBrandConfig } from '@/ee/whitelabeling'
 
 type DropdownId = 'docs' | 'blog' | null
@@ -212,6 +213,13 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                 href='/workspace'
                 className='inline-flex h-[30px] items-center gap-[7px] rounded-[5px] border border-[var(--white)] bg-[var(--white)] px-[9px] text-[13.5px] text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
                 aria-label='Go to app'
+                onClick={() =>
+                  trackLandingCta({
+                    label: 'Go to App',
+                    section: 'navbar',
+                    destination: '/workspace',
+                  })
+                }
               >
                 Go to App
               </Link>
@@ -221,6 +229,9 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                   href='/login'
                   className='inline-flex h-[30px] items-center rounded-[5px] border border-[var(--landing-border-strong)] px-[9px] text-[13.5px] text-[var(--landing-text)] transition-colors hover:bg-[var(--landing-bg-elevated)]'
                   aria-label='Log in'
+                  onClick={() =>
+                    trackLandingCta({ label: 'Log in', section: 'navbar', destination: '/login' })
+                  }
                 >
                   Log in
                 </Link>
@@ -228,6 +239,13 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                   href='/signup'
                   className='inline-flex h-[30px] items-center gap-[7px] rounded-[5px] border border-[var(--white)] bg-[var(--white)] px-2.5 text-[13.5px] text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
                   aria-label='Get started with Sim'
+                  onClick={() =>
+                    trackLandingCta({
+                      label: 'Get started',
+                      section: 'navbar',
+                      destination: '/signup',
+                    })
+                  }
                 >
                   Get started
                 </Link>
@@ -303,7 +321,14 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                 <Link
                   href='/workspace'
                   className='flex h-[32px] items-center justify-center rounded-[5px] border border-[var(--white)] bg-[var(--white)] text-[14px] text-black transition-colors active:bg-[#E0E0E0]'
-                  onClick={() => setMobileMenuOpen(false)}
+                  onClick={() => {
+                    trackLandingCta({
+                      label: 'Go to App',
+                      section: 'navbar',
+                      destination: '/workspace',
+                    })
+                    setMobileMenuOpen(false)
+                  }}
                   aria-label='Go to app'
                 >
                   Go to App
@@ -313,7 +338,10 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                   <Link
                     href='/login'
                     className='flex h-[32px] items-center justify-center rounded-[5px] border border-[var(--landing-border-strong)] text-[14px] text-[var(--landing-text)] transition-colors active:bg-[var(--landing-bg-elevated)]'
-                    onClick={() => setMobileMenuOpen(false)}
+                    onClick={() => {
+                      trackLandingCta({ label: 'Log in', section: 'navbar', destination: '/login' })
+                      setMobileMenuOpen(false)
+                    }}
                     aria-label='Log in'
                   >
                     Log in
@@ -321,7 +349,14 @@ export default function Navbar({ logoOnly = false, blogPosts = [] }: NavbarProps
                   <Link
                     href='/signup'
                     className='flex h-[32px] items-center justify-center rounded-[5px] border border-[var(--white)] bg-[var(--white)] text-[14px] text-black transition-colors active:bg-[#E0E0E0]'
-                    onClick={() => setMobileMenuOpen(false)}
+                    onClick={() => {
+                      trackLandingCta({
+                        label: 'Get started',
+                        section: 'navbar',
+                        destination: '/signup',
+                      })
+                      setMobileMenuOpen(false)
+                    }}
                     aria-label='Get started with Sim'
                   >
                     Get started
diff --git a/apps/sim/app/(landing)/components/pricing/pricing.tsx b/apps/sim/app/(landing)/components/pricing/pricing.tsx
index 455aea124c8..d4d0789467c 100644
--- a/apps/sim/app/(landing)/components/pricing/pricing.tsx
+++ b/apps/sim/app/(landing)/components/pricing/pricing.tsx
@@ -3,6 +3,7 @@
 import Link from 'next/link'
 import { Badge } from '@/components/emcn'
 import { DemoRequestModal } from '@/app/(landing)/components/demo-request/demo-request-modal'
+import { trackLandingCta } from '@/app/(landing)/landing-analytics'
 
 interface PricingTier {
   id: string
@@ -150,6 +151,13 @@ function PricingCard({ tier }: PricingCardProps) {
                 <button
                   type='button'
                   className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[var(--landing-border-light)] bg-transparent px-2.5 font-[430] font-season text-[14px] text-[var(--landing-text-dark)] transition-colors hover:bg-[var(--landing-bg-hover)]'
+                  onClick={() =>
+                    trackLandingCta({
+                      label: tier.cta.label,
+                      section: 'pricing',
+                      destination: 'demo_modal',
+                    })
+                  }
                 >
                   {tier.cta.label}
                 </button>
@@ -158,6 +166,13 @@ function PricingCard({ tier }: PricingCardProps) {
               <Link
                 href={tier.cta.href || '/signup'}
                 className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[#1D1D1D] bg-[#1D1D1D] px-2.5 font-[430] font-season text-[14px] text-white transition-colors hover:border-[var(--landing-border)] hover:bg-[var(--landing-bg-elevated)]'
+                onClick={() =>
+                  trackLandingCta({
+                    label: tier.cta.label,
+                    section: 'pricing',
+                    destination: tier.cta.href || '/signup',
+                  })
+                }
               >
                 {tier.cta.label}
               </Link>
@@ -165,6 +180,13 @@ function PricingCard({ tier }: PricingCardProps) {
               <Link
                 href={tier.cta.href || '/signup'}
                 className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[var(--landing-border-light)] px-2.5 font-[430] font-season text-[14px] text-[var(--landing-text-dark)] transition-colors hover:bg-[var(--landing-bg-hover)]'
+                onClick={() =>
+                  trackLandingCta({
+                    label: tier.cta.label,
+                    section: 'pricing',
+                    destination: tier.cta.href || '/signup',
+                  })
+                }
               >
                 {tier.cta.label}
               </Link>
diff --git a/apps/sim/app/(landing)/integrations/data/icon-mapping.ts b/apps/sim/app/(landing)/integrations/data/icon-mapping.ts
index ee5f8c95a5b..503242d8c1e 100644
--- a/apps/sim/app/(landing)/integrations/data/icon-mapping.ts
+++ b/apps/sim/app/(landing)/integrations/data/icon-mapping.ts
@@ -154,6 +154,7 @@ import {
   SftpIcon,
   ShopifyIcon,
   SimilarwebIcon,
+  SixtyfourIcon,
   SlackIcon,
   SmtpIcon,
   SQSIcon,
@@ -283,7 +284,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   langsmith: LangsmithIcon,
   launchdarkly: LaunchDarklyIcon,
   lemlist: LemlistIcon,
-  linear: LinearIcon,
+  linear_v2: LinearIcon,
   linkedin: LinkedInIcon,
   linkup: LinkupIcon,
   loops: LoopsIcon,
@@ -340,6 +341,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   sharepoint: MicrosoftSharepointIcon,
   shopify: ShopifyIcon,
   similarweb: SimilarwebIcon,
+  sixtyfour: SixtyfourIcon,
   slack: SlackIcon,
   smtp: SmtpIcon,
   sqs: SQSIcon,
diff --git a/apps/sim/app/(landing)/integrations/data/integrations.json b/apps/sim/app/(landing)/integrations/data/integrations.json
index 9db82b6d349..1aedf79474f 100644
--- a/apps/sim/app/(landing)/integrations/data/integrations.json
+++ b/apps/sim/app/(landing)/integrations/data/integrations.json
@@ -324,7 +324,7 @@
     "longDescription": "Search across your synced data sources using Airweave. Supports semantic search with hybrid, neural, or keyword retrieval strategies. Optionally generate AI-powered answers from search results.",
     "bgColor": "#6366F1",
     "iconName": "AirweaveIcon",
-    "docsUrl": "https://docs.airweave.ai",
+    "docsUrl": "https://docs.sim.ai/tools/airweave",
     "operations": [],
     "operationCount": 0,
     "triggers": [],
@@ -4015,8 +4015,14 @@
       }
     ],
     "operationCount": 12,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "gmail_poller",
+        "name": "Gmail Email Trigger",
+        "description": "Triggers when new emails are received in Gmail (requires Gmail credentials)"
+      }
+    ],
+    "triggerCount": 1,
     "authType": "oauth",
     "category": "tools",
     "integrationType": "email",
@@ -4106,8 +4112,19 @@
       }
     ],
     "operationCount": 18,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "gong_webhook",
+        "name": "Gong Webhook",
+        "description": "Generic webhook trigger for all Gong events"
+      },
+      {
+        "id": "gong_call_completed",
+        "name": "Gong Call Completed",
+        "description": "Trigger workflow when a call is completed and processed in Gong"
+      }
+    ],
+    "triggerCount": 2,
     "authType": "none",
     "category": "tools",
     "integrationType": "sales-intelligence",
@@ -5253,8 +5270,49 @@
       }
     ],
     "operationCount": 11,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "greenhouse_candidate_hired",
+        "name": "Greenhouse Candidate Hired",
+        "description": "Trigger workflow when a candidate is hired"
+      },
+      {
+        "id": "greenhouse_new_application",
+        "name": "Greenhouse New Application",
+        "description": "Trigger workflow when a new application is submitted"
+      },
+      {
+        "id": "greenhouse_candidate_stage_change",
+        "name": "Greenhouse Candidate Stage Change",
+        "description": "Trigger workflow when a candidate changes interview stages"
+      },
+      {
+        "id": "greenhouse_candidate_rejected",
+        "name": "Greenhouse Candidate Rejected",
+        "description": "Trigger workflow when a candidate is rejected"
+      },
+      {
+        "id": "greenhouse_offer_created",
+        "name": "Greenhouse Offer Created",
+        "description": "Trigger workflow when a new offer is created"
+      },
+      {
+        "id": "greenhouse_job_created",
+        "name": "Greenhouse Job Created",
+        "description": "Trigger workflow when a new job is created"
+      },
+      {
+        "id": "greenhouse_job_updated",
+        "name": "Greenhouse Job Updated",
+        "description": "Trigger workflow when a job is updated"
+      },
+      {
+        "id": "greenhouse_webhook",
+        "name": "Greenhouse Webhook (Endpoint Events)",
+        "description": "Trigger on whichever event types you select for this URL in Greenhouse. Sim does not filter deliveries for this trigger."
+      }
+    ],
+    "triggerCount": 8,
     "authType": "api-key",
     "category": "tools",
     "integrationType": "hr",
@@ -5517,6 +5575,11 @@
         "name": "HubSpot Contact Deleted",
         "description": "Trigger workflow when a contact is deleted in HubSpot"
       },
+      {
+        "id": "hubspot_contact_merged",
+        "name": "HubSpot Contact Merged",
+        "description": "Trigger workflow when contacts are merged in HubSpot"
+      },
       {
         "id": "hubspot_contact_privacy_deleted",
         "name": "HubSpot Contact Privacy Deleted",
@@ -5527,6 +5590,11 @@
         "name": "HubSpot Contact Property Changed",
         "description": "Trigger workflow when any property of a contact is updated in HubSpot"
       },
+      {
+        "id": "hubspot_contact_restored",
+        "name": "HubSpot Contact Restored",
+        "description": "Trigger workflow when a deleted contact is restored in HubSpot"
+      },
       {
         "id": "hubspot_company_created",
         "name": "HubSpot Company Created",
@@ -5537,11 +5605,21 @@
         "name": "HubSpot Company Deleted",
         "description": "Trigger workflow when a company is deleted in HubSpot"
       },
+      {
+        "id": "hubspot_company_merged",
+        "name": "HubSpot Company Merged",
+        "description": "Trigger workflow when companies are merged in HubSpot"
+      },
       {
         "id": "hubspot_company_property_changed",
         "name": "HubSpot Company Property Changed",
         "description": "Trigger workflow when any property of a company is updated in HubSpot"
       },
+      {
+        "id": "hubspot_company_restored",
+        "name": "HubSpot Company Restored",
+        "description": "Trigger workflow when a deleted company is restored in HubSpot"
+      },
       {
         "id": "hubspot_conversation_creation",
         "name": "HubSpot Conversation Creation",
@@ -5577,11 +5655,21 @@
         "name": "HubSpot Deal Deleted",
         "description": "Trigger workflow when a deal is deleted in HubSpot"
       },
+      {
+        "id": "hubspot_deal_merged",
+        "name": "HubSpot Deal Merged",
+        "description": "Trigger workflow when deals are merged in HubSpot"
+      },
       {
         "id": "hubspot_deal_property_changed",
         "name": "HubSpot Deal Property Changed",
         "description": "Trigger workflow when any property of a deal is updated in HubSpot"
       },
+      {
+        "id": "hubspot_deal_restored",
+        "name": "HubSpot Deal Restored",
+        "description": "Trigger workflow when a deleted deal is restored in HubSpot"
+      },
       {
         "id": "hubspot_ticket_created",
         "name": "HubSpot Ticket Created",
@@ -5592,13 +5680,28 @@
         "name": "HubSpot Ticket Deleted",
         "description": "Trigger workflow when a ticket is deleted in HubSpot"
       },
+      {
+        "id": "hubspot_ticket_merged",
+        "name": "HubSpot Ticket Merged",
+        "description": "Trigger workflow when tickets are merged in HubSpot"
+      },
       {
         "id": "hubspot_ticket_property_changed",
         "name": "HubSpot Ticket Property Changed",
         "description": "Trigger workflow when any property of a ticket is updated in HubSpot"
+      },
+      {
+        "id": "hubspot_ticket_restored",
+        "name": "HubSpot Ticket Restored",
+        "description": "Trigger workflow when a deleted ticket is restored in HubSpot"
+      },
+      {
+        "id": "hubspot_webhook",
+        "name": "HubSpot Webhook (All Events)",
+        "description": "Trigger workflow on any HubSpot webhook event"
       }
     ],
-    "triggerCount": 18,
+    "triggerCount": 27,
     "authType": "oauth",
     "category": "tools",
     "integrationType": "crm",
@@ -6077,8 +6180,39 @@
       }
     ],
     "operationCount": 31,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "intercom_conversation_created",
+        "name": "Intercom Conversation Created",
+        "description": "Trigger workflow when a new conversation is created in Intercom"
+      },
+      {
+        "id": "intercom_conversation_reply",
+        "name": "Intercom Conversation Reply",
+        "description": "Trigger workflow when someone replies to an Intercom conversation"
+      },
+      {
+        "id": "intercom_conversation_closed",
+        "name": "Intercom Conversation Closed",
+        "description": "Trigger workflow when a conversation is closed in Intercom"
+      },
+      {
+        "id": "intercom_contact_created",
+        "name": "Intercom Contact Created",
+        "description": "Trigger workflow when a new lead is created in Intercom"
+      },
+      {
+        "id": "intercom_user_created",
+        "name": "Intercom User Created",
+        "description": "Trigger workflow when a new user is created in Intercom"
+      },
+      {
+        "id": "intercom_webhook",
+        "name": "Intercom Webhook (All Events)",
+        "description": "Trigger workflow on any Intercom webhook event"
+      }
+    ],
+    "triggerCount": 6,
     "authType": "api-key",
     "category": "tools",
     "integrationType": "customer-support",
@@ -6731,7 +6865,7 @@
     "tags": ["sales-engagement", "email-marketing", "automation"]
   },
   {
-    "type": "linear",
+    "type": "linear_v2",
     "slug": "linear",
     "name": "Linear",
     "description": "Interact with Linear issues, projects, and more",
@@ -7056,79 +7190,79 @@
     "operationCount": 78,
     "triggers": [
       {
-        "id": "linear_issue_created",
+        "id": "linear_issue_created_v2",
         "name": "Linear Issue Created",
         "description": "Trigger workflow when a new issue is created in Linear"
       },
       {
-        "id": "linear_issue_updated",
+        "id": "linear_issue_updated_v2",
         "name": "Linear Issue Updated",
         "description": "Trigger workflow when an issue is updated in Linear"
       },
       {
-        "id": "linear_issue_removed",
+        "id": "linear_issue_removed_v2",
         "name": "Linear Issue Removed",
         "description": "Trigger workflow when an issue is removed/deleted in Linear"
       },
       {
-        "id": "linear_comment_created",
+        "id": "linear_comment_created_v2",
         "name": "Linear Comment Created",
         "description": "Trigger workflow when a new comment is created in Linear"
       },
       {
-        "id": "linear_comment_updated",
+        "id": "linear_comment_updated_v2",
         "name": "Linear Comment Updated",
         "description": "Trigger workflow when a comment is updated in Linear"
       },
       {
-        "id": "linear_project_created",
+        "id": "linear_project_created_v2",
         "name": "Linear Project Created",
         "description": "Trigger workflow when a new project is created in Linear"
       },
       {
-        "id": "linear_project_updated",
+        "id": "linear_project_updated_v2",
         "name": "Linear Project Updated",
         "description": "Trigger workflow when a project is updated in Linear"
       },
       {
-        "id": "linear_cycle_created",
+        "id": "linear_cycle_created_v2",
         "name": "Linear Cycle Created",
         "description": "Trigger workflow when a new cycle is created in Linear"
       },
       {
-        "id": "linear_cycle_updated",
+        "id": "linear_cycle_updated_v2",
         "name": "Linear Cycle Updated",
         "description": "Trigger workflow when a cycle is updated in Linear"
       },
       {
-        "id": "linear_label_created",
+        "id": "linear_label_created_v2",
         "name": "Linear Label Created",
         "description": "Trigger workflow when a new label is created in Linear"
       },
       {
-        "id": "linear_label_updated",
+        "id": "linear_label_updated_v2",
         "name": "Linear Label Updated",
         "description": "Trigger workflow when a label is updated in Linear"
       },
       {
-        "id": "linear_project_update_created",
+        "id": "linear_project_update_created_v2",
         "name": "Linear Project Update Created",
         "description": "Trigger workflow when a new project update is posted in Linear"
       },
       {
-        "id": "linear_customer_request_created",
+        "id": "linear_customer_request_created_v2",
         "name": "Linear Customer Request Created",
         "description": "Trigger workflow when a new customer request is created in Linear"
       },
       {
-        "id": "linear_customer_request_updated",
+        "id": "linear_customer_request_updated_v2",
         "name": "Linear Customer Request Updated",
         "description": "Trigger workflow when a customer request is updated in Linear"
       },
       {
-        "id": "linear_webhook",
+        "id": "linear_webhook_v2",
         "name": "Linear Webhook",
-        "description": "Trigger workflow from any Linear webhook event"
+        "description": "Trigger workflow from Linear events you select when creating the webhook in Linear (not guaranteed to be every model or event type)."
       }
     ],
     "triggerCount": 15,
@@ -8138,8 +8272,54 @@
     "docsUrl": "https://docs.sim.ai/tools/notion",
     "operations": [],
     "operationCount": 0,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "notion_page_created",
+        "name": "Notion Page Created",
+        "description": "Trigger workflow when a new page is created in Notion"
+      },
+      {
+        "id": "notion_page_properties_updated",
+        "name": "Notion Page Properties Updated",
+        "description": "Trigger workflow when page properties are modified in Notion"
+      },
+      {
+        "id": "notion_page_content_updated",
+        "name": "Notion Page Content Updated",
+        "description": "Trigger workflow when page content is changed in Notion"
+      },
+      {
+        "id": "notion_page_deleted",
+        "name": "Notion Page Deleted",
+        "description": "Trigger workflow when a page is deleted in Notion"
+      },
+      {
+        "id": "notion_database_created",
+        "name": "Notion Database Created",
+        "description": "Trigger workflow when a new database is created in Notion"
+      },
+      {
+        "id": "notion_database_schema_updated",
+        "name": "Notion Database Schema Updated",
+        "description": "Trigger workflow when a database schema is modified in Notion"
+      },
+      {
+        "id": "notion_database_deleted",
+        "name": "Notion Database Deleted",
+        "description": "Trigger workflow when a database is deleted in Notion"
+      },
+      {
+        "id": "notion_comment_created",
+        "name": "Notion Comment Created",
+        "description": "Trigger workflow when a comment or suggested edit is added in Notion"
+      },
+      {
+        "id": "notion_webhook",
+        "name": "Notion Webhook (All Events)",
+        "description": "Trigger workflow on any Notion webhook event"
+      }
+    ],
+    "triggerCount": 9,
     "authType": "oauth",
     "category": "tools",
     "integrationType": "documents",
@@ -8406,8 +8586,14 @@
       }
     ],
     "operationCount": 9,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "outlook_poller",
+        "name": "Outlook Email Trigger",
+        "description": "Triggers when new emails are received in Outlook (requires Microsoft credentials)"
+      }
+    ],
+    "triggerCount": 1,
     "authType": "oauth",
     "category": "tools",
     "integrationType": "email",
@@ -9428,8 +9614,49 @@
       }
     ],
     "operationCount": 8,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "resend_email_sent",
+        "name": "Resend Email Sent",
+        "description": "Trigger workflow when an email is sent"
+      },
+      {
+        "id": "resend_email_delivered",
+        "name": "Resend Email Delivered",
+        "description": "Trigger workflow when an email is delivered"
+      },
+      {
+        "id": "resend_email_bounced",
+        "name": "Resend Email Bounced",
+        "description": "Trigger workflow when an email bounces"
+      },
+      {
+        "id": "resend_email_complained",
+        "name": "Resend Email Complained",
+        "description": "Trigger workflow when an email is marked as spam"
+      },
+      {
+        "id": "resend_email_opened",
+        "name": "Resend Email Opened",
+        "description": "Trigger workflow when an email is opened"
+      },
+      {
+        "id": "resend_email_clicked",
+        "name": "Resend Email Clicked",
+        "description": "Trigger workflow when a link in an email is clicked"
+      },
+      {
+        "id": "resend_email_failed",
+        "name": "Resend Email Failed",
+        "description": "Trigger workflow when an email fails to send"
+      },
+      {
+        "id": "resend_webhook",
+        "name": "Resend Webhook (All Events)",
+        "description": "Trigger on Resend webhook events we subscribe to (email lifecycle, contacts, domains—see Resend docs). Flattened email fields may be null for non-email events; use <code>data</code> for the full payload."
+      }
+    ],
+    "triggerCount": 8,
     "authType": "none",
     "category": "tools",
     "integrationType": "email",
@@ -10175,8 +10402,39 @@
       }
     ],
     "operationCount": 35,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "salesforce_record_created",
+        "name": "Salesforce Record Created",
+        "description": "Trigger workflow when a Salesforce record is created"
+      },
+      {
+        "id": "salesforce_record_updated",
+        "name": "Salesforce Record Updated",
+        "description": "Trigger workflow when a Salesforce record is updated"
+      },
+      {
+        "id": "salesforce_record_deleted",
+        "name": "Salesforce Record Deleted",
+        "description": "Trigger workflow when a Salesforce record is deleted"
+      },
+      {
+        "id": "salesforce_opportunity_stage_changed",
+        "name": "Salesforce Opportunity Stage Changed",
+        "description": "Trigger workflow when an opportunity stage changes"
+      },
+      {
+        "id": "salesforce_case_status_changed",
+        "name": "Salesforce Case Status Changed",
+        "description": "Trigger workflow when a case status changes"
+      },
+      {
+        "id": "salesforce_webhook",
+        "name": "Salesforce Webhook (All Events)",
+        "description": "Trigger workflow on any Salesforce webhook event"
+      }
+    ],
+    "triggerCount": 6,
     "authType": "oauth",
     "category": "tools",
     "integrationType": "crm",
@@ -10639,6 +10897,41 @@
     "integrationType": "analytics",
     "tags": ["marketing", "data-analytics", "seo"]
   },
+  {
+    "type": "sixtyfour",
+    "slug": "sixtyfour-ai",
+    "name": "Sixtyfour AI",
+    "description": "Enrich leads and companies with AI-powered research",
+    "longDescription": "Find emails, phone numbers, and enrich lead or company data with contact information, social profiles, and detailed research using Sixtyfour AI.",
+    "bgColor": "#000000",
+    "iconName": "SixtyfourIcon",
+    "docsUrl": "https://docs.sim.ai/tools/sixtyfour",
+    "operations": [
+      {
+        "name": "Find Phone",
+        "description": "Find phone numbers for a lead using Sixtyfour AI."
+      },
+      {
+        "name": "Find Email",
+        "description": "Find email addresses for a lead using Sixtyfour AI."
+      },
+      {
+        "name": "Enrich Lead",
+        "description": "Enrich lead information with contact details, social profiles, and company data using Sixtyfour AI."
+      },
+      {
+        "name": "Enrich Company",
+        "description": "Enrich company data with additional information and find associated people using Sixtyfour AI."
+      }
+    ],
+    "operationCount": 4,
+    "triggers": [],
+    "triggerCount": 0,
+    "authType": "api-key",
+    "category": "tools",
+    "integrationType": "sales-intelligence",
+    "tags": ["enrichment", "sales-engagement"]
+  },
   {
     "type": "slack",
     "slug": "slack",
@@ -11930,8 +12223,49 @@
       }
     ],
     "operationCount": 50,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "vercel_deployment_created",
+        "name": "Vercel Deployment Created",
+        "description": "Trigger workflow when a new deployment is created"
+      },
+      {
+        "id": "vercel_deployment_ready",
+        "name": "Vercel Deployment Ready",
+        "description": "Trigger workflow when a deployment is ready to serve traffic"
+      },
+      {
+        "id": "vercel_deployment_error",
+        "name": "Vercel Deployment Error",
+        "description": "Trigger workflow when a deployment fails"
+      },
+      {
+        "id": "vercel_deployment_canceled",
+        "name": "Vercel Deployment Canceled",
+        "description": "Trigger workflow when a deployment is canceled"
+      },
+      {
+        "id": "vercel_project_created",
+        "name": "Vercel Project Created",
+        "description": "Trigger workflow when a new project is created"
+      },
+      {
+        "id": "vercel_project_removed",
+        "name": "Vercel Project Removed",
+        "description": "Trigger workflow when a project is removed"
+      },
+      {
+        "id": "vercel_domain_created",
+        "name": "Vercel Domain Created",
+        "description": "Trigger workflow when a domain is created"
+      },
+      {
+        "id": "vercel_webhook",
+        "name": "Vercel Webhook (Common Events)",
+        "description": "Trigger on a curated set of common Vercel events (deployments, projects, domains, edge config). Pick a specific trigger to listen to one event type only."
+      }
+    ],
+    "triggerCount": 8,
     "authType": "api-key",
     "category": "tools",
     "integrationType": "developer-tools",
@@ -12733,8 +13067,39 @@
       }
     ],
     "operationCount": 10,
-    "triggers": [],
-    "triggerCount": 0,
+    "triggers": [
+      {
+        "id": "zoom_meeting_started",
+        "name": "Zoom Meeting Started",
+        "description": "Trigger workflow when a Zoom meeting starts"
+      },
+      {
+        "id": "zoom_meeting_ended",
+        "name": "Zoom Meeting Ended",
+        "description": "Trigger workflow when a Zoom meeting ends"
+      },
+      {
+        "id": "zoom_participant_joined",
+        "name": "Zoom Participant Joined",
+        "description": "Trigger workflow when a participant joins a Zoom meeting"
+      },
+      {
+        "id": "zoom_participant_left",
+        "name": "Zoom Participant Left",
+        "description": "Trigger workflow when a participant leaves a Zoom meeting"
+      },
+      {
+        "id": "zoom_recording_completed",
+        "name": "Zoom Recording Completed",
+        "description": "Trigger workflow when a Zoom cloud recording is completed"
+      },
+      {
+        "id": "zoom_webhook",
+        "name": "Zoom Webhook (All Events)",
+        "description": "Trigger workflow on any Zoom webhook event"
+      }
+    ],
+    "triggerCount": 6,
     "authType": "oauth",
     "category": "tools",
     "integrationType": "communication",
diff --git a/apps/sim/app/(landing)/landing-analytics.tsx b/apps/sim/app/(landing)/landing-analytics.tsx
index 10be29e5edd..d79e5faaa52 100644
--- a/apps/sim/app/(landing)/landing-analytics.tsx
+++ b/apps/sim/app/(landing)/landing-analytics.tsx
@@ -2,7 +2,8 @@
 
 import { useEffect } from 'react'
 import { usePostHog } from 'posthog-js/react'
-import { captureEvent } from '@/lib/posthog/client'
+import { captureClientEvent, captureEvent } from '@/lib/posthog/client'
+import type { PostHogEventMap } from '@/lib/posthog/events'
 
 export function LandingAnalytics() {
   const posthog = usePostHog()
@@ -13,3 +14,11 @@ export function LandingAnalytics() {
 
   return null
 }
+
+/**
+ * Fire-and-forget tracker for landing page CTA clicks.
+ * Uses the non-hook client so it works in any click handler without requiring a PostHog provider ref.
+ */
+export function trackLandingCta(props: PostHogEventMap['landing_cta_clicked']): void {
+  captureClientEvent('landing_cta_clicked', props)
+}
diff --git a/apps/sim/app/api/auth/reset-password/route.test.ts b/apps/sim/app/api/auth/reset-password/route.test.ts
index ee969fe9067..5a8bd79f5e0 100644
--- a/apps/sim/app/api/auth/reset-password/route.test.ts
+++ b/apps/sim/app/api/auth/reset-password/route.test.ts
@@ -68,7 +68,7 @@ describe('Reset Password API Route', () => {
 
   it('should handle missing token', async () => {
     const req = createMockRequest('POST', {
-      newPassword: 'newSecurePassword123',
+      newPassword: 'newSecurePassword123!',
     })
 
     const response = await POST(req)
@@ -97,7 +97,7 @@ describe('Reset Password API Route', () => {
   it('should handle empty token', async () => {
     const req = createMockRequest('POST', {
       token: '',
-      newPassword: 'newSecurePassword123',
+      newPassword: 'newSecurePassword123!',
     })
 
     const response = await POST(req)
@@ -119,7 +119,11 @@ describe('Reset Password API Route', () => {
     const data = await response.json()
 
     expect(response.status).toBe(400)
-    expect(data.message).toBe('Password must be at least 8 characters long')
+    expect(data.message).toContain('Password must be at least 8 characters long')
+    expect(data.message).toContain('Password must contain at least one uppercase letter')
+    expect(data.message).toContain('Password must contain at least one lowercase letter')
+    expect(data.message).toContain('Password must contain at least one number')
+    expect(data.message).toContain('Password must contain at least one special character')
 
     expect(mockResetPassword).not.toHaveBeenCalled()
   })
diff --git a/apps/sim/app/api/auth/reset-password/route.ts b/apps/sim/app/api/auth/reset-password/route.ts
index 1d47be10354..0ec277543c4 100644
--- a/apps/sim/app/api/auth/reset-password/route.ts
+++ b/apps/sim/app/api/auth/reset-password/route.ts
@@ -26,8 +26,7 @@ export async function POST(request: NextRequest) {
     const validationResult = resetPasswordSchema.safeParse(body)
 
     if (!validationResult.success) {
-      const firstError = validationResult.error.errors[0]
-      const errorMessage = firstError?.message || 'Invalid request data'
+      const errorMessage = validationResult.error.errors.map((e) => e.message).join(' ')
 
       logger.warn('Invalid password reset request data', {
         errors: validationResult.error.format(),
diff --git a/apps/sim/app/api/copilot/chat/resources/route.ts b/apps/sim/app/api/copilot/chat/resources/route.ts
index 69d7bb204dc..8d528150218 100644
--- a/apps/sim/app/api/copilot/chat/resources/route.ts
+++ b/apps/sim/app/api/copilot/chat/resources/route.ts
@@ -15,13 +15,19 @@ import type { ChatResource, ResourceType } from '@/lib/copilot/resources'
 
 const logger = createLogger('CopilotChatResourcesAPI')
 
-const VALID_RESOURCE_TYPES = new Set<ResourceType>(['table', 'file', 'workflow', 'knowledgebase'])
-const GENERIC_TITLES = new Set(['Table', 'File', 'Workflow', 'Knowledge Base'])
+const VALID_RESOURCE_TYPES = new Set<ResourceType>([
+  'table',
+  'file',
+  'workflow',
+  'knowledgebase',
+  'folder',
+])
+const GENERIC_TITLES = new Set(['Table', 'File', 'Workflow', 'Knowledge Base', 'Folder'])
 
 const AddResourceSchema = z.object({
   chatId: z.string(),
   resource: z.object({
-    type: z.enum(['table', 'file', 'workflow', 'knowledgebase']),
+    type: z.enum(['table', 'file', 'workflow', 'knowledgebase', 'folder']),
     id: z.string(),
     title: z.string(),
   }),
@@ -29,7 +35,7 @@ const AddResourceSchema = z.object({
 
 const RemoveResourceSchema = z.object({
   chatId: z.string(),
-  resourceType: z.enum(['table', 'file', 'workflow', 'knowledgebase']),
+  resourceType: z.enum(['table', 'file', 'workflow', 'knowledgebase', 'folder']),
   resourceId: z.string(),
 })
 
@@ -37,7 +43,7 @@ const ReorderResourcesSchema = z.object({
   chatId: z.string(),
   resources: z.array(
     z.object({
-      type: z.enum(['table', 'file', 'workflow', 'knowledgebase']),
+      type: z.enum(['table', 'file', 'workflow', 'knowledgebase', 'folder']),
       id: z.string(),
       title: z.string(),
     })
diff --git a/apps/sim/app/api/copilot/chat/route.ts b/apps/sim/app/api/copilot/chat/route.ts
index bc9f736f52b..21f83737066 100644
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -88,6 +88,7 @@ const ChatMessageSchema = z.object({
           'docs',
           'table',
           'file',
+          'folder',
         ]),
         label: z.string(),
         chatId: z.string().optional(),
@@ -99,6 +100,7 @@ const ChatMessageSchema = z.object({
         executionId: z.string().optional(),
         tableId: z.string().optional(),
         fileId: z.string().optional(),
+        folderId: z.string().optional(),
       })
     )
     .optional(),
diff --git a/apps/sim/app/api/environment/route.ts b/apps/sim/app/api/environment/route.ts
index 34195a055dd..229ba26382f 100644
--- a/apps/sim/app/api/environment/route.ts
+++ b/apps/sim/app/api/environment/route.ts
@@ -10,7 +10,7 @@ import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { generateId } from '@/lib/core/utils/uuid'
 import { syncPersonalEnvCredentialsForUser } from '@/lib/credentials/environment'
-import type { EnvironmentVariable } from '@/stores/settings/environment'
+import type { EnvironmentVariable } from '@/lib/environment/api'
 
 const logger = createLogger('EnvironmentAPI')
 
diff --git a/apps/sim/app/api/folders/[id]/restore/route.ts b/apps/sim/app/api/folders/[id]/restore/route.ts
new file mode 100644
index 00000000000..7aa6a9189c9
--- /dev/null
+++ b/apps/sim/app/api/folders/[id]/restore/route.ts
@@ -0,0 +1,58 @@
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { getSession } from '@/lib/auth'
+import { captureServerEvent } from '@/lib/posthog/server'
+import { performRestoreFolder } from '@/lib/workflows/orchestration/folder-lifecycle'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
+
+const logger = createLogger('RestoreFolderAPI')
+
+export async function POST(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+  const { id: folderId } = await params
+
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const body = await request.json().catch(() => ({}))
+    const workspaceId = body.workspaceId as string | undefined
+
+    if (!workspaceId) {
+      return NextResponse.json({ error: 'Workspace ID is required' }, { status: 400 })
+    }
+
+    const permission = await getUserEntityPermissions(session.user.id, 'workspace', workspaceId)
+    if (permission !== 'admin' && permission !== 'write') {
+      return NextResponse.json({ error: 'Insufficient permissions' }, { status: 403 })
+    }
+
+    const result = await performRestoreFolder({
+      folderId,
+      workspaceId,
+      userId: session.user.id,
+    })
+
+    if (!result.success) {
+      return NextResponse.json({ error: result.error }, { status: 400 })
+    }
+
+    logger.info(`Restored folder ${folderId}`, { restoredItems: result.restoredItems })
+
+    captureServerEvent(
+      session.user.id,
+      'folder_restored',
+      { folder_id: folderId, workspace_id: workspaceId },
+      { groups: { workspace: workspaceId } }
+    )
+
+    return NextResponse.json({ success: true, restoredItems: result.restoredItems })
+  } catch (error) {
+    logger.error(`Error restoring folder ${folderId}`, error)
+    return NextResponse.json(
+      { error: error instanceof Error ? error.message : 'Internal server error' },
+      { status: 500 }
+    )
+  }
+}
diff --git a/apps/sim/app/api/folders/route.ts b/apps/sim/app/api/folders/route.ts
index bd33a93caf6..98e80f5aa3d 100644
--- a/apps/sim/app/api/folders/route.ts
+++ b/apps/sim/app/api/folders/route.ts
@@ -1,7 +1,7 @@
 import { db } from '@sim/db'
 import { workflow, workflowFolder } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, asc, eq, isNull, min } from 'drizzle-orm'
+import { and, asc, eq, isNotNull, isNull, min } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
@@ -47,12 +47,16 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: 'Access denied to this workspace' }, { status: 403 })
     }
 
-    // If user has workspace permissions, fetch ALL folders in the workspace
-    // This allows shared workspace members to see folders created by other users
+    const scope = searchParams.get('scope') ?? 'active'
+    const archivedFilter =
+      scope === 'archived'
+        ? isNotNull(workflowFolder.archivedAt)
+        : isNull(workflowFolder.archivedAt)
+
     const folders = await db
       .select()
       .from(workflowFolder)
-      .where(eq(workflowFolder.workspaceId, workspaceId))
+      .where(and(eq(workflowFolder.workspaceId, workspaceId), archivedFilter))
       .orderBy(asc(workflowFolder.sortOrder), asc(workflowFolder.createdAt))
 
     return NextResponse.json({ folders })
diff --git a/apps/sim/app/api/mothership/chat/route.ts b/apps/sim/app/api/mothership/chat/route.ts
index 9f567244fb3..09dea73a050 100644
--- a/apps/sim/app/api/mothership/chat/route.ts
+++ b/apps/sim/app/api/mothership/chat/route.ts
@@ -36,7 +36,7 @@ const FileAttachmentSchema = z.object({
 })
 
 const ResourceAttachmentSchema = z.object({
-  type: z.enum(['workflow', 'table', 'file', 'knowledgebase']),
+  type: z.enum(['workflow', 'table', 'file', 'knowledgebase', 'folder']),
   id: z.string().min(1),
   title: z.string().optional(),
   active: z.boolean().optional(),
@@ -66,6 +66,7 @@ const MothershipMessageSchema = z.object({
           'docs',
           'table',
           'file',
+          'folder',
         ]),
         label: z.string(),
         chatId: z.string().optional(),
@@ -77,6 +78,7 @@ const MothershipMessageSchema = z.object({
         executionId: z.string().optional(),
         tableId: z.string().optional(),
         fileId: z.string().optional(),
+        folderId: z.string().optional(),
       })
     )
     .optional(),
@@ -224,6 +226,7 @@ export async function POST(req: NextRequest) {
               ...(c.knowledgeId && { knowledgeId: c.knowledgeId }),
               ...(c.tableId && { tableId: c.tableId }),
               ...(c.fileId && { fileId: c.fileId }),
+              ...(c.folderId && { folderId: c.folderId }),
             })),
           }),
       }
diff --git a/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts b/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
index 194d9dfcdd0..1a75d8aa598 100644
--- a/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
+++ b/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
@@ -3,6 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { AuthType } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { generateId } from '@/lib/core/utils/uuid'
+import { setExecutionMeta } from '@/lib/execution/event-buffer'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
@@ -125,14 +126,43 @@ export async function POST(
       })
     }
 
-    PauseResumeManager.startResumeExecution({
+    await setExecutionMeta(enqueueResult.resumeExecutionId, {
+      status: 'active',
+      userId,
+      workflowId,
+    })
+
+    const resumeArgs = {
       resumeEntryId: enqueueResult.resumeEntryId,
       resumeExecutionId: enqueueResult.resumeExecutionId,
       pausedExecution: enqueueResult.pausedExecution,
       contextId: enqueueResult.contextId,
       resumeInput: enqueueResult.resumeInput,
       userId: enqueueResult.userId,
-    }).catch((error) => {
+    }
+
+    const isApiCaller = access.auth?.authType === AuthType.API_KEY
+
+    if (isApiCaller) {
+      const result = await PauseResumeManager.startResumeExecution(resumeArgs)
+
+      return NextResponse.json({
+        success: result.success,
+        status: result.status ?? (result.success ? 'completed' : 'failed'),
+        executionId: enqueueResult.resumeExecutionId,
+        output: result.output,
+        error: result.error,
+        metadata: result.metadata
+          ? {
+              duration: result.metadata.duration,
+              startTime: result.metadata.startTime,
+              endTime: result.metadata.endTime,
+            }
+          : undefined,
+      })
+    }
+
+    PauseResumeManager.startResumeExecution(resumeArgs).catch((error) => {
       logger.error('Failed to start resume execution', {
         workflowId,
         parentExecutionId: executionId,
diff --git a/apps/sim/app/api/webhooks/route.ts b/apps/sim/app/api/webhooks/route.ts
index ea17b75cefe..c6ef9e992e1 100644
--- a/apps/sim/app/api/webhooks/route.ts
+++ b/apps/sim/app/api/webhooks/route.ts
@@ -16,13 +16,9 @@ import {
   createExternalWebhookSubscription,
   shouldRecreateExternalWebhookSubscription,
 } from '@/lib/webhooks/provider-subscriptions'
+import { getProviderHandler } from '@/lib/webhooks/providers'
 import { mergeNonUserFields } from '@/lib/webhooks/utils'
-import {
-  configureGmailPolling,
-  configureOutlookPolling,
-  configureRssPolling,
-  syncWebhooksForCredentialSet,
-} from '@/lib/webhooks/utils.server'
+import { syncWebhooksForCredentialSet } from '@/lib/webhooks/utils.server'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
 import { extractCredentialSetId, isCredentialSetValue } from '@/executor/constants'
 
@@ -348,7 +344,6 @@ export async function POST(request: NextRequest) {
       workflowRecord.workspaceId || undefined
     )
 
-    // --- Credential Set Handling ---
     // For credential sets, we fan out to create one webhook per credential at save time.
     // This applies to all OAuth-based triggers, not just polling ones.
     // Check for credentialSetId directly (frontend may already extract it) or credential set value in credential fields
@@ -402,16 +397,13 @@ export async function POST(request: NextRequest) {
             )
           }
 
-          const needsConfiguration = provider === 'gmail' || provider === 'outlook'
+          const providerHandler = getProviderHandler(provider)
 
-          if (needsConfiguration) {
-            const configureFunc =
-              provider === 'gmail' ? configureGmailPolling : configureOutlookPolling
+          if (providerHandler.configurePolling) {
             const configureErrors: string[] = []
 
             for (const wh of syncResult.webhooks) {
               if (wh.isNew) {
-                // Fetch the webhook data for configuration
                 const webhookRows = await db
                   .select()
                   .from(webhook)
@@ -419,7 +411,10 @@ export async function POST(request: NextRequest) {
                   .limit(1)
 
                 if (webhookRows.length > 0) {
-                  const success = await configureFunc(webhookRows[0], requestId)
+                  const success = await providerHandler.configurePolling({
+                    webhook: webhookRows[0],
+                    requestId,
+                  })
                   if (!success) {
                     configureErrors.push(
                       `Failed to configure webhook for credential ${wh.credentialId}`
@@ -436,7 +431,6 @@ export async function POST(request: NextRequest) {
               configureErrors.length > 0 &&
               configureErrors.length === syncResult.webhooks.length
             ) {
-              // All configurations failed - roll back
               logger.error(`[${requestId}] All webhook configurations failed, rolling back`)
               for (const wh of syncResult.webhooks) {
                 await db.delete(webhook).where(eq(webhook.id, wh.id))
@@ -488,8 +482,6 @@ export async function POST(request: NextRequest) {
         }
       }
     }
-    // --- End Credential Set Handling ---
-
     let externalSubscriptionCreated = false
     const createTempWebhookData = (providerConfigOverride = resolvedProviderConfig) => ({
       id: targetWebhookId || generateShortId(),
@@ -629,115 +621,49 @@ export async function POST(request: NextRequest) {
       }
     }
 
-    // --- Gmail/Outlook webhook setup (these don't require external subscriptions, configure after DB save) ---
-    if (savedWebhook && provider === 'gmail') {
-      logger.info(`[${requestId}] Gmail provider detected. Setting up Gmail webhook configuration.`)
-      try {
-        const success = await configureGmailPolling(savedWebhook, requestId)
-
-        if (!success) {
-          logger.error(`[${requestId}] Failed to configure Gmail polling, rolling back webhook`)
-          await revertSavedWebhook(savedWebhook, existingWebhook, requestId)
-          return NextResponse.json(
-            {
-              error: 'Failed to configure Gmail polling',
-              details: 'Please check your Gmail account permissions and try again',
-            },
-            { status: 500 }
-          )
-        }
-
-        logger.info(`[${requestId}] Successfully configured Gmail polling`)
-      } catch (err) {
-        logger.error(
-          `[${requestId}] Error setting up Gmail webhook configuration, rolling back webhook`,
-          err
-        )
-        await revertSavedWebhook(savedWebhook, existingWebhook, requestId)
-        return NextResponse.json(
-          {
-            error: 'Failed to configure Gmail webhook',
-            details: err instanceof Error ? err.message : 'Unknown error',
-          },
-          { status: 500 }
+    if (savedWebhook) {
+      const pollingHandler = getProviderHandler(provider)
+      if (pollingHandler.configurePolling) {
+        logger.info(
+          `[${requestId}] ${provider} provider detected. Setting up polling configuration.`
         )
-      }
-    }
-    // --- End Gmail specific logic ---
+        try {
+          const success = await pollingHandler.configurePolling({
+            webhook: savedWebhook,
+            requestId,
+          })
 
-    // --- Outlook webhook setup ---
-    if (savedWebhook && provider === 'outlook') {
-      logger.info(
-        `[${requestId}] Outlook provider detected. Setting up Outlook webhook configuration.`
-      )
-      try {
-        const success = await configureOutlookPolling(savedWebhook, requestId)
+          if (!success) {
+            logger.error(
+              `[${requestId}] Failed to configure ${provider} polling, rolling back webhook`
+            )
+            await revertSavedWebhook(savedWebhook, existingWebhook, requestId)
+            return NextResponse.json(
+              {
+                error: `Failed to configure ${provider} polling`,
+                details: 'Please check your account permissions and try again',
+              },
+              { status: 500 }
+            )
+          }
 
-        if (!success) {
-          logger.error(`[${requestId}] Failed to configure Outlook polling, rolling back webhook`)
-          await revertSavedWebhook(savedWebhook, existingWebhook, requestId)
-          return NextResponse.json(
-            {
-              error: 'Failed to configure Outlook polling',
-              details: 'Please check your Outlook account permissions and try again',
-            },
-            { status: 500 }
+          logger.info(`[${requestId}] Successfully configured ${provider} polling`)
+        } catch (err) {
+          logger.error(
+            `[${requestId}] Error setting up ${provider} webhook configuration, rolling back webhook`,
+            err
           )
-        }
-
-        logger.info(`[${requestId}] Successfully configured Outlook polling`)
-      } catch (err) {
-        logger.error(
-          `[${requestId}] Error setting up Outlook webhook configuration, rolling back webhook`,
-          err
-        )
-        await revertSavedWebhook(savedWebhook, existingWebhook, requestId)
-        return NextResponse.json(
-          {
-            error: 'Failed to configure Outlook webhook',
-            details: err instanceof Error ? err.message : 'Unknown error',
-          },
-          { status: 500 }
-        )
-      }
-    }
-    // --- End Outlook specific logic ---
-
-    // --- RSS webhook setup ---
-    if (savedWebhook && provider === 'rss') {
-      logger.info(`[${requestId}] RSS provider detected. Setting up RSS webhook configuration.`)
-      try {
-        const success = await configureRssPolling(savedWebhook, requestId)
-
-        if (!success) {
-          logger.error(`[${requestId}] Failed to configure RSS polling, rolling back webhook`)
           await revertSavedWebhook(savedWebhook, existingWebhook, requestId)
           return NextResponse.json(
             {
-              error: 'Failed to configure RSS polling',
-              details: 'Please try again',
+              error: `Failed to configure ${provider} webhook`,
+              details: err instanceof Error ? err.message : 'Unknown error',
             },
             { status: 500 }
           )
         }
-
-        logger.info(`[${requestId}] Successfully configured RSS polling`)
-      } catch (err) {
-        logger.error(
-          `[${requestId}] Error setting up RSS webhook configuration, rolling back webhook`,
-          err
-        )
-        await revertSavedWebhook(savedWebhook, existingWebhook, requestId)
-        return NextResponse.json(
-          {
-            error: 'Failed to configure RSS webhook',
-            details: err instanceof Error ? err.message : 'Unknown error',
-          },
-          { status: 500 }
-        )
       }
     }
-    // --- End RSS specific logic ---
 
     if (!targetWebhookId && savedWebhook) {
       try {
diff --git a/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts b/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
index 7ee5d198f3f..88073b11cba 100644
--- a/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
+++ b/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
@@ -97,7 +97,6 @@ const {
   handleSlackChallengeMock,
   processWhatsAppDeduplicationMock,
   processGenericDeduplicationMock,
-  fetchAndProcessAirtablePayloadsMock,
   processWebhookMock,
   executeMock,
   getWorkspaceBilledAccountUserIdMock,
@@ -109,7 +108,6 @@ const {
   handleSlackChallengeMock: vi.fn().mockReturnValue(null),
   processWhatsAppDeduplicationMock: vi.fn().mockResolvedValue(null),
   processGenericDeduplicationMock: vi.fn().mockResolvedValue(null),
-  fetchAndProcessAirtablePayloadsMock: vi.fn().mockResolvedValue(undefined),
   processWebhookMock: vi.fn().mockResolvedValue(new Response('Webhook processed', { status: 200 })),
   executeMock: vi.fn().mockResolvedValue({
     success: true,
@@ -156,10 +154,8 @@ vi.mock('@/background/logs-webhook-delivery', () => ({
 vi.mock('@/lib/webhooks/utils', () => ({
   handleWhatsAppVerification: handleWhatsAppVerificationMock,
   handleSlackChallenge: handleSlackChallengeMock,
-  verifyProviderWebhook: vi.fn().mockReturnValue(null),
   processWhatsAppDeduplication: processWhatsAppDeduplicationMock,
   processGenericDeduplication: processGenericDeduplicationMock,
-  fetchAndProcessAirtablePayloads: fetchAndProcessAirtablePayloadsMock,
   processWebhook: processWebhookMock,
 }))
 
diff --git a/apps/sim/app/api/webhooks/trigger/[path]/route.ts b/apps/sim/app/api/webhooks/trigger/[path]/route.ts
index 2c283b72fdb..46ec98d4735 100644
--- a/apps/sim/app/api/webhooks/trigger/[path]/route.ts
+++ b/apps/sim/app/api/webhooks/trigger/[path]/route.ts
@@ -76,7 +76,7 @@ async function handleWebhookPost(
 
   const { body, rawBody } = parseResult
 
-  const challengeResponse = await handleProviderChallenges(body, request, requestId, path)
+  const challengeResponse = await handleProviderChallenges(body, request, requestId, path, rawBody)
   if (challengeResponse) {
     return challengeResponse
   }
@@ -87,7 +87,7 @@ async function handleWebhookPost(
   if (webhooksForPath.length === 0) {
     const verificationResponse = await handlePreLookupWebhookVerification(
       request.method,
-      body,
+      body as Record<string, unknown> | undefined,
       requestId,
       path
     )
diff --git a/apps/sim/app/api/workflows/[id]/execute/route.ts b/apps/sim/app/api/workflows/[id]/execute/route.ts
index d5b484dfaca..86a4a722eb8 100644
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -41,7 +41,7 @@ import {
 } from '@/lib/uploads/utils/user-file-base64.server'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
 import { type ExecutionEvent, encodeSSEEvent } from '@/lib/workflows/executor/execution-events'
-import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
+import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
 import {
   DIRECT_WORKFLOW_JOB_NAME,
   type QueuedWorkflowExecutionPayload,
@@ -903,6 +903,8 @@ async function handleExecutePost(
           abortSignal: timeoutController.signal,
         })
 
+        await handlePostExecutionPauseState({ result, workflowId, executionId, loggingSession })
+
         if (
           result.status === 'cancelled' &&
           timeoutController.isTimedOut() &&
@@ -1359,31 +1361,7 @@ async function handleExecutePost(
             runFromBlock: resolvedRunFromBlock,
           })
 
-          if (result.status === 'paused') {
-            if (!result.snapshotSeed) {
-              reqLogger.error('Missing snapshot seed for paused execution')
-              await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
-            } else {
-              try {
-                await PauseResumeManager.persistPauseResult({
-                  workflowId,
-                  executionId,
-                  pausePoints: result.pausePoints || [],
-                  snapshotSeed: result.snapshotSeed,
-                  executorUserId: result.metadata?.userId,
-                })
-              } catch (pauseError) {
-                reqLogger.error('Failed to persist pause result', {
-                  error: pauseError instanceof Error ? pauseError.message : String(pauseError),
-                })
-                await loggingSession.markAsFailed(
-                  `Failed to persist pause state: ${pauseError instanceof Error ? pauseError.message : String(pauseError)}`
-                )
-              }
-            }
-          } else {
-            await PauseResumeManager.processQueuedResumes(executionId)
-          }
+          await handlePostExecutionPauseState({ result, workflowId, executionId, loggingSession })
 
           if (result.status === 'cancelled') {
             if (timeoutController.isTimedOut() && timeoutController.timeoutMs) {
@@ -1422,25 +1400,42 @@ async function handleExecutePost(
             return
           }
 
-          sendEvent({
-            type: 'execution:completed',
-            timestamp: new Date().toISOString(),
-            executionId,
-            workflowId,
-            data: {
-              success: result.success,
-              output: includeFileBase64
-                ? await hydrateUserFilesWithBase64(result.output, {
-                    requestId,
-                    executionId,
-                    maxBytes: base64MaxBytes,
-                  })
-                : result.output,
-              duration: result.metadata?.duration || 0,
-              startTime: result.metadata?.startTime || startTime.toISOString(),
-              endTime: result.metadata?.endTime || new Date().toISOString(),
-            },
-          })
+          const sseOutput = includeFileBase64
+            ? await hydrateUserFilesWithBase64(result.output, {
+                requestId,
+                executionId,
+                maxBytes: base64MaxBytes,
+              })
+            : result.output
+
+          if (result.status === 'paused') {
+            sendEvent({
+              type: 'execution:paused',
+              timestamp: new Date().toISOString(),
+              executionId,
+              workflowId,
+              data: {
+                output: sseOutput,
+                duration: result.metadata?.duration || 0,
+                startTime: result.metadata?.startTime || startTime.toISOString(),
+                endTime: result.metadata?.endTime || new Date().toISOString(),
+              },
+            })
+          } else {
+            sendEvent({
+              type: 'execution:completed',
+              timestamp: new Date().toISOString(),
+              executionId,
+              workflowId,
+              data: {
+                success: result.success,
+                output: sseOutput,
+                duration: result.metadata?.duration || 0,
+                startTime: result.metadata?.startTime || startTime.toISOString(),
+                endTime: result.metadata?.endTime || new Date().toISOString(),
+              },
+            })
+          }
           finalMetaStatus = 'complete'
         } catch (error: unknown) {
           const isTimeout = isTimeoutError(error) || timeoutController.isTimedOut()
diff --git a/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts b/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts
index 0893209c961..ad2f94722d1 100644
--- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts
+++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
+import { getSession } from '@/lib/auth'
 import { SSE_HEADERS } from '@/lib/core/utils/sse'
 import {
   type ExecutionStreamStatus,
@@ -29,14 +29,14 @@ export async function GET(
   const { id: workflowId, executionId } = await params
 
   try {
-    const auth = await checkHybridAuth(req, { requireWorkflowId: false })
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
+    const session = await getSession()
+    if (!session?.user?.id) {
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
     const workflowAuthorization = await authorizeWorkflowByWorkspacePermission({
       workflowId,
-      userId: auth.userId,
+      userId: session.user.id,
       action: 'read',
     })
     if (!workflowAuthorization.allowed) {
@@ -46,16 +46,6 @@ export async function GET(
       )
     }
 
-    if (
-      auth.apiKeyType === 'workspace' &&
-      workflowAuthorization.workflow?.workspaceId !== auth.workspaceId
-    ) {
-      return NextResponse.json(
-        { error: 'API key is not authorized for this workspace' },
-        { status: 403 }
-      )
-    }
-
     const meta = await getExecutionMeta(executionId)
     if (!meta) {
       return NextResponse.json({ error: 'Execution buffer not found or expired' }, { status: 404 })
diff --git a/apps/sim/app/layout.tsx b/apps/sim/app/layout.tsx
index c7b35d1c1fa..604639f2b7f 100644
--- a/apps/sim/app/layout.tsx
+++ b/apps/sim/app/layout.tsx
@@ -6,7 +6,7 @@ import { PostHogProvider } from '@/app/_shell/providers/posthog-provider'
 import { generateBrandedMetadata, generateThemeCSS } from '@/ee/whitelabeling'
 import '@/app/_styles/globals.css'
 import { OneDollarStats } from '@/components/analytics/onedollarstats'
-import { isReactGrabEnabled, isReactScanEnabled } from '@/lib/core/config/feature-flags'
+import { isHosted, isReactGrabEnabled, isReactScanEnabled } from '@/lib/core/config/feature-flags'
 import { HydrationErrorHandler } from '@/app/_shell/hydration-error-handler'
 import { QueryProvider } from '@/app/_shell/providers/query-provider'
 import { SessionProvider } from '@/app/_shell/providers/session-provider'
@@ -25,6 +25,9 @@ export const viewport: Viewport = {
 
 export const metadata: Metadata = generateBrandedMetadata()
 
+const GTM_ID = 'GTM-T7PHSRX5' as const
+const GA_ID = 'G-DR7YBE70VS' as const
+
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   const themeCSS = generateThemeCSS()
 
@@ -208,9 +211,54 @@ export default function RootLayout({ children }: { children: React.ReactNode })
         <link rel='dns-prefetch' href='https://assets.onedollarstats.com' />
         <script defer src='https://assets.onedollarstats.com/stonks.js' />
 
+        {/* Google Tag Manager — hosted only */}
+        {isHosted && (
+          <Script
+            id='gtm'
+            strategy='afterInteractive'
+            dangerouslySetInnerHTML={{
+              __html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','${GTM_ID}');`,
+            }}
+          />
+        )}
+
+        {/* Google Analytics (gtag.js) — hosted only */}
+        {isHosted && (
+          <>
+            <Script
+              id='gtag-src'
+              src={`https://www.googletagmanager.com/gtag/js?id=${GA_ID}`}
+              strategy='afterInteractive'
+            />
+            <Script
+              id='gtag-init'
+              strategy='afterInteractive'
+              dangerouslySetInnerHTML={{
+                __html: `window.dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments);}gtag('js',new Date());gtag('config','${GA_ID}');`,
+              }}
+            />
+          </>
+        )}
+
         <PublicEnvScript />
       </head>
       <body className={`${season.variable} font-season`} suppressHydrationWarning>
+        {/* Google Tag Manager (noscript) — hosted only */}
+        {isHosted && (
+          <noscript>
+            <iframe
+              src={`https://www.googletagmanager.com/ns.html?id=${GTM_ID}`}
+              title='Google Tag Manager'
+              height='0'
+              width='0'
+              className='invisible hidden'
+            />
+          </noscript>
+        )}
         <HydrationErrorHandler />
         <OneDollarStats />
         <PostHogProvider>
diff --git a/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx b/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
index ec34adc43ca..f6d2ef0182c 100644
--- a/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
+++ b/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
@@ -6,6 +6,7 @@ import { useRouter } from 'next/navigation'
 import {
   Badge,
   Button,
+  Code,
   Input,
   Label,
   Table,
@@ -155,7 +156,6 @@ function getBlockNameFromSnapshot(
     const parsed = JSON.parse(executionSnapshot.snapshot)
     const workflowState = parsed?.workflow
     if (!workflowState?.blocks || !Array.isArray(workflowState.blocks)) return null
-    // Blocks are stored as an array of serialized blocks with id and metadata.name
     const block = workflowState.blocks.find((b: { id: string }) => b.id === blockId)
     return block?.metadata?.name || null
   } catch {
@@ -163,6 +163,47 @@ function getBlockNameFromSnapshot(
   }
 }
 
+function renderStructuredValuePreview(value: unknown) {
+  if (value === null || value === undefined) {
+    return <span style={{ fontSize: '12px', color: 'var(--text-muted)' }}>—</span>
+  }
+
+  if (typeof value === 'object') {
+    return (
+      <div style={{ minWidth: '220px' }}>
+        <Code.Viewer
+          code={JSON.stringify(value, null, 2)}
+          language='json'
+          wrapText
+          className='max-h-[220px]'
+        />
+      </div>
+    )
+  }
+
+  const stringValue = String(value)
+  return (
+    <div
+      style={{
+        display: 'inline-flex',
+        maxWidth: '100%',
+        borderRadius: '6px',
+        border: '1px solid var(--border)',
+        background: 'var(--surface-5)',
+        padding: '4px 8px',
+        whiteSpace: 'pre-wrap',
+        wordBreak: 'break-word',
+        fontFamily: 'var(--font-mono, monospace)',
+        fontSize: '12px',
+        lineHeight: '16px',
+        color: 'var(--text-primary)',
+      }}
+    >
+      {stringValue}
+    </div>
+  )
+}
+
 export default function ResumeExecutionPage({
   params,
   initialExecutionDetail,
@@ -874,8 +915,11 @@ export default function ResumeExecutionPage({
               <Tooltip.Trigger asChild>
                 <Button
                   variant='outline'
+                  size='sm'
                   onClick={refreshExecutionDetail}
                   disabled={refreshingExecution}
+                  className='gap-1.5 px-2.5'
+                  aria-label='Refresh execution details'
                 >
                   <RefreshCw
                     style={{
@@ -884,6 +928,7 @@ export default function ResumeExecutionPage({
                       animation: refreshingExecution ? 'spin 1s linear infinite' : undefined,
                     }}
                   />
+                  Refresh
                 </Button>
               </Tooltip.Trigger>
               <Tooltip.Content>Refresh</Tooltip.Content>
@@ -1123,11 +1168,7 @@ export default function ResumeExecutionPage({
                                   <TableRow key={row.id}>
                                     <TableCell>{row.name}</TableCell>
                                     <TableCell>{row.type}</TableCell>
-                                    <TableCell>
-                                      <code style={{ fontSize: '12px' }}>
-                                        {formatStructureValue(row.value)}
-                                      </code>
-                                    </TableCell>
+                                    <TableCell>{renderStructuredValuePreview(row.value)}</TableCell>
                                   </TableRow>
                                 ))}
                               </TableBody>
@@ -1243,6 +1284,8 @@ export default function ResumeExecutionPage({
                               }}
                               placeholder='{"example": "value"}'
                               rows={6}
+                              spellCheck={false}
+                              className='min-h-[180px] border-[var(--border-1)] bg-[var(--surface-3)] font-mono text-[12px] leading-5'
                             />
                           </div>
                         </div>
@@ -1267,10 +1310,10 @@ export default function ResumeExecutionPage({
         {/* Footer */}
         <div
           style={{
-            marginTop: '32px',
-            padding: '16px',
+            maxWidth: '1200px',
+            margin: '24px auto 0',
+            padding: '0 24px 24px',
             textAlign: 'center',
-            borderTop: '1px solid var(--border)',
             fontSize: '13px',
             color: 'var(--text-muted)',
           }}
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
index 53ccff13e6d..36e7d1348e6 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-chat/mothership-chat.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useLayoutEffect, useRef } from 'react'
+import { useCallback, useLayoutEffect, useRef } from 'react'
 import { cn } from '@/lib/core/utils/cn'
 import { MessageActions } from '@/app/workspace/[workspaceId]/components'
 import { ChatMessageAttachments } from '@/app/workspace/[workspaceId]/home/components/chat-message-attachments'
@@ -99,6 +99,18 @@ export function MothershipChat({
   const hasMessages = messages.length > 0
   const initialScrollDoneRef = useRef(false)
 
+  const messageQueueRef = useRef(messageQueue)
+  messageQueueRef.current = messageQueue
+  const onSendQueuedMessageRef = useRef(onSendQueuedMessage)
+  onSendQueuedMessageRef.current = onSendQueuedMessage
+
+  const handleEnterWhileEmpty = useCallback(() => {
+    const topMessage = messageQueueRef.current[0]
+    if (!topMessage) return false
+    void onSendQueuedMessageRef.current(topMessage.id)
+    return true
+  }, [])
+
   useLayoutEffect(() => {
     if (!hasMessages) {
       initialScrollDoneRef.current = false
@@ -197,6 +209,7 @@ export function MothershipChat({
             onContextAdd={onContextAdd}
             editValue={editValue}
             onEditValueConsumed={onEditValueConsumed}
+            onEnterWhileEmpty={handleEnterWhileEmpty}
           />
         </div>
       </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
index 821d6c47242..02bdf37822c 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/add-resource-dropdown/add-resource-dropdown.tsx
@@ -24,6 +24,7 @@ import type {
   MothershipResource,
   MothershipResourceType,
 } from '@/app/workspace/[workspaceId]/home/types'
+import { useFolders } from '@/hooks/queries/folders'
 import { useKnowledgeBasesQuery } from '@/hooks/queries/kb/knowledge'
 import { useTablesList } from '@/hooks/queries/tables'
 import { useWorkflows } from '@/hooks/queries/workflows'
@@ -51,6 +52,7 @@ export function useAvailableResources(
   const { data: tables = [] } = useTablesList(workspaceId)
   const { data: files = [] } = useWorkspaceFiles(workspaceId)
   const { data: knowledgeBases } = useKnowledgeBasesQuery(workspaceId)
+  const { data: folders = [] } = useFolders(workspaceId)
 
   return useMemo(
     () => [
@@ -63,6 +65,14 @@ export function useAvailableResources(
           isOpen: existingKeys.has(`workflow:${w.id}`),
         })),
       },
+      {
+        type: 'folder' as const,
+        items: folders.map((f) => ({
+          id: f.id,
+          name: f.name,
+          isOpen: existingKeys.has(`folder:${f.id}`),
+        })),
+      },
       {
         type: 'table' as const,
         items: tables.map((t) => ({
@@ -88,7 +98,7 @@ export function useAvailableResources(
         })),
       },
     ],
-    [workflows, tables, files, knowledgeBases, existingKeys]
+    [workflows, folders, tables, files, knowledgeBases, existingKeys]
   )
 }
 
@@ -206,7 +216,7 @@ export function AddResourceDropdown({
                 )
               })
             ) : (
-              <div className='px-2 py-[5px] text-center font-medium text-[var(--text-tertiary)] text-caption'>
+              <div className='px-2 py-1.5 text-center font-medium text-[var(--text-tertiary)] text-caption'>
                 No results
               </div>
             )
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
index 3ec33a67366..e9fb56844ed 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-content/resource-content.tsx
@@ -5,7 +5,13 @@ import { createLogger } from '@sim/logger'
 import { Square } from 'lucide-react'
 import { useRouter } from 'next/navigation'
 import { Button, PlayOutline, Skeleton, Tooltip } from '@/components/emcn'
-import { Download, FileX, SquareArrowUpRight, WorkflowX } from '@/components/emcn/icons'
+import {
+  Download,
+  FileX,
+  Folder as FolderIcon,
+  SquareArrowUpRight,
+  WorkflowX,
+} from '@/components/emcn/icons'
 import {
   cancelRunToolExecution,
   markRunToolManuallyStopped,
@@ -37,6 +43,7 @@ import {
 import { Table } from '@/app/workspace/[workspaceId]/tables/[tableId]/components'
 import { useUsageLimits } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks'
 import { useWorkflowExecution } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution'
+import { useFolders } from '@/hooks/queries/folders'
 import { useWorkflows } from '@/hooks/queries/workflows'
 import { useWorkspaceFiles } from '@/hooks/queries/workspace-files'
 import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
@@ -147,6 +154,9 @@ export const ResourceContent = memo(function ResourceContent({
         />
       )
 
+    case 'folder':
+      return <EmbeddedFolder key={resource.id} workspaceId={workspaceId} folderId={resource.id} />
+
     case 'generic':
       return (
         <GenericResourceContent key={resource.id} data={genericResourceData ?? { entries: [] }} />
@@ -172,6 +182,7 @@ export function ResourceActions({ workspaceId, resource }: ResourceActionsProps)
       return (
         <EmbeddedKnowledgeBaseActions workspaceId={workspaceId} knowledgeBaseId={resource.id} />
       )
+    case 'folder':
     case 'generic':
       return null
     default:
@@ -450,6 +461,72 @@ function EmbeddedFile({ workspaceId, fileId, previewMode, streamingContent }: Em
   )
 }
 
+interface EmbeddedFolderProps {
+  workspaceId: string
+  folderId: string
+}
+
+function EmbeddedFolder({ workspaceId, folderId }: EmbeddedFolderProps) {
+  const { data: folderList, isPending: isFoldersPending } = useFolders(workspaceId)
+  const { data: workflowList = [] } = useWorkflows(workspaceId)
+
+  const folder = useMemo(
+    () => (folderList ?? []).find((f) => f.id === folderId),
+    [folderList, folderId]
+  )
+
+  const folderWorkflows = useMemo(
+    () => workflowList.filter((w) => w.folderId === folderId),
+    [workflowList, folderId]
+  )
+
+  if (isFoldersPending) return LOADING_SKELETON
+
+  if (!folder) {
+    return (
+      <div className='flex h-full flex-col items-center justify-center gap-3'>
+        <FolderIcon className='h-[32px] w-[32px] text-[var(--text-icon)]' />
+        <div className='flex flex-col items-center gap-1'>
+          <h2 className='font-medium text-[20px] text-[var(--text-primary)]'>Folder not found</h2>
+          <p className='text-[var(--text-body)] text-small'>
+            This folder may have been deleted or moved
+          </p>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className='flex h-full flex-col overflow-y-auto p-6'>
+      <h2 className='mb-4 font-medium text-[16px] text-[var(--text-primary)]'>{folder.name}</h2>
+      {folderWorkflows.length === 0 ? (
+        <p className='text-[13px] text-[var(--text-muted)]'>No workflows in this folder</p>
+      ) : (
+        <div className='flex flex-col gap-1'>
+          {folderWorkflows.map((w) => (
+            <button
+              key={w.id}
+              type='button'
+              onClick={() => window.open(`/workspace/${workspaceId}/w/${w.id}`, '_blank')}
+              className='flex items-center gap-2 rounded-[6px] px-3 py-2 text-left transition-colors hover:bg-[var(--surface-4)]'
+            >
+              <div
+                className='h-[12px] w-[12px] flex-shrink-0 rounded-[3px] border-[2px]'
+                style={{
+                  backgroundColor: w.color,
+                  borderColor: `${w.color}60`,
+                  backgroundClip: 'padding-box',
+                }}
+              />
+              <span className='truncate text-[13px] text-[var(--text-primary)]'>{w.name}</span>
+            </button>
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
+
 function extractFileContent(raw: string): string {
   const marker = '"content":'
   const idx = raw.indexOf(marker)
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
index 5c8bd184cf5..e10c31b9a61 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry/resource-registry.tsx
@@ -6,6 +6,7 @@ import { useParams } from 'next/navigation'
 import {
   Database,
   File as FileIcon,
+  Folder as FolderIcon,
   Table as TableIcon,
   TerminalWindow,
 } from '@/components/emcn/icons'
@@ -18,6 +19,7 @@ import type {
 } from '@/app/workspace/[workspaceId]/home/types'
 import { knowledgeKeys } from '@/hooks/queries/kb/knowledge'
 import { tableKeys } from '@/hooks/queries/tables'
+import { folderKeys } from '@/hooks/queries/utils/folder-keys'
 import { invalidateWorkflowLists } from '@/hooks/queries/utils/invalidate-workflow-lists'
 import { useWorkflows } from '@/hooks/queries/workflows'
 import { workspaceFilesKeys } from '@/hooks/queries/workspace-files'
@@ -140,6 +142,15 @@ export const RESOURCE_REGISTRY: Record<MothershipResourceType, ResourceTypeConfi
     ),
     renderDropdownItem: (props) => <IconDropdownItem {...props} icon={Database} />,
   },
+  folder: {
+    type: 'folder',
+    label: 'Folders',
+    icon: FolderIcon,
+    renderTabIcon: (_resource, className) => (
+      <FolderIcon className={cn(className, 'text-[var(--text-icon)]')} />
+    ),
+    renderDropdownItem: (props) => <IconDropdownItem {...props} icon={FolderIcon} />,
+  },
 } as const
 
 export const RESOURCE_TYPES = Object.values(RESOURCE_REGISTRY)
@@ -171,6 +182,9 @@ const RESOURCE_INVALIDATORS: Record<
     qc.invalidateQueries({ queryKey: knowledgeKeys.detail(id) })
     qc.invalidateQueries({ queryKey: knowledgeKeys.tagDefinitions(id) })
   },
+  folder: (qc) => {
+    qc.invalidateQueries({ queryKey: folderKeys.lists() })
+  },
 }
 
 /**
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
index c630d50b5e9..a3ef9628d03 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-tabs/resource-tabs.tsx
@@ -23,6 +23,7 @@ import type {
   MothershipResource,
   MothershipResourceType,
 } from '@/app/workspace/[workspaceId]/home/types'
+import { useFolders } from '@/hooks/queries/folders'
 import { useKnowledgeBasesQuery } from '@/hooks/queries/kb/knowledge'
 import { useTablesList } from '@/hooks/queries/tables'
 import {
@@ -57,6 +58,7 @@ function useResourceNameLookup(workspaceId: string): Map<string, string> {
   const { data: tables = [] } = useTablesList(workspaceId)
   const { data: files = [] } = useWorkspaceFiles(workspaceId)
   const { data: knowledgeBases } = useKnowledgeBasesQuery(workspaceId)
+  const { data: folders = [] } = useFolders(workspaceId)
 
   return useMemo(() => {
     const map = new Map<string, string>()
@@ -64,8 +66,9 @@ function useResourceNameLookup(workspaceId: string): Map<string, string> {
     for (const t of tables) map.set(`table:${t.id}`, t.name)
     for (const f of files) map.set(`file:${f.id}`, f.name)
     for (const kb of knowledgeBases ?? []) map.set(`knowledgebase:${kb.id}`, kb.name)
+    for (const folder of folders) map.set(`folder:${folder.id}`, folder.name)
     return map
-  }, [workflows, tables, files, knowledgeBases])
+  }, [workflows, tables, files, knowledgeBases, folders])
 }
 
 interface ResourceTabsProps {
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts
index 93c3d79fa39..d619aed9102 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/constants.ts
@@ -87,6 +87,8 @@ export function mapResourceToContext(resource: MothershipResource): ChatContext
       return { kind: 'table', tableId: resource.id, label: resource.title }
     case 'file':
       return { kind: 'file', fileId: resource.id, label: resource.title }
+    case 'folder':
+      return { kind: 'folder', folderId: resource.id, label: resource.title }
     default:
       return { kind: 'docs', label: resource.title }
   }
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown.tsx
index 54a0142fc81..42882beafa0 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/components/plus-menu-dropdown.tsx
@@ -183,7 +183,7 @@ export const PlusMenuDropdown = React.memo(
                     )
                   })
                 ) : (
-                  <div className='px-2 py-[5px] text-center font-medium text-[12px] text-[var(--text-tertiary)]'>
+                  <div className='px-2 py-1.5 text-center font-medium text-[12px] text-[var(--text-tertiary)]'>
                     No results
                   </div>
                 )
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
index c44471f019a..d2415318b31 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-input/user-input.tsx
@@ -3,7 +3,7 @@
 import type React from 'react'
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { useParams } from 'next/navigation'
-import { Database, Table as TableIcon } from '@/components/emcn/icons'
+import { Database, Folder as FolderIcon, Table as TableIcon } from '@/components/emcn/icons'
 import { getDocumentIcon } from '@/components/icons/document-icons'
 import { useSession } from '@/lib/auth/auth-client'
 import { cn } from '@/lib/core/utils/cn'
@@ -108,6 +108,7 @@ interface UserInputProps {
   isInitialView?: boolean
   userId?: string
   onContextAdd?: (context: ChatContext) => void
+  onEnterWhileEmpty?: () => boolean
 }
 
 export function UserInput({
@@ -120,6 +121,7 @@ export function UserInput({
   isInitialView = true,
   userId,
   onContextAdd,
+  onEnterWhileEmpty,
 }: UserInputProps) {
   const { workspaceId } = useParams<{ workspaceId: string }>()
   const { data: workflowsById = {} } = useWorkflowMap(workspaceId)
@@ -175,6 +177,7 @@ export function UserInput({
       if (ctx.kind === 'knowledge' && ctx.knowledgeId) keys.add(`knowledgebase:${ctx.knowledgeId}`)
       if (ctx.kind === 'table' && ctx.tableId) keys.add(`table:${ctx.tableId}`)
       if (ctx.kind === 'file' && ctx.fileId) keys.add(`file:${ctx.fileId}`)
+      if (ctx.kind === 'folder' && ctx.folderId) keys.add(`folder:${ctx.folderId}`)
     }
     return keys
   }, [contextManagement.selectedContexts])
@@ -207,6 +210,10 @@ export function UserInput({
   filesRef.current = files
   const contextRef = useRef(contextManagement)
   contextRef.current = contextManagement
+  const onEnterWhileEmptyRef = useRef(onEnterWhileEmpty)
+  onEnterWhileEmptyRef.current = onEnterWhileEmpty
+  const isSendingRef = useRef(isSending)
+  isSendingRef.current = isSending
 
   useEffect(() => {
     return () => {
@@ -447,6 +454,10 @@ export function UserInput({
     (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
       if (e.key === 'Enter' && !e.shiftKey && !e.nativeEvent.isComposing) {
         e.preventDefault()
+        if (isSendingRef.current && !valueRef.current.trim()) {
+          onEnterWhileEmptyRef.current?.()
+          return
+        }
         handleSubmit()
         return
       }
@@ -663,6 +674,9 @@ export function UserInput({
             mentionIconNode = <FileDocIcon className={iconClasses} />
             break
           }
+          case 'folder':
+            mentionIconNode = <FolderIcon className={iconClasses} />
+            break
         }
       }
 
diff --git a/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx b/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx
index ed6da498d47..7e72bdf54f4 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/components/user-message-content/user-message-content.tsx
@@ -2,7 +2,7 @@
 
 import { useMemo } from 'react'
 import { useParams } from 'next/navigation'
-import { Database, Table as TableIcon } from '@/components/emcn/icons'
+import { Database, Folder as FolderIcon, Table as TableIcon } from '@/components/emcn/icons'
 import { getDocumentIcon } from '@/components/icons/document-icons'
 import type { ChatMessageContext } from '@/app/workspace/[workspaceId]/home/types'
 import { useWorkflows } from '@/hooks/queries/workflows'
@@ -81,6 +81,9 @@ function MentionHighlight({ context }: { context: ChatMessageContext }) {
       icon = <FileDocIcon className={iconClasses} />
       break
     }
+    case 'folder':
+      icon = <FolderIcon className={iconClasses} />
+      break
   }
 
   return (
diff --git a/apps/sim/app/workspace/[workspaceId]/home/home.tsx b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
index 02109c3507b..d76f17ff454 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/home.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/home/home.tsx
@@ -195,6 +195,7 @@ export function Home({ chatId }: HomeProps = {}) {
     } else {
       url.searchParams.delete('resource')
     }
+    url.hash = ''
     window.history.replaceState(null, '', url.toString())
   }, [activeResourceId])
 
diff --git a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
index 3003704c65a..ac5bf1ab167 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts
@@ -294,6 +294,7 @@ function mapStoredMessage(msg: TaskStoredMessage): ChatMessage {
       ...(c.knowledgeId && { knowledgeId: c.knowledgeId }),
       ...(c.tableId && { tableId: c.tableId }),
       ...(c.fileId && { fileId: c.fileId }),
+      ...(c.folderId && { folderId: c.folderId }),
     }))
   }
 
@@ -1953,6 +1954,7 @@ export function useChat(
         ...('knowledgeId' in c && c.knowledgeId ? { knowledgeId: c.knowledgeId } : {}),
         ...('tableId' in c && c.tableId ? { tableId: c.tableId } : {}),
         ...('fileId' in c && c.fileId ? { fileId: c.fileId } : {}),
+        ...('folderId' in c && c.folderId ? { folderId: c.folderId } : {}),
       }))
 
       setMessages((prev) => [
diff --git a/apps/sim/app/workspace/[workspaceId]/home/types.ts b/apps/sim/app/workspace/[workspaceId]/home/types.ts
index 1395c99db6d..d4f812cc25a 100644
--- a/apps/sim/app/workspace/[workspaceId]/home/types.ts
+++ b/apps/sim/app/workspace/[workspaceId]/home/types.ts
@@ -266,6 +266,7 @@ export interface ChatMessageContext {
   knowledgeId?: string
   tableId?: string
   fileId?: string
+  folderId?: string
 }
 
 export interface ChatMessage {
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credentials-manager.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credentials-manager.tsx
index 21ae97ca049..d3916265d72 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credentials-manager.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/credentials/credentials-manager.tsx
@@ -30,6 +30,7 @@ import {
   type PendingCredentialCreateRequest,
   readPendingCredentialCreateRequest,
 } from '@/lib/credentials/client-state'
+import type { WorkspaceEnvironmentData } from '@/lib/environment/api'
 import { getUserColor } from '@/lib/workspaces/colors'
 import { isValidEnvVarName } from '@/executor/constants'
 import {
@@ -48,9 +49,9 @@ import {
   useSavePersonalEnvironment,
   useUpsertWorkspaceEnvironment,
   useWorkspaceEnvironment,
-  type WorkspaceEnvironmentData,
 } from '@/hooks/queries/environment'
 import { useWorkspacePermissionsQuery } from '@/hooks/queries/workspace'
+import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
 
 const logger = createLogger('SecretsManager')
 
@@ -323,7 +324,6 @@ export function CredentialsManager() {
   const [selectedDescriptionDraft, setSelectedDescriptionDraft] = useState('')
   const [copyIdSuccess, setCopyIdSuccess] = useState(false)
   const [detailsError, setDetailsError] = useState<string | null>(null)
-  const [isSavingDetails, setIsSavingDetails] = useState(false)
   const [showDetailUnsavedChanges, setShowDetailUnsavedChanges] = useState(false)
   const [memberUserId, setMemberUserId] = useState('')
   const [memberRole, setMemberRole] = useState<WorkspaceCredentialRole>('member')
@@ -350,8 +350,9 @@ export function CredentialsManager() {
     [envCredentials, selectedCredentialId]
   )
 
-  if (selectedCredential?.id !== prevSelectedCredentialId) {
-    setPrevSelectedCredentialId(selectedCredential?.id ?? null)
+  const currentCredentialId = selectedCredential?.id ?? null
+  if (currentCredentialId !== prevSelectedCredentialId) {
+    setPrevSelectedCredentialId(currentCredentialId)
     if (!selectedCredential) {
       setSelectedDescriptionDraft('')
       setSelectedDisplayNameDraft('')
@@ -474,9 +475,23 @@ export function CredentialsManager() {
     return personalInvalid || workspaceInvalid
   }, [envVars, newWorkspaceRows])
 
+  const isListSaving =
+    savePersonalMutation.isPending ||
+    upsertWorkspaceMutation.isPending ||
+    removeWorkspaceMutation.isPending
+
   hasChangesRef.current = hasChanges
   shouldBlockNavRef.current = hasChanges || isDetailsDirty
 
+  const setNavGuardDirty = useSettingsDirtyStore((s) => s.setDirty)
+  const resetNavGuard = useSettingsDirtyStore((s) => s.reset)
+
+  useEffect(() => {
+    setNavGuardDirty(hasChanges || isDetailsDirty)
+  }, [hasChanges, isDetailsDirty, setNavGuardDirty])
+
+  useEffect(() => () => resetNavGuard(), [resetNavGuard])
+
   // --- Effects ---
   useEffect(() => {
     if (hasSavedRef.current) return
@@ -652,12 +667,12 @@ export function CredentialsManager() {
   )
 
   const handleBackAttempt = useCallback(() => {
-    if (isDetailsDirty && !isSavingDetails) {
+    if (isDetailsDirty && !updateCredential.isPending) {
       setShowDetailUnsavedChanges(true)
     } else {
       setSelectedCredentialId(null)
     }
-  }, [isDetailsDirty, isSavingDetails])
+  }, [isDetailsDirty, updateCredential.isPending])
 
   const handleDiscardDetailChanges = useCallback(() => {
     setShowDetailUnsavedChanges(false)
@@ -667,9 +682,9 @@ export function CredentialsManager() {
   }, [selectedCredential])
 
   const handleSaveDetails = useCallback(async () => {
-    if (!selectedCredential || !isSelectedAdmin || !isDetailsDirty) return
+    if (!selectedCredential || !isSelectedAdmin || !isDetailsDirty || updateCredential.isPending)
+      return
     setDetailsError(null)
-    setIsSavingDetails(true)
 
     try {
       if (isDisplayNameDirty || isDescriptionDirty) {
@@ -683,8 +698,6 @@ export function CredentialsManager() {
       const message = error instanceof Error ? error.message : 'Failed to save changes'
       setDetailsError(message)
       logger.error('Failed to save secret details', error)
-    } finally {
-      setIsSavingDetails(false)
     }
   }, [
     selectedCredential,
@@ -906,6 +919,8 @@ export function CredentialsManager() {
   const handleCancel = resetToSaved
 
   const handleSave = useCallback(async () => {
+    if (isListSaving) return
+
     const prevInitialVars = [...initialVarsRef.current]
     const prevInitialWorkspaceVars = { ...initialWorkspaceVarsRef.current }
 
@@ -964,6 +979,7 @@ export function CredentialsManager() {
       logger.error('Failed to save environment variables:', error)
     }
   }, [
+    isListSaving,
     envVars,
     workspaceVars,
     newWorkspaceRows,
@@ -975,6 +991,7 @@ export function CredentialsManager() {
 
   const handleDiscardAndNavigate = useCallback(() => {
     shouldBlockNavRef.current = false
+    resetNavGuard()
     resetToSaved()
     setSelectedCredentialId(null)
 
@@ -983,7 +1000,7 @@ export function CredentialsManager() {
       pendingNavigationUrlRef.current = null
       router.push(url)
     }
-  }, [router, resetToSaved])
+  }, [router, resetToSaved, resetNavGuard])
 
   const renderEnvVarRow = useCallback(
     (envVar: UIEnvironmentVariable, originalIndex: number) => {
@@ -1316,9 +1333,9 @@ export function CredentialsManager() {
                 <Button
                   variant='primary'
                   onClick={handleSaveDetails}
-                  disabled={!isDetailsDirty || isSavingDetails}
+                  disabled={!isDetailsDirty || updateCredential.isPending}
                 >
-                  {isSavingDetails ? 'Saving...' : 'Save'}
+                  {updateCredential.isPending ? 'Saving...' : 'Save'}
                 </Button>
               )}
             </div>
@@ -1416,11 +1433,13 @@ export function CredentialsManager() {
             <Tooltip.Trigger asChild>
               <Button
                 onClick={handleSave}
-                disabled={isLoading || !hasChanges || hasConflicts || hasInvalidKeys}
+                disabled={
+                  isLoading || !hasChanges || hasConflicts || hasInvalidKeys || isListSaving
+                }
                 variant='primary'
                 className={`${hasConflicts || hasInvalidKeys ? 'cursor-not-allowed opacity-50' : ''}`}
               >
-                Save
+                {isListSaving ? 'Saving...' : 'Save'}
               </Button>
             </Tooltip.Trigger>
             {hasConflicts && <Tooltip.Content>Resolve all conflicts before saving</Tooltip.Content>}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
index 46ea1679ae1..a688a44091a 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
@@ -54,6 +54,7 @@ import {
 } from '@/hooks/queries/oauth/oauth-connections'
 import { useWorkspacePermissionsQuery } from '@/hooks/queries/workspace'
 import { useOAuthReturnRouter } from '@/hooks/use-oauth-return'
+import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
 
 const logger = createLogger('IntegrationsManager')
 
@@ -246,12 +247,20 @@ export function IntegrationsManager() {
   }, [selectedCredential, selectedDisplayNameDraft])
 
   const isDetailsDirty = isDescriptionDirty || isDisplayNameDirty
-  const [isSavingDetails, setIsSavingDetails] = useState(false)
+
+  const setNavGuardDirty = useSettingsDirtyStore((s) => s.setDirty)
+  const resetNavGuard = useSettingsDirtyStore((s) => s.reset)
+
+  useEffect(() => {
+    setNavGuardDirty(isDetailsDirty)
+  }, [isDetailsDirty, setNavGuardDirty])
+
+  useEffect(() => () => resetNavGuard(), [resetNavGuard])
 
   const handleSaveDetails = async () => {
-    if (!selectedCredential || !isSelectedAdmin || !isDetailsDirty) return
+    if (!selectedCredential || !isSelectedAdmin || !isDetailsDirty || updateCredential.isPending)
+      return
     setDetailsError(null)
-    setIsSavingDetails(true)
 
     try {
       if (isDisplayNameDirty || isDescriptionDirty) {
@@ -263,26 +272,22 @@ export function IntegrationsManager() {
         if (isDisplayNameDirty) setSelectedDisplayNameDraft((v) => v.trim())
         if (isDescriptionDirty) setSelectedDescriptionDraft((v) => v.trim())
       }
-
-      await refetchCredentials()
     } catch (error: unknown) {
       const message = error instanceof Error ? error.message : 'Failed to save changes'
       setDetailsError(message)
       logger.error('Failed to save credential details', error)
-    } finally {
-      setIsSavingDetails(false)
     }
   }
 
   const handleBackAttempt = useCallback(() => {
-    if (isDetailsDirty && !isSavingDetails) {
+    if (isDetailsDirty && !updateCredential.isPending) {
       setShowUnsavedChangesAlert(true)
     } else {
       setSelectedCredentialId(null)
       setSelectedDescriptionDraft('')
       setSelectedDisplayNameDraft('')
     }
-  }, [isDetailsDirty, isSavingDetails])
+  }, [isDetailsDirty, updateCredential.isPending])
 
   const handleDiscardChanges = useCallback(() => {
     setShowUnsavedChangesAlert(false)
@@ -1430,9 +1435,9 @@ export function IntegrationsManager() {
                 <Button
                   variant='primary'
                   onClick={handleSaveDetails}
-                  disabled={!isDetailsDirty || isSavingDetails}
+                  disabled={!isDetailsDirty || updateCredential.isPending}
                 >
-                  {isSavingDetails ? 'Saving...' : 'Save'}
+                  {updateCredential.isPending ? 'Saving...' : 'Save'}
                 </Button>
               )}
             </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted.tsx
index c9b3f37a48c..3cd6d051ca7 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/recently-deleted/recently-deleted.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { useMemo, useState } from 'react'
-import { Search } from 'lucide-react'
+import { Folder, Search } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
 import { Button, Combobox, SModalTabs, SModalTabsList, SModalTabsTrigger } from '@/components/emcn'
 import { Input } from '@/components/ui'
@@ -9,6 +9,7 @@ import { formatDate } from '@/lib/core/utils/formatting'
 import { RESOURCE_REGISTRY } from '@/app/workspace/[workspaceId]/home/components/mothership-view/components/resource-registry'
 import type { MothershipResourceType } from '@/app/workspace/[workspaceId]/home/types'
 import { DeletedItemSkeleton } from '@/app/workspace/[workspaceId]/settings/components/recently-deleted/deleted-item-skeleton'
+import { useFolders, useRestoreFolder } from '@/hooks/queries/folders'
 import { useKnowledgeBasesQuery, useRestoreKnowledgeBase } from '@/hooks/queries/kb/knowledge'
 import { useRestoreTable, useTablesList } from '@/hooks/queries/tables'
 import { useRestoreWorkflow, useWorkflows } from '@/hooks/queries/workflows'
@@ -29,10 +30,12 @@ function getResourceHref(
       return `${base}/knowledge/${id}`
     case 'file':
       return `${base}/files`
+    case 'folder':
+      return `${base}/w`
   }
 }
 
-type ResourceType = 'all' | 'workflow' | 'table' | 'knowledge' | 'file'
+type ResourceType = 'all' | 'workflow' | 'table' | 'knowledge' | 'file' | 'folder'
 
 type SortColumn = 'deleted' | 'name' | 'type'
 
@@ -51,7 +54,9 @@ const SORT_OPTIONS: { column: SortColumn; direction: 'asc' | 'desc'; label: stri
 
 const ICON_CLASS = 'h-[14px] w-[14px]'
 
-const RESOURCE_TYPE_TO_MOTHERSHIP: Record<Exclude<ResourceType, 'all'>, MothershipResourceType> = {
+const RESOURCE_TYPE_TO_MOTHERSHIP: Partial<
+  Record<Exclude<ResourceType, 'all'>, MothershipResourceType>
+> = {
   workflow: 'workflow',
   table: 'table',
   knowledge: 'knowledgebase',
@@ -70,6 +75,7 @@ interface DeletedResource {
 const TABS: { id: ResourceType; label: string }[] = [
   { id: 'all', label: 'All' },
   { id: 'workflow', label: 'Workflows' },
+  { id: 'folder', label: 'Folders' },
   { id: 'table', label: 'Tables' },
   { id: 'knowledge', label: 'Knowledge Bases' },
   { id: 'file', label: 'Files' },
@@ -77,6 +83,7 @@ const TABS: { id: ResourceType; label: string }[] = [
 
 const TYPE_LABEL: Record<Exclude<ResourceType, 'all'>, string> = {
   workflow: 'Workflow',
+  folder: 'Folder',
   table: 'Table',
   knowledge: 'Knowledge Base',
   file: 'File',
@@ -97,7 +104,13 @@ function ResourceIcon({ resource }: { resource: DeletedResource }) {
     )
   }
 
+  if (resource.type === 'folder') {
+    const color = resource.color ?? '#6B7280'
+    return <Folder className={ICON_CLASS} style={{ color }} />
+  }
+
   const mothershipType = RESOURCE_TYPE_TO_MOTHERSHIP[resource.type]
+  if (!mothershipType) return null
   const config = RESOURCE_REGISTRY[mothershipType]
   return (
     <>
@@ -120,23 +133,30 @@ export function RecentlyDeleted() {
   const [restoredItems, setRestoredItems] = useState<Map<string, DeletedResource>>(new Map())
 
   const workflowsQuery = useWorkflows(workspaceId, { scope: 'archived' })
+  const foldersQuery = useFolders(workspaceId, { scope: 'archived' })
   const tablesQuery = useTablesList(workspaceId, 'archived')
   const knowledgeQuery = useKnowledgeBasesQuery(workspaceId, { scope: 'archived' })
   const filesQuery = useWorkspaceFiles(workspaceId, 'archived')
 
   const restoreWorkflow = useRestoreWorkflow()
+  const restoreFolder = useRestoreFolder()
   const restoreTable = useRestoreTable()
   const restoreKnowledgeBase = useRestoreKnowledgeBase()
   const restoreWorkspaceFile = useRestoreWorkspaceFile()
 
   const isLoading =
     workflowsQuery.isLoading ||
+    foldersQuery.isLoading ||
     tablesQuery.isLoading ||
     knowledgeQuery.isLoading ||
     filesQuery.isLoading
 
   const error =
-    workflowsQuery.error || tablesQuery.error || knowledgeQuery.error || filesQuery.error
+    workflowsQuery.error ||
+    foldersQuery.error ||
+    tablesQuery.error ||
+    knowledgeQuery.error ||
+    filesQuery.error
 
   const resources = useMemo<DeletedResource[]>(() => {
     const items: DeletedResource[] = []
@@ -152,6 +172,17 @@ export function RecentlyDeleted() {
       })
     }
 
+    for (const folder of foldersQuery.data ?? []) {
+      items.push({
+        id: folder.id,
+        name: folder.name,
+        type: 'folder',
+        deletedAt: folder.archivedAt ? new Date(folder.archivedAt) : new Date(folder.updatedAt),
+        workspaceId: folder.workspaceId,
+        color: folder.color,
+      })
+    }
+
     for (const t of tablesQuery.data ?? []) {
       items.push({
         id: t.id,
@@ -193,6 +224,7 @@ export function RecentlyDeleted() {
     return items
   }, [
     workflowsQuery.data,
+    foldersQuery.data,
     tablesQuery.data,
     knowledgeQuery.data,
     filesQuery.data,
@@ -250,6 +282,12 @@ export function RecentlyDeleted() {
           { onSettled, onSuccess }
         )
         break
+      case 'folder':
+        restoreFolder.mutate(
+          { folderId: resource.id, workspaceId: resource.workspaceId },
+          { onSettled, onSuccess }
+        )
+        break
       case 'table':
         restoreTable.mutate(resource.id, { onSettled, onSuccess })
         break
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
index b26afd20752..49fbe2d306d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
@@ -10,11 +10,8 @@ import {
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import { writePendingCredentialCreateRequest } from '@/lib/credentials/client-state'
-import {
-  usePersonalEnvironment,
-  useWorkspaceEnvironment,
-  type WorkspaceEnvironmentData,
-} from '@/hooks/queries/environment'
+import type { WorkspaceEnvironmentData } from '@/lib/environment/api'
+import { usePersonalEnvironment, useWorkspaceEnvironment } from '@/hooks/queries/environment'
 import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
 
 /**
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
index 22aab4c9251..1f21304b5ce 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -210,7 +210,7 @@ function WorkflowToolDeployBadge({
   workflowId: string
   onDeploySuccess?: () => void
 }) {
-  const { data, isLoading } = useDeploymentInfo(workflowId)
+  const { data, isLoading } = useDeploymentInfo(workflowId, { refetchOnMount: 'always' })
   const { mutate, isPending: isDeploying } = useDeployWorkflow()
   const userPermissions = useUserPermissionsContext()
 
@@ -1021,13 +1021,13 @@ export const ToolInput = memo(function ToolInput({
     [isPreview, disabled, selectedTools, setStoreValue]
   )
 
-  const [previewExpanded, setPreviewExpanded] = useState<Record<number, boolean>>({})
+  const [localExpanded, setLocalExpanded] = useState<Record<number, boolean>>({})
 
   const toggleToolExpansion = (toolIndex: number) => {
-    if ((isPreview && !allowExpandInPreview) || disabled) return
+    if (isPreview && !allowExpandInPreview) return
 
-    if (isPreview) {
-      setPreviewExpanded((prev) => ({
+    if (isPreview || disabled) {
+      setLocalExpanded((prev) => ({
         ...prev,
         [toolIndex]: !(prev[toolIndex] ?? !!selectedTools[toolIndex]?.isExpanded),
       }))
@@ -1689,8 +1689,8 @@ export const ToolInput = memo(function ToolInput({
           const hasToolBody = hasOperations || hasParams
 
           const isExpandedForDisplay = hasToolBody
-            ? isPreview
-              ? (previewExpanded[toolIndex] ?? !!tool.isExpanded)
+            ? isPreview || disabled
+              ? (localExpanded[toolIndex] ?? !!tool.isExpanded)
               : !!tool.isExpanded
             : false
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts
index 2db80532508..6f9d22a7841 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts
@@ -1,77 +1,18 @@
 import { useCallback, useMemo } from 'react'
-import type { CanonicalModeOverrides } from '@/lib/workflows/subblocks/visibility'
 import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
   isSubBlockFeatureEnabled,
   isSubBlockHidden,
   isSubBlockVisibleForMode,
-  resolveDependencyValue,
 } from '@/lib/workflows/subblocks/visibility'
 import type { BlockConfig, SubBlockConfig, SubBlockType } from '@/blocks/types'
-import { useWorkspaceCredential } from '@/hooks/queries/credentials'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
+import { useReactiveConditions } from '@/hooks/use-reactive-conditions'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { mergeSubblockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
-/**
- * Evaluates reactive conditions for subblocks. Always calls the same hooks
- * regardless of whether a reactive condition exists (Rules of Hooks).
- *
- * Returns a Set of subblock IDs that should be hidden.
- */
-function useReactiveConditions(
-  subBlocks: SubBlockConfig[],
-  blockId: string,
-  activeWorkflowId: string | null,
-  canonicalModeOverrides?: CanonicalModeOverrides
-): Set<string> {
-  const reactiveSubBlock = useMemo(() => subBlocks.find((sb) => sb.reactiveCondition), [subBlocks])
-  const reactiveCond = reactiveSubBlock?.reactiveCondition
-
-  const canonicalIndex = useMemo(() => buildCanonicalIndex(subBlocks), [subBlocks])
-
-  // Resolve watchFields through canonical index to get the active credential value
-  const watchedCredentialId = useSubBlockStore(
-    useCallback(
-      (state) => {
-        if (!reactiveCond || !activeWorkflowId) return ''
-        const blockValues = state.workflowValues[activeWorkflowId]?.[blockId] ?? {}
-        for (const field of reactiveCond.watchFields) {
-          const val = resolveDependencyValue(
-            field,
-            blockValues,
-            canonicalIndex,
-            canonicalModeOverrides
-          )
-          if (val && typeof val === 'string') return val
-        }
-        return ''
-      },
-      [reactiveCond, activeWorkflowId, blockId, canonicalIndex, canonicalModeOverrides]
-    )
-  )
-
-  // Always call useWorkspaceCredential (stable hook count), disable when not needed
-  const { data: credential } = useWorkspaceCredential(
-    watchedCredentialId || undefined,
-    Boolean(reactiveCond && watchedCredentialId)
-  )
-
-  return useMemo(() => {
-    const hidden = new Set<string>()
-    if (!reactiveSubBlock || !reactiveCond) return hidden
-
-    const conditionMet = credential?.type === reactiveCond.requiredType
-    if (!conditionMet) {
-      hidden.add(reactiveSubBlock.id)
-    }
-    return hidden
-  }, [reactiveSubBlock, reactiveCond, credential?.type])
-}
-
 /**
  * Custom hook for computing subblock layout in the editor panel.
  * Determines which subblocks should be visible based on mode, conditions, and feature flags.
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts
index f13b80ec210..78b4126c8da 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts
@@ -11,8 +11,9 @@ export interface UseChildWorkflowReturn {
 
 /**
  * Manages child workflow deployment status for workflow selector blocks.
- * Uses the shared useDeploymentInfo query (same source of truth as the
- * editor header's Deploy button) for consistent deployment detection.
+ * Uses useDeploymentInfo which computes needsRedeployment server-side via
+ * hasWorkflowChanged — the same comparison the deploy button uses — so the
+ * badge stays aligned with the child workflow's Live/Update header.
  */
 export function useChildWorkflow(
   blockId: string,
@@ -39,7 +40,8 @@ export function useChildWorkflow(
   }
 
   const { data, isPending } = useDeploymentInfo(
-    isWorkflowSelector ? (childWorkflowId ?? null) : null
+    isWorkflowSelector ? (childWorkflowId ?? null) : null,
+    { refetchOnMount: 'always' }
   )
 
   const childIsDeployed = data?.isDeployed ?? null
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
index bb676157396..8db6eabe3a1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
@@ -47,6 +47,7 @@ import { useReactivateSchedule, useScheduleInfo } from '@/hooks/queries/schedule
 import { useSkills } from '@/hooks/queries/skills'
 import { useTablesList } from '@/hooks/queries/tables'
 import { useWorkflowMap } from '@/hooks/queries/workflows'
+import { useReactiveConditions } from '@/hooks/use-reactive-conditions'
 import { useSelectorDisplayName } from '@/hooks/use-selector-display-name'
 import { useVariablesStore } from '@/stores/variables/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
@@ -942,6 +943,13 @@ export const WorkflowBlock = memo(function WorkflowBlock({
   const canonicalIndex = useMemo(() => buildCanonicalIndex(config.subBlocks), [config.subBlocks])
   const canonicalModeOverrides = currentStoreBlock?.data?.canonicalModes
 
+  const hiddenByReactiveCondition = useReactiveConditions(
+    config.subBlocks,
+    id,
+    activeWorkflowId,
+    canonicalModeOverrides
+  )
+
   const subBlockRowsData = useMemo(() => {
     const rows: SubBlockConfig[][] = []
     let currentRow: SubBlockConfig[] = []
@@ -979,6 +987,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
     const visibleSubBlocks = config.subBlocks.filter((block) => {
       if (block.hidden) return false
       if (block.hideFromPreview) return false
+      if (hiddenByReactiveCondition.has(block.id)) return false
       if (!isSubBlockFeatureEnabled(block)) return false
       if (isSubBlockHidden(block)) return false
 
@@ -1047,6 +1056,7 @@ export const WorkflowBlock = memo(function WorkflowBlock({
     canonicalModeOverrides,
     userPermissions.canEdit,
     canonicalIndex,
+    hiddenByReactiveCondition,
     blockSubBlockValues,
     activeWorkflowId,
   ])
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge.tsx
index 53ee177b3b8..075b8a88d4d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge.tsx
@@ -134,7 +134,7 @@ const WorkflowEdgeComponent = ({
               position: 'absolute',
               transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,
               pointerEvents: 'all',
-              zIndex: 100,
+              zIndex: 1011,
             }}
             onClick={(e) => {
               e.preventDefault()
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
index 83a2f8c0b43..90e5425966a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -2772,10 +2772,37 @@ const WorkflowContent = React.memo(
       (changes: NodeChange[]) => {
         const hasSelectionChange = changes.some((c) => c.type === 'select')
         setDisplayNodes((currentNodes) => {
-          const updated = applyNodeChanges(changes, currentNodes)
+          // Filter out cross-context selection changes before applying so that
+          // nodes at a different nesting level never appear selected, even for
+          // a single frame.
+          let changesToApply = changes
+          if (hasSelectionChange) {
+            const currentlySelected = currentNodes.filter((n) => n.selected)
+            // Only filter on additive multi-select (shift-click), not replacement
+            // clicks. A replacement click includes deselections of currently selected
+            // nodes; a shift-click only adds selections.
+            const isReplacementClick = changes.some(
+              (c) =>
+                c.type === 'select' &&
+                'selected' in c &&
+                !c.selected &&
+                currentlySelected.some((n) => n.id === c.id)
+            )
+            if (!isReplacementClick && currentlySelected.length > 0) {
+              const selectionContext = getNodeSelectionContextId(currentlySelected[0], blocks)
+              changesToApply = changes.filter((c) => {
+                if (c.type !== 'select' || !('selected' in c) || !c.selected) return true
+                const node = currentNodes.find((n) => n.id === c.id)
+                if (!node) return true
+                return getNodeSelectionContextId(node, blocks) === selectionContext
+              })
+            }
+          }
+
+          const updated = applyNodeChanges(changesToApply, currentNodes)
           if (!hasSelectionChange) return updated
 
-          const preferredNodeId = [...changes]
+          const preferredNodeId = [...changesToApply]
             .reverse()
             .find(
               (change): change is NodeChange & { id: string; selected: boolean } =>
@@ -3271,12 +3298,17 @@ const WorkflowContent = React.memo(
             previousPositions: multiNodeDragStartRef.current,
           })
 
-          // Process parent updates using shared helper
-          executeBatchParentUpdate(
-            selectedNodes,
-            potentialParentId,
-            'Batch moved nodes to new parent'
-          )
+          // Only reparent when an actual drag changed the target container.
+          // onNodeDragStart sets both potentialParentId and dragStartParentId to the
+          // clicked node's current parent; they only diverge when onNodeDrag detects
+          // the selection being dragged over a different container.
+          if (potentialParentId !== dragStartParentId) {
+            executeBatchParentUpdate(
+              selectedNodes,
+              potentialParentId,
+              'Batch moved nodes to new parent'
+            )
+          }
 
           // Clear drag start state
           setDragStartPosition(null)
@@ -3687,6 +3719,20 @@ const WorkflowContent = React.memo(
     const handleNodeClick = useCallback(
       (event: React.MouseEvent, node: Node) => {
         const isMultiSelect = event.shiftKey || event.metaKey || event.ctrlKey
+
+        // Ignore shift-clicks on nodes at a different nesting level
+        if (isMultiSelect) {
+          const clickedContext = getNodeSelectionContextId(node, blocks)
+          const currentlySelected = getNodes().filter((n) => n.selected)
+          if (currentlySelected.length > 0) {
+            const selectionContext = getNodeSelectionContextId(currentlySelected[0], blocks)
+            if (clickedContext !== selectionContext) {
+              usePanelEditorStore.getState().clearCurrentBlock()
+              return
+            }
+          }
+        }
+
         setDisplayNodes((currentNodes) => {
           const updated = currentNodes.map((currentNode) => ({
             ...currentNode,
@@ -3699,7 +3745,7 @@ const WorkflowContent = React.memo(
           return resolveSelectionConflicts(updated, blocks, isMultiSelect ? node.id : undefined)
         })
       },
-      [blocks]
+      [blocks, getNodes]
     )
 
     /** Handles edge selection with container context tracking and Shift-click multi-selection. */
@@ -3808,9 +3854,17 @@ const WorkflowContent = React.memo(
           (targetNode?.zIndex ?? 21) + 1
         )
 
+        // Edges inside subflows need a z-index above the container's body area
+        // (which has pointer-events: auto) so they're directly clickable.
+        // Derive from the container's depth-based zIndex (+1) so the edge sits
+        // just above its parent container but below canvas blocks (z-21+) and
+        // child blocks (z-1000).
+        const containerNode = parentLoopId ? nodeMap.get(parentLoopId) : null
+        const baseZIndex = containerNode ? (containerNode.zIndex ?? 0) + 1 : 0
+
         return {
           ...edge,
-          zIndex: connectedToElevated ? elevatedZIndex : 0,
+          zIndex: connectedToElevated ? elevatedZIndex : baseZIndex,
           data: {
             ...edge.data,
             isSelected: selectedEdges.has(edgeContextId),
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx
index 07062fc1081..ccb7cba760b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-sidebar/settings-sidebar.tsx
@@ -1,9 +1,18 @@
 'use client'
 
-import { useCallback, useMemo } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import { useQueryClient } from '@tanstack/react-query'
 import { useParams, usePathname, useRouter } from 'next/navigation'
-import { ChevronDown, Skeleton } from '@/components/emcn'
+import {
+  Button,
+  ChevronDown,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  Skeleton,
+} from '@/components/emcn'
 import { useSession } from '@/lib/auth/auth-client'
 import { getSubscriptionAccessState } from '@/lib/billing/client'
 import { isHosted } from '@/lib/core/config/feature-flags'
@@ -23,6 +32,7 @@ import { useOrganizations } from '@/hooks/queries/organization'
 import { prefetchSubscriptionData, useSubscriptionData } from '@/hooks/queries/subscription'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { useSettingsNavigation } from '@/hooks/use-settings-navigation'
+import { useSettingsDirtyStore } from '@/stores/settings/dirty/store'
 
 const SKELETON_SECTIONS = [3, 2, 2] as const
 
@@ -41,6 +51,13 @@ export function SettingsSidebar({
   const router = useRouter()
 
   const queryClient = useQueryClient()
+
+  const requestNavigation = useSettingsDirtyStore((s) => s.requestNavigation)
+  const confirmNavigation = useSettingsDirtyStore((s) => s.confirmNavigation)
+  const cancelNavigation = useSettingsDirtyStore((s) => s.cancelNavigation)
+  const isDirty = useSettingsDirtyStore((s) => s.isDirty)
+  const [showDiscardDialog, setShowDiscardDialog] = useState(false)
+
   const { data: session, isPending: sessionLoading } = useSession()
   const { data: organizationsData, isLoading: orgsLoading } = useOrganizations()
   const { data: generalSettings } = useGeneralSettings()
@@ -180,8 +197,27 @@ export function SettingsSidebar({
   const { popSettingsReturnUrl, getSettingsHref } = useSettingsNavigation()
 
   const handleBack = useCallback(() => {
+    if (isDirty) {
+      setShowDiscardDialog(true)
+      return
+    }
     router.push(popSettingsReturnUrl(`/workspace/${workspaceId}/home`))
-  }, [router, popSettingsReturnUrl, workspaceId])
+  }, [router, popSettingsReturnUrl, workspaceId, isDirty])
+
+  const handleConfirmDiscard = useCallback(() => {
+    const section = confirmNavigation()
+    setShowDiscardDialog(false)
+    if (section) {
+      router.replace(getSettingsHref({ section }), { scroll: false })
+    } else {
+      router.push(popSettingsReturnUrl(`/workspace/${workspaceId}/home`))
+    }
+  }, [confirmNavigation, router, getSettingsHref, popSettingsReturnUrl, workspaceId])
+
+  const handleCancelDiscard = useCallback(() => {
+    cancelNavigation()
+    setShowDiscardDialog(false)
+  }, [cancelNavigation])
 
   return (
     <>
@@ -286,11 +322,15 @@ export function SettingsSidebar({
                         className={itemClassName}
                         onMouseEnter={() => handlePrefetch(item.id)}
                         onFocus={() => handlePrefetch(item.id)}
-                        onClick={() =>
-                          router.replace(getSettingsHref({ section: item.id as SettingsSection }), {
-                            scroll: false,
-                          })
-                        }
+                        onClick={() => {
+                          const section = item.id as SettingsSection
+                          if (section === activeSection) return
+                          if (!requestNavigation(section)) {
+                            setShowDiscardDialog(true)
+                            return
+                          }
+                          router.replace(getSettingsHref({ section }), { scroll: false })
+                        }}
                       >
                         {content}
                       </button>
@@ -312,6 +352,25 @@ export function SettingsSidebar({
           })
         )}
       </div>
+
+      <Modal open={showDiscardDialog} onOpenChange={(open) => !open && handleCancelDiscard()}>
+        <ModalContent size='sm'>
+          <ModalHeader>Unsaved Changes</ModalHeader>
+          <ModalBody>
+            <p className='text-[var(--text-secondary)]'>
+              You have unsaved changes. Are you sure you want to discard them?
+            </p>
+          </ModalBody>
+          <ModalFooter>
+            <Button variant='default' onClick={handleCancelDiscard}>
+              Keep Editing
+            </Button>
+            <Button variant='destructive' onClick={handleConfirmDiscard}>
+              Discard Changes
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
     </>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx
index 8eaec0f21c4..5eb334c0588 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx
@@ -64,7 +64,7 @@ export function DeleteModal({
     title = 'Delete Workspace'
   }
 
-  const restorableTypes = new Set<string>(['workflow'])
+  const restorableTypes = new Set<string>(['workflow', 'folder', 'mixed'])
 
   const renderDescription = () => {
     if (itemType === 'workflow') {
@@ -113,8 +113,7 @@ export function DeleteModal({
             </span>
             ?{' '}
             <span className='text-[var(--text-error)]'>
-              This will permanently remove all workflows, logs, and knowledge bases within these
-              folders.
+              All workflows and contents within these folders will be archived.
             </span>
           </>
         )
@@ -125,7 +124,7 @@ export function DeleteModal({
             Are you sure you want to delete{' '}
             <span className='font-medium text-[var(--text-primary)]'>{displayNames[0]}</span>?{' '}
             <span className='text-[var(--text-error)]'>
-              This will permanently remove all associated workflows, logs, and knowledge bases.
+              All associated workflows and contents will be archived.
             </span>
           </>
         )
@@ -134,7 +133,7 @@ export function DeleteModal({
         <>
           Are you sure you want to delete this folder?{' '}
           <span className='text-[var(--text-error)]'>
-            This will permanently remove all associated workflows, logs, and knowledge bases.
+            All associated workflows and contents will be archived.
           </span>
         </>
       )
@@ -186,8 +185,7 @@ export function DeleteModal({
             </span>
             ?{' '}
             <span className='text-[var(--text-error)]'>
-              This will permanently remove all selected workflows and folders, including their
-              contents.
+              All selected workflows and folders, including their contents, will be archived.
             </span>
           </>
         )
@@ -196,8 +194,7 @@ export function DeleteModal({
         <>
           Are you sure you want to delete the selected items?{' '}
           <span className='text-[var(--text-error)]'>
-            This will permanently remove all selected workflows and folders, including their
-            contents.
+            All selected workflows and folders, including their contents, will be archived.
           </span>
         </>
       )
@@ -238,7 +235,7 @@ export function DeleteModal({
                 You can restore it from Recently Deleted in Settings.
               </span>
             ) : (
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
+              <span className='text-[var(--text-tertiary)]'>This action cannot be undone.</span>
             )}
           </p>
         </ModalBody>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
index e9d3e713fbe..719488e3a3d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
@@ -614,7 +614,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
                 {memberToRemove?.email}
               </span>{' '}
               from this workspace?{' '}
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
+              <span className='text-[var(--text-tertiary)]'>This action cannot be undone.</span>
             </p>
           </ModalBody>
           <ModalFooter>
@@ -646,7 +646,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
               <span className='font-medium text-[var(--text-primary)]'>
                 {invitationToRemove?.email}
               </span>
-              ? <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
+              ? <span className='text-[var(--text-tertiary)]'>This action cannot be undone.</span>
             </p>
           </ModalBody>
           <ModalFooter>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 93defdd2d05..306834b22f8 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -668,7 +668,7 @@ export function WorkspaceHeader({
               Are you sure you want to leave{' '}
               <span className='font-base text-[var(--text-primary)]'>{leaveTarget?.name}</span>? You
               will lose access to all workflows and data in this workspace.{' '}
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
+              <span className='text-[var(--text-tertiary)]'>This action cannot be undone.</span>
             </p>
           </ModalBody>
           <ModalFooter>
diff --git a/apps/sim/app/workspace/providers/socket-provider.tsx b/apps/sim/app/workspace/providers/socket-provider.tsx
index b2257280c10..d04cc6e0fe2 100644
--- a/apps/sim/app/workspace/providers/socket-provider.tsx
+++ b/apps/sim/app/workspace/providers/socket-provider.tsx
@@ -166,6 +166,7 @@ export function SocketProvider({ children, user }: SocketProviderProps) {
   const positionUpdateTimeouts = useRef<Map<string, number>>(new Map())
   const isRejoiningRef = useRef<boolean>(false)
   const pendingPositionUpdates = useRef<Map<string, any>>(new Map())
+  const deletedWorkflowIdRef = useRef<string | null>(null)
 
   const generateSocketToken = async (): Promise<string> => {
     const res = await fetch('/api/auth/socket-token', {
@@ -371,6 +372,7 @@ export function SocketProvider({ children, user }: SocketProviderProps) {
 
         socketInstance.on('workflow-deleted', (data) => {
           logger.warn(`Workflow ${data.workflowId} has been deleted`)
+          deletedWorkflowIdRef.current = data.workflowId
           setCurrentWorkflowId((current) => {
             if (current === data.workflowId) {
               setPresenceUsers([])
@@ -500,7 +502,11 @@ export function SocketProvider({ children, user }: SocketProviderProps) {
           if (error?.type === 'SESSION_ERROR') {
             const workflowId = urlWorkflowIdRef.current
 
-            if (workflowId && !isRejoiningRef.current) {
+            if (
+              workflowId &&
+              !isRejoiningRef.current &&
+              deletedWorkflowIdRef.current !== workflowId
+            ) {
               isRejoiningRef.current = true
               logger.info(`Session expired, rejoining workflow: ${workflowId}`)
               socketInstance.emit('join-workflow', {
@@ -552,13 +558,25 @@ export function SocketProvider({ children, user }: SocketProviderProps) {
   const hydrationPhase = useWorkflowRegistryStore((s) => s.hydration.phase)
 
   useEffect(() => {
-    if (!socket || !isConnected || !urlWorkflowId) return
+    if (!socket || !isConnected || !urlWorkflowId) {
+      if (!urlWorkflowId) {
+        deletedWorkflowIdRef.current = null
+      }
+      return
+    }
 
     if (hydrationPhase === 'creating') return
 
     // Skip if already in the correct room
     if (currentWorkflowId === urlWorkflowId) return
 
+    // Prevent rejoining a workflow that was just deleted. The URL param may
+    // still reference the old workflow while router.push() propagates.
+    if (deletedWorkflowIdRef.current === urlWorkflowId) {
+      return
+    }
+    deletedWorkflowIdRef.current = null
+
     logger.info(
       `URL workflow changed from ${currentWorkflowId} to ${urlWorkflowId}, switching rooms`
     )
diff --git a/apps/sim/background/schedule-execution.ts b/apps/sim/background/schedule-execution.ts
index 007f4d5b071..634adcaf753 100644
--- a/apps/sim/background/schedule-execution.ts
+++ b/apps/sim/background/schedule-execution.ts
@@ -13,7 +13,7 @@ import {
   executeWorkflowCore,
   wasExecutionFinalizedByCore,
 } from '@/lib/workflows/executor/execution-core'
-import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
+import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
 import {
   blockExistsInDeployment,
   loadDeployedWorkflowState,
@@ -237,33 +237,13 @@ async function runWorkflowExecution({
         timeoutMs: timeoutController.timeoutMs,
       })
       await loggingSession.markAsFailed(timeoutErrorMessage)
-    } else if (executionResult.status === 'paused') {
-      if (!executionResult.snapshotSeed) {
-        logger.error(`[${requestId}] Missing snapshot seed for paused execution`, {
-          executionId,
-        })
-        await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
-      } else {
-        try {
-          await PauseResumeManager.persistPauseResult({
-            workflowId: payload.workflowId,
-            executionId,
-            pausePoints: executionResult.pausePoints || [],
-            snapshotSeed: executionResult.snapshotSeed,
-            executorUserId: executionResult.metadata?.userId,
-          })
-        } catch (pauseError) {
-          logger.error(`[${requestId}] Failed to persist pause result`, {
-            executionId,
-            error: pauseError instanceof Error ? pauseError.message : String(pauseError),
-          })
-          await loggingSession.markAsFailed(
-            `Failed to persist pause state: ${pauseError instanceof Error ? pauseError.message : String(pauseError)}`
-          )
-        }
-      }
     } else {
-      await PauseResumeManager.processQueuedResumes(executionId)
+      await handlePostExecutionPauseState({
+        result: executionResult,
+        workflowId: payload.workflowId,
+        executionId,
+        loggingSession,
+      })
     }
 
     await loggingSession.waitForPostExecution()
diff --git a/apps/sim/background/webhook-execution.ts b/apps/sim/background/webhook-execution.ts
index f9e01c6300c..d78a1401389 100644
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -7,22 +7,22 @@ import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
 import { IdempotencyService, webhookIdempotency } from '@/lib/core/idempotency'
 import { generateId } from '@/lib/core/utils/uuid'
-import { processExecutionFiles } from '@/lib/execution/files'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
 import { WebhookAttachmentProcessor } from '@/lib/webhooks/attachment-processor'
-import { fetchAndProcessAirtablePayloads, formatWebhookInput } from '@/lib/webhooks/utils.server'
+import { getProviderHandler } from '@/lib/webhooks/providers'
 import {
   executeWorkflowCore,
   wasExecutionFinalizedByCore,
 } from '@/lib/workflows/executor/execution-core'
-import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
+import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
 import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
 import { resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
 import { getBlock } from '@/blocks'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata } from '@/executor/execution/types'
+import type { ExecutionResult } from '@/executor/types'
 import { hasExecutionResult } from '@/executor/utils/errors'
 import { safeAssign } from '@/tools/safe-assign'
 import { getTrigger, isTriggerValid } from '@/triggers'
@@ -48,12 +48,12 @@ export function buildWebhookCorrelation(
 }
 
 /**
- * Process trigger outputs based on their schema definitions
- * Finds outputs marked as 'file' or 'file[]' and uploads them to execution storage
+ * Process trigger outputs based on their schema definitions.
+ * Finds outputs marked as 'file' or 'file[]' and uploads them to execution storage.
  */
 async function processTriggerFileOutputs(
-  input: any,
-  triggerOutputs: Record<string, any>,
+  input: unknown,
+  triggerOutputs: Record<string, unknown>,
   context: {
     workspaceId: string
     workflowId: string
@@ -62,29 +62,31 @@ async function processTriggerFileOutputs(
     userId?: string
   },
   path = ''
-): Promise<any> {
+): Promise<unknown> {
   if (!input || typeof input !== 'object') {
     return input
   }
 
-  const processed: any = Array.isArray(input) ? [] : {}
+  const processed = (Array.isArray(input) ? [] : {}) as Record<string, unknown>
 
   for (const [key, value] of Object.entries(input)) {
     const currentPath = path ? `${path}.${key}` : key
-    const outputDef = triggerOutputs[key]
-    const val: any = value
+    const outputDef = triggerOutputs[key] as Record<string, unknown> | undefined
+    const val = value as Record<string, unknown>
 
-    // If this field is marked as file or file[], process it
     if (outputDef?.type === 'file[]' && Array.isArray(val)) {
       try {
-        processed[key] = await WebhookAttachmentProcessor.processAttachments(val as any, context)
+        processed[key] = await WebhookAttachmentProcessor.processAttachments(
+          val as unknown as Parameters<typeof WebhookAttachmentProcessor.processAttachments>[0],
+          context
+        )
       } catch (error) {
         processed[key] = []
       }
     } else if (outputDef?.type === 'file' && val) {
       try {
         const [processedFile] = await WebhookAttachmentProcessor.processAttachments(
-          [val as any],
+          [val] as unknown as Parameters<typeof WebhookAttachmentProcessor.processAttachments>[0],
           context
         )
         processed[key] = processedFile
@@ -98,18 +100,20 @@ async function processTriggerFileOutputs(
       (outputDef.type === 'object' || outputDef.type === 'json') &&
       outputDef.properties
     ) {
-      // Explicit object schema with properties - recurse into properties
       processed[key] = await processTriggerFileOutputs(
         val,
-        outputDef.properties,
+        outputDef.properties as Record<string, unknown>,
         context,
         currentPath
       )
     } else if (outputDef && typeof outputDef === 'object' && !outputDef.type) {
-      // Nested object in schema (flat pattern) - recurse with the nested schema
-      processed[key] = await processTriggerFileOutputs(val, outputDef, context, currentPath)
+      processed[key] = await processTriggerFileOutputs(
+        val,
+        outputDef as Record<string, unknown>,
+        context,
+        currentPath
+      )
     } else {
-      // Not a file output - keep as is
       processed[key] = val
     }
   }
@@ -125,7 +129,7 @@ export type WebhookExecutionPayload = {
   requestId?: string
   correlation?: AsyncExecutionCorrelation
   provider: string
-  body: any
+  body: unknown
   headers: Record<string, string>
   path: string
   blockId?: string
@@ -164,9 +168,6 @@ export async function executeWebhookJob(payload: WebhookExecutionPayload) {
   )
 }
 
-/**
- * Resolve the account userId for a credential
- */
 async function resolveCredentialAccountUserId(credentialId: string): Promise<string | undefined> {
   const resolved = await resolveOAuthAccountId(credentialId)
   if (!resolved) {
@@ -180,6 +181,42 @@ async function resolveCredentialAccountUserId(credentialId: string): Promise<str
   return credentialRecord?.userId
 }
 
+/**
+ * Handle execution result status (timeout, pause, resume).
+ * Shared between all provider paths to eliminate duplication.
+ */
+async function handleExecutionResult(
+  executionResult: ExecutionResult,
+  ctx: {
+    loggingSession: LoggingSession
+    timeoutController: ReturnType<typeof createTimeoutAbortController>
+    requestId: string
+    executionId: string
+    workflowId: string
+  }
+) {
+  if (
+    executionResult.status === 'cancelled' &&
+    ctx.timeoutController.isTimedOut() &&
+    ctx.timeoutController.timeoutMs
+  ) {
+    const timeoutErrorMessage = getTimeoutErrorMessage(null, ctx.timeoutController.timeoutMs)
+    logger.info(`[${ctx.requestId}] Webhook execution timed out`, {
+      timeoutMs: ctx.timeoutController.timeoutMs,
+    })
+    await ctx.loggingSession.markAsFailed(timeoutErrorMessage)
+  } else {
+    await handlePostExecutionPauseState({
+      result: executionResult,
+      workflowId: ctx.workflowId,
+      executionId: ctx.executionId,
+      loggingSession: ctx.loggingSession,
+    })
+  }
+
+  await ctx.loggingSession.waitForPostExecution()
+}
+
 async function executeWebhookJobInternal(
   payload: WebhookExecutionPayload,
   correlation: AsyncExecutionCorrelation
@@ -192,7 +229,6 @@ async function executeWebhookJobInternal(
     requestId
   )
 
-  // Resolve workflow record, billing actor, subscription, and timeout
   const preprocessResult = await preprocessExecution({
     workflowId: payload.workflowId,
     userId: payload.userId,
@@ -221,14 +257,13 @@ async function executeWebhookJobInternal(
     throw new Error(`Workflow ${payload.workflowId} has no associated workspace`)
   }
 
-  const workflowVariables = (workflowRecord.variables as Record<string, any>) || {}
+  const workflowVariables = (workflowRecord.variables as Record<string, unknown>) || {}
   const asyncTimeout = executionTimeout?.async ?? 120_000
   const timeoutController = createTimeoutAbortController(asyncTimeout)
 
   let deploymentVersionId: string | undefined
 
   try {
-    // Parallelize workflow state, webhook record, and credential resolution
     const [workflowData, webhookRows, resolvedCredentialUserId] = await Promise.all([
       loadDeployedWorkflowState(payload.workflowId, workspaceId),
       db.select().from(webhook).where(eq(webhook.id, payload.webhookId)).limit(1),
@@ -255,184 +290,38 @@ async function executeWebhookJobInternal(
         ? (workflowData.deploymentVersionId as string)
         : undefined
 
-    // Handle special Airtable case
-    if (payload.provider === 'airtable') {
-      logger.info(`[${requestId}] Processing Airtable webhook via fetchAndProcessAirtablePayloads`)
-
-      const webhookRecord = webhookRows[0]
-      if (!webhookRecord) {
-        throw new Error(`Webhook record not found: ${payload.webhookId}`)
-      }
-
-      const webhookData = {
-        id: payload.webhookId,
-        provider: payload.provider,
-        providerConfig: webhookRecord.providerConfig,
-      }
-
-      const mockWorkflow = {
-        id: payload.workflowId,
-        userId: payload.userId,
-      }
-
-      const airtableInput = await fetchAndProcessAirtablePayloads(
-        webhookData,
-        mockWorkflow,
-        requestId
-      )
+    const handler = getProviderHandler(payload.provider)
 
-      if (airtableInput) {
-        logger.info(`[${requestId}] Executing workflow with Airtable changes`)
+    let input: Record<string, unknown> | null = null
+    let skipMessage: string | undefined
 
-        const metadata: ExecutionMetadata = {
-          requestId,
-          executionId,
-          workflowId: payload.workflowId,
-          workspaceId,
-          userId: payload.userId,
-          sessionUserId: undefined,
-          workflowUserId: workflowRecord.userId,
-          triggerType: payload.provider || 'webhook',
-          triggerBlockId: payload.blockId,
-          useDraftState: false,
-          startTime: new Date().toISOString(),
-          isClientSession: false,
-          credentialAccountUserId,
-          correlation,
-          workflowStateOverride: {
-            blocks,
-            edges,
-            loops: loops || {},
-            parallels: parallels || {},
-            deploymentVersionId,
-          },
-        }
-
-        const snapshot = new ExecutionSnapshot(
-          metadata,
-          workflowRecord,
-          airtableInput,
-          workflowVariables,
-          []
-        )
-
-        const executionResult = await executeWorkflowCore({
-          snapshot,
-          callbacks: {},
-          loggingSession,
-          includeFileBase64: true,
-          base64MaxBytes: undefined,
-          abortSignal: timeoutController.signal,
-        })
-
-        if (
-          executionResult.status === 'cancelled' &&
-          timeoutController.isTimedOut() &&
-          timeoutController.timeoutMs
-        ) {
-          const timeoutErrorMessage = getTimeoutErrorMessage(null, timeoutController.timeoutMs)
-          logger.info(`[${requestId}] Airtable webhook execution timed out`, {
-            timeoutMs: timeoutController.timeoutMs,
-          })
-          await loggingSession.markAsFailed(timeoutErrorMessage)
-        } else if (executionResult.status === 'paused') {
-          if (!executionResult.snapshotSeed) {
-            logger.error(`[${requestId}] Missing snapshot seed for paused execution`, {
-              executionId,
-            })
-            await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
-          } else {
-            try {
-              await PauseResumeManager.persistPauseResult({
-                workflowId: payload.workflowId,
-                executionId,
-                pausePoints: executionResult.pausePoints || [],
-                snapshotSeed: executionResult.snapshotSeed,
-                executorUserId: executionResult.metadata?.userId,
-              })
-            } catch (pauseError) {
-              logger.error(`[${requestId}] Failed to persist pause result`, {
-                executionId,
-                error: pauseError instanceof Error ? pauseError.message : String(pauseError),
-              })
-              await loggingSession.markAsFailed(
-                `Failed to persist pause state: ${pauseError instanceof Error ? pauseError.message : String(pauseError)}`
-              )
-            }
-          }
-        } else {
-          await PauseResumeManager.processQueuedResumes(executionId)
-        }
-
-        await loggingSession.waitForPostExecution()
-
-        logger.info(`[${requestId}] Airtable webhook execution completed`, {
-          success: executionResult.success,
-          workflowId: payload.workflowId,
-        })
-
-        return {
-          success: executionResult.success,
-          workflowId: payload.workflowId,
-          executionId,
-          output: executionResult.output,
-          executedAt: new Date().toISOString(),
-          provider: payload.provider,
-        }
-      }
-      // No changes to process
-      logger.info(`[${requestId}] No Airtable changes to process`)
-
-      await loggingSession.safeStart({
-        userId: payload.userId,
-        workspaceId,
-        variables: {},
-        triggerData: {
-          isTest: false,
-          correlation,
-        },
-        deploymentVersionId,
-      })
+    const webhookRecord = webhookRows[0]
+    if (!webhookRecord) {
+      throw new Error(`Webhook record not found: ${payload.webhookId}`)
+    }
 
-      await loggingSession.safeComplete({
-        endedAt: new Date().toISOString(),
-        totalDurationMs: 0,
-        finalOutput: { message: 'No Airtable changes to process' },
-        traceSpans: [],
+    if (handler.formatInput) {
+      const result = await handler.formatInput({
+        webhook: webhookRecord,
+        workflow: { id: payload.workflowId, userId: payload.userId },
+        body: payload.body,
+        headers: payload.headers,
+        requestId,
       })
-
-      return {
-        success: true,
-        workflowId: payload.workflowId,
-        executionId,
-        output: { message: 'No Airtable changes to process' },
-        executedAt: new Date().toISOString(),
-      }
+      input = result.input as Record<string, unknown> | null
+      skipMessage = result.skip?.message
+    } else {
+      input = payload.body as Record<string, unknown> | null
     }
 
-    // Format input for standard webhooks
-    const actualWebhook =
-      webhookRows.length > 0
-        ? webhookRows[0]
-        : {
-            provider: payload.provider,
-            blockId: payload.blockId,
-            providerConfig: {},
-          }
-
-    const mockWorkflow = {
-      id: payload.workflowId,
-      userId: payload.userId,
+    if (!input && handler.handleEmptyInput) {
+      const skipResult = handler.handleEmptyInput(requestId)
+      if (skipResult) {
+        skipMessage = skipResult.message
+      }
     }
-    const mockRequest = {
-      headers: new Map(Object.entries(payload.headers)),
-    } as any
-
-    const input = await formatWebhookInput(actualWebhook, mockWorkflow, payload.body, mockRequest)
-
-    if (!input && payload.provider === 'whatsapp') {
-      logger.info(`[${requestId}] No messages in WhatsApp payload, skipping execution`)
 
+    if (skipMessage) {
       await loggingSession.safeStart({
         userId: payload.userId,
         workspaceId,
@@ -447,19 +336,19 @@ async function executeWebhookJobInternal(
       await loggingSession.safeComplete({
         endedAt: new Date().toISOString(),
         totalDurationMs: 0,
-        finalOutput: { message: 'No messages in WhatsApp payload' },
+        finalOutput: { message: skipMessage },
         traceSpans: [],
       })
+
       return {
         success: true,
         workflowId: payload.workflowId,
         executionId,
-        output: { message: 'No messages in WhatsApp payload' },
+        output: { message: skipMessage },
         executedAt: new Date().toISOString(),
       }
     }
 
-    // Process trigger file outputs based on schema
     if (input && payload.blockId && blocks[payload.blockId]) {
       try {
         const triggerBlock = blocks[payload.blockId]
@@ -502,49 +391,20 @@ async function executeWebhookJobInternal(
       }
     }
 
-    // Process generic webhook files based on inputFormat
-    if (input && payload.provider === 'generic' && payload.blockId && blocks[payload.blockId]) {
+    if (input && handler.processInputFiles && payload.blockId && blocks[payload.blockId]) {
       try {
-        const triggerBlock = blocks[payload.blockId]
-
-        if (triggerBlock?.subBlocks?.inputFormat?.value) {
-          const inputFormat = triggerBlock.subBlocks.inputFormat.value as unknown as Array<{
-            name: string
-            type: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file[]'
-          }>
-
-          const fileFields = inputFormat.filter((field) => field.type === 'file[]')
-
-          if (fileFields.length > 0 && typeof input === 'object' && input !== null) {
-            const executionContext = {
-              workspaceId,
-              workflowId: payload.workflowId,
-              executionId,
-            }
-
-            for (const fileField of fileFields) {
-              const fieldValue = input[fileField.name]
-
-              if (fieldValue && typeof fieldValue === 'object') {
-                const uploadedFiles = await processExecutionFiles(
-                  fieldValue,
-                  executionContext,
-                  requestId,
-                  payload.userId
-                )
-
-                if (uploadedFiles.length > 0) {
-                  input[fileField.name] = uploadedFiles
-                  logger.info(
-                    `[${requestId}] Successfully processed ${uploadedFiles.length} file(s) for field: ${fileField.name}`
-                  )
-                }
-              }
-            }
-          }
-        }
+        await handler.processInputFiles({
+          input,
+          blocks,
+          blockId: payload.blockId,
+          workspaceId,
+          workflowId: payload.workflowId,
+          executionId,
+          requestId,
+          userId: payload.userId,
+        })
       } catch (error) {
-        logger.error(`[${requestId}] Error processing generic webhook files:`, error)
+        logger.error(`[${requestId}] Error processing provider-specific files:`, error)
       }
     }
 
@@ -589,49 +449,17 @@ async function executeWebhookJobInternal(
       callbacks: {},
       loggingSession,
       includeFileBase64: true,
+      base64MaxBytes: undefined,
       abortSignal: timeoutController.signal,
     })
 
-    if (
-      executionResult.status === 'cancelled' &&
-      timeoutController.isTimedOut() &&
-      timeoutController.timeoutMs
-    ) {
-      const timeoutErrorMessage = getTimeoutErrorMessage(null, timeoutController.timeoutMs)
-      logger.info(`[${requestId}] Webhook execution timed out`, {
-        timeoutMs: timeoutController.timeoutMs,
-      })
-      await loggingSession.markAsFailed(timeoutErrorMessage)
-    } else if (executionResult.status === 'paused') {
-      if (!executionResult.snapshotSeed) {
-        logger.error(`[${requestId}] Missing snapshot seed for paused execution`, {
-          executionId,
-        })
-        await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
-      } else {
-        try {
-          await PauseResumeManager.persistPauseResult({
-            workflowId: payload.workflowId,
-            executionId,
-            pausePoints: executionResult.pausePoints || [],
-            snapshotSeed: executionResult.snapshotSeed,
-            executorUserId: executionResult.metadata?.userId,
-          })
-        } catch (pauseError) {
-          logger.error(`[${requestId}] Failed to persist pause result`, {
-            executionId,
-            error: pauseError instanceof Error ? pauseError.message : String(pauseError),
-          })
-          await loggingSession.markAsFailed(
-            `Failed to persist pause state: ${pauseError instanceof Error ? pauseError.message : String(pauseError)}`
-          )
-        }
-      }
-    } else {
-      await PauseResumeManager.processQueuedResumes(executionId)
-    }
-
-    await loggingSession.waitForPostExecution()
+    await handleExecutionResult(executionResult, {
+      loggingSession,
+      timeoutController,
+      requestId,
+      executionId,
+      workflowId: payload.workflowId,
+    })
 
     logger.info(`[${requestId}] Webhook execution completed`, {
       success: executionResult.success,
diff --git a/apps/sim/background/workflow-execution.ts b/apps/sim/background/workflow-execution.ts
index 316ccfc5bbb..0990879ba69 100644
--- a/apps/sim/background/workflow-execution.ts
+++ b/apps/sim/background/workflow-execution.ts
@@ -10,7 +10,7 @@ import {
   executeWorkflowCore,
   wasExecutionFinalizedByCore,
 } from '@/lib/workflows/executor/execution-core'
-import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
+import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata } from '@/executor/execution/types'
 import { hasExecutionResult } from '@/executor/utils/errors'
@@ -148,33 +148,8 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
         timeoutMs: timeoutController.timeoutMs,
       })
       await loggingSession.markAsFailed(timeoutErrorMessage)
-    } else if (result.status === 'paused') {
-      if (!result.snapshotSeed) {
-        logger.error(`[${requestId}] Missing snapshot seed for paused execution`, {
-          executionId,
-        })
-        await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
-      } else {
-        try {
-          await PauseResumeManager.persistPauseResult({
-            workflowId,
-            executionId,
-            pausePoints: result.pausePoints || [],
-            snapshotSeed: result.snapshotSeed,
-            executorUserId: result.metadata?.userId,
-          })
-        } catch (pauseError) {
-          logger.error(`[${requestId}] Failed to persist pause result`, {
-            executionId,
-            error: pauseError instanceof Error ? pauseError.message : String(pauseError),
-          })
-          await loggingSession.markAsFailed(
-            `Failed to persist pause state: ${pauseError instanceof Error ? pauseError.message : String(pauseError)}`
-          )
-        }
-      }
     } else {
-      await PauseResumeManager.processQueuedResumes(executionId)
+      await handlePostExecutionPauseState({ result, workflowId, executionId, loggingSession })
     }
 
     await loggingSession.waitForPostExecution()
diff --git a/apps/sim/blocks/blocks/airweave.ts b/apps/sim/blocks/blocks/airweave.ts
index caa9c4097f6..6948351d9a6 100644
--- a/apps/sim/blocks/blocks/airweave.ts
+++ b/apps/sim/blocks/blocks/airweave.ts
@@ -10,7 +10,7 @@ export const AirweaveBlock: BlockConfig<AirweaveSearchResponse> = {
   authMode: AuthMode.ApiKey,
   longDescription:
     'Search across your synced data sources using Airweave. Supports semantic search with hybrid, neural, or keyword retrieval strategies. Optionally generate AI-powered answers from search results.',
-  docsLink: 'https://docs.airweave.ai',
+  docsLink: 'https://docs.sim.ai/tools/airweave',
   category: 'tools',
   integrationType: IntegrationType.Search,
   tags: ['vector-search', 'knowledge-base'],
diff --git a/apps/sim/blocks/blocks/gong.ts b/apps/sim/blocks/blocks/gong.ts
index 33adaf28742..ef41be5d22f 100644
--- a/apps/sim/blocks/blocks/gong.ts
+++ b/apps/sim/blocks/blocks/gong.ts
@@ -1,6 +1,7 @@
 import { GongIcon } from '@/components/icons'
 import { AuthMode, type BlockConfig, IntegrationType } from '@/blocks/types'
 import type { GongResponse } from '@/tools/gong/types'
+import { getTrigger } from '@/triggers'
 
 export const GongBlock: BlockConfig<GongResponse> = {
   type: 'gong',
@@ -15,7 +16,10 @@ export const GongBlock: BlockConfig<GongResponse> = {
   tags: ['meeting', 'sales-engagement', 'speech-to-text'],
   bgColor: '#8039DF',
   icon: GongIcon,
+  triggerAllowed: true,
   subBlocks: [
+    ...getTrigger('gong_webhook').subBlocks,
+    ...getTrigger('gong_call_completed').subBlocks,
     {
       id: 'operation',
       title: 'Operation',
@@ -568,4 +572,8 @@ Return ONLY the timestamp string in ISO 8601 format - no explanations, no quotes
       description: 'Gong API response data',
     },
   },
+  triggers: {
+    enabled: true,
+    available: ['gong_webhook', 'gong_call_completed'],
+  },
 }
diff --git a/apps/sim/blocks/blocks/greenhouse.ts b/apps/sim/blocks/blocks/greenhouse.ts
index 4df4963fca4..4df34ef87cb 100644
--- a/apps/sim/blocks/blocks/greenhouse.ts
+++ b/apps/sim/blocks/blocks/greenhouse.ts
@@ -1,6 +1,7 @@
 import { GreenhouseIcon } from '@/components/icons'
 import { AuthMode, type BlockConfig, IntegrationType } from '@/blocks/types'
 import type { GreenhouseResponse } from '@/tools/greenhouse/types'
+import { getTrigger } from '@/triggers'
 
 export const GreenhouseBlock: BlockConfig<GreenhouseResponse> = {
   type: 'greenhouse',
@@ -16,6 +17,20 @@ export const GreenhouseBlock: BlockConfig<GreenhouseResponse> = {
   icon: GreenhouseIcon,
   authMode: AuthMode.ApiKey,
 
+  triggers: {
+    enabled: true,
+    available: [
+      'greenhouse_candidate_hired',
+      'greenhouse_new_application',
+      'greenhouse_candidate_stage_change',
+      'greenhouse_candidate_rejected',
+      'greenhouse_offer_created',
+      'greenhouse_job_created',
+      'greenhouse_job_updated',
+      'greenhouse_webhook',
+    ],
+  },
+
   subBlocks: [
     {
       id: 'operation',
@@ -291,6 +306,17 @@ Return ONLY the ISO 8601 timestamp - no explanations, no extra text.`,
       required: true,
       password: true,
     },
+
+    // ── Trigger subBlocks ──
+
+    ...getTrigger('greenhouse_candidate_hired').subBlocks,
+    ...getTrigger('greenhouse_new_application').subBlocks,
+    ...getTrigger('greenhouse_candidate_stage_change').subBlocks,
+    ...getTrigger('greenhouse_candidate_rejected').subBlocks,
+    ...getTrigger('greenhouse_offer_created').subBlocks,
+    ...getTrigger('greenhouse_job_created').subBlocks,
+    ...getTrigger('greenhouse_job_updated').subBlocks,
+    ...getTrigger('greenhouse_webhook').subBlocks,
   ],
 
   tools: {
diff --git a/apps/sim/blocks/blocks/hubspot.ts b/apps/sim/blocks/blocks/hubspot.ts
index 165c0b02bf4..5cbd9210264 100644
--- a/apps/sim/blocks/blocks/hubspot.ts
+++ b/apps/sim/blocks/blocks/hubspot.ts
@@ -985,11 +985,15 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
     },
     ...getTrigger('hubspot_contact_created').subBlocks.slice(1),
     ...getTrigger('hubspot_contact_deleted').subBlocks.slice(1),
+    ...getTrigger('hubspot_contact_merged').subBlocks.slice(1),
     ...getTrigger('hubspot_contact_privacy_deleted').subBlocks.slice(1),
     ...getTrigger('hubspot_contact_property_changed').subBlocks.slice(1),
+    ...getTrigger('hubspot_contact_restored').subBlocks.slice(1),
     ...getTrigger('hubspot_company_created').subBlocks.slice(1),
     ...getTrigger('hubspot_company_deleted').subBlocks.slice(1),
+    ...getTrigger('hubspot_company_merged').subBlocks.slice(1),
     ...getTrigger('hubspot_company_property_changed').subBlocks.slice(1),
+    ...getTrigger('hubspot_company_restored').subBlocks.slice(1),
     ...getTrigger('hubspot_conversation_creation').subBlocks.slice(1),
     ...getTrigger('hubspot_conversation_deletion').subBlocks.slice(1),
     ...getTrigger('hubspot_conversation_new_message').subBlocks.slice(1),
@@ -997,10 +1001,15 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
     ...getTrigger('hubspot_conversation_property_changed').subBlocks.slice(1),
     ...getTrigger('hubspot_deal_created').subBlocks.slice(1),
     ...getTrigger('hubspot_deal_deleted').subBlocks.slice(1),
+    ...getTrigger('hubspot_deal_merged').subBlocks.slice(1),
     ...getTrigger('hubspot_deal_property_changed').subBlocks.slice(1),
+    ...getTrigger('hubspot_deal_restored').subBlocks.slice(1),
     ...getTrigger('hubspot_ticket_created').subBlocks.slice(1),
     ...getTrigger('hubspot_ticket_deleted').subBlocks.slice(1),
+    ...getTrigger('hubspot_ticket_merged').subBlocks.slice(1),
     ...getTrigger('hubspot_ticket_property_changed').subBlocks.slice(1),
+    ...getTrigger('hubspot_ticket_restored').subBlocks.slice(1),
+    ...getTrigger('hubspot_webhook').subBlocks.slice(1),
   ],
   tools: {
     access: [
@@ -1329,11 +1338,15 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
     available: [
       'hubspot_contact_created',
       'hubspot_contact_deleted',
+      'hubspot_contact_merged',
       'hubspot_contact_privacy_deleted',
       'hubspot_contact_property_changed',
+      'hubspot_contact_restored',
       'hubspot_company_created',
       'hubspot_company_deleted',
+      'hubspot_company_merged',
       'hubspot_company_property_changed',
+      'hubspot_company_restored',
       'hubspot_conversation_creation',
       'hubspot_conversation_deletion',
       'hubspot_conversation_new_message',
@@ -1341,10 +1354,15 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
       'hubspot_conversation_property_changed',
       'hubspot_deal_created',
       'hubspot_deal_deleted',
+      'hubspot_deal_merged',
       'hubspot_deal_property_changed',
+      'hubspot_deal_restored',
       'hubspot_ticket_created',
       'hubspot_ticket_deleted',
+      'hubspot_ticket_merged',
       'hubspot_ticket_property_changed',
+      'hubspot_ticket_restored',
+      'hubspot_webhook',
     ],
   },
 }
diff --git a/apps/sim/blocks/blocks/intercom.ts b/apps/sim/blocks/blocks/intercom.ts
index 21b8124324a..a044cb57ca0 100644
--- a/apps/sim/blocks/blocks/intercom.ts
+++ b/apps/sim/blocks/blocks/intercom.ts
@@ -2,6 +2,7 @@ import { IntercomIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import { createVersionedToolSelector } from '@/blocks/utils'
+import { getTrigger } from '@/triggers'
 
 export const IntercomBlock: BlockConfig = {
   type: 'intercom',
@@ -1409,6 +1410,26 @@ export const IntercomV2Block: BlockConfig = {
   integrationType: IntegrationType.CustomerSupport,
   tags: ['customer-support', 'messaging'],
   hideFromToolbar: false,
+  subBlocks: [
+    ...IntercomBlock.subBlocks,
+    ...getTrigger('intercom_conversation_created').subBlocks,
+    ...getTrigger('intercom_conversation_reply').subBlocks,
+    ...getTrigger('intercom_conversation_closed').subBlocks,
+    ...getTrigger('intercom_contact_created').subBlocks,
+    ...getTrigger('intercom_user_created').subBlocks,
+    ...getTrigger('intercom_webhook').subBlocks,
+  ],
+  triggers: {
+    enabled: true,
+    available: [
+      'intercom_conversation_created',
+      'intercom_conversation_reply',
+      'intercom_conversation_closed',
+      'intercom_contact_created',
+      'intercom_user_created',
+      'intercom_webhook',
+    ],
+  },
   tools: {
     ...IntercomBlock.tools,
     access: [
diff --git a/apps/sim/blocks/blocks/linear.ts b/apps/sim/blocks/blocks/linear.ts
index 18dad4d8574..6b808a19a4a 100644
--- a/apps/sim/blocks/blocks/linear.ts
+++ b/apps/sim/blocks/blocks/linear.ts
@@ -8,8 +8,9 @@ import { getTrigger } from '@/triggers'
 
 export const LinearBlock: BlockConfig<LinearResponse> = {
   type: 'linear',
-  name: 'Linear',
+  name: 'Linear (Legacy)',
   description: 'Interact with Linear issues, projects, and more',
+  hideFromToolbar: true,
   authMode: AuthMode.OAuth,
   triggerAllowed: true,
   longDescription:
@@ -2543,3 +2544,62 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
     ],
   },
 }
+
+/**
+ * Linear V2 Block
+ *
+ * Uses automatic webhook registration via the Linear GraphQL API.
+ * Inherits all tool operations from the legacy block.
+ */
+export const LinearV2Block: BlockConfig<LinearResponse> = {
+  ...LinearBlock,
+  type: 'linear_v2',
+  name: 'Linear',
+  hideFromToolbar: false,
+  subBlocks: [
+    ...LinearBlock.subBlocks.filter(
+      (sb) =>
+        !sb.id?.startsWith('webhookUrlDisplay') &&
+        !sb.id?.startsWith('webhookSecret') &&
+        !sb.id?.startsWith('triggerSave') &&
+        !sb.id?.startsWith('triggerInstructions') &&
+        !sb.id?.startsWith('selectedTriggerId')
+    ),
+    // V2 Trigger SubBlocks
+    ...getTrigger('linear_issue_created_v2').subBlocks,
+    ...getTrigger('linear_issue_updated_v2').subBlocks,
+    ...getTrigger('linear_issue_removed_v2').subBlocks,
+    ...getTrigger('linear_comment_created_v2').subBlocks,
+    ...getTrigger('linear_comment_updated_v2').subBlocks,
+    ...getTrigger('linear_project_created_v2').subBlocks,
+    ...getTrigger('linear_project_updated_v2').subBlocks,
+    ...getTrigger('linear_cycle_created_v2').subBlocks,
+    ...getTrigger('linear_cycle_updated_v2').subBlocks,
+    ...getTrigger('linear_label_created_v2').subBlocks,
+    ...getTrigger('linear_label_updated_v2').subBlocks,
+    ...getTrigger('linear_project_update_created_v2').subBlocks,
+    ...getTrigger('linear_customer_request_created_v2').subBlocks,
+    ...getTrigger('linear_customer_request_updated_v2').subBlocks,
+    ...getTrigger('linear_webhook_v2').subBlocks,
+  ],
+  triggers: {
+    enabled: true,
+    available: [
+      'linear_issue_created_v2',
+      'linear_issue_updated_v2',
+      'linear_issue_removed_v2',
+      'linear_comment_created_v2',
+      'linear_comment_updated_v2',
+      'linear_project_created_v2',
+      'linear_project_updated_v2',
+      'linear_cycle_created_v2',
+      'linear_cycle_updated_v2',
+      'linear_label_created_v2',
+      'linear_label_updated_v2',
+      'linear_project_update_created_v2',
+      'linear_customer_request_created_v2',
+      'linear_customer_request_updated_v2',
+      'linear_webhook_v2',
+    ],
+  },
+}
diff --git a/apps/sim/blocks/blocks/notion.ts b/apps/sim/blocks/blocks/notion.ts
index 82fae4c2c3f..34f5198aeeb 100644
--- a/apps/sim/blocks/blocks/notion.ts
+++ b/apps/sim/blocks/blocks/notion.ts
@@ -3,6 +3,7 @@ import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import { createVersionedToolSelector } from '@/blocks/utils'
 import type { NotionResponse } from '@/tools/notion/types'
+import { getTrigger } from '@/triggers'
 
 // Legacy block - hidden from toolbar
 export const NotionBlock: BlockConfig<NotionResponse> = {
@@ -436,7 +437,34 @@ export const NotionV2Block: BlockConfig<any> = {
   bgColor: '#181C1E',
   icon: NotionIcon,
   hideFromToolbar: false,
-  subBlocks: NotionBlock.subBlocks,
+  subBlocks: [
+    ...NotionBlock.subBlocks,
+
+    // Trigger subBlocks
+    ...getTrigger('notion_page_created').subBlocks,
+    ...getTrigger('notion_page_properties_updated').subBlocks,
+    ...getTrigger('notion_page_content_updated').subBlocks,
+    ...getTrigger('notion_page_deleted').subBlocks,
+    ...getTrigger('notion_database_created').subBlocks,
+    ...getTrigger('notion_database_schema_updated').subBlocks,
+    ...getTrigger('notion_database_deleted').subBlocks,
+    ...getTrigger('notion_comment_created').subBlocks,
+    ...getTrigger('notion_webhook').subBlocks,
+  ],
+  triggers: {
+    enabled: true,
+    available: [
+      'notion_page_created',
+      'notion_page_properties_updated',
+      'notion_page_content_updated',
+      'notion_page_deleted',
+      'notion_database_created',
+      'notion_database_schema_updated',
+      'notion_database_deleted',
+      'notion_comment_created',
+      'notion_webhook',
+    ],
+  },
   tools: {
     access: [
       'notion_read_v2',
diff --git a/apps/sim/blocks/blocks/resend.ts b/apps/sim/blocks/blocks/resend.ts
index db3b77506a9..f4533978af0 100644
--- a/apps/sim/blocks/blocks/resend.ts
+++ b/apps/sim/blocks/blocks/resend.ts
@@ -1,6 +1,7 @@
 import { ResendIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
+import { getTrigger } from '@/triggers'
 
 export const ResendBlock: BlockConfig = {
   type: 'resend',
@@ -16,6 +17,20 @@ export const ResendBlock: BlockConfig = {
   icon: ResendIcon,
   authMode: AuthMode.ApiKey,
 
+  triggers: {
+    enabled: true,
+    available: [
+      'resend_email_sent',
+      'resend_email_delivered',
+      'resend_email_bounced',
+      'resend_email_complained',
+      'resend_email_opened',
+      'resend_email_clicked',
+      'resend_email_failed',
+      'resend_webhook',
+    ],
+  },
+
   subBlocks: [
     {
       id: 'operation',
@@ -221,6 +236,15 @@ Return ONLY the email body - no explanations, no extra text.`,
       condition: { field: 'operation', value: ['get_contact', 'update_contact', 'delete_contact'] },
       required: true,
     },
+
+    ...getTrigger('resend_email_sent').subBlocks,
+    ...getTrigger('resend_email_delivered').subBlocks,
+    ...getTrigger('resend_email_bounced').subBlocks,
+    ...getTrigger('resend_email_complained').subBlocks,
+    ...getTrigger('resend_email_opened').subBlocks,
+    ...getTrigger('resend_email_clicked').subBlocks,
+    ...getTrigger('resend_email_failed').subBlocks,
+    ...getTrigger('resend_webhook').subBlocks,
   ],
 
   tools: {
diff --git a/apps/sim/blocks/blocks/salesforce.ts b/apps/sim/blocks/blocks/salesforce.ts
index 53a9d67adae..53302520ca9 100644
--- a/apps/sim/blocks/blocks/salesforce.ts
+++ b/apps/sim/blocks/blocks/salesforce.ts
@@ -3,6 +3,7 @@ import { getScopesForService } from '@/lib/oauth/utils'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import type { SalesforceResponse } from '@/tools/salesforce/types'
+import { getTrigger } from '@/triggers'
 
 export const SalesforceBlock: BlockConfig<SalesforceResponse> = {
   type: 'salesforce',
@@ -17,6 +18,17 @@ export const SalesforceBlock: BlockConfig<SalesforceResponse> = {
   tags: ['sales-engagement', 'customer-support'],
   bgColor: '#E0E0E0',
   icon: SalesforceIcon,
+  triggers: {
+    enabled: true,
+    available: [
+      'salesforce_record_created',
+      'salesforce_record_updated',
+      'salesforce_record_deleted',
+      'salesforce_opportunity_stage_changed',
+      'salesforce_case_status_changed',
+      'salesforce_webhook',
+    ],
+  },
   subBlocks: [
     {
       id: 'operation',
@@ -511,6 +523,12 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
         ],
       },
     },
+    ...getTrigger('salesforce_record_created').subBlocks,
+    ...getTrigger('salesforce_record_updated').subBlocks,
+    ...getTrigger('salesforce_record_deleted').subBlocks,
+    ...getTrigger('salesforce_opportunity_stage_changed').subBlocks,
+    ...getTrigger('salesforce_case_status_changed').subBlocks,
+    ...getTrigger('salesforce_webhook').subBlocks,
   ],
   tools: {
     access: [
diff --git a/apps/sim/blocks/blocks/sixtyfour.ts b/apps/sim/blocks/blocks/sixtyfour.ts
new file mode 100644
index 00000000000..30389839a86
--- /dev/null
+++ b/apps/sim/blocks/blocks/sixtyfour.ts
@@ -0,0 +1,292 @@
+import { SixtyfourIcon } from '@/components/icons'
+import { AuthMode, type BlockConfig, IntegrationType } from '@/blocks/types'
+
+export const SixtyfourBlock: BlockConfig = {
+  type: 'sixtyfour',
+  name: 'Sixtyfour AI',
+  description: 'Enrich leads and companies with AI-powered research',
+  longDescription:
+    'Find emails, phone numbers, and enrich lead or company data with contact information, social profiles, and detailed research using Sixtyfour AI.',
+  docsLink: 'https://docs.sim.ai/tools/sixtyfour',
+  category: 'tools',
+  integrationType: IntegrationType.SalesIntelligence,
+  tags: ['enrichment', 'sales-engagement'],
+  bgColor: '#000000',
+  icon: SixtyfourIcon,
+  authMode: AuthMode.ApiKey,
+
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Find Phone', id: 'find_phone' },
+        { label: 'Find Email', id: 'find_email' },
+        { label: 'Enrich Lead', id: 'enrich_lead' },
+        { label: 'Enrich Company', id: 'enrich_company' },
+      ],
+      value: () => 'find_phone',
+    },
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input',
+      required: true,
+      placeholder: 'Enter your Sixtyfour API key',
+      password: true,
+    },
+    {
+      id: 'name',
+      title: 'Name',
+      type: 'short-input',
+      placeholder: 'Full name of the person',
+      required: { field: 'operation', value: ['find_phone', 'find_email'] },
+      condition: { field: 'operation', value: ['find_phone', 'find_email'] },
+    },
+    {
+      id: 'company',
+      title: 'Company',
+      type: 'short-input',
+      placeholder: 'Company name',
+      condition: { field: 'operation', value: ['find_phone', 'find_email'] },
+    },
+    {
+      id: 'linkedinUrl',
+      title: 'LinkedIn URL',
+      type: 'short-input',
+      placeholder: 'https://linkedin.com/in/johndoe',
+      condition: { field: 'operation', value: ['find_phone', 'find_email'] },
+      mode: 'advanced',
+    },
+    {
+      id: 'domain',
+      title: 'Domain',
+      type: 'short-input',
+      placeholder: 'example.com',
+      condition: { field: 'operation', value: ['find_phone', 'find_email'] },
+      mode: 'advanced',
+    },
+    {
+      id: 'emailInput',
+      title: 'Email',
+      type: 'short-input',
+      placeholder: 'Email address',
+      condition: { field: 'operation', value: 'find_phone' },
+      mode: 'advanced',
+    },
+    {
+      id: 'phoneInput',
+      title: 'Phone',
+      type: 'short-input',
+      placeholder: 'Phone number',
+      condition: { field: 'operation', value: 'find_email' },
+      mode: 'advanced',
+    },
+    {
+      id: 'title',
+      title: 'Job Title',
+      type: 'short-input',
+      placeholder: 'Job title',
+      condition: { field: 'operation', value: 'find_email' },
+      mode: 'advanced',
+    },
+    {
+      id: 'mode',
+      title: 'Mode',
+      type: 'dropdown',
+      options: [
+        { label: 'Professional', id: 'PROFESSIONAL' },
+        { label: 'Personal', id: 'PERSONAL' },
+      ],
+      value: () => 'PROFESSIONAL',
+      condition: { field: 'operation', value: 'find_email' },
+    },
+    {
+      id: 'leadInfo',
+      title: 'Lead Info',
+      type: 'long-input',
+      placeholder:
+        '{"name": "John Doe", "company": "Acme Inc", "title": "CEO", "linkedin": "https://linkedin.com/in/johndoe"}',
+      required: { field: 'operation', value: 'enrich_lead' },
+      condition: { field: 'operation', value: 'enrich_lead' },
+    },
+    {
+      id: 'leadStruct',
+      title: 'Fields to Collect',
+      type: 'long-input',
+      placeholder:
+        '{"email": "Email address", "phone": "Phone number", "company": "Company name", "title": "Job title"}',
+      required: { field: 'operation', value: 'enrich_lead' },
+      condition: { field: 'operation', value: 'enrich_lead' },
+    },
+    {
+      id: 'leadResearchPlan',
+      title: 'Research Plan',
+      type: 'long-input',
+      placeholder: 'Optional guidance for the enrichment agent',
+      condition: { field: 'operation', value: 'enrich_lead' },
+      mode: 'advanced',
+    },
+    {
+      id: 'targetCompany',
+      title: 'Company Info',
+      type: 'long-input',
+      placeholder: '{"name": "Acme Inc", "domain": "acme.com", "industry": "Technology"}',
+      required: { field: 'operation', value: 'enrich_company' },
+      condition: { field: 'operation', value: 'enrich_company' },
+    },
+    {
+      id: 'companyStruct',
+      title: 'Fields to Collect',
+      type: 'long-input',
+      placeholder:
+        '{"website": "Company website URL", "num_employees": "Employee count", "address": "Company address"}',
+      required: { field: 'operation', value: 'enrich_company' },
+      condition: { field: 'operation', value: 'enrich_company' },
+    },
+    {
+      id: 'findPeople',
+      title: 'Find People',
+      type: 'switch',
+      condition: { field: 'operation', value: 'enrich_company' },
+    },
+    {
+      id: 'peopleFocusPrompt',
+      title: 'People Focus',
+      type: 'short-input',
+      placeholder: 'e.g. Find the VP of Marketing and the CTO',
+      condition: { field: 'operation', value: 'enrich_company' },
+      mode: 'advanced',
+    },
+    {
+      id: 'fullOrgChart',
+      title: 'Full Org Chart',
+      type: 'switch',
+      condition: { field: 'operation', value: 'enrich_company' },
+      mode: 'advanced',
+    },
+    {
+      id: 'companyLeadStruct',
+      title: 'Lead Schema',
+      type: 'long-input',
+      placeholder: '{"name": "Full name", "email": "Email", "title": "Job title"}',
+      condition: { field: 'operation', value: 'enrich_company' },
+      mode: 'advanced',
+    },
+    {
+      id: 'companyResearchPlan',
+      title: 'Research Plan',
+      type: 'long-input',
+      placeholder: 'Optional guidance for the enrichment agent',
+      condition: { field: 'operation', value: 'enrich_company' },
+      mode: 'advanced',
+    },
+  ],
+
+  tools: {
+    access: [
+      'sixtyfour_find_phone',
+      'sixtyfour_find_email',
+      'sixtyfour_enrich_lead',
+      'sixtyfour_enrich_company',
+    ],
+    config: {
+      tool: (params) => `sixtyfour_${params.operation}`,
+      params: (params) => {
+        const result: Record<string, unknown> = {}
+
+        if (params.operation === 'find_phone') {
+          if (params.emailInput) result.email = params.emailInput
+        } else if (params.operation === 'find_email') {
+          if (params.phoneInput) result.phone = params.phoneInput
+        } else if (params.operation === 'enrich_lead') {
+          result.leadInfo = params.leadInfo
+          result.struct = params.leadStruct
+          if (params.leadResearchPlan) result.researchPlan = params.leadResearchPlan
+        } else if (params.operation === 'enrich_company') {
+          result.targetCompany = params.targetCompany
+          result.struct = params.companyStruct
+          if (params.findPeople !== undefined) result.findPeople = Boolean(params.findPeople)
+          if (params.fullOrgChart !== undefined) result.fullOrgChart = Boolean(params.fullOrgChart)
+          if (params.peopleFocusPrompt) result.peopleFocusPrompt = params.peopleFocusPrompt
+          if (params.companyLeadStruct) result.leadStruct = params.companyLeadStruct
+          if (params.companyResearchPlan) result.researchPlan = params.companyResearchPlan
+        }
+
+        return result
+      },
+    },
+  },
+
+  inputs: {
+    operation: { type: 'string', description: 'Operation to perform' },
+    apiKey: { type: 'string', description: 'Sixtyfour API key' },
+    name: { type: 'string', description: 'Person name' },
+    company: { type: 'string', description: 'Company name' },
+    linkedinUrl: { type: 'string', description: 'LinkedIn URL' },
+    domain: { type: 'string', description: 'Company domain' },
+    emailInput: { type: 'string', description: 'Email address (find phone)' },
+    phoneInput: { type: 'string', description: 'Phone number (find email)' },
+    title: { type: 'string', description: 'Job title' },
+    mode: { type: 'string', description: 'Email mode (PROFESSIONAL or PERSONAL)' },
+    leadInfo: { type: 'string', description: 'Lead information JSON' },
+    leadStruct: { type: 'string', description: 'Fields to collect for lead' },
+    leadResearchPlan: { type: 'string', description: 'Research plan for lead enrichment' },
+    targetCompany: { type: 'string', description: 'Company information JSON' },
+    companyStruct: { type: 'string', description: 'Fields to collect for company' },
+    findPeople: { type: 'boolean', description: 'Find associated people' },
+    fullOrgChart: { type: 'boolean', description: 'Retrieve full org chart' },
+    peopleFocusPrompt: { type: 'string', description: 'People focus description' },
+    companyLeadStruct: { type: 'string', description: 'Lead schema for company enrichment' },
+    companyResearchPlan: { type: 'string', description: 'Research plan for company enrichment' },
+  },
+
+  outputs: {
+    name: {
+      type: 'string',
+      description: 'Name of the person (find_phone, find_email)',
+    },
+    company: {
+      type: 'string',
+      description: 'Company name (find_phone, find_email)',
+    },
+    phone: {
+      type: 'string',
+      description: 'Phone number(s) found (find_phone)',
+    },
+    linkedinUrl: {
+      type: 'string',
+      description: 'LinkedIn profile URL (find_phone, find_email)',
+    },
+    title: {
+      type: 'string',
+      description: 'Job title (find_email)',
+    },
+    emails: {
+      type: 'json',
+      description: 'Email addresses found with validation status and type (find_email)',
+    },
+    personalEmails: {
+      type: 'json',
+      description: 'Personal email addresses found in PERSONAL mode (find_email)',
+    },
+    notes: {
+      type: 'string',
+      description: 'Research notes (enrich_lead, enrich_company)',
+    },
+    structuredData: {
+      type: 'json',
+      description:
+        'Enriched data matching the requested struct fields (enrich_lead, enrich_company)',
+    },
+    references: {
+      type: 'json',
+      description: 'Source URLs and descriptions used for enrichment (enrich_lead, enrich_company)',
+    },
+    confidenceScore: {
+      type: 'number',
+      description: 'Quality score for the returned data, 0-10 (enrich_lead, enrich_company)',
+    },
+  },
+}
diff --git a/apps/sim/blocks/blocks/vercel.ts b/apps/sim/blocks/blocks/vercel.ts
index 0a89cc24c34..0993e6ed723 100644
--- a/apps/sim/blocks/blocks/vercel.ts
+++ b/apps/sim/blocks/blocks/vercel.ts
@@ -1,6 +1,7 @@
 import { VercelIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
+import { getTrigger } from '@/triggers'
 
 export const VercelBlock: BlockConfig = {
   type: 'vercel',
@@ -15,6 +16,19 @@ export const VercelBlock: BlockConfig = {
   bgColor: '#171717',
   icon: VercelIcon,
   authMode: AuthMode.ApiKey,
+  triggers: {
+    enabled: true,
+    available: [
+      'vercel_deployment_created',
+      'vercel_deployment_ready',
+      'vercel_deployment_error',
+      'vercel_deployment_canceled',
+      'vercel_project_created',
+      'vercel_project_removed',
+      'vercel_domain_created',
+      'vercel_webhook',
+    ],
+  },
   subBlocks: [
     {
       id: 'operation',
@@ -649,6 +663,16 @@ export const VercelBlock: BlockConfig = {
       },
       mode: 'advanced',
     },
+
+    // === Trigger subBlocks ===
+    ...getTrigger('vercel_deployment_created').subBlocks,
+    ...getTrigger('vercel_deployment_ready').subBlocks,
+    ...getTrigger('vercel_deployment_error').subBlocks,
+    ...getTrigger('vercel_deployment_canceled').subBlocks,
+    ...getTrigger('vercel_project_created').subBlocks,
+    ...getTrigger('vercel_project_removed').subBlocks,
+    ...getTrigger('vercel_domain_created').subBlocks,
+    ...getTrigger('vercel_webhook').subBlocks,
   ],
   tools: {
     access: [
diff --git a/apps/sim/blocks/blocks/zoom.ts b/apps/sim/blocks/blocks/zoom.ts
index 5c77ac856ed..c699431a643 100644
--- a/apps/sim/blocks/blocks/zoom.ts
+++ b/apps/sim/blocks/blocks/zoom.ts
@@ -3,6 +3,7 @@ import { getScopesForService } from '@/lib/oauth/utils'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
 import type { ZoomResponse } from '@/tools/zoom/types'
+import { getTrigger } from '@/triggers'
 
 export const ZoomBlock: BlockConfig<ZoomResponse> = {
   type: 'zoom',
@@ -17,6 +18,17 @@ export const ZoomBlock: BlockConfig<ZoomResponse> = {
   tags: ['meeting', 'calendar', 'scheduling'],
   bgColor: '#2D8CFF',
   icon: ZoomIcon,
+  triggers: {
+    enabled: true,
+    available: [
+      'zoom_meeting_started',
+      'zoom_meeting_ended',
+      'zoom_participant_joined',
+      'zoom_participant_left',
+      'zoom_recording_completed',
+      'zoom_webhook',
+    ],
+  },
   subBlocks: [
     {
       id: 'operation',
@@ -440,6 +452,12 @@ Return ONLY the date string - no explanations, no quotes, no extra text.`,
         value: ['zoom_delete_meeting'],
       },
     },
+    ...getTrigger('zoom_meeting_started').subBlocks,
+    ...getTrigger('zoom_meeting_ended').subBlocks,
+    ...getTrigger('zoom_participant_joined').subBlocks,
+    ...getTrigger('zoom_participant_left').subBlocks,
+    ...getTrigger('zoom_recording_completed').subBlocks,
+    ...getTrigger('zoom_webhook').subBlocks,
   ],
   tools: {
     access: [
diff --git a/apps/sim/blocks/registry.ts b/apps/sim/blocks/registry.ts
index 8b21cebea1a..e78578b176b 100644
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -102,7 +102,7 @@ import { KnowledgeBlock } from '@/blocks/blocks/knowledge'
 import { LangsmithBlock } from '@/blocks/blocks/langsmith'
 import { LaunchDarklyBlock } from '@/blocks/blocks/launchdarkly'
 import { LemlistBlock } from '@/blocks/blocks/lemlist'
-import { LinearBlock } from '@/blocks/blocks/linear'
+import { LinearBlock, LinearV2Block } from '@/blocks/blocks/linear'
 import { LinkedInBlock } from '@/blocks/blocks/linkedin'
 import { LinkupBlock } from '@/blocks/blocks/linkup'
 import { LoopsBlock } from '@/blocks/blocks/loops'
@@ -171,6 +171,7 @@ import { SftpBlock } from '@/blocks/blocks/sftp'
 import { SharepointBlock } from '@/blocks/blocks/sharepoint'
 import { ShopifyBlock } from '@/blocks/blocks/shopify'
 import { SimilarwebBlock } from '@/blocks/blocks/similarweb'
+import { SixtyfourBlock } from '@/blocks/blocks/sixtyfour'
 import { SlackBlock } from '@/blocks/blocks/slack'
 import { SmtpBlock } from '@/blocks/blocks/smtp'
 import { SpotifyBlock } from '@/blocks/blocks/spotify'
@@ -337,6 +338,7 @@ export const registry: Record<string, BlockConfig> = {
   launchdarkly: LaunchDarklyBlock,
   lemlist: LemlistBlock,
   linear: LinearBlock,
+  linear_v2: LinearV2Block,
   linkedin: LinkedInBlock,
   linkup: LinkupBlock,
   loops: LoopsBlock,
@@ -407,6 +409,7 @@ export const registry: Record<string, BlockConfig> = {
   sharepoint: SharepointBlock,
   shopify: ShopifyBlock,
   similarweb: SimilarwebBlock,
+  sixtyfour: SixtyfourBlock,
   slack: SlackBlock,
   smtp: SmtpBlock,
   spotify: SpotifyBlock,
diff --git a/apps/sim/components/emcn/icons/folder.tsx b/apps/sim/components/emcn/icons/folder.tsx
new file mode 100644
index 00000000000..cbeef8272d3
--- /dev/null
+++ b/apps/sim/components/emcn/icons/folder.tsx
@@ -0,0 +1,26 @@
+import type { SVGProps } from 'react'
+
+/**
+ * Folder icon component
+ * @param props - SVG properties including className, fill, etc.
+ */
+export function Folder(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      width='15'
+      height='13'
+      viewBox='0 0 15 13'
+      fill='none'
+      xmlns='http://www.w3.org/2000/svg'
+      aria-hidden='true'
+      {...props}
+    >
+      <path
+        d='M4.32234e-07 5.83339V3.79628C4.32234e-07 3.19982 -0.000206684 2.71995 0.0338546 2.33339C0.0685083 1.94027 0.141749 1.59614 0.317058 1.28196C0.542977 0.877129 0.87707 0.543036 1.2819 0.317117C1.59608 0.141808 1.94021 0.0685674 2.33333 0.0339137C2.71989 -0.000147559 3.19976 5.9557e-05 3.79622 5.9557e-05C4.53268 5.9264e-05 5.03054 -0.0078558 5.47526 0.158914C6.46893 0.531571 6.86678 1.44909 7.19141 2.09837L7.47591 2.66673H10.3333C11.025 2.66673 11.5814 2.66637 12.0267 2.71165C12.4803 2.75779 12.874 2.85548 13.222 3.08795C13.495 3.27035 13.7297 3.50508 13.9121 3.77805C14.1446 4.12607 14.2423 4.51976 14.2884 4.97337C14.3337 5.41867 14.3333 5.97505 14.3333 6.66673C14.3333 7.82671 14.3338 8.73433 14.2604 9.45579C14.1862 10.1855 14.0323 10.7801 13.6875 11.2963C13.4078 11.7148 13.0481 12.0746 12.6296 12.3542C12.1134 12.6991 11.5188 12.8529 10.7891 12.9271C10.0676 13.0005 9.15998 13.0001 8 13.0001H7.16667C5.6096 13.0001 4.39144 13.0013 3.44271 12.8738C2.47955 12.7443 1.71959 12.4736 1.12305 11.877C0.526507 11.2805 0.255796 10.5205 0.126303 9.55735C-0.00122168 8.60861 4.32234e-07 7.39046 4.32234e-07 5.83339ZM1 5.83339C1 7.41888 1.00132 8.55789 1.11784 9.42454C1.23243 10.2767 1.45034 10.7902 1.83008 11.17C2.20982 11.5497 2.72339 11.7676 3.57552 11.8822C4.44217 11.9987 5.58118 12.0001 7.16667 12.0001H8C9.18079 12.0001 10.029 11.9994 10.6882 11.9324C11.3387 11.8661 11.7498 11.7396 12.0742 11.5228C12.3836 11.3161 12.6494 11.0503 12.8561 10.7409C13.0729 10.4165 13.1994 10.0054 13.2656 9.35488C13.3327 8.69577 13.3333 7.84752 13.3333 6.66673C13.3333 5.9541 13.3326 5.45727 13.2936 5.07428C13.2555 4.69972 13.1852 4.48976 13.0807 4.33339C12.9713 4.16961 12.8305 4.02877 12.6667 3.91933C12.5103 3.81488 12.3003 3.74454 11.9258 3.70644C11.5428 3.66748 11.046 3.66673 10.3333 3.66673H5.16667C4.89052 3.66673 4.66667 3.44287 4.66667 3.16673C4.66667 2.89058 4.89052 2.66673 5.16667 2.66673H6.35742L6.29688 2.54563C5.92188 1.79565 5.68045 1.30454 5.1237 1.09576C4.88932 1.00791 4.6112 1.00006 3.79622 1.00006C3.18196 1.00006 2.75368 1.00072 2.42122 1.03001C2.09531 1.05874 1.90901 1.11196 1.76888 1.19016C1.52605 1.3257 1.32564 1.52611 1.1901 1.76894C1.1119 1.90907 1.05868 2.09537 1.02995 2.42128C1.00066 2.75373 1 3.18202 1 3.79628V5.83339Z'
+        fill='currentColor'
+        stroke='currentColor'
+        strokeWidth='0.3'
+      />
+    </svg>
+  )
+}
diff --git a/apps/sim/components/emcn/icons/index.ts b/apps/sim/components/emcn/icons/index.ts
index 7df4c5fba0e..272e2cb897d 100644
--- a/apps/sim/components/emcn/icons/index.ts
+++ b/apps/sim/components/emcn/icons/index.ts
@@ -30,6 +30,7 @@ export { Eye } from './eye'
 export { File } from './file'
 export { FileX } from './file-x'
 export { Fingerprint } from './fingerprint'
+export { Folder } from './folder'
 export { FolderCode } from './folder-code'
 export { FolderPlus } from './folder-plus'
 export { Hammer } from './hammer'
diff --git a/apps/sim/components/icons.tsx b/apps/sim/components/icons.tsx
index 6a2a66183fb..cbc3b5edd85 100644
--- a/apps/sim/components/icons.tsx
+++ b/apps/sim/components/icons.tsx
@@ -2132,7 +2132,15 @@ export function Mem0Icon(props: SVGProps<SVGSVGElement>) {
 
 export function ExtendIcon(props: SVGProps<SVGSVGElement>) {
   return (
-    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 33 18' fill='none'>
+    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 33 24' fill='none'>
+      <path
+        d='M6.3782 13.7746L4.28874 14.8056C4.11382 14.8899 4.11382 15.1367 4.28874 15.2211L15.8924 20.9462C16.1423 21.068 16.433 21.068 16.6797 20.9462L28.2864 15.2211C28.4582 15.1367 28.4582 14.8899 28.2864 14.8056L26.2 13.7746C27.3838 13.1937 28.5145 12.6378 29.4578 12.1787C30.2605 12.5722 31.0666 12.9689 31.8693 13.3625C32.3003 13.5749 32.5721 14.0123 32.5721 14.4932V15.5426C32.5721 16.0204 32.3003 16.4609 31.8693 16.6733C31.8693 16.6733 19.5816 22.7016 17.5542 23.6887C16.7296 24.0916 15.8955 24.1103 15.0615 23.7043C12.8123 22.6078 1.9646 17.2857 0.705842 16.6672C0.274806 16.4579 0 16.0174 0 15.5395V14.4899C4.1552e-05 14.012 0.271779 13.5715 0.702792 13.3591C1.43993 12.9968 2.2584 12.5973 3.12047 12.1756C4.06685 12.641 5.19446 13.1937 6.3782 13.7746Z'
+        fill='currentColor'
+      />
+      <path
+        d='M15.1021 6.30652C15.9017 5.92234 16.717 5.9348 17.5103 6.32207C20.1715 7.62145 22.8297 8.92398 25.4878 10.2265L22.249 11.8257L16.6797 9.07681C16.433 8.955 16.1423 8.955 15.8924 9.07681L10.3262 11.8257L7.0874 10.2265C11.2142 8.20664 15.0743 6.3201 15.1021 6.30652Z'
+        fill='currentColor'
+      />
       <path
         clipRule='evenodd'
         d='M16.2893 0C16.6984 1.91708e-05 17.1074 0.0970011 17.5103 0.293745C22.3018 2.63326 27.0841 4.98521 31.8693 7.33722C32.3003 7.54649 32.5721 7.9868 32.5721 8.46461V9.51422C32.5721 9.99522 32.3004 10.4357 31.8693 10.645C31.8693 10.645 19.5816 16.6732 17.5542 17.6634C17.1357 17.8696 16.692 17.9727 16.2859 17.9727C15.8799 17.9727 15.4707 17.8758 15.0615 17.6759C12.8124 16.5795 1.9646 11.2604 0.705842 10.6419C0.274826 10.4295 2.31482e-05 9.99216 0 9.51117V8.46461C4.59913e-05 7.98366 0.271816 7.54656 0.702792 7.33417C5.8977 4.7819 15.0599 0.301869 15.1021 0.281239C15.4957 0.0938275 15.8801 0 16.2893 0ZM16.2859 2.96124C16.1516 2.96126 16.0173 2.98909 15.8924 3.05153L4.28874 8.77696C4.11382 8.86442 4.11382 9.10831 4.28874 9.19577L15.8924 14.9209C16.0173 14.9802 16.1516 15.0115 16.2859 15.0115C16.4202 15.0115 16.5548 14.9802 16.6797 14.9209L28.2864 9.19577C28.4582 9.10831 28.4582 8.86442 28.2864 8.77696L16.6797 3.05153C16.5548 2.98906 16.4202 2.96124 16.2859 2.96124Z'
@@ -5930,6 +5938,33 @@ export function PulseIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+export function SixtyfourIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg {...props} viewBox='0 0 158 143' fill='none' xmlns='http://www.w3.org/2000/svg'>
+      <path
+        d='M32.3952 141.17L31.637 140.73V142.481L31.8417 142.603L32.3952 142.921L32.9487 142.603L33.1534 142.481V140.73L32.3952 141.17Z'
+        fill='currentColor'
+      />
+      <path
+        d='M33.1534 140.73V142.603H31.637V140.73L32.3952 141.17L33.1534 140.73Z'
+        fill='currentColor'
+      />
+      <path
+        d='M93.3271 105.608V106.564L94.0854 106.996L94.8436 106.564V105.608H93.3271Z'
+        fill='currentColor'
+      />
+      <path
+        d='M94.8436 105.608V106.564L94.0854 106.996L93.3271 106.564V105.608H94.8436Z'
+        fill='currentColor'
+      />
+      <path
+        d='M125.681 12.9895L94.836 30.755L63.9909 12.9895L32.3951 31.1872H32.3875V68.8565L0.79933 87.0542H0.791748V124.723L31.6369 142.481V140.73L2.30822 123.844V89.6701L31.6369 106.564V140.73L32.3951 141.17L33.1533 140.73V106.564L62.482 89.6701V123.844L33.1533 140.73V142.481L63.2402 125.163L93.3271 142.481L93.5318 142.603L94.0853 142.921L94.6388 142.603L94.8436 142.481L125.689 124.723V87.0542L126.235 86.7357L126.439 86.6144L157.284 68.8565V31.1872L125.681 12.9895ZM63.2326 84.8629L33.904 67.9769V33.8031L63.2326 50.6967V84.8629ZM64.7491 50.6967L94.0777 33.8031V67.9769L64.7491 84.8629V50.6967ZM124.172 123.844L94.8436 140.73V106.564L94.0853 106.996L93.3271 106.564V140.73L63.9985 123.844V89.6701L93.3271 106.564V105.608H94.8436V106.564L124.172 89.6701V123.844ZM124.923 84.8629L95.5942 67.9769V33.8031L124.923 50.6891V84.8629ZM155.768 67.9769L126.439 84.8629V50.6967L155.768 33.8031V67.9769Z'
+        fill='currentColor'
+      />
+    </svg>
+  )
+}
+
 export function SimilarwebIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
diff --git a/apps/sim/ee/access-control/components/access-control.tsx b/apps/sim/ee/access-control/components/access-control.tsx
index 030269750ec..d6e334c8ff9 100644
--- a/apps/sim/ee/access-control/components/access-control.tsx
+++ b/apps/sim/ee/access-control/components/access-control.tsx
@@ -1290,7 +1290,7 @@ export function AccessControl() {
               <span className='text-[var(--text-error)]'>
                 All members will be removed from this group.
               </span>{' '}
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
+              <span className='text-[var(--text-tertiary)]'>This action cannot be undone.</span>
             </p>
           </ModalBody>
           <ModalFooter>
diff --git a/apps/sim/hooks/queries/credentials.ts b/apps/sim/hooks/queries/credentials.ts
index 5859970ea08..9267759209f 100644
--- a/apps/sim/hooks/queries/credentials.ts
+++ b/apps/sim/hooks/queries/credentials.ts
@@ -223,6 +223,45 @@ export function useUpdateWorkspaceCredential() {
       }
       return response.json()
     },
+    onMutate: async (variables) => {
+      await queryClient.cancelQueries({
+        queryKey: workspaceCredentialKeys.detail(variables.credentialId),
+      })
+      await queryClient.cancelQueries({ queryKey: workspaceCredentialKeys.lists() })
+
+      const previousLists = queryClient.getQueriesData<WorkspaceCredential[]>({
+        queryKey: workspaceCredentialKeys.lists(),
+      })
+
+      queryClient.setQueriesData<WorkspaceCredential[]>(
+        { queryKey: workspaceCredentialKeys.lists() },
+        (old) => {
+          if (!old) return old
+          return old.map((cred) =>
+            cred.id === variables.credentialId
+              ? {
+                  ...cred,
+                  ...(variables.displayName !== undefined
+                    ? { displayName: variables.displayName }
+                    : {}),
+                  ...(variables.description !== undefined
+                    ? { description: variables.description ?? null }
+                    : {}),
+                }
+              : cred
+          )
+        }
+      )
+
+      return { previousLists }
+    },
+    onError: (_err, _variables, context) => {
+      if (context?.previousLists) {
+        for (const [queryKey, data] of context.previousLists) {
+          queryClient.setQueryData(queryKey, data)
+        }
+      }
+    },
     onSettled: (_data, _error, variables) => {
       queryClient.invalidateQueries({
         queryKey: workspaceCredentialKeys.detail(variables.credentialId),
diff --git a/apps/sim/hooks/queries/deployments.ts b/apps/sim/hooks/queries/deployments.ts
index 7bcf8be904d..a0a559ce802 100644
--- a/apps/sim/hooks/queries/deployments.ts
+++ b/apps/sim/hooks/queries/deployments.ts
@@ -83,13 +83,17 @@ async function fetchDeploymentInfo(
  * Hook to fetch deployment info for a workflow.
  * Provides isDeployed status, deployedAt timestamp, apiKey info, and needsRedeployment flag.
  */
-export function useDeploymentInfo(workflowId: string | null, options?: { enabled?: boolean }) {
+export function useDeploymentInfo(
+  workflowId: string | null,
+  options?: { enabled?: boolean; refetchOnMount?: boolean | 'always' }
+) {
   return useQuery({
     queryKey: deploymentKeys.info(workflowId),
     queryFn: ({ signal }) => fetchDeploymentInfo(workflowId!, signal),
     enabled: Boolean(workflowId) && (options?.enabled ?? true),
     staleTime: 30 * 1000, // 30 seconds
     placeholderData: keepPreviousData,
+    ...(options?.refetchOnMount !== undefined && { refetchOnMount: options.refetchOnMount }),
   })
 }
 
diff --git a/apps/sim/hooks/queries/environment.ts b/apps/sim/hooks/queries/environment.ts
index 6d9c2dab94a..ebc5f2430bc 100644
--- a/apps/sim/hooks/queries/environment.ts
+++ b/apps/sim/hooks/queries/environment.ts
@@ -1,13 +1,9 @@
 import { createLogger } from '@sim/logger'
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import type { WorkspaceEnvironmentData } from '@/lib/environment/api'
+import type { EnvironmentVariable, WorkspaceEnvironmentData } from '@/lib/environment/api'
 import { fetchPersonalEnvironment, fetchWorkspaceEnvironment } from '@/lib/environment/api'
 import { workspaceCredentialKeys } from '@/hooks/queries/credentials'
 import { API_ENDPOINTS } from '@/stores/constants'
-import type { EnvironmentVariable } from '@/stores/settings/environment'
-
-export type { WorkspaceEnvironmentData } from '@/lib/environment/api'
-export type { EnvironmentVariable } from '@/stores/settings/environment'
 
 const logger = createLogger('EnvironmentQueries')
 
@@ -27,8 +23,7 @@ export function usePersonalEnvironment() {
   return useQuery({
     queryKey: environmentKeys.personal(),
     queryFn: ({ signal }) => fetchPersonalEnvironment(signal),
-    staleTime: 60 * 1000, // 1 minute
-    placeholderData: keepPreviousData,
+    staleTime: 60 * 1000,
   })
 }
 
diff --git a/apps/sim/hooks/queries/folders.ts b/apps/sim/hooks/queries/folders.ts
index b3ebf900f99..b968cf1642b 100644
--- a/apps/sim/hooks/queries/folders.ts
+++ b/apps/sim/hooks/queries/folders.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { generateId } from '@/lib/core/utils/uuid'
 import { getFolderMap } from '@/hooks/queries/utils/folder-cache'
-import { folderKeys } from '@/hooks/queries/utils/folder-keys'
+import { type FolderQueryScope, folderKeys } from '@/hooks/queries/utils/folder-keys'
 import { invalidateWorkflowLists } from '@/hooks/queries/utils/invalidate-workflow-lists'
 import {
   createOptimisticMutationHandlers,
@@ -26,11 +26,16 @@ function mapFolder(folder: any): WorkflowFolder {
     sortOrder: folder.sortOrder,
     createdAt: new Date(folder.createdAt),
     updatedAt: new Date(folder.updatedAt),
+    archivedAt: folder.archivedAt ? new Date(folder.archivedAt) : null,
   }
 }
 
-async function fetchFolders(workspaceId: string, signal?: AbortSignal): Promise<WorkflowFolder[]> {
-  const response = await fetch(`/api/folders?workspaceId=${workspaceId}`, { signal })
+async function fetchFolders(
+  workspaceId: string,
+  scope: FolderQueryScope = 'active',
+  signal?: AbortSignal
+): Promise<WorkflowFolder[]> {
+  const response = await fetch(`/api/folders?workspaceId=${workspaceId}&scope=${scope}`, { signal })
 
   if (!response.ok) {
     throw new Error('Failed to fetch folders')
@@ -40,10 +45,11 @@ async function fetchFolders(workspaceId: string, signal?: AbortSignal): Promise<
   return folders.map(mapFolder)
 }
 
-export function useFolders(workspaceId?: string) {
+export function useFolders(workspaceId?: string, options?: { scope?: FolderQueryScope }) {
+  const scope = options?.scope ?? 'active'
   return useQuery({
-    queryKey: folderKeys.list(workspaceId),
-    queryFn: ({ signal }) => fetchFolders(workspaceId as string, signal),
+    queryKey: folderKeys.list(workspaceId, scope),
+    queryFn: ({ signal }) => fetchFolders(workspaceId as string, scope, signal),
     enabled: Boolean(workspaceId),
     placeholderData: keepPreviousData,
     staleTime: 60 * 1000,
@@ -53,7 +59,7 @@ export function useFolders(workspaceId?: string) {
 export function useFolderMap(workspaceId?: string) {
   return useQuery({
     queryKey: folderKeys.list(workspaceId),
-    queryFn: ({ signal }) => fetchFolders(workspaceId as string, signal),
+    queryFn: ({ signal }) => fetchFolders(workspaceId as string, 'active', signal),
     enabled: Boolean(workspaceId),
     placeholderData: keepPreviousData,
     staleTime: 60 * 1000,
@@ -158,6 +164,7 @@ export function useCreateFolder() {
           ),
         createdAt: new Date(),
         updatedAt: new Date(),
+        archivedAt: null,
       }
     },
     (variables) => variables.id ?? generateId()
@@ -223,7 +230,37 @@ export function useDeleteFolderMutation() {
       return response.json()
     },
     onSettled: (_data, _error, variables) => {
-      queryClient.invalidateQueries({ queryKey: folderKeys.list(variables.workspaceId) })
+      queryClient.invalidateQueries({ queryKey: folderKeys.lists() })
+      return invalidateWorkflowLists(queryClient, variables.workspaceId, ['active', 'archived'])
+    },
+  })
+}
+
+interface RestoreFolderVariables {
+  workspaceId: string
+  folderId: string
+}
+
+export function useRestoreFolder() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ workspaceId, folderId }: RestoreFolderVariables) => {
+      const response = await fetch(`/api/folders/${folderId}/restore`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ workspaceId }),
+      })
+
+      if (!response.ok) {
+        const error = await response.json().catch(() => ({}))
+        throw new Error(error.error || 'Failed to restore folder')
+      }
+
+      return response.json()
+    },
+    onSettled: (_data, _error, variables) => {
+      queryClient.invalidateQueries({ queryKey: folderKeys.lists() })
       return invalidateWorkflowLists(queryClient, variables.workspaceId, ['active', 'archived'])
     },
   })
@@ -258,6 +295,7 @@ export function useDuplicateFolderMutation() {
         ),
         createdAt: new Date(),
         updatedAt: new Date(),
+        archivedAt: null,
       }
     },
     (variables) => variables.newId ?? generateId()
diff --git a/apps/sim/hooks/queries/tasks.ts b/apps/sim/hooks/queries/tasks.ts
index ea2a6cef4e3..2c38f339558 100644
--- a/apps/sim/hooks/queries/tasks.ts
+++ b/apps/sim/hooks/queries/tasks.ts
@@ -48,6 +48,7 @@ export interface TaskStoredMessageContext {
   knowledgeId?: string
   tableId?: string
   fileId?: string
+  folderId?: string
 }
 
 export interface TaskStoredMessage {
diff --git a/apps/sim/hooks/queries/utils/folder-keys.ts b/apps/sim/hooks/queries/utils/folder-keys.ts
index 517d5cd9b94..2fecf659f2d 100644
--- a/apps/sim/hooks/queries/utils/folder-keys.ts
+++ b/apps/sim/hooks/queries/utils/folder-keys.ts
@@ -1,5 +1,8 @@
+export type FolderQueryScope = 'active' | 'archived'
+
 export const folderKeys = {
   all: ['folders'] as const,
   lists: () => [...folderKeys.all, 'list'] as const,
-  list: (workspaceId: string | undefined) => [...folderKeys.lists(), workspaceId ?? ''] as const,
+  list: (workspaceId: string | undefined, scope: FolderQueryScope = 'active') =>
+    [...folderKeys.lists(), workspaceId ?? '', scope] as const,
 }
diff --git a/apps/sim/hooks/use-execution-stream.ts b/apps/sim/hooks/use-execution-stream.ts
index 1198a179bea..728cf52b6d2 100644
--- a/apps/sim/hooks/use-execution-stream.ts
+++ b/apps/sim/hooks/use-execution-stream.ts
@@ -9,6 +9,7 @@ import type {
   ExecutionCompletedData,
   ExecutionErrorData,
   ExecutionEvent,
+  ExecutionPausedData,
   ExecutionStartedData,
   StreamChunkData,
   StreamDoneData,
@@ -74,6 +75,9 @@ export async function processSSEStream(
             case 'execution:completed':
               callbacks.onExecutionCompleted?.(event.data)
               break
+            case 'execution:paused':
+              callbacks.onExecutionPaused?.(event.data)
+              break
             case 'execution:error':
               callbacks.onExecutionError?.(event.data)
               break
@@ -114,6 +118,7 @@ export async function processSSEStream(
 export interface ExecutionStreamCallbacks {
   onExecutionStarted?: (data: ExecutionStartedData) => void
   onExecutionCompleted?: (data: ExecutionCompletedData) => void
+  onExecutionPaused?: (data: ExecutionPausedData) => void
   onExecutionError?: (data: ExecutionErrorData) => void
   onExecutionCancelled?: (data: ExecutionCancelledData) => void
   onBlockStarted?: (data: BlockStartedData) => void
diff --git a/apps/sim/hooks/use-reactive-conditions.ts b/apps/sim/hooks/use-reactive-conditions.ts
new file mode 100644
index 00000000000..0971eee2cd3
--- /dev/null
+++ b/apps/sim/hooks/use-reactive-conditions.ts
@@ -0,0 +1,62 @@
+import { useCallback, useMemo } from 'react'
+import type { CanonicalModeOverrides } from '@/lib/workflows/subblocks/visibility'
+import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
+import type { SubBlockConfig } from '@/blocks/types'
+import { useWorkspaceCredential } from '@/hooks/queries/credentials'
+import { useSubBlockStore } from '@/stores/workflows/subblock/store'
+
+/**
+ * Evaluates reactive conditions for subblocks. Always calls the same hooks
+ * regardless of whether a reactive condition exists (Rules of Hooks).
+ *
+ * Returns a Set of subblock IDs that should be hidden.
+ */
+export function useReactiveConditions(
+  subBlocks: SubBlockConfig[],
+  blockId: string,
+  activeWorkflowId: string | null,
+  canonicalModeOverrides?: CanonicalModeOverrides
+): Set<string> {
+  const reactiveSubBlock = useMemo(() => subBlocks.find((sb) => sb.reactiveCondition), [subBlocks])
+  const reactiveCond = reactiveSubBlock?.reactiveCondition
+
+  const canonicalIndex = useMemo(() => buildCanonicalIndex(subBlocks), [subBlocks])
+
+  // Resolve watchFields through canonical index to get the active credential value
+  const watchedCredentialId = useSubBlockStore(
+    useCallback(
+      (state) => {
+        if (!reactiveCond || !activeWorkflowId) return ''
+        const blockValues = state.workflowValues[activeWorkflowId]?.[blockId] ?? {}
+        for (const field of reactiveCond.watchFields) {
+          const val = resolveDependencyValue(
+            field,
+            blockValues,
+            canonicalIndex,
+            canonicalModeOverrides
+          )
+          if (val && typeof val === 'string') return val
+        }
+        return ''
+      },
+      [reactiveCond, activeWorkflowId, blockId, canonicalIndex, canonicalModeOverrides]
+    )
+  )
+
+  // Always call useWorkspaceCredential (stable hook count), disable when not needed
+  const { data: credential } = useWorkspaceCredential(
+    watchedCredentialId || undefined,
+    Boolean(reactiveCond && watchedCredentialId)
+  )
+
+  return useMemo(() => {
+    const hidden = new Set<string>()
+    if (!reactiveSubBlock || !reactiveCond) return hidden
+
+    const conditionMet = credential?.type === reactiveCond.requiredType
+    if (!conditionMet) {
+      hidden.add(reactiveSubBlock.id)
+    }
+    return hidden
+  }, [reactiveSubBlock, reactiveCond, credential?.type])
+}
diff --git a/apps/sim/lib/a2a/utils.ts b/apps/sim/lib/a2a/utils.ts
index 5a704e20aea..9dd1b879050 100644
--- a/apps/sim/lib/a2a/utils.ts
+++ b/apps/sim/lib/a2a/utils.ts
@@ -264,7 +264,7 @@ export interface ParsedSSEChunk {
   /** Final success flag if this chunk contains the final event */
   finalSuccess?: boolean
   /** Terminal task state if known */
-  terminalState?: 'completed' | 'failed' | 'canceled'
+  terminalState?: 'completed' | 'failed' | 'canceled' | 'input-required'
   /** Final artifacts if present on terminal event */
   finalArtifacts?: Artifact[]
   /** Whether this chunk indicates the stream is done */
@@ -326,6 +326,15 @@ export function parseWorkflowSSEChunk(chunk: string): ParsedSSEChunk {
         result.finalSuccess = parsed.data?.success !== false
         result.terminalState = result.finalSuccess ? 'completed' : 'failed'
         result.isDone = true
+      } else if (parsed.type === 'execution:paused') {
+        if (parsed.data?.output?.content) {
+          result.finalContent = parsed.data.output.content
+        } else if (parsed.data?.output) {
+          result.finalContent = JSON.stringify(parsed.data.output)
+        }
+        result.finalSuccess = true
+        result.terminalState = 'input-required'
+        result.isDone = true
       } else if (parsed.type === 'execution:cancelled') {
         result.finalSuccess = false
         result.terminalState = 'canceled'
diff --git a/apps/sim/lib/audit/log.ts b/apps/sim/lib/audit/log.ts
index 27eefd05c11..89d3060520d 100644
--- a/apps/sim/lib/audit/log.ts
+++ b/apps/sim/lib/audit/log.ts
@@ -67,6 +67,7 @@ export const AuditAction = {
   FOLDER_CREATED: 'folder.created',
   FOLDER_DELETED: 'folder.deleted',
   FOLDER_DUPLICATED: 'folder.duplicated',
+  FOLDER_RESTORED: 'folder.restored',
 
   // Forms
   FORM_CREATED: 'form.created',
diff --git a/apps/sim/lib/copilot/client-sse/run-tool-execution.ts b/apps/sim/lib/copilot/client-sse/run-tool-execution.ts
index 7c80d159840..2e22fcf6a78 100644
--- a/apps/sim/lib/copilot/client-sse/run-tool-execution.ts
+++ b/apps/sim/lib/copilot/client-sse/run-tool-execution.ts
@@ -320,17 +320,46 @@ async function reportCompletion(
   data?: Record<string, unknown>
 ): Promise<void> {
   try {
+    const body = JSON.stringify({
+      toolCallId,
+      status,
+      message: message || (status === 'success' ? 'Tool completed' : 'Tool failed'),
+      ...(data ? { data } : {}),
+    })
     const res = await fetch(COPILOT_CONFIRM_API_PATH, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        toolCallId,
-        status,
-        message: message || (status === 'success' ? 'Tool completed' : 'Tool failed'),
-        ...(data ? { data } : {}),
-      }),
+      body,
     })
-    if (!res.ok) {
+    // Next.js silently truncates request bodies beyond its body size limit (default 10MB),
+    // corrupting the JSON and causing a server-side parse error (500). When the request fails
+    // and the payload is large, retry without logs (the largest field) to fit under the limit.
+    const LARGE_PAYLOAD_THRESHOLD = 10 * 1024 * 1024
+    const bodySize = new Blob([body]).size
+    if (!res.ok && data && bodySize > LARGE_PAYLOAD_THRESHOLD) {
+      const { logs: _logs, ...dataWithoutLogs } = data
+      logger.warn('[RunTool] reportCompletion failed with large payload, retrying without logs', {
+        toolCallId,
+        status: res.status,
+        bodySize,
+      })
+      const retryRes = await fetch(COPILOT_CONFIRM_API_PATH, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          toolCallId,
+          status,
+          message: message || (status === 'success' ? 'Tool completed' : 'Tool failed'),
+          data: dataWithoutLogs,
+        }),
+      })
+      if (!retryRes.ok) {
+        logger.warn('[RunTool] reportCompletion retry also failed', {
+          toolCallId,
+          status: retryRes.status,
+        })
+      }
+    } else if (!res.ok) {
       logger.warn('[RunTool] reportCompletion failed', { toolCallId, status: res.status })
     }
   } catch (err) {
diff --git a/apps/sim/lib/copilot/process-contents.ts b/apps/sim/lib/copilot/process-contents.ts
index 5378b678f5c..9673a124aeb 100644
--- a/apps/sim/lib/copilot/process-contents.ts
+++ b/apps/sim/lib/copilot/process-contents.ts
@@ -33,6 +33,7 @@ export type AgentContextType =
   | 'templates'
   | 'workflow_block'
   | 'docs'
+  | 'folder'
   | 'active_resource'
 
 export interface AgentContext {
@@ -178,6 +179,11 @@ export async function processContextsServer(
         if (!result) return null
         return { type: 'file', tag: ctx.label ? `@${ctx.label}` : '@', content: result.content }
       }
+      if (ctx.kind === 'folder' && 'folderId' in ctx && ctx.folderId && currentWorkspaceId) {
+        const result = await resolveFolderResource(ctx.folderId, currentWorkspaceId)
+        if (!result) return null
+        return { type: 'folder', tag: ctx.label ? `@${ctx.label}` : '@', content: result.content }
+      }
       if (ctx.kind === 'docs') {
         try {
           const { searchDocumentationServerTool } = await import(
@@ -776,6 +782,9 @@ export async function resolveActiveResourceContext(
       case 'file': {
         return await resolveFileResource(resourceId, workspaceId)
       }
+      case 'folder': {
+        return await resolveFolderResource(resourceId, workspaceId)
+      }
       default:
         return null
     }
@@ -812,3 +821,31 @@ async function resolveFileResource(
     }),
   }
 }
+
+async function resolveFolderResource(
+  folderId: string,
+  workspaceId: string
+): Promise<AgentContext | null> {
+  try {
+    const { workflowFolder, workflow } = await import('@sim/db/schema')
+    const [folder] = await db
+      .select({ id: workflowFolder.id, name: workflowFolder.name })
+      .from(workflowFolder)
+      .where(and(eq(workflowFolder.id, folderId), eq(workflowFolder.workspaceId, workspaceId)))
+      .limit(1)
+    if (!folder) return null
+
+    const workflows = await db
+      .select({ id: workflow.id, name: workflow.name })
+      .from(workflow)
+      .where(and(eq(workflow.folderId, folderId), eq(workflow.workspaceId, workspaceId)))
+
+    const workflowList = workflows.map((w) => `- ${w.name} (id: ${w.id})`).join('\n')
+    const content = `Folder: ${folder.name} (id: ${folder.id})\nWorkflows:\n${workflowList || '(empty)'}`
+
+    return { type: 'active_resource', tag: '@active_resource', content }
+  } catch (error) {
+    logger.error('Failed to resolve folder resource', { folderId, error })
+    return null
+  }
+}
diff --git a/apps/sim/lib/copilot/resource-types.ts b/apps/sim/lib/copilot/resource-types.ts
index a3b3f3f4bfb..c0e83fe8a46 100644
--- a/apps/sim/lib/copilot/resource-types.ts
+++ b/apps/sim/lib/copilot/resource-types.ts
@@ -1,4 +1,10 @@
-export type MothershipResourceType = 'table' | 'file' | 'workflow' | 'knowledgebase' | 'generic'
+export type MothershipResourceType =
+  | 'table'
+  | 'file'
+  | 'workflow'
+  | 'knowledgebase'
+  | 'folder'
+  | 'generic'
 
 export interface MothershipResource {
   type: MothershipResourceType
@@ -11,4 +17,5 @@ export const VFS_DIR_TO_RESOURCE: Record<string, MothershipResourceType> = {
   files: 'file',
   workflows: 'workflow',
   knowledgebases: 'knowledgebase',
+  folders: 'folder',
 } as const
diff --git a/apps/sim/lib/copilot/resources.ts b/apps/sim/lib/copilot/resources.ts
index 5efec3dd50b..4a674c83119 100644
--- a/apps/sim/lib/copilot/resources.ts
+++ b/apps/sim/lib/copilot/resources.ts
@@ -41,7 +41,7 @@ export async function persistChatResources(
 
     const existing = Array.isArray(chat.resources) ? (chat.resources as MothershipResource[]) : []
     const map = new Map<string, MothershipResource>()
-    const GENERIC = new Set(['Table', 'File', 'Workflow', 'Knowledge Base'])
+    const GENERIC = new Set(['Table', 'File', 'Workflow', 'Knowledge Base', 'Folder'])
 
     for (const r of existing) {
       map.set(`${r.type}:${r.id}`, r)
diff --git a/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts b/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts
index b15785f9fd4..aec442ceff6 100644
--- a/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts
+++ b/apps/sim/lib/copilot/tools/server/blocks/get-blocks-metadata-tool.ts
@@ -5,6 +5,7 @@ import { getCopilotToolDescription } from '@/lib/copilot/tool-descriptions'
 import type { BaseServerTool } from '@/lib/copilot/tools/server/base-tool'
 import { GetBlocksMetadataInput, GetBlocksMetadataResult } from '@/lib/copilot/tools/shared/schemas'
 import { getAllowedIntegrationsFromEnv, isHosted } from '@/lib/core/config/feature-flags'
+import { getServiceAccountProviderForProviderId } from '@/lib/oauth/utils'
 import { registry as blockRegistry } from '@/blocks/registry'
 import { AuthMode, type BlockConfig, isHiddenFromDisplay } from '@/blocks/types'
 import { getUserPermissionConfig } from '@/ee/access-control/utils/permission-check'
@@ -342,6 +343,20 @@ function transformBlockMetadata(metadata: CopilotBlockMetadata): any {
         service: metadata.id, // e.g., 'gmail', 'slack', etc.
         description: `OAuth authentication required for ${metadata.name}`,
       }
+
+      // Check if this service also supports service account credentials
+      const oauthSubBlock = metadata.inputSchema?.find(
+        (sb: CopilotSubblockMetadata) => sb.type === 'oauth-input' && sb.serviceId
+      )
+      if (oauthSubBlock?.serviceId) {
+        const serviceAccountProviderId = getServiceAccountProviderForProviderId(
+          oauthSubBlock.serviceId
+        )
+        if (serviceAccountProviderId) {
+          transformed.requiredCredentials.serviceAccountType = serviceAccountProviderId
+          transformed.requiredCredentials.description = `OAuth or service account authentication supported for ${metadata.name}`
+        }
+      }
     } else if (metadata.authType === 'API Key') {
       transformed.requiredCredentials = {
         type: 'api_key',
diff --git a/apps/sim/lib/core/idempotency/service.test.ts b/apps/sim/lib/core/idempotency/service.test.ts
new file mode 100644
index 00000000000..52ef9e7d019
--- /dev/null
+++ b/apps/sim/lib/core/idempotency/service.test.ts
@@ -0,0 +1,38 @@
+/**
+ * @vitest-environment node
+ */
+
+import { describe, expect, it } from 'vitest'
+import { IdempotencyService } from '@/lib/core/idempotency/service'
+
+describe('IdempotencyService.createWebhookIdempotencyKey', () => {
+  it('uses Greenhouse-Event-ID when present', () => {
+    const key = IdempotencyService.createWebhookIdempotencyKey(
+      'wh_1',
+      { 'greenhouse-event-id': 'evt-gh-99' },
+      {},
+      'greenhouse'
+    )
+    expect(key).toBe('wh_1:evt-gh-99')
+  })
+
+  it('prefers svix-id for Resend / Svix duplicate delivery deduplication', () => {
+    const key = IdempotencyService.createWebhookIdempotencyKey(
+      'wh_1',
+      { 'svix-id': 'msg_abc123' },
+      { type: 'email.sent' },
+      'resend'
+    )
+    expect(key).toBe('wh_1:msg_abc123')
+  })
+
+  it('prefers Linear-Delivery so repeated updates to the same entity are not treated as one idempotent run', () => {
+    const key = IdempotencyService.createWebhookIdempotencyKey(
+      'wh_linear',
+      { 'linear-delivery': '234d1a4e-b617-4388-90fe-adc3633d6b72' },
+      { action: 'update', data: { id: 'shared-entity-id' } },
+      'linear'
+    )
+    expect(key).toBe('wh_linear:234d1a4e-b617-4388-90fe-adc3633d6b72')
+  })
+})
diff --git a/apps/sim/lib/core/idempotency/service.ts b/apps/sim/lib/core/idempotency/service.ts
index d9adf4f504f..f5b59d3c8f8 100644
--- a/apps/sim/lib/core/idempotency/service.ts
+++ b/apps/sim/lib/core/idempotency/service.ts
@@ -6,7 +6,7 @@ import { getRedisClient } from '@/lib/core/config/redis'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
 import { getStorageMethod, type StorageMethod } from '@/lib/core/storage'
 import { generateId } from '@/lib/core/utils/uuid'
-import { extractProviderIdentifierFromBody } from '@/lib/webhooks/provider-utils'
+import { extractProviderIdentifierFromBody } from '@/lib/webhooks/providers'
 
 const logger = createLogger('IdempotencyService')
 
@@ -419,7 +419,12 @@ export class IdempotencyService {
       normalizedHeaders?.['x-shopify-webhook-id'] ||
       normalizedHeaders?.['x-github-delivery'] ||
       normalizedHeaders?.['x-event-id'] ||
-      normalizedHeaders?.['x-teams-notification-id']
+      normalizedHeaders?.['x-teams-notification-id'] ||
+      normalizedHeaders?.['svix-id'] ||
+      normalizedHeaders?.['linear-delivery'] ||
+      normalizedHeaders?.['greenhouse-event-id'] ||
+      normalizedHeaders?.['x-zm-request-id'] ||
+      normalizedHeaders?.['idempotency-key']
 
     if (webhookIdHeader) {
       return `${webhookId}:${webhookIdHeader}`
diff --git a/apps/sim/lib/core/security/input-validation.ts b/apps/sim/lib/core/security/input-validation.ts
index 52c4dde288a..2c8e401bf84 100644
--- a/apps/sim/lib/core/security/input-validation.ts
+++ b/apps/sim/lib/core/security/input-validation.ts
@@ -741,18 +741,8 @@ export function validateExternalUrl(
     }
   }
 
-  // Block suspicious ports commonly used for internal services
   const port = parsedUrl.port
-  const blockedPorts = [
-    '22', // SSH
-    '23', // Telnet
-    '25', // SMTP
-    '3306', // MySQL
-    '5432', // PostgreSQL
-    '6379', // Redis
-    '27017', // MongoDB
-    '9200', // Elasticsearch
-  ]
+  const blockedPorts = ['22', '23', '25', '3306', '5432', '6379', '27017', '9200']
 
   if (port && blockedPorts.includes(port)) {
     return {
@@ -842,7 +832,6 @@ export function validateAirtableId(
     }
   }
 
-  // Airtable IDs: prefix (3 chars) + 14 alphanumeric characters = 17 chars total
   const airtableIdPattern = new RegExp(`^${expectedPrefix}[a-zA-Z0-9]{14}$`)
 
   if (!airtableIdPattern.test(value)) {
@@ -893,11 +882,6 @@ export function validateAwsRegion(
     }
   }
 
-  // AWS region patterns:
-  // - Standard: af|ap|ca|eu|me|sa|us|il followed by direction and number
-  // - GovCloud: us-gov-east-1, us-gov-west-1
-  // - China: cn-north-1, cn-northwest-1
-  // - ISO: us-iso-east-1, us-iso-west-1, us-isob-east-1
   const awsRegionPattern =
     /^(af|ap|ca|cn|eu|il|me|sa|us|us-gov|us-iso|us-isob)-(central|north|northeast|northwest|south|southeast|southwest|east|west)-\d{1,2}$/
 
@@ -1156,7 +1140,6 @@ export function validatePaginationCursor(
     }
   }
 
-  // Allow alphanumeric, base64 chars (+, /, =), and URL-safe chars (-, _, ., ~, %)
   const cursorPattern = /^[A-Za-z0-9+/=\-_.~%]+$/
   if (!cursorPattern.test(value)) {
     logger.warn('Pagination cursor contains disallowed characters', {
@@ -1224,3 +1207,43 @@ export function validateOktaDomain(rawDomain: string): string {
   }
   return domain
 }
+
+const MICROSOFT_CONTENT_SUFFIXES = [
+  'sharepoint.com',
+  'sharepoint.us',
+  'sharepoint.de',
+  'sharepoint.cn',
+  'sharepointonline.com',
+  'onedrive.com',
+  'onedrive.live.com',
+  '1drv.ms',
+  '1drv.com',
+  'microsoftpersonalcontent.com',
+] as const
+
+/**
+ * Returns true if the given URL is hosted on a trusted Microsoft SharePoint or
+ * OneDrive domain. Validates the parsed hostname against an allowlist using exact
+ * match or subdomain suffix, preventing incomplete-substring bypasses.
+ *
+ * Covers SharePoint Online (commercial, GCC/GCC High/DoD, Germany, China),
+ * OneDrive business and consumer, OneDrive short-link and CDN domains,
+ * and Microsoft personal content CDN.
+ *
+ * @see https://learn.microsoft.com/en-us/sharepoint/required-urls-and-ports
+ * @see https://learn.microsoft.com/en-us/microsoft-365/enterprise/microsoft-365-u-s-government-gcc-high-endpoints
+ *
+ * @param url - The URL to check
+ * @returns Whether the URL belongs to a trusted Microsoft content host
+ */
+export function isMicrosoftContentUrl(url: string): boolean {
+  let hostname: string
+  try {
+    hostname = new URL(url).hostname.toLowerCase()
+  } catch {
+    return false
+  }
+  return MICROSOFT_CONTENT_SUFFIXES.some(
+    (suffix) => hostname === suffix || hostname.endsWith(`.${suffix}`)
+  )
+}
diff --git a/apps/sim/lib/environment/api.ts b/apps/sim/lib/environment/api.ts
index bdb22fc9f42..5c7c8c66ae5 100644
--- a/apps/sim/lib/environment/api.ts
+++ b/apps/sim/lib/environment/api.ts
@@ -1,5 +1,9 @@
 import { API_ENDPOINTS } from '@/stores/constants'
-import type { EnvironmentVariable } from '@/stores/settings/environment'
+
+export interface EnvironmentVariable {
+  key: string
+  value: string
+}
 
 export interface WorkspaceEnvironmentData {
   workspace: Record<string, string>
diff --git a/apps/sim/lib/posthog/events.ts b/apps/sim/lib/posthog/events.ts
index c186d82cd47..537a9864282 100644
--- a/apps/sim/lib/posthog/events.ts
+++ b/apps/sim/lib/posthog/events.ts
@@ -14,8 +14,24 @@ export interface PostHogEventMap {
 
   landing_page_viewed: Record<string, never>
 
+  landing_cta_clicked: {
+    label: string
+    section: 'hero' | 'navbar' | 'footer_cta' | 'pricing'
+    destination: string
+  }
+
+  landing_demo_request_submitted: {
+    company_size: string
+  }
+
+  landing_prompt_submitted: Record<string, never>
+
   signup_page_viewed: Record<string, never>
 
+  signup_failed: {
+    error_code: string
+  }
+
   subscription_created: {
     plan: string
     status: string
@@ -425,6 +441,11 @@ export interface PostHogEventMap {
     workspace_id: string
   }
 
+  folder_restored: {
+    folder_id: string
+    workspace_id: string
+  }
+
   logs_filter_applied: {
     filter_type: 'status' | 'workflow' | 'folder' | 'trigger' | 'time'
     workspace_id: string
diff --git a/apps/sim/lib/webhooks/deploy.ts b/apps/sim/lib/webhooks/deploy.ts
index 1dd2f8b8f99..43188e88f2b 100644
--- a/apps/sim/lib/webhooks/deploy.ts
+++ b/apps/sim/lib/webhooks/deploy.ts
@@ -11,11 +11,8 @@ import {
   createExternalWebhookSubscription,
   shouldRecreateExternalWebhookSubscription,
 } from '@/lib/webhooks/provider-subscriptions'
-import {
-  configureGmailPolling,
-  configureOutlookPolling,
-  syncWebhooksForCredentialSet,
-} from '@/lib/webhooks/utils.server'
+import { getProviderHandler } from '@/lib/webhooks/providers'
+import { syncWebhooksForCredentialSet } from '@/lib/webhooks/utils.server'
 import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { BlockState } from '@/stores/workflows/workflow/types'
@@ -233,29 +230,20 @@ function buildProviderConfig(
 
 async function configurePollingIfNeeded(
   provider: string,
-  savedWebhook: any,
+  savedWebhook: Record<string, unknown>,
   requestId: string
 ): Promise<TriggerSaveError | null> {
-  if (provider === 'gmail') {
-    const success = await configureGmailPolling(savedWebhook, requestId)
-    if (!success) {
-      await db.delete(webhook).where(eq(webhook.id, savedWebhook.id))
-      return {
-        message: 'Failed to configure Gmail polling. Please check your Gmail account permissions.',
-        status: 500,
-      }
-    }
+  const handler = getProviderHandler(provider)
+  if (!handler.configurePolling) {
+    return null
   }
 
-  if (provider === 'outlook') {
-    const success = await configureOutlookPolling(savedWebhook, requestId)
-    if (!success) {
-      await db.delete(webhook).where(eq(webhook.id, savedWebhook.id))
-      return {
-        message:
-          'Failed to configure Outlook polling. Please check your Outlook account permissions.',
-        status: 500,
-      }
+  const success = await handler.configurePolling({ webhook: savedWebhook, requestId })
+  if (!success) {
+    await db.delete(webhook).where(eq(webhook.id, savedWebhook.id as string))
+    return {
+      message: `Failed to configure ${provider} polling. Please check your account permissions.`,
+      status: 500,
     }
   }
 
@@ -297,7 +285,7 @@ async function syncCredentialSetWebhooks(params: {
     basePath: triggerPath,
     credentialSetId,
     oauthProviderId,
-    providerConfig: baseConfig as Record<string, any>,
+    providerConfig: baseConfig as Record<string, unknown>,
     requestId,
     deploymentVersionId,
   })
@@ -322,13 +310,13 @@ async function syncCredentialSetWebhooks(params: {
     }
   }
 
-  if (provider === 'gmail' || provider === 'outlook') {
-    const configureFunc = provider === 'gmail' ? configureGmailPolling : configureOutlookPolling
+  const handler = getProviderHandler(provider)
+  if (handler.configurePolling) {
     for (const wh of syncResult.webhooks) {
       if (wh.isNew) {
         const rows = await db.select().from(webhook).where(eq(webhook.id, wh.id)).limit(1)
         if (rows.length > 0) {
-          const success = await configureFunc(rows[0], requestId)
+          const success = await handler.configurePolling({ webhook: rows[0], requestId })
           if (!success) {
             await db.delete(webhook).where(eq(webhook.id, wh.id))
             return {
@@ -459,6 +447,18 @@ export async function saveTriggerWebhooksForDeploy({
       }
     }
 
+    if (providerConfig.requireAuth && !providerConfig.token) {
+      await restorePreviousSubscriptions()
+      return {
+        success: false,
+        error: {
+          message:
+            'Authentication is enabled but no token is configured. Please set an authentication token or disable authentication.',
+          status: 400,
+        },
+      }
+    }
+
     webhookConfigs.set(block.id, { provider, providerConfig, triggerPath, triggerDef })
 
     if (providerConfig.credentialSetId) {
@@ -558,13 +558,13 @@ export async function saveTriggerWebhooksForDeploy({
         await restorePreviousSubscriptions()
         return { success: false, error: syncResult.error, warnings: collectedWarnings }
       }
-    } catch (error: any) {
+    } catch (error: unknown) {
       logger.error(`[${requestId}] Failed to create webhook for ${block.id}`, error)
       await restorePreviousSubscriptions()
       return {
         success: false,
         error: {
-          message: error?.message || 'Failed to save trigger configuration',
+          message: (error as Error)?.message || 'Failed to save trigger configuration',
           status: 500,
         },
         warnings: collectedWarnings,
@@ -621,7 +621,7 @@ export async function saveTriggerWebhooksForDeploy({
         updatedProviderConfig: result.updatedProviderConfig as Record<string, unknown>,
         externalSubscriptionCreated: result.externalSubscriptionCreated,
       })
-    } catch (error: any) {
+    } catch (error: unknown) {
       logger.error(`[${requestId}] Failed to create external subscription for ${block.id}`, error)
       await pendingVerificationTracker.clearAll()
       for (const sub of createdSubscriptions) {
@@ -649,7 +649,7 @@ export async function saveTriggerWebhooksForDeploy({
       return {
         success: false,
         error: {
-          message: error?.message || 'Failed to create external subscription',
+          message: (error as Error)?.message || 'Failed to create external subscription',
           status: 500,
         },
       }
@@ -722,7 +722,7 @@ export async function saveTriggerWebhooksForDeploy({
         return { success: false, error: pollingError }
       }
     }
-  } catch (error: any) {
+  } catch (error: unknown) {
     await pendingVerificationTracker.clearAll()
     logger.error(`[${requestId}] Failed to insert webhook records`, error)
     for (const sub of createdSubscriptions) {
@@ -750,7 +750,7 @@ export async function saveTriggerWebhooksForDeploy({
     return {
       success: false,
       error: {
-        message: error?.message || 'Failed to save webhook records',
+        message: (error as Error)?.message || 'Failed to save webhook records',
         status: 500,
       },
     }
diff --git a/apps/sim/lib/webhooks/pending-verification.ts b/apps/sim/lib/webhooks/pending-verification.ts
index 4d77d35bd24..02c50204f92 100644
--- a/apps/sim/lib/webhooks/pending-verification.ts
+++ b/apps/sim/lib/webhooks/pending-verification.ts
@@ -47,6 +47,7 @@ const pendingWebhookVerificationRegistrationMatchers: Record<
   ashby: () => true,
   grain: () => true,
   generic: (registration) => registration.metadata?.verifyTestEvents === true,
+  salesforce: () => true,
 }
 
 const pendingWebhookVerificationProbeMatchers: Record<
@@ -62,6 +63,10 @@ const pendingWebhookVerificationProbeMatchers: Record<
     method === 'GET' ||
     method === 'HEAD' ||
     (method === 'POST' && (!body || Object.keys(body).length === 0)),
+  salesforce: ({ method, body }) =>
+    method === 'GET' ||
+    method === 'HEAD' ||
+    (method === 'POST' && (!body || Object.keys(body).length === 0)),
 }
 
 function getRedisKey(path: string): string {
diff --git a/apps/sim/lib/webhooks/processor.test.ts b/apps/sim/lib/webhooks/processor.test.ts
index e3cb8dcde41..3f543780f71 100644
--- a/apps/sim/lib/webhooks/processor.test.ts
+++ b/apps/sim/lib/webhooks/processor.test.ts
@@ -106,17 +106,10 @@ vi.mock('@/lib/webhooks/utils', () => ({
 vi.mock('@/lib/webhooks/utils.server', () => ({
   handleSlackChallenge: vi.fn().mockReturnValue(null),
   handleWhatsAppVerification: vi.fn().mockResolvedValue(null),
-  validateAttioSignature: vi.fn().mockReturnValue(true),
-  validateCalcomSignature: vi.fn().mockReturnValue(true),
-  validateCirclebackSignature: vi.fn().mockReturnValue(true),
-  validateFirefliesSignature: vi.fn().mockReturnValue(true),
-  validateGitHubSignature: vi.fn().mockReturnValue(true),
-  validateJiraSignature: vi.fn().mockReturnValue(true),
-  validateLinearSignature: vi.fn().mockReturnValue(true),
-  validateMicrosoftTeamsSignature: vi.fn().mockReturnValue(true),
-  validateTwilioSignature: vi.fn().mockResolvedValue(true),
-  validateTypeformSignature: vi.fn().mockReturnValue(true),
-  verifyProviderWebhook: vi.fn().mockReturnValue(null),
+}))
+
+vi.mock('@/lib/webhooks/providers', () => ({
+  getProviderHandler: vi.fn().mockReturnValue({}),
 }))
 
 vi.mock('@/background/webhook-execution', () => ({
diff --git a/apps/sim/lib/webhooks/processor.ts b/apps/sim/lib/webhooks/processor.ts
index 34de5f54ba6..eb1503c0029 100644
--- a/apps/sim/lib/webhooks/processor.ts
+++ b/apps/sim/lib/webhooks/processor.ts
@@ -8,7 +8,6 @@ import { getInlineJobQueue, getJobQueue, shouldExecuteInline } from '@/lib/core/
 import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createBullMQJobData, isBullMQEnabled } from '@/lib/core/bullmq'
 import { isProd } from '@/lib/core/config/feature-flags'
-import { safeCompare } from '@/lib/core/security/encryption'
 import { generateId } from '@/lib/core/utils/uuid'
 import { enqueueWorkspaceDispatch } from '@/lib/core/workspace-dispatch'
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
@@ -18,30 +17,10 @@ import {
   matchesPendingWebhookVerificationProbe,
   requiresPendingWebhookVerification,
 } from '@/lib/webhooks/pending-verification'
-import { convertSquareBracketsToTwiML } from '@/lib/webhooks/utils'
-import {
-  handleSlackChallenge,
-  handleWhatsAppVerification,
-  validateAshbySignature,
-  validateAttioSignature,
-  validateCalcomSignature,
-  validateCirclebackSignature,
-  validateFirefliesSignature,
-  validateGitHubSignature,
-  validateJiraSignature,
-  validateLinearSignature,
-  validateMicrosoftTeamsSignature,
-  validateTwilioSignature,
-  validateTypeformSignature,
-  verifyProviderWebhook,
-} from '@/lib/webhooks/utils.server'
+import { getProviderHandler } from '@/lib/webhooks/providers'
 import { executeWebhookJob } from '@/background/webhook-execution'
 import { resolveEnvVarReferences } from '@/executor/utils/reference-validation'
-import { isConfluencePayloadMatch } from '@/triggers/confluence/utils'
 import { isPollingWebhookProvider } from '@/triggers/constants'
-import { isGitHubEventMatch } from '@/triggers/github/utils'
-import { isHubSpotContactEventMatch } from '@/triggers/hubspot/utils'
-import { isJiraEventMatch } from '@/triggers/jira/utils'
 
 const logger = createLogger('WebhookProcessor')
 
@@ -61,19 +40,6 @@ export interface WebhookPreprocessingResult {
   correlation?: AsyncExecutionCorrelation
 }
 
-function getExternalUrl(request: NextRequest): string {
-  const proto = request.headers.get('x-forwarded-proto') || 'https'
-  const host = request.headers.get('x-forwarded-host') || request.headers.get('host')
-
-  if (host) {
-    const url = new URL(request.url)
-    const reconstructed = `${proto}://${host}${url.pathname}${url.search}`
-    return reconstructed
-  }
-
-  return request.url
-}
-
 async function verifyCredentialSetBilling(credentialSetId: string): Promise<{
   valid: boolean
   error?: string
@@ -106,13 +72,12 @@ async function verifyCredentialSetBilling(credentialSetId: string): Promise<{
 export async function parseWebhookBody(
   request: NextRequest,
   requestId: string
-): Promise<{ body: any; rawBody: string } | NextResponse> {
+): Promise<{ body: unknown; rawBody: string } | NextResponse> {
   let rawBody: string | null = null
   try {
     const requestClone = request.clone()
     rawBody = await requestClone.text()
 
-    // Allow empty body - some webhooks send empty payloads
     if (!rawBody || rawBody.length === 0) {
       return { body: {}, rawBody: '' }
     }
@@ -123,7 +88,7 @@ export async function parseWebhookBody(
     return new NextResponse('Failed to read request body', { status: 400 })
   }
 
-  let body: any
+  let body: unknown
   try {
     const contentType = request.headers.get('content-type') || ''
 
@@ -139,10 +104,6 @@ export async function parseWebhookBody(
     } else {
       body = JSON.parse(rawBody)
     }
-
-    // Allow empty JSON objects - some webhooks send empty payloads
-    if (Object.keys(body).length === 0) {
-    }
   } catch (parseError) {
     logger.error(`[${requestId}] Failed to parse webhook body`, {
       error: parseError instanceof Error ? parseError.message : String(parseError),
@@ -155,38 +116,25 @@ export async function parseWebhookBody(
   return { body, rawBody }
 }
 
+/** Providers that implement challenge/verification handling, checked before webhook lookup. */
+const CHALLENGE_PROVIDERS = ['slack', 'microsoft-teams', 'whatsapp', 'zoom'] as const
+
 export async function handleProviderChallenges(
-  body: any,
+  body: unknown,
   request: NextRequest,
   requestId: string,
-  path: string
+  path: string,
+  rawBody?: string
 ): Promise<NextResponse | null> {
-  const slackResponse = handleSlackChallenge(body)
-  if (slackResponse) {
-    return slackResponse
-  }
-
-  const url = new URL(request.url)
-
-  // Microsoft Graph subscription validation (can come as GET or POST)
-  const validationToken = url.searchParams.get('validationToken')
-  if (validationToken) {
-    logger.info(`[${requestId}] Microsoft Graph subscription validation for path: ${path}`)
-    return new NextResponse(validationToken, {
-      status: 200,
-      headers: { 'Content-Type': 'text/plain' },
-    })
-  }
-
-  const mode = url.searchParams.get('hub.mode')
-  const token = url.searchParams.get('hub.verify_token')
-  const challenge = url.searchParams.get('hub.challenge')
-
-  const whatsAppResponse = await handleWhatsAppVerification(requestId, path, mode, token, challenge)
-  if (whatsAppResponse) {
-    return whatsAppResponse
+  for (const provider of CHALLENGE_PROVIDERS) {
+    const handler = getProviderHandler(provider)
+    if (handler.handleChallenge) {
+      const response = await handler.handleChallenge(body, request, requestId, path, rawBody)
+      if (response) {
+        return response
+      }
+    }
   }
-
   return null
 }
 
@@ -218,108 +166,54 @@ export async function handlePreLookupWebhookVerification(
 
 /**
  * Handle provider-specific reachability tests that occur AFTER webhook lookup.
- *
- * @param webhook - The webhook record from the database
- * @param body - The parsed request body
- * @param requestId - Request ID for logging
- * @returns NextResponse if this is a verification request, null to continue normal flow
+ * Delegates to the provider handler registry.
  */
 export function handleProviderReachabilityTest(
-  webhook: any,
-  body: any,
+  webhookRecord: { provider: string },
+  body: unknown,
   requestId: string
 ): NextResponse | null {
-  const provider = webhook?.provider
-
-  if (provider === 'grain') {
-    const isVerificationRequest = !body || Object.keys(body).length === 0 || !body.type
-    if (isVerificationRequest) {
-      logger.info(
-        `[${requestId}] Grain reachability test detected - returning 200 for webhook verification`
-      )
-      return NextResponse.json({
-        status: 'ok',
-        message: 'Webhook endpoint verified',
-      })
-    }
-  }
-
-  return null
+  const handler = getProviderHandler(webhookRecord?.provider)
+  return handler.handleReachabilityTest?.(body, requestId) ?? null
 }
 
 /**
  * Format error response based on provider requirements.
- * Some providers (like Microsoft Teams) require specific response formats.
+ * Delegates to the provider handler registry.
  */
 export function formatProviderErrorResponse(
-  webhook: any,
+  webhookRecord: { provider: string },
   error: string,
   status: number
 ): NextResponse {
-  if (webhook.provider === 'microsoft-teams') {
-    return NextResponse.json({ type: 'message', text: error }, { status })
-  }
-  return NextResponse.json({ error }, { status })
+  const handler = getProviderHandler(webhookRecord.provider)
+  return handler.formatErrorResponse?.(error, status) ?? NextResponse.json({ error }, { status })
 }
 
 /**
  * Check if a webhook event should be skipped based on provider-specific filtering.
- * Returns true if the event should be skipped, false if it should be processed.
+ * Delegates to the provider handler registry.
  */
-export function shouldSkipWebhookEvent(webhook: any, body: any, requestId: string): boolean {
-  const providerConfig = (webhook.providerConfig as Record<string, any>) || {}
-
-  if (webhook.provider === 'stripe') {
-    const eventTypes = providerConfig.eventTypes
-    if (eventTypes && Array.isArray(eventTypes) && eventTypes.length > 0) {
-      const eventType = body?.type
-      if (eventType && !eventTypes.includes(eventType)) {
-        logger.info(
-          `[${requestId}] Stripe event type '${eventType}' not in allowed list for webhook ${webhook.id}, skipping`
-        )
-        return true
-      }
-    }
-  }
-
-  if (webhook.provider === 'grain') {
-    const eventTypes = providerConfig.eventTypes
-    if (eventTypes && Array.isArray(eventTypes) && eventTypes.length > 0) {
-      const eventType = body?.type
-      if (eventType && !eventTypes.includes(eventType)) {
-        logger.info(
-          `[${requestId}] Grain event type '${eventType}' not in allowed list for webhook ${webhook.id}, skipping`
-        )
-        return true
-      }
-    }
-  }
-
-  // Webflow collection filtering - filter by collectionId if configured
-  if (webhook.provider === 'webflow') {
-    const configuredCollectionId = providerConfig.collectionId
-    if (configuredCollectionId) {
-      const payloadCollectionId = body?.payload?.collectionId || body?.collectionId
-      if (payloadCollectionId && payloadCollectionId !== configuredCollectionId) {
-        logger.info(
-          `[${requestId}] Webflow collection '${payloadCollectionId}' doesn't match configured collection '${configuredCollectionId}' for webhook ${webhook.id}, skipping`
-        )
-        return true
-      }
-    }
-  }
-
-  return false
+export function shouldSkipWebhookEvent(
+  webhookRecord: { provider: string; providerConfig?: Record<string, unknown> },
+  body: unknown,
+  requestId: string
+): boolean {
+  const handler = getProviderHandler(webhookRecord.provider)
+  const providerConfig = webhookRecord.providerConfig ?? {}
+  return (
+    handler.shouldSkipEvent?.({ webhook: webhookRecord, body, requestId, providerConfig }) ?? false
+  )
 }
 
 /** Returns 200 OK for providers that validate URLs before the workflow is deployed */
 export function handlePreDeploymentVerification(
-  webhook: any,
+  webhookRecord: { provider: string },
   requestId: string
 ): NextResponse | null {
-  if (requiresPendingWebhookVerification(webhook.provider)) {
+  if (requiresPendingWebhookVerification(webhookRecord.provider)) {
     logger.info(
-      `[${requestId}] ${webhook.provider} webhook - block not in deployment, returning 200 OK for URL validation`
+      `[${requestId}] ${webhookRecord.provider} webhook - block not in deployment, returning 200 OK for URL validation`
     )
     return NextResponse.json({
       status: 'ok',
@@ -458,27 +352,15 @@ export async function findAllWebhooksForPath(
   return results
 }
 
-/**
- * Resolve {{VARIABLE}} references in a string value
- * @param value - String that may contain {{VARIABLE}} references
- * @param envVars - Already decrypted environment variables
- * @returns String with all {{VARIABLE}} references replaced
- */
 function resolveEnvVars(value: string, envVars: Record<string, string>): string {
   return resolveEnvVarReferences(value, envVars) as string
 }
 
-/**
- * Resolve environment variables in webhook providerConfig
- * @param config - Raw providerConfig from database (may contain {{VARIABLE}} refs)
- * @param envVars - Already decrypted environment variables
- * @returns New object with resolved values (original config is unchanged)
- */
 function resolveProviderConfigEnvVars(
-  config: Record<string, any>,
+  config: Record<string, unknown>,
   envVars: Record<string, string>
-): Record<string, any> {
-  const resolved: Record<string, any> = {}
+): Record<string, unknown> {
+  const resolved: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(config)) {
     if (typeof value === 'string') {
       resolved[key] = resolveEnvVars(value, envVars)
@@ -490,8 +372,8 @@ function resolveProviderConfigEnvVars(
 }
 
 /**
- * Verify webhook provider authentication and signatures
- * @returns NextResponse with 401 if auth fails, null if auth passes
+ * Verify webhook provider authentication and signatures.
+ * Delegates to the provider handler registry.
  */
 export async function verifyProviderAuth(
   foundWebhook: any,
@@ -500,7 +382,6 @@ export async function verifyProviderAuth(
   rawBody: string,
   requestId: string
 ): Promise<NextResponse | null> {
-  // Step 1: Fetch and decrypt environment variables for signature verification
   let decryptedEnvVars: Record<string, string> = {}
   try {
     decryptedEnvVars = await getEffectiveDecryptedEnv(
@@ -513,429 +394,20 @@ export async function verifyProviderAuth(
     })
   }
 
-  // Step 2: Resolve {{VARIABLE}} references in providerConfig
-  const rawProviderConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
+  const rawProviderConfig = (foundWebhook.providerConfig as Record<string, unknown>) || {}
   const providerConfig = resolveProviderConfigEnvVars(rawProviderConfig, decryptedEnvVars)
 
-  if (foundWebhook.provider === 'microsoft-teams') {
-    if (providerConfig.hmacSecret) {
-      const authHeader = request.headers.get('authorization')
-
-      if (!authHeader || !authHeader.startsWith('HMAC ')) {
-        logger.warn(
-          `[${requestId}] Microsoft Teams outgoing webhook missing HMAC authorization header`
-        )
-        return new NextResponse('Unauthorized - Missing HMAC signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateMicrosoftTeamsSignature(
-        providerConfig.hmacSecret,
-        authHeader,
-        rawBody
-      )
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Microsoft Teams HMAC signature verification failed`)
-        return new NextResponse('Unauthorized - Invalid HMAC signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  // Ashby webhook signature verification (HMAC-SHA256 via Ashby-Signature header)
-  if (foundWebhook.provider === 'ashby') {
-    const secretToken = providerConfig.secretToken as string | undefined
-
-    if (secretToken) {
-      const signature = request.headers.get('ashby-signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Ashby webhook missing Ashby-Signature header`)
-        return new NextResponse('Unauthorized - Missing Ashby signature', {
-          status: 401,
-        })
-      }
-
-      if (!validateAshbySignature(secretToken, signature, rawBody)) {
-        logger.warn(`[${requestId}] Ashby webhook signature verification failed`)
-        return new NextResponse('Unauthorized - Invalid Ashby signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  // Provider-specific verification (utils may return a response for some providers)
-  const providerVerification = verifyProviderWebhook(foundWebhook, request, requestId)
-  if (providerVerification) {
-    return providerVerification
-  }
-
-  // Handle Google Forms shared-secret authentication (Apps Script forwarder)
-  if (foundWebhook.provider === 'google_forms') {
-    const expectedToken = providerConfig.token as string | undefined
-    const secretHeaderName = providerConfig.secretHeaderName as string | undefined
-
-    if (expectedToken) {
-      let isTokenValid = false
-
-      if (secretHeaderName) {
-        const headerValue = request.headers.get(secretHeaderName.toLowerCase())
-        if (headerValue === expectedToken) {
-          isTokenValid = true
-        }
-      } else {
-        const authHeader = request.headers.get('authorization')
-        if (authHeader?.toLowerCase().startsWith('bearer ')) {
-          const token = authHeader.substring(7)
-          if (token === expectedToken) {
-            isTokenValid = true
-          }
-        }
-      }
-
-      if (!isTokenValid) {
-        logger.warn(`[${requestId}] Google Forms webhook authentication failed`)
-        return new NextResponse('Unauthorized - Invalid secret', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  // Twilio Voice webhook signature verification
-  if (foundWebhook.provider === 'twilio_voice') {
-    const authToken = providerConfig.authToken as string | undefined
-
-    if (authToken) {
-      const signature = request.headers.get('x-twilio-signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Twilio Voice webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Twilio signature', {
-          status: 401,
-        })
-      }
-
-      let params: Record<string, any> = {}
-      try {
-        if (typeof rawBody === 'string') {
-          const urlParams = new URLSearchParams(rawBody)
-          params = Object.fromEntries(urlParams.entries())
-        }
-      } catch (error) {
-        logger.error(
-          `[${requestId}] Error parsing Twilio webhook body for signature validation:`,
-          error
-        )
-        return new NextResponse('Bad Request - Invalid body format', {
-          status: 400,
-        })
-      }
-
-      const fullUrl = getExternalUrl(request)
-      const isValidSignature = await validateTwilioSignature(authToken, signature, fullUrl, params)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Twilio Voice signature verification failed`, {
-          url: fullUrl,
-          signatureLength: signature.length,
-          paramsCount: Object.keys(params).length,
-          authTokenLength: authToken.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Twilio signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'typeform') {
-    const secret = providerConfig.secret as string | undefined
-
-    if (secret) {
-      const signature = request.headers.get('Typeform-Signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Typeform webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Typeform signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateTypeformSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Typeform signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Typeform signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'attio') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (!secret) {
-      logger.debug(
-        `[${requestId}] Attio webhook ${foundWebhook.id} has no signing secret, skipping signature verification`
-      )
-    } else {
-      const signature = request.headers.get('Attio-Signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Attio webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Attio signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateAttioSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Attio signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Attio signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'linear') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (secret) {
-      const signature = request.headers.get('Linear-Signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Linear webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Linear signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateLinearSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Linear signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Linear signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'circleback') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (secret) {
-      const signature = request.headers.get('x-signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Circleback webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Circleback signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateCirclebackSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Circleback signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Circleback signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'calcom') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (secret) {
-      const signature = request.headers.get('X-Cal-Signature-256')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Cal.com webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Cal.com signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateCalcomSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Cal.com signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Cal.com signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'jira') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (secret) {
-      const signature = request.headers.get('X-Hub-Signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Jira webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Jira signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateJiraSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Jira signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Jira signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'confluence') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (secret) {
-      const signature = request.headers.get('X-Hub-Signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Confluence webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Confluence signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateJiraSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Confluence signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Confluence signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'github') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (secret) {
-      // GitHub supports both SHA-256 (preferred) and SHA-1 (legacy)
-      const signature256 = request.headers.get('X-Hub-Signature-256')
-      const signature1 = request.headers.get('X-Hub-Signature')
-      const signature = signature256 || signature1
-
-      if (!signature) {
-        logger.warn(`[${requestId}] GitHub webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing GitHub signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateGitHubSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] GitHub signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-          usingSha256: !!signature256,
-        })
-        return new NextResponse('Unauthorized - Invalid GitHub signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'fireflies') {
-    const secret = providerConfig.webhookSecret as string | undefined
-
-    if (secret) {
-      const signature = request.headers.get('x-hub-signature')
-
-      if (!signature) {
-        logger.warn(`[${requestId}] Fireflies webhook missing signature header`)
-        return new NextResponse('Unauthorized - Missing Fireflies signature', {
-          status: 401,
-        })
-      }
-
-      const isValidSignature = validateFirefliesSignature(secret, signature, rawBody)
-
-      if (!isValidSignature) {
-        logger.warn(`[${requestId}] Fireflies signature verification failed`, {
-          signatureLength: signature.length,
-          secretLength: secret.length,
-        })
-        return new NextResponse('Unauthorized - Invalid Fireflies signature', {
-          status: 401,
-        })
-      }
-    }
-  }
-
-  if (foundWebhook.provider === 'generic') {
-    if (providerConfig.requireAuth) {
-      const configToken = providerConfig.token
-      const secretHeaderName = providerConfig.secretHeaderName
-
-      if (configToken) {
-        let isTokenValid = false
-
-        if (secretHeaderName) {
-          const headerValue = request.headers.get(secretHeaderName.toLowerCase())
-          if (headerValue && safeCompare(headerValue, configToken)) {
-            isTokenValid = true
-          }
-        } else {
-          const authHeader = request.headers.get('authorization')
-          if (authHeader?.toLowerCase().startsWith('bearer ')) {
-            const token = authHeader.substring(7)
-            if (safeCompare(token, configToken)) {
-              isTokenValid = true
-            }
-          }
-        }
-
-        if (!isTokenValid) {
-          return new NextResponse('Unauthorized - Invalid authentication token', { status: 401 })
-        }
-      } else {
-        return new NextResponse('Unauthorized - Authentication required but not configured', {
-          status: 401,
-        })
-      }
-    }
+  const handler = getProviderHandler(foundWebhook.provider)
+  if (handler.verifyAuth) {
+    const authResult = await handler.verifyAuth({
+      webhook: foundWebhook,
+      workflow: foundWorkflow,
+      request,
+      rawBody,
+      requestId,
+      providerConfig,
+    })
+    if (authResult) return authResult
   }
 
   return null
@@ -943,7 +415,6 @@ export async function verifyProviderAuth(
 
 /**
  * Run preprocessing checks for webhook execution
- * This replaces the old checkRateLimits and checkUsageLimits functions
  */
 export async function checkWebhookPreprocessing(
   foundWorkflow: any,
@@ -984,20 +455,8 @@ export async function checkWebhookPreprocessing(
         statusCode: error.statusCode,
       })
 
-      if (foundWebhook.provider === 'microsoft-teams') {
-        return {
-          error: NextResponse.json(
-            {
-              type: 'message',
-              text: error.message,
-            },
-            { status: error.statusCode }
-          ),
-        }
-      }
-
       return {
-        error: NextResponse.json({ error: error.message }, { status: error.statusCode }),
+        error: formatProviderErrorResponse(foundWebhook, error.message, error.statusCode),
       }
     }
 
@@ -1010,20 +469,8 @@ export async function checkWebhookPreprocessing(
   } catch (preprocessError) {
     logger.error(`[${requestId}] Error during webhook preprocessing:`, preprocessError)
 
-    if (foundWebhook.provider === 'microsoft-teams') {
-      return {
-        error: NextResponse.json(
-          {
-            type: 'message',
-            text: 'Internal error during preprocessing',
-          },
-          { status: 500 }
-        ),
-      }
-    }
-
     return {
-      error: NextResponse.json({ error: 'Internal error during preprocessing' }, { status: 500 }),
+      error: formatProviderErrorResponse(foundWebhook, 'Internal error during preprocessing', 500),
     }
   }
 }
@@ -1035,188 +482,41 @@ export async function queueWebhookExecution(
   request: NextRequest,
   options: WebhookProcessorOptions
 ): Promise<NextResponse> {
-  try {
-    // GitHub event filtering for event-specific triggers
-    if (foundWebhook.provider === 'github') {
-      const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-      const triggerId = providerConfig.triggerId as string | undefined
-
-      if (triggerId && triggerId !== 'github_webhook') {
-        const eventType = request.headers.get('x-github-event')
-        const action = body.action
-
-        if (!isGitHubEventMatch(triggerId, eventType || '', action, body)) {
-          logger.debug(
-            `[${options.requestId}] GitHub event mismatch for trigger ${triggerId}. Event: ${eventType}, Action: ${action}. Skipping execution.`,
-            {
-              webhookId: foundWebhook.id,
-              workflowId: foundWorkflow.id,
-              triggerId,
-              receivedEvent: eventType,
-              receivedAction: action,
-            }
-          )
-
-          // Return 200 OK to prevent GitHub from retrying
-          return NextResponse.json({
-            message: 'Event type does not match trigger configuration. Ignoring.',
-          })
-        }
-      }
-    }
-
-    // Jira event filtering for event-specific triggers
-    if (foundWebhook.provider === 'jira') {
-      const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-      const triggerId = providerConfig.triggerId as string | undefined
-
-      if (triggerId && triggerId !== 'jira_webhook') {
-        const webhookEvent = body.webhookEvent as string | undefined
+  const providerConfig = (foundWebhook.providerConfig as Record<string, unknown>) || {}
+  const handler = getProviderHandler(foundWebhook.provider)
 
-        if (!isJiraEventMatch(triggerId, webhookEvent || '', body)) {
-          logger.debug(
-            `[${options.requestId}] Jira event mismatch for trigger ${triggerId}. Event: ${webhookEvent}. Skipping execution.`,
-            {
-              webhookId: foundWebhook.id,
-              workflowId: foundWorkflow.id,
-              triggerId,
-              receivedEvent: webhookEvent,
-            }
-          )
-
-          // Return 200 OK to prevent Jira from retrying
-          return NextResponse.json({
-            message: 'Event type does not match trigger configuration. Ignoring.',
-          })
+  try {
+    if (handler.matchEvent) {
+      const result = await handler.matchEvent({
+        webhook: foundWebhook,
+        workflow: foundWorkflow,
+        body,
+        request,
+        requestId: options.requestId,
+        providerConfig,
+      })
+      if (result !== true) {
+        if (result instanceof NextResponse) {
+          return result
         }
-      }
-    }
-
-    if (foundWebhook.provider === 'confluence') {
-      const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-      const triggerId = providerConfig.triggerId as string | undefined
-
-      if (triggerId && !isConfluencePayloadMatch(triggerId, body)) {
-        logger.debug(
-          `[${options.requestId}] Confluence payload mismatch for trigger ${triggerId}. Skipping execution.`,
-          {
-            webhookId: foundWebhook.id,
-            workflowId: foundWorkflow.id,
-            triggerId,
-            bodyKeys: Object.keys(body),
-          }
-        )
-
         return NextResponse.json({
-          message: 'Payload does not match trigger configuration. Ignoring.',
+          message: 'Event type does not match trigger configuration. Ignoring.',
         })
       }
     }
 
-    if (foundWebhook.provider === 'attio') {
-      const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-      const triggerId = providerConfig.triggerId as string | undefined
-
-      if (triggerId && triggerId !== 'attio_webhook') {
-        const { isAttioPayloadMatch, getAttioEvent } = await import('@/triggers/attio/utils')
-        if (!isAttioPayloadMatch(triggerId, body)) {
-          const event = getAttioEvent(body)
-          const eventType = event?.event_type as string | undefined
-          logger.debug(
-            `[${options.requestId}] Attio event mismatch for trigger ${triggerId}. Event: ${eventType}. Skipping execution.`,
-            {
-              webhookId: foundWebhook.id,
-              workflowId: foundWorkflow.id,
-              triggerId,
-              receivedEvent: eventType,
-              bodyKeys: Object.keys(body),
-            }
-          )
-          return NextResponse.json({
-            status: 'skipped',
-            reason: 'event_type_mismatch',
-          })
-        }
-      }
-    }
-
-    if (foundWebhook.provider === 'hubspot') {
-      const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-      const triggerId = providerConfig.triggerId as string | undefined
-
-      if (triggerId?.startsWith('hubspot_')) {
-        const events = Array.isArray(body) ? body : [body]
-        const firstEvent = events[0]
-
-        const subscriptionType = firstEvent?.subscriptionType as string | undefined
-
-        if (!isHubSpotContactEventMatch(triggerId, subscriptionType || '')) {
-          logger.debug(
-            `[${options.requestId}] HubSpot event mismatch for trigger ${triggerId}. Event: ${subscriptionType}. Skipping execution.`,
-            {
-              webhookId: foundWebhook.id,
-              workflowId: foundWorkflow.id,
-              triggerId,
-              receivedEvent: subscriptionType,
-            }
-          )
-
-          // Return 200 OK to prevent HubSpot from retrying
-          return NextResponse.json({
-            message: 'Event type does not match trigger configuration. Ignoring.',
-          })
-        }
-
-        logger.info(
-          `[${options.requestId}] HubSpot event match confirmed for trigger ${triggerId}. Event: ${subscriptionType}`,
-          {
-            webhookId: foundWebhook.id,
-            workflowId: foundWorkflow.id,
-            triggerId,
-            receivedEvent: subscriptionType,
-          }
-        )
-      }
-    }
-
     const { 'x-sim-idempotency-key': _, ...headers } = Object.fromEntries(request.headers.entries())
 
-    // For Microsoft Teams Graph notifications, extract unique identifiers for idempotency
-    if (
-      foundWebhook.provider === 'microsoft-teams' &&
-      body?.value &&
-      Array.isArray(body.value) &&
-      body.value.length > 0
-    ) {
-      const notification = body.value[0]
-      const subscriptionId = notification.subscriptionId
-      const messageId = notification.resourceData?.id
-
-      if (subscriptionId && messageId) {
-        headers['x-teams-notification-id'] = `${subscriptionId}:${messageId}`
-      }
-    }
-
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-
-    if (foundWebhook.provider === 'generic') {
-      const idempotencyField = providerConfig.idempotencyField as string | undefined
-      if (idempotencyField && body) {
-        const value = idempotencyField
-          .split('.')
-          .reduce((acc: any, key: string) => acc?.[key], body)
-        if (value !== undefined && value !== null && typeof value !== 'object') {
-          headers['x-sim-idempotency-key'] = String(value)
-        }
-      }
+    if (handler.enrichHeaders) {
+      handler.enrichHeaders(
+        { webhook: foundWebhook, body, requestId: options.requestId, providerConfig },
+        headers
+      )
     }
 
     const credentialId = providerConfig.credentialId as string | undefined
-
-    // credentialSetId is a direct field on webhook table, not in providerConfig
     const credentialSetId = foundWebhook.credentialSetId as string | undefined
 
-    // Verify billing for credential sets
     if (credentialSetId) {
       const billingCheck = await verifyCredentialSetBilling(credentialSetId)
       if (!billingCheck.valid) {
@@ -1355,112 +655,18 @@ export async function queueWebhookExecution(
       }
     }
 
-    if (foundWebhook.provider === 'microsoft-teams') {
-      const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-      const triggerId = providerConfig.triggerId as string | undefined
-
-      // Chat subscription (Graph API) returns 202
-      if (triggerId === 'microsoftteams_chat_subscription') {
-        return new NextResponse(null, { status: 202 })
-      }
-
-      // Channel webhook (outgoing webhook) returns message response
-      return NextResponse.json({
-        type: 'message',
-        text: 'Sim',
-      })
-    }
-
-    // Slack requires an empty 200 for interactive payloads (view_submission, block_actions, etc.)
-    // A JSON body like {"message":"..."} is not a recognized response format and causes modal errors
-    if (foundWebhook.provider === 'slack') {
-      return new NextResponse(null, { status: 200 })
-    }
-
-    // Twilio Voice requires TwiML XML response
-    if (foundWebhook.provider === 'twilio_voice') {
-      const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-      const twimlResponse = (providerConfig.twimlResponse as string | undefined)?.trim()
-
-      // If user provided custom TwiML, convert square brackets to angle brackets and return
-      if (twimlResponse && twimlResponse.length > 0) {
-        const convertedTwiml = convertSquareBracketsToTwiML(twimlResponse)
-        return new NextResponse(convertedTwiml, {
-          status: 200,
-          headers: {
-            'Content-Type': 'text/xml; charset=utf-8',
-          },
-        })
-      }
-
-      // Default TwiML if none provided
-      const defaultTwiml = `<?xml version="1.0" encoding="UTF-8"?>
-<Response>
-  <Say>Your call is being processed.</Say>
-  <Pause length="1"/>
-</Response>`
-
-      return new NextResponse(defaultTwiml, {
-        status: 200,
-        headers: {
-          'Content-Type': 'text/xml; charset=utf-8',
-        },
-      })
-    }
-
-    if (foundWebhook.provider === 'generic' && providerConfig.responseMode === 'custom') {
-      const rawCode = Number(providerConfig.responseStatusCode) || 200
-      const statusCode = rawCode >= 100 && rawCode <= 599 ? rawCode : 200
-      const responseBody = (providerConfig.responseBody as string | undefined)?.trim()
-
-      if (!responseBody) {
-        return new NextResponse(null, { status: statusCode })
-      }
-
-      try {
-        const parsed = JSON.parse(responseBody)
-        return NextResponse.json(parsed, { status: statusCode })
-      } catch {
-        return new NextResponse(responseBody, {
-          status: statusCode,
-          headers: { 'Content-Type': 'text/plain' },
-        })
-      }
+    const successResponse = handler.formatSuccessResponse?.(providerConfig) ?? null
+    if (successResponse) {
+      return successResponse
     }
 
     return NextResponse.json({ message: 'Webhook processed' })
-  } catch (error: any) {
+  } catch (error: unknown) {
     logger.error(`[${options.requestId}] Failed to queue webhook execution:`, error)
 
-    if (foundWebhook.provider === 'microsoft-teams') {
-      return NextResponse.json(
-        {
-          type: 'message',
-          text: 'Webhook processing failed',
-        },
-        { status: 500 }
-      )
-    }
-
-    if (foundWebhook.provider === 'slack') {
-      // Return empty 200 to avoid Slack showing an error dialog to the user,
-      // even though processing failed. The error is already logged above.
-      return new NextResponse(null, { status: 200 })
-    }
-
-    if (foundWebhook.provider === 'twilio_voice') {
-      const errorTwiml = `<?xml version="1.0" encoding="UTF-8"?>
-<Response>
-  <Say>We're sorry, but an error occurred processing your call. Please try again later.</Say>
-  <Hangup/>
-</Response>`
-
-      return new NextResponse(errorTwiml, {
-        status: 200,
-        headers: {
-          'Content-Type': 'text/xml',
-        },
-      })
+    const errorResponse = handler.formatQueueErrorResponse?.() ?? null
+    if (errorResponse) {
+      return errorResponse
     }
 
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
diff --git a/apps/sim/lib/webhooks/provider-subscription-utils.ts b/apps/sim/lib/webhooks/provider-subscription-utils.ts
new file mode 100644
index 00000000000..e52e1eeefa1
--- /dev/null
+++ b/apps/sim/lib/webhooks/provider-subscription-utils.ts
@@ -0,0 +1,48 @@
+import { db } from '@sim/db'
+import { account } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { eq } from 'drizzle-orm'
+import { getBaseUrl } from '@/lib/core/utils/urls'
+import { resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
+
+const logger = createLogger('WebhookProviderSubscriptions')
+
+/** Safely read a webhook row's provider config as a plain object. */
+export function getProviderConfig(webhook: Record<string, unknown>): Record<string, unknown> {
+  return (webhook.providerConfig as Record<string, unknown>) || {}
+}
+
+/** Build the public callback URL providers should deliver webhook events to. */
+export function getNotificationUrl(webhook: Record<string, unknown>): string {
+  return `${getBaseUrl()}/api/webhooks/trigger/${webhook.path}`
+}
+
+/**
+ * Resolve an OAuth-backed credential to the owning user and account.
+ *
+ * Provider subscription handlers use this when they need to refresh tokens or
+ * make provider API calls on behalf of the credential owner during webhook
+ * registration and cleanup.
+ */
+export async function getCredentialOwner(
+  credentialId: string,
+  requestId: string
+): Promise<{ userId: string; accountId: string } | null> {
+  const resolved = await resolveOAuthAccountId(credentialId)
+  if (!resolved) {
+    logger.warn(`[${requestId}] Failed to resolve OAuth account for credentialId ${credentialId}`)
+    return null
+  }
+  const [credentialRecord] = await db
+    .select({ userId: account.userId })
+    .from(account)
+    .where(eq(account.id, resolved.accountId))
+    .limit(1)
+
+  if (!credentialRecord?.userId) {
+    logger.warn(`[${requestId}] Credential owner not found for credentialId ${credentialId}`)
+    return null
+  }
+
+  return { userId: credentialRecord.userId, accountId: resolved.accountId }
+}
diff --git a/apps/sim/lib/webhooks/provider-subscriptions.ts b/apps/sim/lib/webhooks/provider-subscriptions.ts
index 4c5e16ffc1a..cbf6a05f184 100644
--- a/apps/sim/lib/webhooks/provider-subscriptions.ts
+++ b/apps/sim/lib/webhooks/provider-subscriptions.ts
@@ -1,1978 +1,8 @@
-import { db } from '@sim/db'
-import { account } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
-import { validateAirtableId, validateAlphanumericId } from '@/lib/core/security/input-validation'
-import { getBaseUrl } from '@/lib/core/utils/urls'
-import { generateId } from '@/lib/core/utils/uuid'
-import {
-  getOAuthToken,
-  refreshAccessTokenIfNeeded,
-  resolveOAuthAccountId,
-} from '@/app/api/auth/oauth/utils'
+import { getProviderHandler } from '@/lib/webhooks/providers'
 
-const teamsLogger = createLogger('TeamsSubscription')
-const telegramLogger = createLogger('TelegramWebhook')
-const airtableLogger = createLogger('AirtableWebhook')
-const typeformLogger = createLogger('TypeformWebhook')
-const calendlyLogger = createLogger('CalendlyWebhook')
-const ashbyLogger = createLogger('AshbyWebhook')
-const grainLogger = createLogger('GrainWebhook')
-const fathomLogger = createLogger('FathomWebhook')
-const lemlistLogger = createLogger('LemlistWebhook')
-const webflowLogger = createLogger('WebflowWebhook')
-const attioLogger = createLogger('AttioWebhook')
-const providerSubscriptionsLogger = createLogger('WebhookProviderSubscriptions')
-
-function getProviderConfig(webhook: any): Record<string, any> {
-  return (webhook.providerConfig as Record<string, any>) || {}
-}
-
-function getNotificationUrl(webhook: any): string {
-  return `${getBaseUrl()}/api/webhooks/trigger/${webhook.path}`
-}
-
-async function getCredentialOwner(
-  credentialId: string,
-  requestId: string
-): Promise<{ userId: string; accountId: string } | null> {
-  const resolved = await resolveOAuthAccountId(credentialId)
-  if (!resolved) {
-    providerSubscriptionsLogger.warn(
-      `[${requestId}] Failed to resolve OAuth account for credentialId ${credentialId}`
-    )
-    return null
-  }
-  const [credentialRecord] = await db
-    .select({ userId: account.userId })
-    .from(account)
-    .where(eq(account.id, resolved.accountId))
-    .limit(1)
-
-  if (!credentialRecord?.userId) {
-    providerSubscriptionsLogger.warn(
-      `[${requestId}] Credential owner not found for credentialId ${credentialId}`
-    )
-    return null
-  }
-
-  return { userId: credentialRecord.userId, accountId: resolved.accountId }
-}
-
-/**
- * Create a Microsoft Teams chat subscription
- * Throws errors with friendly messages if subscription creation fails
- */
-export async function createTeamsSubscription(
-  request: NextRequest,
-  webhook: any,
-  workflow: any,
-  requestId: string
-): Promise<string | undefined> {
-  const config = getProviderConfig(webhook)
-
-  if (config.triggerId !== 'microsoftteams_chat_subscription') {
-    return undefined
-  }
-
-  const credentialId = config.credentialId as string | undefined
-  const chatId = config.chatId as string | undefined
-
-  if (!credentialId) {
-    teamsLogger.warn(
-      `[${requestId}] Missing credentialId for Teams chat subscription ${webhook.id}`
-    )
-    throw new Error(
-      'Microsoft Teams credentials are required. Please connect your Microsoft account in the trigger configuration.'
-    )
-  }
-
-  if (!chatId) {
-    teamsLogger.warn(`[${requestId}] Missing chatId for Teams chat subscription ${webhook.id}`)
-    throw new Error(
-      'Chat ID is required to create a Teams subscription. Please provide a valid chat ID.'
-    )
-  }
-
-  const credentialOwner = await getCredentialOwner(credentialId, requestId)
-  const accessToken = credentialOwner
-    ? await refreshAccessTokenIfNeeded(credentialOwner.accountId, credentialOwner.userId, requestId)
-    : null
-  if (!accessToken) {
-    teamsLogger.error(
-      `[${requestId}] Failed to get access token for Teams subscription ${webhook.id}`
-    )
-    throw new Error(
-      'Failed to authenticate with Microsoft Teams. Please reconnect your Microsoft account and try again.'
-    )
-  }
-
-  const existingSubscriptionId = config.externalSubscriptionId as string | undefined
-  if (existingSubscriptionId) {
-    try {
-      const checkRes = await fetch(
-        `https://graph.microsoft.com/v1.0/subscriptions/${existingSubscriptionId}`,
-        { method: 'GET', headers: { Authorization: `Bearer ${accessToken}` } }
-      )
-      if (checkRes.ok) {
-        teamsLogger.info(
-          `[${requestId}] Teams subscription ${existingSubscriptionId} already exists for webhook ${webhook.id}`
-        )
-        return existingSubscriptionId
-      }
-    } catch {
-      teamsLogger.debug(`[${requestId}] Existing subscription check failed, will create new one`)
-    }
-  }
-
-  const notificationUrl = getNotificationUrl(webhook)
-  const resource = `/chats/${chatId}/messages`
-
-  // Max lifetime: 4230 minutes (~3 days) - Microsoft Graph API limit
-  const maxLifetimeMinutes = 4230
-  const expirationDateTime = new Date(Date.now() + maxLifetimeMinutes * 60 * 1000).toISOString()
-
-  const body = {
-    changeType: 'created,updated',
-    notificationUrl,
-    lifecycleNotificationUrl: notificationUrl,
-    resource,
-    includeResourceData: false,
-    expirationDateTime,
-    clientState: webhook.id,
-  }
-
-  try {
-    const res = await fetch('https://graph.microsoft.com/v1.0/subscriptions', {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(body),
-    })
-
-    const payload = await res.json()
-    if (!res.ok) {
-      const errorMessage =
-        payload.error?.message || payload.error?.code || 'Unknown Microsoft Graph API error'
-      teamsLogger.error(
-        `[${requestId}] Failed to create Teams subscription for webhook ${webhook.id}`,
-        {
-          status: res.status,
-          error: payload.error,
-        }
-      )
-
-      let userFriendlyMessage = 'Failed to create Teams subscription'
-      if (res.status === 401 || res.status === 403) {
-        userFriendlyMessage =
-          'Authentication failed. Please reconnect your Microsoft Teams account and ensure you have the necessary permissions.'
-      } else if (res.status === 404) {
-        userFriendlyMessage =
-          'Chat not found. Please verify that the Chat ID is correct and that you have access to the specified chat.'
-      } else if (errorMessage && errorMessage !== 'Unknown Microsoft Graph API error') {
-        userFriendlyMessage = `Teams error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    teamsLogger.info(
-      `[${requestId}] Successfully created Teams subscription ${payload.id} for webhook ${webhook.id}`
-    )
-    return payload.id as string
-  } catch (error: any) {
-    if (
-      error instanceof Error &&
-      (error.message.includes('credentials') ||
-        error.message.includes('Chat ID') ||
-        error.message.includes('authenticate'))
-    ) {
-      throw error
-    }
-
-    teamsLogger.error(
-      `[${requestId}] Error creating Teams subscription for webhook ${webhook.id}`,
-      error
-    )
-    throw new Error(
-      error instanceof Error
-        ? error.message
-        : 'Failed to create Teams subscription. Please try again.'
-    )
-  }
-}
-
-/**
- * Delete a Microsoft Teams chat subscription
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteTeamsSubscription(
-  webhook: any,
-  workflow: any,
-  requestId: string
-): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-
-    if (config.triggerId !== 'microsoftteams_chat_subscription') {
-      return
-    }
-
-    const externalSubscriptionId = config.externalSubscriptionId as string | undefined
-    const credentialId = config.credentialId as string | undefined
-
-    if (!externalSubscriptionId || !credentialId) {
-      teamsLogger.info(
-        `[${requestId}] No external subscription to delete for webhook ${webhook.id}`
-      )
-      return
-    }
-
-    const credentialOwner = await getCredentialOwner(credentialId, requestId)
-    const accessToken = credentialOwner
-      ? await refreshAccessTokenIfNeeded(
-          credentialOwner.accountId,
-          credentialOwner.userId,
-          requestId
-        )
-      : null
-    if (!accessToken) {
-      teamsLogger.warn(
-        `[${requestId}] Could not get access token to delete Teams subscription for webhook ${webhook.id}`
-      )
-      return
-    }
-
-    const res = await fetch(
-      `https://graph.microsoft.com/v1.0/subscriptions/${externalSubscriptionId}`,
-      {
-        method: 'DELETE',
-        headers: { Authorization: `Bearer ${accessToken}` },
-      }
-    )
-
-    if (res.ok || res.status === 404) {
-      teamsLogger.info(
-        `[${requestId}] Successfully deleted Teams subscription ${externalSubscriptionId} for webhook ${webhook.id}`
-      )
-    } else {
-      const errorBody = await res.text()
-      teamsLogger.warn(
-        `[${requestId}] Failed to delete Teams subscription ${externalSubscriptionId} for webhook ${webhook.id}. Status: ${res.status}`
-      )
-    }
-  } catch (error) {
-    teamsLogger.error(
-      `[${requestId}] Error deleting Teams subscription for webhook ${webhook.id}`,
-      error
-    )
-  }
-}
-
-/**
- * Create a Telegram bot webhook
- * Throws errors with friendly messages if webhook creation fails
- */
-export async function createTelegramWebhook(
-  request: NextRequest,
-  webhook: any,
-  requestId: string
-): Promise<void> {
-  const config = getProviderConfig(webhook)
-  const botToken = config.botToken as string | undefined
-
-  if (!botToken) {
-    telegramLogger.warn(`[${requestId}] Missing botToken for Telegram webhook ${webhook.id}`)
-    throw new Error(
-      'Bot token is required to create a Telegram webhook. Please provide a valid Telegram bot token.'
-    )
-  }
-
-  const notificationUrl = getNotificationUrl(webhook)
-  const telegramApiUrl = `https://api.telegram.org/bot${botToken}/setWebhook`
-
-  try {
-    const telegramResponse = await fetch(telegramApiUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'User-Agent': 'TelegramBot/1.0',
-      },
-      body: JSON.stringify({ url: notificationUrl }),
-    })
-
-    const responseBody = await telegramResponse.json()
-    if (!telegramResponse.ok || !responseBody.ok) {
-      const errorMessage =
-        responseBody.description ||
-        `Failed to create Telegram webhook. Status: ${telegramResponse.status}`
-      telegramLogger.error(`[${requestId}] ${errorMessage}`, { response: responseBody })
-
-      let userFriendlyMessage = 'Failed to create Telegram webhook'
-      if (telegramResponse.status === 401) {
-        userFriendlyMessage =
-          'Invalid bot token. Please verify that the bot token is correct and try again.'
-      } else if (responseBody.description) {
-        userFriendlyMessage = `Telegram error: ${responseBody.description}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    telegramLogger.info(
-      `[${requestId}] Successfully created Telegram webhook for webhook ${webhook.id}`
-    )
-  } catch (error: any) {
-    if (
-      error instanceof Error &&
-      (error.message.includes('Bot token') || error.message.includes('Telegram error'))
-    ) {
-      throw error
-    }
-
-    telegramLogger.error(
-      `[${requestId}] Error creating Telegram webhook for webhook ${webhook.id}`,
-      error
-    )
-    throw new Error(
-      error instanceof Error
-        ? error.message
-        : 'Failed to create Telegram webhook. Please try again.'
-    )
-  }
-}
-
-/**
- * Delete a Telegram bot webhook
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteTelegramWebhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const botToken = config.botToken as string | undefined
-
-    if (!botToken) {
-      telegramLogger.warn(
-        `[${requestId}] Missing botToken for Telegram webhook deletion ${webhook.id}`
-      )
-      return
-    }
-
-    const telegramApiUrl = `https://api.telegram.org/bot${botToken}/deleteWebhook`
-    const telegramResponse = await fetch(telegramApiUrl, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-    })
-
-    const responseBody = await telegramResponse.json()
-    if (!telegramResponse.ok || !responseBody.ok) {
-      const errorMessage =
-        responseBody.description ||
-        `Failed to delete Telegram webhook. Status: ${telegramResponse.status}`
-      telegramLogger.error(`[${requestId}] ${errorMessage}`, { response: responseBody })
-    } else {
-      telegramLogger.info(
-        `[${requestId}] Successfully deleted Telegram webhook for webhook ${webhook.id}`
-      )
-    }
-  } catch (error) {
-    telegramLogger.error(
-      `[${requestId}] Error deleting Telegram webhook for webhook ${webhook.id}`,
-      error
-    )
-  }
-}
-
-/**
- * Delete an Airtable webhook
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteAirtableWebhook(
-  webhook: any,
-  _workflow: any,
-  requestId: string
-): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const { baseId, externalId } = config as {
-      baseId?: string
-      externalId?: string
-    }
-
-    if (!baseId) {
-      airtableLogger.warn(`[${requestId}] Missing baseId for Airtable webhook deletion`, {
-        webhookId: webhook.id,
-      })
-      return
-    }
-
-    const baseIdValidation = validateAirtableId(baseId, 'app', 'baseId')
-    if (!baseIdValidation.isValid) {
-      airtableLogger.warn(`[${requestId}] Invalid Airtable base ID format, skipping deletion`, {
-        webhookId: webhook.id,
-        baseId: baseId.substring(0, 20),
-      })
-      return
-    }
-
-    const credentialId = config.credentialId as string | undefined
-    if (!credentialId) {
-      airtableLogger.warn(
-        `[${requestId}] Missing credentialId for Airtable webhook deletion ${webhook.id}`
-      )
-      return
-    }
-
-    const credentialOwner = await getCredentialOwner(credentialId, requestId)
-    const accessToken = credentialOwner
-      ? await refreshAccessTokenIfNeeded(
-          credentialOwner.accountId,
-          credentialOwner.userId,
-          requestId
-        )
-      : null
-    if (!accessToken) {
-      airtableLogger.warn(
-        `[${requestId}] Could not retrieve Airtable access token. Cannot delete webhook in Airtable.`,
-        { webhookId: webhook.id }
-      )
-      return
-    }
-
-    let resolvedExternalId: string | undefined = externalId
-
-    if (!resolvedExternalId) {
-      try {
-        const expectedNotificationUrl = getNotificationUrl(webhook)
-
-        const listUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks`
-        const listResp = await fetch(listUrl, {
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-          },
-        })
-        const listBody = await listResp.json().catch(() => null)
-
-        if (listResp.ok && listBody && Array.isArray(listBody.webhooks)) {
-          const match = listBody.webhooks.find((w: any) => {
-            const url: string | undefined = w?.notificationUrl
-            if (!url) return false
-            return (
-              url === expectedNotificationUrl ||
-              url.endsWith(`/api/webhooks/trigger/${webhook.path}`)
-            )
-          })
-          if (match?.id) {
-            resolvedExternalId = match.id as string
-            airtableLogger.info(`[${requestId}] Resolved Airtable externalId by listing webhooks`, {
-              baseId,
-              externalId: resolvedExternalId,
-            })
-          } else {
-            airtableLogger.warn(`[${requestId}] Could not resolve Airtable externalId from list`, {
-              baseId,
-              expectedNotificationUrl,
-            })
-          }
-        } else {
-          airtableLogger.warn(
-            `[${requestId}] Failed to list Airtable webhooks to resolve externalId`,
-            {
-              baseId,
-              status: listResp.status,
-              body: listBody,
-            }
-          )
-        }
-      } catch (e: any) {
-        airtableLogger.warn(`[${requestId}] Error attempting to resolve Airtable externalId`, {
-          error: e?.message,
-        })
-      }
-    }
-
-    if (!resolvedExternalId) {
-      airtableLogger.info(
-        `[${requestId}] Airtable externalId not found; skipping remote deletion`,
-        { baseId }
-      )
-      return
-    }
-
-    const webhookIdValidation = validateAirtableId(resolvedExternalId, 'ach', 'webhookId')
-    if (!webhookIdValidation.isValid) {
-      airtableLogger.warn(`[${requestId}] Invalid Airtable webhook ID format, skipping deletion`, {
-        webhookId: webhook.id,
-        externalId: resolvedExternalId.substring(0, 20),
-      })
-      return
-    }
-
-    const airtableDeleteUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks/${resolvedExternalId}`
-    const airtableResponse = await fetch(airtableDeleteUrl, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!airtableResponse.ok) {
-      let responseBody: any = null
-      try {
-        responseBody = await airtableResponse.json()
-      } catch {
-        // Ignore parse errors
-      }
-
-      airtableLogger.warn(
-        `[${requestId}] Failed to delete Airtable webhook in Airtable. Status: ${airtableResponse.status}`,
-        { baseId, externalId: resolvedExternalId, response: responseBody }
-      )
-    } else {
-      airtableLogger.info(`[${requestId}] Successfully deleted Airtable webhook in Airtable`, {
-        baseId,
-        externalId: resolvedExternalId,
-      })
-    }
-  } catch (error: any) {
-    airtableLogger.error(`[${requestId}] Error deleting Airtable webhook`, {
-      webhookId: webhook.id,
-      error: error.message,
-      stack: error.stack,
-    })
-  }
-}
-
-/**
- * Create a Typeform webhook subscription
- * Throws errors with friendly messages if webhook creation fails
- */
-export async function createTypeformWebhook(
-  request: NextRequest,
-  webhook: any,
-  requestId: string
-): Promise<string> {
-  const config = getProviderConfig(webhook)
-  const formId = config.formId as string | undefined
-  const apiKey = config.apiKey as string | undefined
-  const webhookTag = config.webhookTag as string | undefined
-  const secret = config.secret as string | undefined
-
-  if (!formId) {
-    typeformLogger.warn(`[${requestId}] Missing formId for Typeform webhook ${webhook.id}`)
-    throw new Error(
-      'Form ID is required to create a Typeform webhook. Please provide a valid form ID.'
-    )
-  }
-
-  if (!apiKey) {
-    typeformLogger.warn(`[${requestId}] Missing apiKey for Typeform webhook ${webhook.id}`)
-    throw new Error(
-      'Personal Access Token is required to create a Typeform webhook. Please provide your Typeform API key.'
-    )
-  }
-
-  const tag = webhookTag || `sim-${webhook.id.substring(0, 8)}`
-  const notificationUrl = getNotificationUrl(webhook)
-
-  try {
-    const typeformApiUrl = `https://api.typeform.com/forms/${formId}/webhooks/${tag}`
-
-    const requestBody: Record<string, any> = {
-      url: notificationUrl,
-      enabled: true,
-      verify_ssl: true,
-      event_types: {
-        form_response: true,
-      },
-    }
-
-    if (secret) {
-      requestBody.secret = secret
-    }
-
-    const typeformResponse = await fetch(typeformApiUrl, {
-      method: 'PUT',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    if (!typeformResponse.ok) {
-      const responseBody = await typeformResponse.json().catch(() => ({}))
-      const errorMessage = responseBody.description || responseBody.message || 'Unknown error'
-
-      typeformLogger.error(`[${requestId}] Typeform API error: ${errorMessage}`, {
-        status: typeformResponse.status,
-        response: responseBody,
-      })
-
-      let userFriendlyMessage = 'Failed to create Typeform webhook'
-      if (typeformResponse.status === 401) {
-        userFriendlyMessage =
-          'Invalid Personal Access Token. Please verify your Typeform API key and try again.'
-      } else if (typeformResponse.status === 403) {
-        userFriendlyMessage =
-          'Access denied. Please ensure you have a Typeform PRO or PRO+ account and the API key has webhook permissions.'
-      } else if (typeformResponse.status === 404) {
-        userFriendlyMessage = 'Form not found. Please verify the form ID is correct.'
-      } else if (responseBody.description || responseBody.message) {
-        userFriendlyMessage = `Typeform error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    const responseBody = await typeformResponse.json()
-    typeformLogger.info(
-      `[${requestId}] Successfully created Typeform webhook for webhook ${webhook.id} with tag ${tag}`,
-      { webhookId: responseBody.id }
-    )
-
-    return tag
-  } catch (error: any) {
-    if (
-      error instanceof Error &&
-      (error.message.includes('Form ID') ||
-        error.message.includes('Personal Access Token') ||
-        error.message.includes('Typeform error'))
-    ) {
-      throw error
-    }
-
-    typeformLogger.error(
-      `[${requestId}] Error creating Typeform webhook for webhook ${webhook.id}`,
-      error
-    )
-    throw new Error(
-      error instanceof Error
-        ? error.message
-        : 'Failed to create Typeform webhook. Please try again.'
-    )
-  }
-}
-
-/**
- * Delete a Typeform webhook
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteTypeformWebhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const formId = config.formId as string | undefined
-    const apiKey = config.apiKey as string | undefined
-    const webhookTag = config.webhookTag as string | undefined
-
-    if (!formId || !apiKey) {
-      typeformLogger.warn(
-        `[${requestId}] Missing formId or apiKey for Typeform webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const tag = webhookTag || `sim-${webhook.id.substring(0, 8)}`
-    const typeformApiUrl = `https://api.typeform.com/forms/${formId}/webhooks/${tag}`
-
-    const typeformResponse = await fetch(typeformApiUrl, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-      },
-    })
-
-    if (!typeformResponse.ok && typeformResponse.status !== 404) {
-      typeformLogger.warn(
-        `[${requestId}] Failed to delete Typeform webhook (non-fatal): ${typeformResponse.status}`
-      )
-    } else {
-      typeformLogger.info(`[${requestId}] Successfully deleted Typeform webhook with tag ${tag}`)
-    }
-  } catch (error) {
-    typeformLogger.warn(`[${requestId}] Error deleting Typeform webhook (non-fatal)`, error)
-  }
-}
-
-/**
- * Delete a Calendly webhook subscription
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteCalendlyWebhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const apiKey = config.apiKey as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!apiKey) {
-      calendlyLogger.warn(
-        `[${requestId}] Missing apiKey for Calendly webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    if (!externalId) {
-      calendlyLogger.warn(
-        `[${requestId}] Missing externalId for Calendly webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const calendlyApiUrl = `https://api.calendly.com/webhook_subscriptions/${externalId}`
-
-    const calendlyResponse = await fetch(calendlyApiUrl, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-      },
-    })
-
-    if (!calendlyResponse.ok && calendlyResponse.status !== 404) {
-      const responseBody = await calendlyResponse.json().catch(() => ({}))
-      calendlyLogger.warn(
-        `[${requestId}] Failed to delete Calendly webhook (non-fatal): ${calendlyResponse.status}`,
-        { response: responseBody }
-      )
-    } else {
-      calendlyLogger.info(
-        `[${requestId}] Successfully deleted Calendly webhook subscription ${externalId}`
-      )
-    }
-  } catch (error) {
-    calendlyLogger.warn(`[${requestId}] Error deleting Calendly webhook (non-fatal)`, error)
-  }
-}
-
-/**
- * Delete a Grain webhook
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteGrainWebhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const apiKey = config.apiKey as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!apiKey) {
-      grainLogger.warn(
-        `[${requestId}] Missing apiKey for Grain webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    if (!externalId) {
-      grainLogger.warn(
-        `[${requestId}] Missing externalId for Grain webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const grainApiUrl = `https://api.grain.com/_/public-api/hooks/${externalId}`
-
-    const grainResponse = await fetch(grainApiUrl, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
-      },
-    })
-
-    if (!grainResponse.ok && grainResponse.status !== 404) {
-      const responseBody = await grainResponse.json().catch(() => ({}))
-      grainLogger.warn(
-        `[${requestId}] Failed to delete Grain webhook (non-fatal): ${grainResponse.status}`,
-        { response: responseBody }
-      )
-    } else {
-      grainLogger.info(`[${requestId}] Successfully deleted Grain webhook ${externalId}`)
-    }
-  } catch (error) {
-    grainLogger.warn(`[${requestId}] Error deleting Grain webhook (non-fatal)`, error)
-  }
-}
-
-/**
- * Delete a Fathom webhook
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteFathomWebhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const apiKey = config.apiKey as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!apiKey) {
-      fathomLogger.warn(
-        `[${requestId}] Missing apiKey for Fathom webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    if (!externalId) {
-      fathomLogger.warn(
-        `[${requestId}] Missing externalId for Fathom webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const idValidation = validateAlphanumericId(externalId, 'Fathom webhook ID', 100)
-    if (!idValidation.isValid) {
-      fathomLogger.warn(
-        `[${requestId}] Invalid externalId format for Fathom webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const fathomApiUrl = `https://api.fathom.ai/external/v1/webhooks/${externalId}`
-
-    const fathomResponse = await fetch(fathomApiUrl, {
-      method: 'DELETE',
-      headers: {
-        'X-Api-Key': apiKey,
-        'Content-Type': 'application/json',
-      },
-    })
-
-    if (!fathomResponse.ok && fathomResponse.status !== 404) {
-      fathomLogger.warn(
-        `[${requestId}] Failed to delete Fathom webhook (non-fatal): ${fathomResponse.status}`
-      )
-    } else {
-      fathomLogger.info(`[${requestId}] Successfully deleted Fathom webhook ${externalId}`)
-    }
-  } catch (error) {
-    fathomLogger.warn(`[${requestId}] Error deleting Fathom webhook (non-fatal)`, error)
-  }
-}
-
-/**
- * Delete a Lemlist webhook
- * Don't fail webhook deletion if cleanup fails
- */
-export async function deleteLemlistWebhook(webhook: any, requestId: string): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const apiKey = config.apiKey as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!apiKey) {
-      lemlistLogger.warn(
-        `[${requestId}] Missing apiKey for Lemlist webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const authString = Buffer.from(`:${apiKey}`).toString('base64')
-
-    const deleteById = async (id: string) => {
-      const validation = validateAlphanumericId(id, 'Lemlist hook ID', 50)
-      if (!validation.isValid) {
-        lemlistLogger.warn(`[${requestId}] Invalid Lemlist hook ID format, skipping deletion`, {
-          id: id.substring(0, 30),
-        })
-        return
-      }
-
-      const lemlistApiUrl = `https://api.lemlist.com/api/hooks/${id}`
-      const lemlistResponse = await fetch(lemlistApiUrl, {
-        method: 'DELETE',
-        headers: {
-          Authorization: `Basic ${authString}`,
-        },
-      })
-
-      if (!lemlistResponse.ok && lemlistResponse.status !== 404) {
-        const responseBody = await lemlistResponse.json().catch(() => ({}))
-        lemlistLogger.warn(
-          `[${requestId}] Failed to delete Lemlist webhook (non-fatal): ${lemlistResponse.status}`,
-          { response: responseBody }
-        )
-      } else {
-        lemlistLogger.info(`[${requestId}] Successfully deleted Lemlist webhook ${id}`)
-      }
-    }
-
-    if (externalId) {
-      await deleteById(externalId)
-      return
-    }
-
-    const notificationUrl = getNotificationUrl(webhook)
-    const listResponse = await fetch('https://api.lemlist.com/api/hooks', {
-      method: 'GET',
-      headers: {
-        Authorization: `Basic ${authString}`,
-      },
-    })
-
-    if (!listResponse.ok) {
-      lemlistLogger.warn(
-        `[${requestId}] Failed to list Lemlist webhooks for cleanup ${webhook.id}`,
-        { status: listResponse.status }
-      )
-      return
-    }
-
-    const listBody = await listResponse.json().catch(() => null)
-    const hooks: Array<Record<string, any>> = Array.isArray(listBody)
-      ? listBody
-      : listBody?.hooks || listBody?.data || []
-    const matches = hooks.filter((hook) => {
-      const targetUrl = hook?.targetUrl || hook?.target_url || hook?.url
-      return typeof targetUrl === 'string' && targetUrl === notificationUrl
-    })
-
-    if (matches.length === 0) {
-      lemlistLogger.info(`[${requestId}] Lemlist webhook not found for cleanup ${webhook.id}`, {
-        notificationUrl,
-      })
-      return
-    }
-
-    for (const hook of matches) {
-      const hookId = hook?._id || hook?.id
-      if (typeof hookId === 'string' && hookId.length > 0) {
-        await deleteById(hookId)
-      }
-    }
-  } catch (error) {
-    lemlistLogger.warn(`[${requestId}] Error deleting Lemlist webhook (non-fatal)`, error)
-  }
-}
-
-export async function deleteWebflowWebhook(
-  webhook: any,
-  _workflow: any,
-  requestId: string
-): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const siteId = config.siteId as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!siteId) {
-      webflowLogger.warn(
-        `[${requestId}] Missing siteId for Webflow webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    if (!externalId) {
-      webflowLogger.warn(
-        `[${requestId}] Missing externalId for Webflow webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const siteIdValidation = validateAlphanumericId(siteId, 'siteId', 100)
-    if (!siteIdValidation.isValid) {
-      webflowLogger.warn(`[${requestId}] Invalid Webflow site ID format, skipping deletion`, {
-        webhookId: webhook.id,
-        siteId: siteId.substring(0, 30),
-      })
-      return
-    }
-
-    const webhookIdValidation = validateAlphanumericId(externalId, 'webhookId', 100)
-    if (!webhookIdValidation.isValid) {
-      webflowLogger.warn(`[${requestId}] Invalid Webflow webhook ID format, skipping deletion`, {
-        webhookId: webhook.id,
-        externalId: externalId.substring(0, 30),
-      })
-      return
-    }
-
-    const credentialId = config.credentialId as string | undefined
-    if (!credentialId) {
-      webflowLogger.warn(
-        `[${requestId}] Missing credentialId for Webflow webhook deletion ${webhook.id}`
-      )
-      return
-    }
-
-    const credentialOwner = await getCredentialOwner(credentialId, requestId)
-    const accessToken = credentialOwner
-      ? await refreshAccessTokenIfNeeded(
-          credentialOwner.accountId,
-          credentialOwner.userId,
-          requestId
-        )
-      : null
-    if (!accessToken) {
-      webflowLogger.warn(
-        `[${requestId}] Could not retrieve Webflow access token. Cannot delete webhook.`,
-        { webhookId: webhook.id }
-      )
-      return
-    }
-
-    const webflowApiUrl = `https://api.webflow.com/v2/sites/${siteId}/webhooks/${externalId}`
-
-    const webflowResponse = await fetch(webflowApiUrl, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        accept: 'application/json',
-      },
-    })
-
-    if (!webflowResponse.ok && webflowResponse.status !== 404) {
-      const responseBody = await webflowResponse.json().catch(() => ({}))
-      webflowLogger.warn(
-        `[${requestId}] Failed to delete Webflow webhook (non-fatal): ${webflowResponse.status}`,
-        { response: responseBody }
-      )
-    } else {
-      webflowLogger.info(`[${requestId}] Successfully deleted Webflow webhook ${externalId}`)
-    }
-  } catch (error) {
-    webflowLogger.warn(`[${requestId}] Error deleting Webflow webhook (non-fatal)`, error)
-  }
-}
-
-export async function createAttioWebhookSubscription(
-  userId: string,
-  webhookData: any,
-  requestId: string
-): Promise<{ externalId: string; webhookSecret: string } | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { triggerId, credentialId } = providerConfig || {}
-
-    if (!credentialId) {
-      attioLogger.warn(`[${requestId}] Missing credentialId for Attio webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error(
-        'Attio account connection required. Please connect your Attio account in the trigger configuration and try again.'
-      )
-    }
-
-    const credentialOwner = await getCredentialOwner(credentialId, requestId)
-    const accessToken = credentialOwner
-      ? await refreshAccessTokenIfNeeded(
-          credentialOwner.accountId,
-          credentialOwner.userId,
-          requestId
-        )
-      : null
-
-    if (!accessToken) {
-      attioLogger.warn(
-        `[${requestId}] Could not retrieve Attio access token for user ${userId}. Cannot create webhook.`
-      )
-      throw new Error(
-        'Attio account connection required. Please connect your Attio account in the trigger configuration and try again.'
-      )
-    }
-
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const { TRIGGER_EVENT_MAP } = await import('@/triggers/attio/utils')
-
-    let subscriptions: Array<{ event_type: string; filter: null }> = []
-    if (triggerId === 'attio_webhook') {
-      const allEvents = new Set<string>()
-      for (const events of Object.values(TRIGGER_EVENT_MAP)) {
-        for (const event of events) {
-          allEvents.add(event)
-        }
-      }
-      subscriptions = Array.from(allEvents).map((event_type) => ({ event_type, filter: null }))
-    } else {
-      const events = TRIGGER_EVENT_MAP[triggerId]
-      if (!events || events.length === 0) {
-        attioLogger.warn(`[${requestId}] No event types mapped for trigger ${triggerId}`, {
-          webhookId: webhookData.id,
-        })
-        throw new Error(`Unknown Attio trigger type: ${triggerId}`)
-      }
-      subscriptions = events.map((event_type) => ({ event_type, filter: null }))
-    }
-
-    const requestBody = {
-      data: {
-        target_url: notificationUrl,
-        subscriptions,
-      },
-    }
-
-    const attioResponse = await fetch('https://api.attio.com/v2/webhooks', {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    if (!attioResponse.ok) {
-      const errorBody = await attioResponse.json().catch(() => ({}))
-      attioLogger.error(
-        `[${requestId}] Failed to create webhook in Attio for webhook ${webhookData.id}. Status: ${attioResponse.status}`,
-        { response: errorBody }
-      )
-
-      let userFriendlyMessage = 'Failed to create webhook subscription in Attio'
-      if (attioResponse.status === 401) {
-        userFriendlyMessage = 'Attio authentication failed. Please reconnect your Attio account.'
-      } else if (attioResponse.status === 403) {
-        userFriendlyMessage =
-          'Attio access denied. Please ensure your integration has webhook permissions.'
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    const responseBody = await attioResponse.json()
-    const data = responseBody.data || responseBody
-    const webhookId = data.id?.webhook_id || data.webhook_id || data.id
-    const secret = data.secret
-
-    if (!webhookId) {
-      attioLogger.error(
-        `[${requestId}] Attio webhook created but no webhook_id returned for webhook ${webhookData.id}`,
-        { response: responseBody }
-      )
-      throw new Error('Attio webhook creation succeeded but no webhook ID was returned')
-    }
-
-    if (!secret) {
-      attioLogger.warn(
-        `[${requestId}] Attio webhook created but no secret returned for webhook ${webhookData.id}. Signature verification will be skipped.`,
-        { response: responseBody }
-      )
-    }
-
-    attioLogger.info(
-      `[${requestId}] Successfully created webhook in Attio for webhook ${webhookData.id}.`,
-      {
-        attioWebhookId: webhookId,
-        targetUrl: notificationUrl,
-        subscriptionCount: subscriptions.length,
-        status: data.status,
-      }
-    )
-
-    return { externalId: webhookId, webhookSecret: secret || '' }
-  } catch (error: unknown) {
-    const message = error instanceof Error ? error.message : String(error)
-    attioLogger.error(
-      `[${requestId}] Exception during Attio webhook creation for webhook ${webhookData.id}.`,
-      { message }
-    )
-    throw error
-  }
-}
-
-export async function deleteAttioWebhook(
-  webhook: any,
-  _workflow: any,
-  requestId: string
-): Promise<void> {
-  try {
-    const config = getProviderConfig(webhook)
-    const externalId = config.externalId as string | undefined
-    const credentialId = config.credentialId as string | undefined
-
-    if (!externalId) {
-      attioLogger.warn(
-        `[${requestId}] Missing externalId for Attio webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    if (!credentialId) {
-      attioLogger.warn(
-        `[${requestId}] Missing credentialId for Attio webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const credentialOwner = await getCredentialOwner(credentialId, requestId)
-    const accessToken = credentialOwner
-      ? await refreshAccessTokenIfNeeded(
-          credentialOwner.accountId,
-          credentialOwner.userId,
-          requestId
-        )
-      : null
-
-    if (!accessToken) {
-      attioLogger.warn(
-        `[${requestId}] Could not retrieve Attio access token. Cannot delete webhook.`,
-        { webhookId: webhook.id }
-      )
-      return
-    }
-
-    const attioResponse = await fetch(`https://api.attio.com/v2/webhooks/${externalId}`, {
-      method: 'DELETE',
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!attioResponse.ok && attioResponse.status !== 404) {
-      const responseBody = await attioResponse.json().catch(() => ({}))
-      attioLogger.warn(
-        `[${requestId}] Failed to delete Attio webhook (non-fatal): ${attioResponse.status}`,
-        { response: responseBody }
-      )
-    } else {
-      attioLogger.info(`[${requestId}] Successfully deleted Attio webhook ${externalId}`)
-    }
-  } catch (error) {
-    attioLogger.warn(`[${requestId}] Error deleting Attio webhook (non-fatal)`, error)
-  }
-}
-
-export async function createGrainWebhookSubscription(
-  _request: NextRequest,
-  webhookData: any,
-  requestId: string
-): Promise<{ id: string; eventTypes: string[] } | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { apiKey, triggerId, viewId } = providerConfig || {}
-
-    if (!apiKey) {
-      grainLogger.warn(`[${requestId}] Missing apiKey for Grain webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error(
-        'Grain API Key is required. Please provide your Grain Personal Access Token in the trigger configuration.'
-      )
-    }
-
-    if (!viewId) {
-      grainLogger.warn(`[${requestId}] Missing viewId for Grain webhook creation.`, {
-        webhookId: webhookData.id,
-        triggerId,
-      })
-      throw new Error(
-        'Grain view ID is required. Please provide the Grain view ID from GET /_/public-api/views in the trigger configuration.'
-      )
-    }
-
-    const actionMap: Record<string, Array<'added' | 'updated' | 'removed'>> = {
-      grain_item_added: ['added'],
-      grain_item_updated: ['updated'],
-      grain_recording_created: ['added'],
-      grain_recording_updated: ['updated'],
-      grain_highlight_created: ['added'],
-      grain_highlight_updated: ['updated'],
-      grain_story_created: ['added'],
-    }
-
-    const eventTypeMap: Record<string, string[]> = {
-      grain_webhook: [],
-      grain_item_added: [],
-      grain_item_updated: [],
-      grain_recording_created: ['recording_added'],
-      grain_recording_updated: ['recording_updated'],
-      grain_highlight_created: ['highlight_added'],
-      grain_highlight_updated: ['highlight_updated'],
-      grain_story_created: ['story_added'],
-    }
-
-    const actions = actionMap[triggerId] ?? []
-    const eventTypes = eventTypeMap[triggerId] ?? []
-
-    if (!triggerId || (!(triggerId in actionMap) && triggerId !== 'grain_webhook')) {
-      grainLogger.warn(
-        `[${requestId}] Unknown triggerId for Grain: ${triggerId}, defaulting to all actions`,
-        {
-          webhookId: webhookData.id,
-        }
-      )
-    }
-
-    grainLogger.info(`[${requestId}] Creating Grain webhook`, {
-      triggerId,
-      viewId,
-      actions,
-      eventTypes,
-      webhookId: webhookData.id,
-    })
-
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const grainApiUrl = 'https://api.grain.com/_/public-api/hooks'
-
-    const requestBody: Record<string, any> = {
-      version: 2,
-      hook_url: notificationUrl,
-      view_id: viewId,
-    }
-    if (actions.length > 0) {
-      requestBody.actions = actions
-    }
-
-    const grainResponse = await fetch(grainApiUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await grainResponse.json()
-
-    if (!grainResponse.ok || responseBody.error || responseBody.errors) {
-      const errorMessage =
-        responseBody.errors?.detail ||
-        responseBody.error?.message ||
-        responseBody.error ||
-        responseBody.message ||
-        'Unknown Grain API error'
-      grainLogger.error(
-        `[${requestId}] Failed to create webhook in Grain for webhook ${webhookData.id}. Status: ${grainResponse.status}`,
-        { message: errorMessage, response: responseBody }
-      )
-
-      let userFriendlyMessage = 'Failed to create webhook subscription in Grain'
-      if (grainResponse.status === 401) {
-        userFriendlyMessage =
-          'Invalid Grain API Key. Please verify your Personal Access Token is correct.'
-      } else if (grainResponse.status === 403) {
-        userFriendlyMessage =
-          'Access denied. Please ensure your Grain API Key has appropriate permissions.'
-      } else if (errorMessage && errorMessage !== 'Unknown Grain API error') {
-        userFriendlyMessage = `Grain error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    const grainWebhookId = responseBody.id
-
-    if (!grainWebhookId) {
-      grainLogger.error(
-        `[${requestId}] Grain webhook creation response missing id for webhook ${webhookData.id}.`,
-        {
-          response: responseBody,
-        }
-      )
-      throw new Error(
-        'Grain webhook created but no webhook ID was returned in the response. Cannot track subscription.'
-      )
-    }
-
-    grainLogger.info(
-      `[${requestId}] Successfully created webhook in Grain for webhook ${webhookData.id}.`,
-      {
-        grainWebhookId,
-        eventTypes,
-      }
-    )
-
-    return { id: grainWebhookId, eventTypes }
-  } catch (error: any) {
-    grainLogger.error(
-      `[${requestId}] Exception during Grain webhook creation for webhook ${webhookData.id}.`,
-      {
-        message: error.message,
-        stack: error.stack,
-      }
-    )
-    throw error
-  }
-}
-
-export async function createFathomWebhookSubscription(
-  _request: NextRequest,
-  webhookData: any,
-  requestId: string
-): Promise<{ id: string } | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const {
-      apiKey,
-      triggerId,
-      triggeredFor,
-      includeSummary,
-      includeTranscript,
-      includeActionItems,
-      includeCrmMatches,
-    } = providerConfig || {}
-
-    if (!apiKey) {
-      fathomLogger.warn(`[${requestId}] Missing apiKey for Fathom webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error(
-        'Fathom API Key is required. Please provide your API key in the trigger configuration.'
-      )
-    }
-
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const triggeredForValue = triggeredFor || 'my_recordings'
-
-    const toBool = (val: unknown, fallback: boolean): boolean => {
-      if (val === undefined) return fallback
-      return val === true || val === 'true'
-    }
-
-    const requestBody: Record<string, any> = {
-      destination_url: notificationUrl,
-      triggered_for: [triggeredForValue],
-      include_summary: toBool(includeSummary, true),
-      include_transcript: toBool(includeTranscript, false),
-      include_action_items: toBool(includeActionItems, false),
-      include_crm_matches: toBool(includeCrmMatches, false),
-    }
-
-    fathomLogger.info(`[${requestId}] Creating Fathom webhook`, {
-      triggerId,
-      triggeredFor: triggeredForValue,
-      webhookId: webhookData.id,
-    })
-
-    const fathomResponse = await fetch('https://api.fathom.ai/external/v1/webhooks', {
-      method: 'POST',
-      headers: {
-        'X-Api-Key': apiKey,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await fathomResponse.json().catch(() => ({}))
-
-    if (!fathomResponse.ok) {
-      const errorMessage =
-        (responseBody as Record<string, string>).message ||
-        (responseBody as Record<string, string>).error ||
-        'Unknown Fathom API error'
-      fathomLogger.error(
-        `[${requestId}] Failed to create webhook in Fathom for webhook ${webhookData.id}. Status: ${fathomResponse.status}`,
-        { message: errorMessage, response: responseBody }
-      )
-
-      let userFriendlyMessage = 'Failed to create webhook subscription in Fathom'
-      if (fathomResponse.status === 401) {
-        userFriendlyMessage = 'Invalid Fathom API Key. Please verify your key is correct.'
-      } else if (fathomResponse.status === 400) {
-        userFriendlyMessage = `Fathom error: ${errorMessage}`
-      } else if (errorMessage && errorMessage !== 'Unknown Fathom API error') {
-        userFriendlyMessage = `Fathom error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    if (!responseBody.id) {
-      fathomLogger.error(
-        `[${requestId}] Fathom webhook creation returned success but no webhook ID for ${webhookData.id}.`
-      )
-      throw new Error('Fathom webhook created but no ID returned. Please try again.')
-    }
-
-    fathomLogger.info(
-      `[${requestId}] Successfully created webhook in Fathom for webhook ${webhookData.id}.`,
-      {
-        fathomWebhookId: responseBody.id,
-      }
-    )
-
-    return { id: responseBody.id }
-  } catch (error: any) {
-    fathomLogger.error(
-      `[${requestId}] Exception during Fathom webhook creation for webhook ${webhookData.id}.`,
-      {
-        message: error.message,
-        stack: error.stack,
-      }
-    )
-    throw error
-  }
-}
-
-export async function createLemlistWebhookSubscription(
-  webhookData: any,
-  requestId: string
-): Promise<{ id: string } | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { apiKey, triggerId, campaignId } = providerConfig || {}
-
-    if (!apiKey) {
-      lemlistLogger.warn(`[${requestId}] Missing apiKey for Lemlist webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error(
-        'Lemlist API Key is required. Please provide your Lemlist API Key in the trigger configuration.'
-      )
-    }
-
-    const eventTypeMap: Record<string, string | undefined> = {
-      lemlist_email_replied: 'emailsReplied',
-      lemlist_linkedin_replied: 'linkedinReplied',
-      lemlist_interested: 'interested',
-      lemlist_not_interested: 'notInterested',
-      lemlist_email_opened: 'emailsOpened',
-      lemlist_email_clicked: 'emailsClicked',
-      lemlist_email_bounced: 'emailsBounced',
-      lemlist_email_sent: 'emailsSent',
-      lemlist_webhook: undefined,
-    }
-
-    const eventType = eventTypeMap[triggerId]
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-    const authString = Buffer.from(`:${apiKey}`).toString('base64')
-
-    lemlistLogger.info(`[${requestId}] Creating Lemlist webhook`, {
-      triggerId,
-      eventType,
-      hasCampaignId: !!campaignId,
-      webhookId: webhookData.id,
-    })
-
-    const lemlistApiUrl = 'https://api.lemlist.com/api/hooks'
-
-    const requestBody: Record<string, any> = {
-      targetUrl: notificationUrl,
-    }
-
-    if (eventType) {
-      requestBody.type = eventType
-    }
-
-    if (campaignId) {
-      requestBody.campaignId = campaignId
-    }
-
-    const lemlistResponse = await fetch(lemlistApiUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `Basic ${authString}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await lemlistResponse.json()
-
-    if (!lemlistResponse.ok || responseBody.error) {
-      const errorMessage = responseBody.message || responseBody.error || 'Unknown Lemlist API error'
-      lemlistLogger.error(
-        `[${requestId}] Failed to create webhook in Lemlist for webhook ${webhookData.id}. Status: ${lemlistResponse.status}`,
-        { message: errorMessage, response: responseBody }
-      )
-
-      let userFriendlyMessage = 'Failed to create webhook subscription in Lemlist'
-      if (lemlistResponse.status === 401) {
-        userFriendlyMessage = 'Invalid Lemlist API Key. Please verify your API Key is correct.'
-      } else if (lemlistResponse.status === 403) {
-        userFriendlyMessage =
-          'Access denied. Please ensure your Lemlist API Key has appropriate permissions.'
-      } else if (errorMessage && errorMessage !== 'Unknown Lemlist API error') {
-        userFriendlyMessage = `Lemlist error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    lemlistLogger.info(
-      `[${requestId}] Successfully created webhook in Lemlist for webhook ${webhookData.id}.`,
-      {
-        lemlistWebhookId: responseBody._id,
-      }
-    )
-
-    return { id: responseBody._id }
-  } catch (error: any) {
-    lemlistLogger.error(
-      `[${requestId}] Exception during Lemlist webhook creation for webhook ${webhookData.id}.`,
-      {
-        message: error.message,
-        stack: error.stack,
-      }
-    )
-    throw error
-  }
-}
-
-export async function createAirtableWebhookSubscription(
-  userId: string,
-  webhookData: any,
-  requestId: string
-): Promise<string | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { baseId, tableId, includeCellValuesInFieldIds, credentialId } = providerConfig || {}
-
-    if (!baseId || !tableId) {
-      airtableLogger.warn(
-        `[${requestId}] Missing baseId or tableId for Airtable webhook creation.`,
-        {
-          webhookId: webhookData.id,
-        }
-      )
-      throw new Error(
-        'Base ID and Table ID are required to create Airtable webhook. Please provide valid Airtable base and table IDs.'
-      )
-    }
-
-    const baseIdValidation = validateAirtableId(baseId, 'app', 'baseId')
-    if (!baseIdValidation.isValid) {
-      throw new Error(baseIdValidation.error)
-    }
-
-    const tableIdValidation = validateAirtableId(tableId, 'tbl', 'tableId')
-    if (!tableIdValidation.isValid) {
-      throw new Error(tableIdValidation.error)
-    }
-
-    const credentialOwner = credentialId ? await getCredentialOwner(credentialId, requestId) : null
-    const accessToken = credentialId
-      ? credentialOwner
-        ? await refreshAccessTokenIfNeeded(
-            credentialOwner.accountId,
-            credentialOwner.userId,
-            requestId
-          )
-        : null
-      : await getOAuthToken(userId, 'airtable')
-    if (!accessToken) {
-      airtableLogger.warn(
-        `[${requestId}] Could not retrieve Airtable access token for user ${userId}. Cannot create webhook in Airtable.`
-      )
-      throw new Error(
-        'Airtable account connection required. Please connect your Airtable account in the trigger configuration and try again.'
-      )
-    }
-
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const airtableApiUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks`
-
-    const specification: any = {
-      options: {
-        filters: {
-          dataTypes: ['tableData'],
-          recordChangeScope: tableId,
-        },
-      },
-    }
-
-    if (includeCellValuesInFieldIds === 'all') {
-      specification.options.includes = {
-        includeCellValuesInFieldIds: 'all',
-      }
-    }
-
-    const requestBody: any = {
-      notificationUrl: notificationUrl,
-      specification: specification,
-    }
-
-    const airtableResponse = await fetch(airtableApiUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await airtableResponse.json()
-
-    if (!airtableResponse.ok || responseBody.error) {
-      const errorMessage =
-        responseBody.error?.message || responseBody.error || 'Unknown Airtable API error'
-      const errorType = responseBody.error?.type
-      airtableLogger.error(
-        `[${requestId}] Failed to create webhook in Airtable for webhook ${webhookData.id}. Status: ${airtableResponse.status}`,
-        { type: errorType, message: errorMessage, response: responseBody }
-      )
-
-      let userFriendlyMessage = 'Failed to create webhook subscription in Airtable'
-      if (airtableResponse.status === 404) {
-        userFriendlyMessage =
-          'Airtable base or table not found. Please verify that the Base ID and Table ID are correct and that you have access to them.'
-      } else if (errorMessage && errorMessage !== 'Unknown Airtable API error') {
-        userFriendlyMessage = `Airtable error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-    airtableLogger.info(
-      `[${requestId}] Successfully created webhook in Airtable for webhook ${webhookData.id}.`,
-      {
-        airtableWebhookId: responseBody.id,
-      }
-    )
-    return responseBody.id
-  } catch (error: any) {
-    airtableLogger.error(
-      `[${requestId}] Exception during Airtable webhook creation for webhook ${webhookData.id}.`,
-      {
-        message: error.message,
-        stack: error.stack,
-      }
-    )
-    throw error
-  }
-}
-
-export async function createCalendlyWebhookSubscription(
-  webhookData: any,
-  requestId: string
-): Promise<string | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { apiKey, organization, triggerId } = providerConfig || {}
-
-    if (!apiKey) {
-      calendlyLogger.warn(`[${requestId}] Missing apiKey for Calendly webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error(
-        'Personal Access Token is required to create Calendly webhook. Please provide your Calendly Personal Access Token.'
-      )
-    }
-
-    if (!organization) {
-      calendlyLogger.warn(
-        `[${requestId}] Missing organization URI for Calendly webhook creation.`,
-        {
-          webhookId: webhookData.id,
-        }
-      )
-      throw new Error(
-        'Organization URI is required to create Calendly webhook. Please provide your Organization URI from the "Get Current User" operation.'
-      )
-    }
-
-    if (!triggerId) {
-      calendlyLogger.warn(`[${requestId}] Missing triggerId for Calendly webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error('Trigger ID is required to create Calendly webhook')
-    }
-
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const eventTypeMap: Record<string, string[]> = {
-      calendly_invitee_created: ['invitee.created'],
-      calendly_invitee_canceled: ['invitee.canceled'],
-      calendly_routing_form_submitted: ['routing_form_submission.created'],
-      calendly_webhook: ['invitee.created', 'invitee.canceled', 'routing_form_submission.created'],
-    }
-
-    const events = eventTypeMap[triggerId] || ['invitee.created']
-
-    const calendlyApiUrl = 'https://api.calendly.com/webhook_subscriptions'
-
-    const requestBody = {
-      url: notificationUrl,
-      events,
-      organization,
-      scope: 'organization',
-    }
-
-    const calendlyResponse = await fetch(calendlyApiUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${apiKey}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    if (!calendlyResponse.ok) {
-      const errorBody = await calendlyResponse.json().catch(() => ({}))
-      const errorMessage = errorBody.message || errorBody.title || 'Unknown Calendly API error'
-      calendlyLogger.error(
-        `[${requestId}] Failed to create webhook in Calendly for webhook ${webhookData.id}. Status: ${calendlyResponse.status}`,
-        { response: errorBody }
-      )
-
-      let userFriendlyMessage = 'Failed to create webhook subscription in Calendly'
-      if (calendlyResponse.status === 401) {
-        userFriendlyMessage =
-          'Calendly authentication failed. Please verify your Personal Access Token is correct.'
-      } else if (calendlyResponse.status === 403) {
-        userFriendlyMessage =
-          'Calendly access denied. Please ensure you have appropriate permissions and a paid Calendly subscription.'
-      } else if (calendlyResponse.status === 404) {
-        userFriendlyMessage =
-          'Calendly organization not found. Please verify the Organization URI is correct.'
-      } else if (errorMessage && errorMessage !== 'Unknown Calendly API error') {
-        userFriendlyMessage = `Calendly error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    const responseBody = await calendlyResponse.json()
-    const webhookUri = responseBody.resource?.uri
-
-    if (!webhookUri) {
-      calendlyLogger.error(
-        `[${requestId}] Calendly webhook created but no webhook URI returned for webhook ${webhookData.id}`,
-        { response: responseBody }
-      )
-      throw new Error('Calendly webhook creation succeeded but no webhook URI was returned')
-    }
-
-    const webhookId = webhookUri.split('/').pop()
-
-    if (!webhookId) {
-      calendlyLogger.error(
-        `[${requestId}] Could not extract webhook ID from Calendly URI: ${webhookUri}`,
-        {
-          response: responseBody,
-        }
-      )
-      throw new Error('Failed to extract webhook ID from Calendly response')
-    }
-
-    calendlyLogger.info(
-      `[${requestId}] Successfully created webhook in Calendly for webhook ${webhookData.id}.`,
-      {
-        calendlyWebhookUri: webhookUri,
-        calendlyWebhookId: webhookId,
-      }
-    )
-    return webhookId
-  } catch (error: any) {
-    calendlyLogger.error(
-      `[${requestId}] Exception during Calendly webhook creation for webhook ${webhookData.id}.`,
-      {
-        message: error.message,
-        stack: error.stack,
-      }
-    )
-    throw error
-  }
-}
-
-export async function createWebflowWebhookSubscription(
-  userId: string,
-  webhookData: any,
-  requestId: string
-): Promise<string | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { siteId, triggerId, collectionId, formName, credentialId } = providerConfig || {}
-
-    if (!siteId) {
-      webflowLogger.warn(`[${requestId}] Missing siteId for Webflow webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error('Site ID is required to create Webflow webhook')
-    }
-
-    const siteIdValidation = validateAlphanumericId(siteId, 'siteId', 100)
-    if (!siteIdValidation.isValid) {
-      throw new Error(siteIdValidation.error)
-    }
-
-    if (!triggerId) {
-      webflowLogger.warn(`[${requestId}] Missing triggerId for Webflow webhook creation.`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error('Trigger type is required to create Webflow webhook')
-    }
-
-    const credentialOwner = credentialId ? await getCredentialOwner(credentialId, requestId) : null
-    const accessToken = credentialId
-      ? credentialOwner
-        ? await refreshAccessTokenIfNeeded(
-            credentialOwner.accountId,
-            credentialOwner.userId,
-            requestId
-          )
-        : null
-      : await getOAuthToken(userId, 'webflow')
-    if (!accessToken) {
-      webflowLogger.warn(
-        `[${requestId}] Could not retrieve Webflow access token for user ${userId}. Cannot create webhook in Webflow.`
-      )
-      throw new Error(
-        'Webflow account connection required. Please connect your Webflow account in the trigger configuration and try again.'
-      )
-    }
-
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-
-    const triggerTypeMap: Record<string, string> = {
-      webflow_collection_item_created: 'collection_item_created',
-      webflow_collection_item_changed: 'collection_item_changed',
-      webflow_collection_item_deleted: 'collection_item_deleted',
-      webflow_form_submission: 'form_submission',
-    }
-
-    const webflowTriggerType = triggerTypeMap[triggerId]
-    if (!webflowTriggerType) {
-      webflowLogger.warn(`[${requestId}] Invalid triggerId for Webflow: ${triggerId}`, {
-        webhookId: webhookData.id,
-      })
-      throw new Error(`Invalid Webflow trigger type: ${triggerId}`)
-    }
-
-    const webflowApiUrl = `https://api.webflow.com/v2/sites/${siteId}/webhooks`
-
-    const requestBody: any = {
-      triggerType: webflowTriggerType,
-      url: notificationUrl,
-    }
-
-    // Note: Webflow API only supports 'filter' for form_submission triggers.
-    if (formName && webflowTriggerType === 'form_submission') {
-      requestBody.filter = {
-        name: formName,
-      }
-    }
-
-    const webflowResponse = await fetch(webflowApiUrl, {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        'Content-Type': 'application/json',
-        accept: 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await webflowResponse.json()
-
-    if (!webflowResponse.ok || responseBody.error) {
-      const errorMessage = responseBody.message || responseBody.error || 'Unknown Webflow API error'
-      webflowLogger.error(
-        `[${requestId}] Failed to create webhook in Webflow for webhook ${webhookData.id}. Status: ${webflowResponse.status}`,
-        { message: errorMessage, response: responseBody }
-      )
-      throw new Error(errorMessage)
-    }
-
-    webflowLogger.info(
-      `[${requestId}] Successfully created webhook in Webflow for webhook ${webhookData.id}.`,
-      {
-        webflowWebhookId: responseBody.id || responseBody._id,
-      }
-    )
-
-    return responseBody.id || responseBody._id
-  } catch (error: any) {
-    webflowLogger.error(
-      `[${requestId}] Exception during Webflow webhook creation for webhook ${webhookData.id}.`,
-      {
-        message: error.message,
-        stack: error.stack,
-      }
-    )
-    throw error
-  }
-}
+const logger = createLogger('WebhookProviderSubscriptions')
 
 type ExternalSubscriptionResult = {
   updatedProviderConfig: Record<string, unknown>
@@ -1986,21 +16,6 @@ type RecreateCheckInput = {
   nextConfig: Record<string, unknown>
 }
 
-/** Providers that create external webhook subscriptions */
-const PROVIDERS_WITH_EXTERNAL_SUBSCRIPTIONS = new Set([
-  'airtable',
-  'ashby',
-  'attio',
-  'calendly',
-  'fathom',
-  'webflow',
-  'typeform',
-  'grain',
-  'lemlist',
-  'telegram',
-  'microsoft-teams',
-])
-
 /** System-managed fields that shouldn't trigger recreation */
 const SYSTEM_MANAGED_FIELDS = new Set([
   'externalId',
@@ -2008,26 +23,37 @@ const SYSTEM_MANAGED_FIELDS = new Set([
   'eventTypes',
   'webhookTag',
   'webhookSecret',
+  'signingSecret',
+  'secretToken',
   'historyId',
   'lastCheckedTimestamp',
   'setupCompleted',
   'userId',
 ])
 
+/**
+ * Determine whether a webhook with provider-managed registration should be
+ * recreated after its persisted provider config changes.
+ *
+ * Only user-controlled fields are considered; provider-managed fields such as
+ * external IDs and generated secrets are ignored.
+ */
 export function shouldRecreateExternalWebhookSubscription({
   previousProvider,
   nextProvider,
   previousConfig,
   nextConfig,
 }: RecreateCheckInput): boolean {
+  const hasSubscription = (provider: string) => {
+    const handler = getProviderHandler(provider)
+    return Boolean(handler.createSubscription)
+  }
+
   if (previousProvider !== nextProvider) {
-    return (
-      PROVIDERS_WITH_EXTERNAL_SUBSCRIPTIONS.has(previousProvider) ||
-      PROVIDERS_WITH_EXTERNAL_SUBSCRIPTIONS.has(nextProvider)
-    )
+    return hasSubscription(previousProvider) || hasSubscription(nextProvider)
   }
 
-  if (!PROVIDERS_WITH_EXTERNAL_SUBSCRIPTIONS.has(nextProvider)) {
+  if (!hasSubscription(nextProvider)) {
     return false
   }
 
@@ -2050,289 +76,69 @@ export function shouldRecreateExternalWebhookSubscription({
   return false
 }
 
+/**
+ * Ask the provider handler to create an external webhook subscription, if that
+ * provider supports automatic registration.
+ *
+ * The returned provider-managed fields are merged back into `providerConfig`
+ * by the caller.
+ */
 export async function createExternalWebhookSubscription(
   request: NextRequest,
-  webhookData: any,
-  workflow: any,
+  webhookData: Record<string, unknown>,
+  workflow: Record<string, unknown>,
   userId: string,
   requestId: string
 ): Promise<ExternalSubscriptionResult> {
   const provider = webhookData.provider as string
   const providerConfig = (webhookData.providerConfig as Record<string, unknown>) || {}
-  let updatedProviderConfig = providerConfig
-  let externalSubscriptionCreated = false
+  const handler = getProviderHandler(provider)
 
-  if (provider === 'ashby') {
-    const result = await createAshbyWebhookSubscription(webhookData, requestId)
-    if (result) {
-      updatedProviderConfig = {
-        ...updatedProviderConfig,
-        externalId: result.id,
-        secretToken: result.secretToken,
-      }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'airtable') {
-    const externalId = await createAirtableWebhookSubscription(userId, webhookData, requestId)
-    if (externalId) {
-      updatedProviderConfig = { ...updatedProviderConfig, externalId }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'attio') {
-    const result = await createAttioWebhookSubscription(userId, webhookData, requestId)
-    if (result) {
-      updatedProviderConfig = {
-        ...updatedProviderConfig,
-        externalId: result.externalId,
-        webhookSecret: result.webhookSecret,
-      }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'calendly') {
-    const externalId = await createCalendlyWebhookSubscription(webhookData, requestId)
-    if (externalId) {
-      updatedProviderConfig = { ...updatedProviderConfig, externalId }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'microsoft-teams') {
-    const subscriptionId = await createTeamsSubscription(request, webhookData, workflow, requestId)
-    if (subscriptionId) {
-      updatedProviderConfig = { ...updatedProviderConfig, externalSubscriptionId: subscriptionId }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'telegram') {
-    await createTelegramWebhook(request, webhookData, requestId)
-    externalSubscriptionCreated = true
-  } else if (provider === 'webflow') {
-    const externalId = await createWebflowWebhookSubscription(userId, webhookData, requestId)
-    if (externalId) {
-      updatedProviderConfig = { ...updatedProviderConfig, externalId }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'typeform') {
-    const usedTag = await createTypeformWebhook(request, webhookData, requestId)
-    if (!updatedProviderConfig.webhookTag && usedTag) {
-      updatedProviderConfig = { ...updatedProviderConfig, webhookTag: usedTag }
-    }
-    externalSubscriptionCreated = true
-  } else if (provider === 'fathom') {
-    const result = await createFathomWebhookSubscription(request, webhookData, requestId)
-    if (result) {
-      updatedProviderConfig = { ...updatedProviderConfig, externalId: result.id }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'grain') {
-    const result = await createGrainWebhookSubscription(request, webhookData, requestId)
-    if (result) {
-      updatedProviderConfig = {
-        ...updatedProviderConfig,
-        externalId: result.id,
-        eventTypes: result.eventTypes,
-      }
-      externalSubscriptionCreated = true
-    }
-  } else if (provider === 'lemlist') {
-    const result = await createLemlistWebhookSubscription(webhookData, requestId)
-    if (result) {
-      updatedProviderConfig = { ...updatedProviderConfig, externalId: result.id }
-      externalSubscriptionCreated = true
-    }
+  if (!handler.createSubscription) {
+    return { updatedProviderConfig: providerConfig, externalSubscriptionCreated: false }
   }
 
-  return { updatedProviderConfig, externalSubscriptionCreated }
-}
+  const result = await handler.createSubscription({
+    webhook: webhookData,
+    workflow,
+    userId,
+    requestId,
+    request,
+  })
 
-/**
- * Clean up external webhook subscriptions for a webhook
- * Handles Airtable, Attio, Teams, Telegram, Typeform, Calendly, Grain, and Lemlist cleanup
- * Don't fail deletion if cleanup fails
- */
-export async function cleanupExternalWebhook(
-  webhook: any,
-  workflow: any,
-  requestId: string
-): Promise<void> {
-  if (webhook.provider === 'ashby') {
-    await deleteAshbyWebhook(webhook, requestId)
-  } else if (webhook.provider === 'airtable') {
-    await deleteAirtableWebhook(webhook, workflow, requestId)
-  } else if (webhook.provider === 'attio') {
-    await deleteAttioWebhook(webhook, workflow, requestId)
-  } else if (webhook.provider === 'microsoft-teams') {
-    await deleteTeamsSubscription(webhook, workflow, requestId)
-  } else if (webhook.provider === 'telegram') {
-    await deleteTelegramWebhook(webhook, requestId)
-  } else if (webhook.provider === 'typeform') {
-    await deleteTypeformWebhook(webhook, requestId)
-  } else if (webhook.provider === 'calendly') {
-    await deleteCalendlyWebhook(webhook, requestId)
-  } else if (webhook.provider === 'webflow') {
-    await deleteWebflowWebhook(webhook, workflow, requestId)
-  } else if (webhook.provider === 'fathom') {
-    await deleteFathomWebhook(webhook, requestId)
-  } else if (webhook.provider === 'grain') {
-    await deleteGrainWebhook(webhook, requestId)
-  } else if (webhook.provider === 'lemlist') {
-    await deleteLemlistWebhook(webhook, requestId)
+  if (!result) {
+    return { updatedProviderConfig: providerConfig, externalSubscriptionCreated: false }
+  }
+
+  return {
+    updatedProviderConfig: { ...providerConfig, ...result.providerConfigUpdates },
+    externalSubscriptionCreated: true,
   }
 }
 
 /**
- * Creates a webhook subscription in Ashby via webhook.create API.
- * Ashby uses Basic Auth and one webhook per event type (webhookType).
+ * Clean up external webhook subscriptions for a webhook.
+ * Errors are swallowed — cleanup failure should not block webhook deletion.
  */
-export async function createAshbyWebhookSubscription(
-  webhookData: any,
+export async function cleanupExternalWebhook(
+  webhook: Record<string, unknown>,
+  workflow: Record<string, unknown>,
   requestId: string
-): Promise<{ id: string; secretToken: string } | undefined> {
-  try {
-    const { path, providerConfig } = webhookData
-    const { apiKey, triggerId } = providerConfig || {}
-
-    if (!apiKey) {
-      throw new Error(
-        'Ashby API Key is required. Please provide your API Key with apiKeysWrite permission in the trigger configuration.'
-      )
-    }
-
-    if (!triggerId) {
-      throw new Error('Trigger ID is required to create Ashby webhook.')
-    }
-
-    const webhookTypeMap: Record<string, string> = {
-      ashby_application_submit: 'applicationSubmit',
-      ashby_candidate_stage_change: 'candidateStageChange',
-      ashby_candidate_hire: 'candidateHire',
-      ashby_candidate_delete: 'candidateDelete',
-      ashby_job_create: 'jobCreate',
-      ashby_offer_create: 'offerCreate',
-    }
-
-    const webhookType = webhookTypeMap[triggerId]
-    if (!webhookType) {
-      throw new Error(`Unknown Ashby triggerId: ${triggerId}. Add it to webhookTypeMap.`)
-    }
-
-    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
-    const authString = Buffer.from(`${apiKey}:`).toString('base64')
-
-    ashbyLogger.info(`[${requestId}] Creating Ashby webhook`, {
-      triggerId,
-      webhookType,
-      webhookId: webhookData.id,
-    })
-
-    const secretToken = generateId()
-
-    const requestBody: Record<string, unknown> = {
-      requestUrl: notificationUrl,
-      webhookType,
-      secretToken,
-    }
-
-    const ashbyResponse = await fetch('https://api.ashbyhq.com/webhook.create', {
-      method: 'POST',
-      headers: {
-        Authorization: `Basic ${authString}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(requestBody),
-    })
-
-    const responseBody = await ashbyResponse.json().catch(() => ({}))
-
-    if (!ashbyResponse.ok || !responseBody.success) {
-      const errorMessage =
-        responseBody.errorInfo?.message || responseBody.message || 'Unknown Ashby API error'
-
-      let userFriendlyMessage = 'Failed to create webhook subscription in Ashby'
-      if (ashbyResponse.status === 401) {
-        userFriendlyMessage =
-          'Invalid Ashby API Key. Please verify your API Key is correct and has apiKeysWrite permission.'
-      } else if (ashbyResponse.status === 403) {
-        userFriendlyMessage =
-          'Access denied. Please ensure your Ashby API Key has the apiKeysWrite permission.'
-      } else if (errorMessage && errorMessage !== 'Unknown Ashby API error') {
-        userFriendlyMessage = `Ashby error: ${errorMessage}`
-      }
-
-      throw new Error(userFriendlyMessage)
-    }
-
-    const externalId = responseBody.results?.id
-    if (!externalId) {
-      throw new Error('Ashby webhook creation succeeded but no webhook ID was returned')
-    }
+): Promise<void> {
+  const provider = webhook.provider as string
+  const handler = getProviderHandler(provider)
 
-    ashbyLogger.info(
-      `[${requestId}] Successfully created Ashby webhook subscription ${externalId} for webhook ${webhookData.id}`
-    )
-    return { id: externalId, secretToken }
-  } catch (error: any) {
-    ashbyLogger.error(
-      `[${requestId}] Exception during Ashby webhook creation for webhook ${webhookData.id}.`,
-      {
-        message: error.message,
-        stack: error.stack,
-      }
-    )
-    throw error
+  if (!handler.deleteSubscription) {
+    return
   }
-}
 
-/**
- * Deletes an Ashby webhook subscription via webhook.delete API.
- * Ashby uses POST with webhookId in the body (not DELETE method).
- */
-export async function deleteAshbyWebhook(webhook: any, requestId: string): Promise<void> {
   try {
-    const config = getProviderConfig(webhook)
-    const apiKey = config.apiKey as string | undefined
-    const externalId = config.externalId as string | undefined
-
-    if (!apiKey) {
-      ashbyLogger.warn(
-        `[${requestId}] Missing apiKey for Ashby webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    if (!externalId) {
-      ashbyLogger.warn(
-        `[${requestId}] Missing externalId for Ashby webhook deletion ${webhook.id}, skipping cleanup`
-      )
-      return
-    }
-
-    const authString = Buffer.from(`${apiKey}:`).toString('base64')
-
-    const ashbyResponse = await fetch('https://api.ashbyhq.com/webhook.delete', {
-      method: 'POST',
-      headers: {
-        Authorization: `Basic ${authString}`,
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ webhookId: externalId }),
-    })
-
-    if (ashbyResponse.ok) {
-      await ashbyResponse.body?.cancel()
-      ashbyLogger.info(
-        `[${requestId}] Successfully deleted Ashby webhook subscription ${externalId}`
-      )
-    } else if (ashbyResponse.status === 404) {
-      await ashbyResponse.body?.cancel()
-      ashbyLogger.info(
-        `[${requestId}] Ashby webhook ${externalId} not found during deletion (already removed)`
-      )
-    } else {
-      const responseBody = await ashbyResponse.json().catch(() => ({}))
-      ashbyLogger.warn(
-        `[${requestId}] Failed to delete Ashby webhook (non-fatal): ${ashbyResponse.status}`,
-        { response: responseBody }
-      )
-    }
+    await handler.deleteSubscription({ webhook, workflow, requestId })
   } catch (error) {
-    ashbyLogger.warn(`[${requestId}] Error deleting Ashby webhook (non-fatal)`, error)
+    logger.warn(`[${requestId}] Error cleaning up external webhook (non-fatal)`, {
+      provider,
+      webhookId: webhook.id,
+      error: error instanceof Error ? error.message : String(error),
+    })
   }
 }
diff --git a/apps/sim/lib/webhooks/provider-utils.ts b/apps/sim/lib/webhooks/provider-utils.ts
deleted file mode 100644
index c475d1205e3..00000000000
--- a/apps/sim/lib/webhooks/provider-utils.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Provider-specific unique identifier extractors for webhook idempotency
- */
-
-function extractSlackIdentifier(body: any): string | null {
-  if (body.event_id) {
-    return body.event_id
-  }
-
-  if (body.event?.ts && body.team_id) {
-    return `${body.team_id}:${body.event.ts}`
-  }
-
-  return null
-}
-
-function extractTwilioIdentifier(body: any): string | null {
-  return body.MessageSid || body.CallSid || null
-}
-
-function extractStripeIdentifier(body: any): string | null {
-  if (body.id && body.object === 'event') {
-    return body.id
-  }
-  return null
-}
-
-function extractHubSpotIdentifier(body: any): string | null {
-  if (Array.isArray(body) && body.length > 0 && body[0]?.eventId) {
-    return String(body[0].eventId)
-  }
-  return null
-}
-
-function extractLinearIdentifier(body: any): string | null {
-  if (body.action && body.data?.id) {
-    return `${body.action}:${body.data.id}`
-  }
-  return null
-}
-
-function extractJiraIdentifier(body: any): string | null {
-  if (body.webhookEvent && (body.issue?.id || body.project?.id)) {
-    return `${body.webhookEvent}:${body.issue?.id || body.project?.id}`
-  }
-  return null
-}
-
-function extractMicrosoftTeamsIdentifier(body: any): string | null {
-  if (body.value && Array.isArray(body.value) && body.value.length > 0) {
-    const notification = body.value[0]
-    if (notification.subscriptionId && notification.resourceData?.id) {
-      return `${notification.subscriptionId}:${notification.resourceData.id}`
-    }
-  }
-  return null
-}
-
-function extractAirtableIdentifier(body: any): string | null {
-  if (body.cursor && typeof body.cursor === 'string') {
-    return body.cursor
-  }
-  return null
-}
-
-function extractGrainIdentifier(body: any): string | null {
-  if (body.type && body.data?.id) {
-    return `${body.type}:${body.data.id}`
-  }
-  return null
-}
-
-const PROVIDER_EXTRACTORS: Record<string, (body: any) => string | null> = {
-  slack: extractSlackIdentifier,
-  twilio: extractTwilioIdentifier,
-  twilio_voice: extractTwilioIdentifier,
-  stripe: extractStripeIdentifier,
-  hubspot: extractHubSpotIdentifier,
-  linear: extractLinearIdentifier,
-  jira: extractJiraIdentifier,
-  'microsoft-teams': extractMicrosoftTeamsIdentifier,
-  airtable: extractAirtableIdentifier,
-  grain: extractGrainIdentifier,
-}
-
-export function extractProviderIdentifierFromBody(provider: string, body: any): string | null {
-  if (!body || typeof body !== 'object') {
-    return null
-  }
-
-  const extractor = PROVIDER_EXTRACTORS[provider]
-  return extractor ? extractor(body) : null
-}
diff --git a/apps/sim/lib/webhooks/providers/airtable.ts b/apps/sim/lib/webhooks/providers/airtable.ts
new file mode 100644
index 00000000000..61daafa4f30
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/airtable.ts
@@ -0,0 +1,760 @@
+import { db } from '@sim/db'
+import { account, webhook } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { eq } from 'drizzle-orm'
+import { validateAirtableId } from '@/lib/core/security/input-validation'
+import { getBaseUrl } from '@/lib/core/utils/urls'
+import {
+  getCredentialOwner,
+  getNotificationUrl,
+  getProviderConfig,
+} from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  FormatInputContext,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import {
+  getOAuthToken,
+  refreshAccessTokenIfNeeded,
+  resolveOAuthAccountId,
+} from '@/app/api/auth/oauth/utils'
+
+const logger = createLogger('WebhookProvider:Airtable')
+
+interface AirtableChange {
+  tableId: string
+  recordId: string
+  changeType: 'created' | 'updated'
+  changedFields: Record<string, unknown>
+  previousFields?: Record<string, unknown>
+}
+
+interface AirtableTableChanges {
+  createdRecordsById?: Record<string, { cellValuesByFieldId?: Record<string, unknown> }>
+  changedRecordsById?: Record<
+    string,
+    {
+      current?: { cellValuesByFieldId?: Record<string, unknown> }
+      previous?: { cellValuesByFieldId?: Record<string, unknown> }
+    }
+  >
+  destroyedRecordIds?: string[]
+}
+
+/**
+ * Process Airtable payloads
+ */
+async function fetchAndProcessAirtablePayloads(
+  webhookData: Record<string, unknown>,
+  workflowData: Record<string, unknown>,
+  requestId: string // Original request ID from the ping, used for the final execution log
+) {
+  // Logging handles all error logging
+  let currentCursor: number | null = null
+  let mightHaveMore = true
+  let payloadsFetched = 0
+  let apiCallCount = 0
+  // Use a Map to consolidate changes per record ID
+  const consolidatedChangesMap = new Map<string, AirtableChange>()
+  // Capture raw payloads from Airtable for exposure to workflows
+  const allPayloads = []
+  const localProviderConfig = {
+    ...((webhookData.providerConfig as Record<string, unknown>) || {}),
+  } as Record<string, unknown>
+
+  try {
+    const baseId = localProviderConfig.baseId
+    const airtableWebhookId = localProviderConfig.externalId
+
+    if (!baseId || !airtableWebhookId) {
+      logger.error(
+        `[${requestId}] Missing baseId or externalId in providerConfig for webhook ${webhookData.id}. Cannot fetch payloads.`
+      )
+      return
+    }
+
+    const credentialId = localProviderConfig.credentialId as string | undefined
+    if (!credentialId) {
+      logger.error(
+        `[${requestId}] Missing credentialId in providerConfig for Airtable webhook ${webhookData.id}.`
+      )
+      return
+    }
+
+    const resolvedAirtable = await resolveOAuthAccountId(credentialId)
+    if (!resolvedAirtable) {
+      logger.error(
+        `[${requestId}] Could not resolve credential ${credentialId} for Airtable webhook`
+      )
+      return
+    }
+
+    let ownerUserId: string | null = null
+    try {
+      const rows = await db
+        .select()
+        .from(account)
+        .where(eq(account.id, resolvedAirtable.accountId))
+        .limit(1)
+      ownerUserId = rows.length ? rows[0].userId : null
+    } catch (_e) {
+      ownerUserId = null
+    }
+
+    if (!ownerUserId) {
+      logger.error(
+        `[${requestId}] Could not resolve owner for Airtable credential ${credentialId} on webhook ${webhookData.id}`
+      )
+      return
+    }
+
+    const storedCursor = localProviderConfig.externalWebhookCursor
+
+    if (storedCursor === undefined || storedCursor === null) {
+      logger.info(
+        `[${requestId}] No cursor found in providerConfig for webhook ${webhookData.id}, initializing...`
+      )
+      localProviderConfig.externalWebhookCursor = null
+
+      try {
+        await db
+          .update(webhook)
+          .set({
+            providerConfig: {
+              ...localProviderConfig,
+              externalWebhookCursor: null,
+            },
+            updatedAt: new Date(),
+          })
+          .where(eq(webhook.id, webhookData.id as string))
+
+        localProviderConfig.externalWebhookCursor = null
+        logger.info(`[${requestId}] Successfully initialized cursor for webhook ${webhookData.id}`)
+      } catch (initError: unknown) {
+        const err = initError as Error
+        logger.error(`[${requestId}] Failed to initialize cursor in DB`, {
+          webhookId: webhookData.id,
+          error: err.message,
+          stack: err.stack,
+        })
+      }
+    }
+
+    if (storedCursor && typeof storedCursor === 'number') {
+      currentCursor = storedCursor
+    } else {
+      currentCursor = null
+    }
+
+    let accessToken: string | null = null
+    try {
+      accessToken = await refreshAccessTokenIfNeeded(
+        resolvedAirtable.accountId,
+        ownerUserId,
+        requestId
+      )
+      if (!accessToken) {
+        logger.error(
+          `[${requestId}] Failed to obtain valid Airtable access token via credential ${credentialId}.`
+        )
+        throw new Error('Airtable access token not found.')
+      }
+    } catch (tokenError: unknown) {
+      const err = tokenError as Error
+      logger.error(
+        `[${requestId}] Failed to get Airtable OAuth token for credential ${credentialId}`,
+        {
+          error: err.message,
+          stack: err.stack,
+          credentialId,
+        }
+      )
+      return
+    }
+
+    const airtableApiBase = 'https://api.airtable.com/v0'
+
+    while (mightHaveMore) {
+      apiCallCount++
+      // Safety break
+      if (apiCallCount > 10) {
+        mightHaveMore = false
+        break
+      }
+
+      const apiUrl = `${airtableApiBase}/bases/${baseId}/webhooks/${airtableWebhookId}/payloads`
+      const queryParams = new URLSearchParams()
+      if (currentCursor !== null) {
+        queryParams.set('cursor', currentCursor.toString())
+      }
+      const fullUrl = `${apiUrl}?${queryParams.toString()}`
+
+      try {
+        const fetchStartTime = Date.now()
+        const response = await fetch(fullUrl, {
+          method: 'GET',
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+            'Content-Type': 'application/json',
+          },
+        })
+
+        const responseBody = await response.json()
+
+        if (!response.ok || responseBody.error) {
+          const errorMessage =
+            responseBody.error?.message ||
+            responseBody.error ||
+            `Airtable API error Status ${response.status}`
+          logger.error(
+            `[${requestId}] Airtable API request to /payloads failed (Call ${apiCallCount})`,
+            {
+              webhookId: webhookData.id,
+              status: response.status,
+              error: errorMessage,
+            }
+          )
+          // Error logging handled by logging session
+          mightHaveMore = false
+          break
+        }
+
+        const receivedPayloads = responseBody.payloads || []
+
+        if (receivedPayloads.length > 0) {
+          payloadsFetched += receivedPayloads.length
+          // Keep the raw payloads for later exposure to the workflow
+          for (const p of receivedPayloads) {
+            allPayloads.push(p)
+          }
+          let changeCount = 0
+          for (const payload of receivedPayloads) {
+            if (payload.changedTablesById) {
+              for (const [tableId, tableChangesUntyped] of Object.entries(
+                payload.changedTablesById
+              )) {
+                const tableChanges = tableChangesUntyped as AirtableTableChanges
+
+                if (tableChanges.createdRecordsById) {
+                  const createdCount = Object.keys(tableChanges.createdRecordsById).length
+                  changeCount += createdCount
+
+                  for (const [recordId, recordData] of Object.entries(
+                    tableChanges.createdRecordsById
+                  )) {
+                    const existingChange = consolidatedChangesMap.get(recordId)
+                    if (existingChange) {
+                      // Record was created and possibly updated within the same batch
+                      existingChange.changedFields = {
+                        ...existingChange.changedFields,
+                        ...(recordData.cellValuesByFieldId || {}),
+                      }
+                      // Keep changeType as 'created' if it started as created
+                    } else {
+                      // New creation
+                      consolidatedChangesMap.set(recordId, {
+                        tableId: tableId,
+                        recordId: recordId,
+                        changeType: 'created',
+                        changedFields: recordData.cellValuesByFieldId || {},
+                      })
+                    }
+                  }
+                }
+
+                // Handle updated records
+                if (tableChanges.changedRecordsById) {
+                  const updatedCount = Object.keys(tableChanges.changedRecordsById).length
+                  changeCount += updatedCount
+
+                  for (const [recordId, recordData] of Object.entries(
+                    tableChanges.changedRecordsById
+                  )) {
+                    const existingChange = consolidatedChangesMap.get(recordId)
+                    const currentFields = recordData.current?.cellValuesByFieldId || {}
+
+                    if (existingChange) {
+                      // Existing record was updated again
+                      existingChange.changedFields = {
+                        ...existingChange.changedFields,
+                        ...currentFields,
+                      }
+                      // Ensure type is 'updated' if it was previously 'created'
+                      existingChange.changeType = 'updated'
+                      // Do not update previousFields again
+                    } else {
+                      // First update for this record in the batch
+                      const newChange: AirtableChange = {
+                        tableId: tableId,
+                        recordId: recordId,
+                        changeType: 'updated',
+                        changedFields: currentFields,
+                      }
+                      if (recordData.previous?.cellValuesByFieldId) {
+                        newChange.previousFields = recordData.previous.cellValuesByFieldId
+                      }
+                      consolidatedChangesMap.set(recordId, newChange)
+                    }
+                  }
+                }
+                // TODO: Handle deleted records (`destroyedRecordIds`) if needed
+              }
+            }
+          }
+        }
+
+        const nextCursor = responseBody.cursor
+        mightHaveMore = responseBody.mightHaveMore || false
+
+        if (nextCursor && typeof nextCursor === 'number' && nextCursor !== currentCursor) {
+          currentCursor = nextCursor
+
+          // Follow exactly the old implementation - use awaited update instead of parallel
+          const updatedConfig = {
+            ...localProviderConfig,
+            externalWebhookCursor: currentCursor,
+          }
+          try {
+            // Force a complete object update to ensure consistency in serverless env
+            await db
+              .update(webhook)
+              .set({
+                providerConfig: updatedConfig, // Use full object
+                updatedAt: new Date(),
+              })
+              .where(eq(webhook.id, webhookData.id as string))
+
+            localProviderConfig.externalWebhookCursor = currentCursor // Update local copy too
+          } catch (dbError: unknown) {
+            const err = dbError as Error
+            logger.error(`[${requestId}] Failed to persist Airtable cursor to DB`, {
+              webhookId: webhookData.id,
+              cursor: currentCursor,
+              error: err.message,
+            })
+            // Error logging handled by logging session
+            mightHaveMore = false
+            throw new Error('Failed to save Airtable cursor, stopping processing.') // Re-throw to break loop clearly
+          }
+        } else if (!nextCursor || typeof nextCursor !== 'number') {
+          logger.warn(`[${requestId}] Invalid or missing cursor received, stopping poll`, {
+            webhookId: webhookData.id,
+            apiCall: apiCallCount,
+            receivedCursor: nextCursor,
+          })
+          mightHaveMore = false
+        } else if (nextCursor === currentCursor) {
+          mightHaveMore = false // Explicitly stop if cursor hasn't changed
+        }
+      } catch (fetchError: unknown) {
+        logger.error(
+          `[${requestId}] Network error calling Airtable GET /payloads (Call ${apiCallCount}) for webhook ${webhookData.id}`,
+          fetchError
+        )
+        // Error logging handled by logging session
+        mightHaveMore = false
+        break
+      }
+    }
+    // Convert map values to array for final processing
+    const finalConsolidatedChanges = Array.from(consolidatedChangesMap.values())
+    logger.info(
+      `[${requestId}] Consolidated ${finalConsolidatedChanges.length} Airtable changes across ${apiCallCount} API calls`
+    )
+
+    if (finalConsolidatedChanges.length > 0 || allPayloads.length > 0) {
+      try {
+        // Build input exposing raw payloads and consolidated changes
+        const latestPayload = allPayloads.length > 0 ? allPayloads[allPayloads.length - 1] : null
+        const input: Record<string, unknown> = {
+          payloads: allPayloads,
+          latestPayload,
+          // Consolidated, simplified changes for convenience
+          airtableChanges: finalConsolidatedChanges,
+          // Include webhook metadata for resolver fallbacks
+          webhook: {
+            data: {
+              provider: 'airtable',
+              providerConfig: webhookData.providerConfig,
+              payload: latestPayload,
+            },
+          },
+        }
+
+        // CRITICAL EXECUTION TRACE POINT
+        logger.info(
+          `[${requestId}] CRITICAL_TRACE: Beginning workflow execution with ${finalConsolidatedChanges.length} Airtable changes`,
+          {
+            workflowId: workflowData.id,
+            recordCount: finalConsolidatedChanges.length,
+            timestamp: new Date().toISOString(),
+            firstRecordId: finalConsolidatedChanges[0]?.recordId || 'none',
+          }
+        )
+
+        // Return the processed input for the trigger.dev task to handle
+        logger.info(`[${requestId}] CRITICAL_TRACE: Airtable changes processed, returning input`, {
+          workflowId: workflowData.id,
+          recordCount: finalConsolidatedChanges.length,
+          rawPayloadCount: allPayloads.length,
+          timestamp: new Date().toISOString(),
+        })
+
+        return input
+      } catch (processingError: unknown) {
+        const err = processingError as Error
+        logger.error(`[${requestId}] CRITICAL_TRACE: Error processing Airtable changes`, {
+          workflowId: workflowData.id,
+          error: err.message,
+          stack: err.stack,
+          timestamp: new Date().toISOString(),
+        })
+
+        throw processingError
+      }
+    } else {
+      // DEBUG: Log when no changes are found
+      logger.info(`[${requestId}] TRACE: No Airtable changes to process`, {
+        workflowId: workflowData.id,
+        apiCallCount,
+        webhookId: webhookData.id,
+      })
+    }
+  } catch (error) {
+    // Catch any unexpected errors during the setup/polling logic itself
+    logger.error(
+      `[${requestId}] Unexpected error during asynchronous Airtable payload processing task`,
+      {
+        webhookId: webhookData.id,
+        workflowId: workflowData.id,
+        error: (error as Error).message,
+      }
+    )
+    // Error logging handled by logging session
+  }
+}
+
+export const airtableHandler: WebhookProviderHandler = {
+  async createSubscription({
+    webhook: webhookRecord,
+    workflow,
+    userId,
+    requestId,
+  }: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    try {
+      const { path, providerConfig } = webhookRecord as Record<string, unknown>
+      const config = (providerConfig as Record<string, unknown>) || {}
+      const { baseId, tableId, includeCellValuesInFieldIds, credentialId } = config as {
+        baseId?: string
+        tableId?: string
+        includeCellValuesInFieldIds?: string
+        credentialId?: string
+      }
+
+      if (!baseId || !tableId) {
+        logger.warn(`[${requestId}] Missing baseId or tableId for Airtable webhook creation.`, {
+          webhookId: webhookRecord.id,
+        })
+        throw new Error(
+          'Base ID and Table ID are required to create Airtable webhook. Please provide valid Airtable base and table IDs.'
+        )
+      }
+
+      const baseIdValidation = validateAirtableId(baseId, 'app', 'baseId')
+      if (!baseIdValidation.isValid) {
+        throw new Error(baseIdValidation.error)
+      }
+
+      const tableIdValidation = validateAirtableId(tableId, 'tbl', 'tableId')
+      if (!tableIdValidation.isValid) {
+        throw new Error(tableIdValidation.error)
+      }
+
+      const credentialOwner = credentialId
+        ? await getCredentialOwner(credentialId, requestId)
+        : null
+      const accessToken = credentialId
+        ? credentialOwner
+          ? await refreshAccessTokenIfNeeded(
+              credentialOwner.accountId,
+              credentialOwner.userId,
+              requestId
+            )
+          : null
+        : await getOAuthToken(userId, 'airtable')
+      if (!accessToken) {
+        logger.warn(
+          `[${requestId}] Could not retrieve Airtable access token for user ${userId}. Cannot create webhook in Airtable.`
+        )
+        throw new Error(
+          'Airtable account connection required. Please connect your Airtable account in the trigger configuration and try again.'
+        )
+      }
+
+      const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
+
+      const airtableApiUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks`
+
+      const specification: Record<string, unknown> = {
+        options: {
+          filters: {
+            dataTypes: ['tableData'],
+            recordChangeScope: tableId,
+          },
+        },
+      }
+
+      if (includeCellValuesInFieldIds === 'all') {
+        ;(specification.options as Record<string, unknown>).includes = {
+          includeCellValuesInFieldIds: 'all',
+        }
+      }
+
+      const requestBody: Record<string, unknown> = {
+        notificationUrl: notificationUrl,
+        specification: specification,
+      }
+
+      const airtableResponse = await fetch(airtableApiUrl, {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      const responseBody = await airtableResponse.json()
+
+      if (!airtableResponse.ok || responseBody.error) {
+        const errorMessage =
+          responseBody.error?.message || responseBody.error || 'Unknown Airtable API error'
+        const errorType = responseBody.error?.type
+        logger.error(
+          `[${requestId}] Failed to create webhook in Airtable for webhook ${webhookRecord.id}. Status: ${airtableResponse.status}`,
+          { type: errorType, message: errorMessage, response: responseBody }
+        )
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Airtable'
+        if (airtableResponse.status === 404) {
+          userFriendlyMessage =
+            'Airtable base or table not found. Please verify that the Base ID and Table ID are correct and that you have access to them.'
+        } else if (errorMessage && errorMessage !== 'Unknown Airtable API error') {
+          userFriendlyMessage = `Airtable error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+      logger.info(
+        `[${requestId}] Successfully created webhook in Airtable for webhook ${webhookRecord.id}.`,
+        {
+          airtableWebhookId: responseBody.id,
+        }
+      )
+      return { providerConfigUpdates: { externalId: responseBody.id } }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${requestId}] Exception during Airtable webhook creation for webhook ${webhookRecord.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription({
+    webhook: webhookRecord,
+    workflow,
+    requestId,
+  }: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(webhookRecord)
+      const { baseId, externalId } = config as {
+        baseId?: string
+        externalId?: string
+      }
+
+      if (!baseId) {
+        logger.warn(`[${requestId}] Missing baseId for Airtable webhook deletion`, {
+          webhookId: webhookRecord.id,
+        })
+        return
+      }
+
+      const baseIdValidation = validateAirtableId(baseId, 'app', 'baseId')
+      if (!baseIdValidation.isValid) {
+        logger.warn(`[${requestId}] Invalid Airtable base ID format, skipping deletion`, {
+          webhookId: webhookRecord.id,
+          baseId: baseId.substring(0, 20),
+        })
+        return
+      }
+
+      const credentialId = config.credentialId as string | undefined
+      if (!credentialId) {
+        logger.warn(
+          `[${requestId}] Missing credentialId for Airtable webhook deletion ${webhookRecord.id}`
+        )
+        return
+      }
+
+      const credentialOwner = await getCredentialOwner(credentialId, requestId)
+      const accessToken = credentialOwner
+        ? await refreshAccessTokenIfNeeded(
+            credentialOwner.accountId,
+            credentialOwner.userId,
+            requestId
+          )
+        : null
+      if (!accessToken) {
+        logger.warn(
+          `[${requestId}] Could not retrieve Airtable access token. Cannot delete webhook in Airtable.`,
+          { webhookId: webhookRecord.id }
+        )
+        return
+      }
+
+      let resolvedExternalId: string | undefined = externalId
+
+      if (!resolvedExternalId) {
+        try {
+          const expectedNotificationUrl = getNotificationUrl(webhookRecord)
+
+          const listUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks`
+          const listResp = await fetch(listUrl, {
+            headers: {
+              Authorization: `Bearer ${accessToken}`,
+            },
+          })
+          const listBody = await listResp.json().catch(() => null)
+
+          if (listResp.ok && listBody && Array.isArray(listBody.webhooks)) {
+            const match = listBody.webhooks.find((w: Record<string, unknown>) => {
+              const url: string | undefined = w?.notificationUrl as string | undefined
+              if (!url) return false
+              return (
+                url === expectedNotificationUrl ||
+                url.endsWith(`/api/webhooks/trigger/${webhookRecord.path}`)
+              )
+            })
+            if (match?.id) {
+              resolvedExternalId = match.id as string
+              logger.info(`[${requestId}] Resolved Airtable externalId by listing webhooks`, {
+                baseId,
+                externalId: resolvedExternalId,
+              })
+            } else {
+              logger.warn(`[${requestId}] Could not resolve Airtable externalId from list`, {
+                baseId,
+                expectedNotificationUrl,
+              })
+            }
+          } else {
+            logger.warn(`[${requestId}] Failed to list Airtable webhooks to resolve externalId`, {
+              baseId,
+              status: listResp.status,
+              body: listBody,
+            })
+          }
+        } catch (e: unknown) {
+          logger.warn(`[${requestId}] Error attempting to resolve Airtable externalId`, {
+            error: (e as Error)?.message,
+          })
+        }
+      }
+
+      if (!resolvedExternalId) {
+        logger.info(`[${requestId}] Airtable externalId not found; skipping remote deletion`, {
+          baseId,
+        })
+        return
+      }
+
+      const webhookIdValidation = validateAirtableId(resolvedExternalId, 'ach', 'webhookId')
+      if (!webhookIdValidation.isValid) {
+        logger.warn(`[${requestId}] Invalid Airtable webhook ID format, skipping deletion`, {
+          webhookId: webhookRecord.id,
+          externalId: resolvedExternalId.substring(0, 20),
+        })
+        return
+      }
+
+      const airtableDeleteUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks/${resolvedExternalId}`
+      const airtableResponse = await fetch(airtableDeleteUrl, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      })
+
+      if (!airtableResponse.ok) {
+        let responseBody: unknown = null
+        try {
+          responseBody = await airtableResponse.json()
+        } catch {
+          // Ignore parse errors
+        }
+
+        logger.warn(
+          `[${requestId}] Failed to delete Airtable webhook in Airtable. Status: ${airtableResponse.status}`,
+          { baseId, externalId: resolvedExternalId, response: responseBody }
+        )
+      } else {
+        logger.info(`[${requestId}] Successfully deleted Airtable webhook in Airtable`, {
+          baseId,
+          externalId: resolvedExternalId,
+        })
+      }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(`[${requestId}] Error deleting Airtable webhook`, {
+        webhookId: webhookRecord.id,
+        error: err.message,
+        stack: err.stack,
+      })
+    }
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    if (typeof obj.cursor === 'string') {
+      return obj.cursor
+    }
+    return null
+  },
+
+  async formatInput({ webhook, workflow, requestId }: FormatInputContext) {
+    logger.info(`[${requestId}] Processing Airtable webhook via fetchAndProcessAirtablePayloads`)
+
+    const webhookData = {
+      id: webhook.id,
+      provider: webhook.provider,
+      providerConfig: webhook.providerConfig,
+    }
+
+    const mockWorkflow = {
+      id: workflow.id,
+      userId: workflow.userId,
+    }
+
+    const airtableInput = await fetchAndProcessAirtablePayloads(
+      webhookData,
+      mockWorkflow,
+      requestId
+    )
+
+    if (airtableInput) {
+      logger.info(`[${requestId}] Executing workflow with Airtable changes`)
+      return { input: airtableInput }
+    }
+
+    logger.info(`[${requestId}] No Airtable changes to process`)
+    return { input: null, skip: { message: 'No Airtable changes to process' } }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/ashby.ts b/apps/sim/lib/webhooks/providers/ashby.ts
new file mode 100644
index 00000000000..d7903af812f
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/ashby.ts
@@ -0,0 +1,217 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { generateId } from '@/lib/core/utils/uuid'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Ashby')
+
+function validateAshbySignature(secretToken: string, signature: string, body: string): boolean {
+  try {
+    if (!secretToken || !signature || !body) {
+      return false
+    }
+    if (!signature.startsWith('sha256=')) {
+      return false
+    }
+    const providedSignature = signature.substring(7)
+    const computedHash = crypto.createHmac('sha256', secretToken).update(body, 'utf8').digest('hex')
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating Ashby signature:', error)
+    return false
+  }
+}
+
+export const ashbyHandler: WebhookProviderHandler = {
+  extractIdempotencyId(body: unknown): string | null {
+    const obj = body as Record<string, unknown>
+    const webhookActionId = obj.webhookActionId
+    if (typeof webhookActionId === 'string' && webhookActionId) {
+      return `ashby:${webhookActionId}`
+    }
+    return null
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return {
+      input: {
+        ...((b.data as Record<string, unknown>) || {}),
+        action: b.action,
+        data: b.data || {},
+      },
+    }
+  },
+
+  verifyAuth: createHmacVerifier({
+    configKey: 'secretToken',
+    headerName: 'ashby-signature',
+    validateFn: validateAshbySignature,
+    providerLabel: 'Ashby',
+  }),
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    try {
+      const providerConfig = getProviderConfig(ctx.webhook)
+      const { apiKey, triggerId } = providerConfig as {
+        apiKey?: string
+        triggerId?: string
+      }
+
+      if (!apiKey) {
+        throw new Error(
+          'Ashby API Key is required. Please provide your API Key with apiKeysWrite permission in the trigger configuration.'
+        )
+      }
+
+      if (!triggerId) {
+        throw new Error('Trigger ID is required to create Ashby webhook.')
+      }
+
+      const webhookTypeMap: Record<string, string> = {
+        ashby_application_submit: 'applicationSubmit',
+        ashby_candidate_stage_change: 'candidateStageChange',
+        ashby_candidate_hire: 'candidateHire',
+        ashby_candidate_delete: 'candidateDelete',
+        ashby_job_create: 'jobCreate',
+        ashby_offer_create: 'offerCreate',
+      }
+
+      const webhookType = webhookTypeMap[triggerId]
+      if (!webhookType) {
+        throw new Error(`Unknown Ashby triggerId: ${triggerId}. Add it to webhookTypeMap.`)
+      }
+
+      const notificationUrl = getNotificationUrl(ctx.webhook)
+      const authString = Buffer.from(`${apiKey}:`).toString('base64')
+
+      logger.info(`[${ctx.requestId}] Creating Ashby webhook`, {
+        triggerId,
+        webhookType,
+        webhookId: ctx.webhook.id,
+      })
+
+      const secretToken = generateId()
+
+      const requestBody: Record<string, unknown> = {
+        requestUrl: notificationUrl,
+        webhookType,
+        secretToken,
+      }
+
+      const ashbyResponse = await fetch('https://api.ashbyhq.com/webhook.create', {
+        method: 'POST',
+        headers: {
+          Authorization: `Basic ${authString}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      const responseBody = (await ashbyResponse.json().catch(() => ({}))) as Record<string, unknown>
+
+      if (!ashbyResponse.ok || !responseBody.success) {
+        const errorInfo = responseBody.errorInfo as Record<string, string> | undefined
+        const errorMessage =
+          errorInfo?.message || (responseBody.message as string) || 'Unknown Ashby API error'
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Ashby'
+        if (ashbyResponse.status === 401) {
+          userFriendlyMessage =
+            'Invalid Ashby API Key. Please verify your API Key is correct and has apiKeysWrite permission.'
+        } else if (ashbyResponse.status === 403) {
+          userFriendlyMessage =
+            'Access denied. Please ensure your Ashby API Key has the apiKeysWrite permission.'
+        } else if (errorMessage && errorMessage !== 'Unknown Ashby API error') {
+          userFriendlyMessage = `Ashby error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      const results = responseBody.results as Record<string, unknown> | undefined
+      const externalId = results?.id as string | undefined
+      if (!externalId) {
+        throw new Error('Ashby webhook creation succeeded but no webhook ID was returned')
+      }
+
+      logger.info(
+        `[${ctx.requestId}] Successfully created Ashby webhook subscription ${externalId} for webhook ${ctx.webhook.id}`
+      )
+      return { providerConfigUpdates: { externalId, secretToken } }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${ctx.requestId}] Exception during Ashby webhook creation for webhook ${ctx.webhook.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(ctx.webhook)
+      const apiKey = config.apiKey as string | undefined
+      const externalId = config.externalId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(
+          `[${ctx.requestId}] Missing apiKey for Ashby webhook deletion ${ctx.webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      if (!externalId) {
+        logger.warn(
+          `[${ctx.requestId}] Missing externalId for Ashby webhook deletion ${ctx.webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const authString = Buffer.from(`${apiKey}:`).toString('base64')
+
+      const ashbyResponse = await fetch('https://api.ashbyhq.com/webhook.delete', {
+        method: 'POST',
+        headers: {
+          Authorization: `Basic ${authString}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ webhookId: externalId }),
+      })
+
+      if (ashbyResponse.ok) {
+        await ashbyResponse.body?.cancel()
+        logger.info(
+          `[${ctx.requestId}] Successfully deleted Ashby webhook subscription ${externalId}`
+        )
+      } else if (ashbyResponse.status === 404) {
+        await ashbyResponse.body?.cancel()
+        logger.info(
+          `[${ctx.requestId}] Ashby webhook ${externalId} not found during deletion (already removed)`
+        )
+      } else {
+        const responseBody = await ashbyResponse.json().catch(() => ({}))
+        logger.warn(
+          `[${ctx.requestId}] Failed to delete Ashby webhook (non-fatal): ${ashbyResponse.status}`,
+          { response: responseBody }
+        )
+      }
+    } catch (error) {
+      logger.warn(`[${ctx.requestId}] Error deleting Ashby webhook (non-fatal)`, error)
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/attio.ts b/apps/sim/lib/webhooks/providers/attio.ts
new file mode 100644
index 00000000000..84c6b740780
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/attio.ts
@@ -0,0 +1,366 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { getBaseUrl } from '@/lib/core/utils/urls'
+import { getCredentialOwner, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  AuthContext,
+  DeleteSubscriptionContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
+
+const logger = createLogger('WebhookProvider:Attio')
+
+function validateAttioSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Attio signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+    logger.debug('Attio signature comparison', {
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${signature.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: signature.length,
+      match: computedHash === signature,
+    })
+    return safeCompare(computedHash, signature)
+  } catch (error) {
+    logger.error('Error validating Attio signature:', error)
+    return false
+  }
+}
+
+export const attioHandler: WebhookProviderHandler = {
+  verifyAuth({ webhook, request, rawBody, requestId, providerConfig }: AuthContext) {
+    const secret = providerConfig.webhookSecret as string | undefined
+
+    if (!secret) {
+      logger.debug(
+        `[${requestId}] Attio webhook ${webhook.id as string} has no signing secret, skipping signature verification`
+      )
+    } else {
+      const signature = request.headers.get('Attio-Signature')
+
+      if (!signature) {
+        logger.warn(`[${requestId}] Attio webhook missing signature header`)
+        return new NextResponse('Unauthorized - Missing Attio signature', {
+          status: 401,
+        })
+      }
+
+      const isValidSignature = validateAttioSignature(secret, signature, rawBody)
+
+      if (!isValidSignature) {
+        logger.warn(`[${requestId}] Attio signature verification failed`, {
+          signatureLength: signature.length,
+          secretLength: secret.length,
+        })
+        return new NextResponse('Unauthorized - Invalid Attio signature', {
+          status: 401,
+        })
+      }
+    }
+
+    return null
+  },
+
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+
+    if (triggerId && triggerId !== 'attio_webhook') {
+      const { isAttioPayloadMatch, getAttioEvent } = await import('@/triggers/attio/utils')
+      if (!isAttioPayloadMatch(triggerId, obj)) {
+        const event = getAttioEvent(obj)
+        const eventType = event?.event_type as string | undefined
+        logger.debug(
+          `[${requestId}] Attio event mismatch for trigger ${triggerId}. Event: ${eventType}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            workflowId: workflow.id,
+            triggerId,
+            receivedEvent: eventType,
+            bodyKeys: Object.keys(obj),
+          }
+        )
+        return NextResponse.json({
+          status: 'skipped',
+          reason: 'event_type_mismatch',
+        })
+      }
+    }
+
+    return true
+  },
+
+  async createSubscription({
+    webhook: webhookRecord,
+    workflow,
+    userId,
+    requestId,
+  }: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    try {
+      const { path, providerConfig } = webhookRecord as Record<string, unknown>
+      const config = (providerConfig as Record<string, unknown>) || {}
+      const { triggerId, credentialId } = config as {
+        triggerId?: string
+        credentialId?: string
+      }
+
+      if (!credentialId) {
+        logger.warn(`[${requestId}] Missing credentialId for Attio webhook creation.`, {
+          webhookId: webhookRecord.id,
+        })
+        throw new Error(
+          'Attio account connection required. Please connect your Attio account in the trigger configuration and try again.'
+        )
+      }
+
+      const credentialOwner = await getCredentialOwner(credentialId, requestId)
+      const accessToken = credentialOwner
+        ? await refreshAccessTokenIfNeeded(
+            credentialOwner.accountId,
+            credentialOwner.userId,
+            requestId
+          )
+        : null
+
+      if (!accessToken) {
+        logger.warn(
+          `[${requestId}] Could not retrieve Attio access token for user ${userId}. Cannot create webhook.`
+        )
+        throw new Error(
+          'Attio account connection required. Please connect your Attio account in the trigger configuration and try again.'
+        )
+      }
+
+      const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
+
+      const { TRIGGER_EVENT_MAP } = await import('@/triggers/attio/utils')
+
+      let subscriptions: Array<{ event_type: string; filter: null }> = []
+      if (triggerId === 'attio_webhook') {
+        const allEvents = new Set<string>()
+        for (const events of Object.values(TRIGGER_EVENT_MAP)) {
+          for (const event of events) {
+            allEvents.add(event)
+          }
+        }
+        subscriptions = Array.from(allEvents).map((event_type) => ({ event_type, filter: null }))
+      } else {
+        const events = TRIGGER_EVENT_MAP[triggerId as string]
+        if (!events || events.length === 0) {
+          logger.warn(`[${requestId}] No event types mapped for trigger ${triggerId}`, {
+            webhookId: webhookRecord.id,
+          })
+          throw new Error(`Unknown Attio trigger type: ${triggerId}`)
+        }
+        subscriptions = events.map((event_type) => ({ event_type, filter: null }))
+      }
+
+      const requestBody = {
+        data: {
+          target_url: notificationUrl,
+          subscriptions,
+        },
+      }
+
+      const attioResponse = await fetch('https://api.attio.com/v2/webhooks', {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      if (!attioResponse.ok) {
+        const errorBody = await attioResponse.json().catch(() => ({}))
+        logger.error(
+          `[${requestId}] Failed to create webhook in Attio for webhook ${webhookRecord.id}. Status: ${attioResponse.status}`,
+          { response: errorBody }
+        )
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Attio'
+        if (attioResponse.status === 401) {
+          userFriendlyMessage = 'Attio authentication failed. Please reconnect your Attio account.'
+        } else if (attioResponse.status === 403) {
+          userFriendlyMessage =
+            'Attio access denied. Please ensure your integration has webhook permissions.'
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      const responseBody = await attioResponse.json()
+      const data = responseBody.data || responseBody
+      const webhookId = data.id?.webhook_id || data.webhook_id || data.id
+      const secret = data.secret
+
+      if (!webhookId) {
+        logger.error(
+          `[${requestId}] Attio webhook created but no webhook_id returned for webhook ${webhookRecord.id}`,
+          { response: responseBody }
+        )
+        throw new Error('Attio webhook creation succeeded but no webhook ID was returned')
+      }
+
+      if (!secret) {
+        logger.warn(
+          `[${requestId}] Attio webhook created but no secret returned for webhook ${webhookRecord.id}. Signature verification will be skipped.`,
+          { response: responseBody }
+        )
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created webhook in Attio for webhook ${webhookRecord.id}.`,
+        {
+          attioWebhookId: webhookId,
+          targetUrl: notificationUrl,
+          subscriptionCount: subscriptions.length,
+          status: data.status,
+        }
+      )
+
+      return { providerConfigUpdates: { externalId: webhookId, webhookSecret: secret || '' } }
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : String(error)
+      logger.error(
+        `[${requestId}] Exception during Attio webhook creation for webhook ${webhookRecord.id}.`,
+        { message }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription({
+    webhook: webhookRecord,
+    workflow,
+    requestId,
+  }: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(webhookRecord)
+      const externalId = config.externalId as string | undefined
+      const credentialId = config.credentialId as string | undefined
+
+      if (!externalId) {
+        logger.warn(
+          `[${requestId}] Missing externalId for Attio webhook deletion ${webhookRecord.id}, skipping cleanup`
+        )
+        return
+      }
+
+      if (!credentialId) {
+        logger.warn(
+          `[${requestId}] Missing credentialId for Attio webhook deletion ${webhookRecord.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const credentialOwner = await getCredentialOwner(credentialId, requestId)
+      const accessToken = credentialOwner
+        ? await refreshAccessTokenIfNeeded(
+            credentialOwner.accountId,
+            credentialOwner.userId,
+            requestId
+          )
+        : null
+
+      if (!accessToken) {
+        logger.warn(
+          `[${requestId}] Could not retrieve Attio access token. Cannot delete webhook.`,
+          { webhookId: webhookRecord.id }
+        )
+        return
+      }
+
+      const attioResponse = await fetch(`https://api.attio.com/v2/webhooks/${externalId}`, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      })
+
+      if (!attioResponse.ok && attioResponse.status !== 404) {
+        const responseBody = await attioResponse.json().catch(() => ({}))
+        logger.warn(
+          `[${requestId}] Failed to delete Attio webhook (non-fatal): ${attioResponse.status}`,
+          { response: responseBody }
+        )
+      } else {
+        logger.info(`[${requestId}] Successfully deleted Attio webhook ${externalId}`)
+      }
+    } catch (error) {
+      logger.warn(`[${requestId}] Error deleting Attio webhook (non-fatal)`, error)
+    }
+  },
+
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const {
+      extractAttioRecordData,
+      extractAttioRecordUpdatedData,
+      extractAttioRecordMergedData,
+      extractAttioNoteData,
+      extractAttioTaskData,
+      extractAttioCommentData,
+      extractAttioListEntryData,
+      extractAttioListEntryUpdatedData,
+      extractAttioListData,
+      extractAttioWorkspaceMemberData,
+      extractAttioGenericData,
+    } = await import('@/triggers/attio/utils')
+
+    const b = body as Record<string, unknown>
+    const providerConfig = (webhook.providerConfig as Record<string, unknown>) || {}
+    const triggerId = providerConfig.triggerId as string | undefined
+
+    if (triggerId === 'attio_record_updated') {
+      return { input: extractAttioRecordUpdatedData(b) }
+    }
+    if (triggerId === 'attio_record_merged') {
+      return { input: extractAttioRecordMergedData(b) }
+    }
+    if (triggerId === 'attio_record_created' || triggerId === 'attio_record_deleted') {
+      return { input: extractAttioRecordData(b) }
+    }
+    if (triggerId?.startsWith('attio_note_')) {
+      return { input: extractAttioNoteData(b) }
+    }
+    if (triggerId?.startsWith('attio_task_')) {
+      return { input: extractAttioTaskData(b) }
+    }
+    if (triggerId?.startsWith('attio_comment_')) {
+      return { input: extractAttioCommentData(b) }
+    }
+    if (triggerId === 'attio_list_entry_updated') {
+      return { input: extractAttioListEntryUpdatedData(b) }
+    }
+    if (triggerId === 'attio_list_entry_created' || triggerId === 'attio_list_entry_deleted') {
+      return { input: extractAttioListEntryData(b) }
+    }
+    if (
+      triggerId === 'attio_list_created' ||
+      triggerId === 'attio_list_updated' ||
+      triggerId === 'attio_list_deleted'
+    ) {
+      return { input: extractAttioListData(b) }
+    }
+    if (triggerId === 'attio_workspace_member_created') {
+      return { input: extractAttioWorkspaceMemberData(b) }
+    }
+    return { input: extractAttioGenericData(b) }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/calcom.ts b/apps/sim/lib/webhooks/providers/calcom.ts
new file mode 100644
index 00000000000..b018b16f581
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/calcom.ts
@@ -0,0 +1,47 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type { WebhookProviderHandler } from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Calcom')
+
+function validateCalcomSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Cal.com signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+    let providedSignature: string
+    if (signature.startsWith('sha256=')) {
+      providedSignature = signature.substring(7)
+    } else {
+      providedSignature = signature
+    }
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+    logger.debug('Cal.com signature comparison', {
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${providedSignature.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: providedSignature.length,
+      match: computedHash === providedSignature,
+    })
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating Cal.com signature:', error)
+    return false
+  }
+}
+
+export const calcomHandler: WebhookProviderHandler = {
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'X-Cal-Signature-256',
+    validateFn: validateCalcomSignature,
+    providerLabel: 'Cal.com',
+  }),
+}
diff --git a/apps/sim/lib/webhooks/providers/calendly.ts b/apps/sim/lib/webhooks/providers/calendly.ts
new file mode 100644
index 00000000000..a85b108c5bf
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/calendly.ts
@@ -0,0 +1,211 @@
+import { createLogger } from '@sim/logger'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Calendly')
+
+export const calendlyHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return {
+      input: {
+        event: b.event,
+        created_at: b.created_at,
+        created_by: b.created_by,
+        payload: b.payload,
+      },
+    }
+  },
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    try {
+      const providerConfig = getProviderConfig(ctx.webhook)
+      const { apiKey, organization, triggerId } = providerConfig as {
+        apiKey?: string
+        organization?: string
+        triggerId?: string
+      }
+
+      if (!apiKey) {
+        logger.warn(`[${ctx.requestId}] Missing apiKey for Calendly webhook creation.`, {
+          webhookId: ctx.webhook.id,
+        })
+        throw new Error(
+          'Personal Access Token is required to create Calendly webhook. Please provide your Calendly Personal Access Token.'
+        )
+      }
+
+      if (!organization) {
+        logger.warn(`[${ctx.requestId}] Missing organization URI for Calendly webhook creation.`, {
+          webhookId: ctx.webhook.id,
+        })
+        throw new Error(
+          'Organization URI is required to create Calendly webhook. Please provide your Organization URI from the "Get Current User" operation.'
+        )
+      }
+
+      if (!triggerId) {
+        logger.warn(`[${ctx.requestId}] Missing triggerId for Calendly webhook creation.`, {
+          webhookId: ctx.webhook.id,
+        })
+        throw new Error('Trigger ID is required to create Calendly webhook')
+      }
+
+      const notificationUrl = getNotificationUrl(ctx.webhook)
+
+      const eventTypeMap: Record<string, string[]> = {
+        calendly_invitee_created: ['invitee.created'],
+        calendly_invitee_canceled: ['invitee.canceled'],
+        calendly_routing_form_submitted: ['routing_form_submission.created'],
+        calendly_webhook: [
+          'invitee.created',
+          'invitee.canceled',
+          'routing_form_submission.created',
+        ],
+      }
+
+      const events = eventTypeMap[triggerId] || ['invitee.created']
+
+      const calendlyApiUrl = 'https://api.calendly.com/webhook_subscriptions'
+
+      const requestBody = {
+        url: notificationUrl,
+        events,
+        organization,
+        scope: 'organization',
+      }
+
+      const calendlyResponse = await fetch(calendlyApiUrl, {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      if (!calendlyResponse.ok) {
+        const errorBody = await calendlyResponse.json().catch(() => ({}))
+        const errorMessage =
+          (errorBody as Record<string, string>).message ||
+          (errorBody as Record<string, string>).title ||
+          'Unknown Calendly API error'
+        logger.error(
+          `[${ctx.requestId}] Failed to create webhook in Calendly for webhook ${ctx.webhook.id}. Status: ${calendlyResponse.status}`,
+          { response: errorBody }
+        )
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Calendly'
+        if (calendlyResponse.status === 401) {
+          userFriendlyMessage =
+            'Calendly authentication failed. Please verify your Personal Access Token is correct.'
+        } else if (calendlyResponse.status === 403) {
+          userFriendlyMessage =
+            'Calendly access denied. Please ensure you have appropriate permissions and a paid Calendly subscription.'
+        } else if (calendlyResponse.status === 404) {
+          userFriendlyMessage =
+            'Calendly organization not found. Please verify the Organization URI is correct.'
+        } else if (errorMessage && errorMessage !== 'Unknown Calendly API error') {
+          userFriendlyMessage = `Calendly error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      const responseBody = (await calendlyResponse.json()) as Record<string, unknown>
+      const resource = responseBody.resource as Record<string, unknown> | undefined
+      const webhookUri = resource?.uri as string | undefined
+
+      if (!webhookUri) {
+        logger.error(
+          `[${ctx.requestId}] Calendly webhook created but no webhook URI returned for webhook ${ctx.webhook.id}`,
+          { response: responseBody }
+        )
+        throw new Error('Calendly webhook creation succeeded but no webhook URI was returned')
+      }
+
+      const webhookId = webhookUri.split('/').pop()
+
+      if (!webhookId) {
+        logger.error(
+          `[${ctx.requestId}] Could not extract webhook ID from Calendly URI: ${webhookUri}`,
+          {
+            response: responseBody,
+          }
+        )
+        throw new Error('Failed to extract webhook ID from Calendly response')
+      }
+
+      logger.info(
+        `[${ctx.requestId}] Successfully created webhook in Calendly for webhook ${ctx.webhook.id}.`,
+        {
+          calendlyWebhookUri: webhookUri,
+          calendlyWebhookId: webhookId,
+        }
+      )
+      return { providerConfigUpdates: { externalId: webhookId } }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${ctx.requestId}] Exception during Calendly webhook creation for webhook ${ctx.webhook.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(ctx.webhook)
+      const apiKey = config.apiKey as string | undefined
+      const externalId = config.externalId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(
+          `[${ctx.requestId}] Missing apiKey for Calendly webhook deletion ${ctx.webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      if (!externalId) {
+        logger.warn(
+          `[${ctx.requestId}] Missing externalId for Calendly webhook deletion ${ctx.webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const calendlyApiUrl = `https://api.calendly.com/webhook_subscriptions/${externalId}`
+
+      const calendlyResponse = await fetch(calendlyApiUrl, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+        },
+      })
+
+      if (!calendlyResponse.ok && calendlyResponse.status !== 404) {
+        const responseBody = await calendlyResponse.json().catch(() => ({}))
+        logger.warn(
+          `[${ctx.requestId}] Failed to delete Calendly webhook (non-fatal): ${calendlyResponse.status}`,
+          { response: responseBody }
+        )
+      } else {
+        logger.info(
+          `[${ctx.requestId}] Successfully deleted Calendly webhook subscription ${externalId}`
+        )
+      }
+    } catch (error) {
+      logger.warn(`[${ctx.requestId}] Error deleting Calendly webhook (non-fatal)`, error)
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/circleback.ts b/apps/sim/lib/webhooks/providers/circleback.ts
new file mode 100644
index 00000000000..1beb8a6814f
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/circleback.ts
@@ -0,0 +1,67 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Circleback')
+
+function validateCirclebackSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Circleback signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+    logger.debug('Circleback signature comparison', {
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${signature.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: signature.length,
+      match: computedHash === signature,
+    })
+    return safeCompare(computedHash, signature)
+  } catch (error) {
+    logger.error('Error validating Circleback signature:', error)
+    return false
+  }
+}
+
+export const circlebackHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return {
+      input: {
+        id: b.id,
+        name: b.name,
+        createdAt: b.createdAt,
+        duration: b.duration,
+        url: b.url,
+        recordingUrl: b.recordingUrl,
+        tags: b.tags || [],
+        icalUid: b.icalUid,
+        attendees: b.attendees || [],
+        notes: b.notes || '',
+        actionItems: b.actionItems || [],
+        transcript: b.transcript || [],
+        insights: b.insights || {},
+        meeting: b,
+      },
+    }
+  },
+
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'x-signature',
+    validateFn: validateCirclebackSignature,
+    providerLabel: 'Circleback',
+  }),
+}
diff --git a/apps/sim/lib/webhooks/providers/confluence.ts b/apps/sim/lib/webhooks/providers/confluence.ts
new file mode 100644
index 00000000000..79fda7c0529
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/confluence.ts
@@ -0,0 +1,92 @@
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { validateJiraSignature } from '@/lib/webhooks/providers/jira'
+import type {
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Confluence')
+
+export const confluenceHandler: WebhookProviderHandler = {
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'X-Hub-Signature',
+    validateFn: validateJiraSignature,
+    providerLabel: 'Confluence',
+  }),
+
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const {
+      extractPageData,
+      extractCommentData,
+      extractBlogData,
+      extractAttachmentData,
+      extractSpaceData,
+      extractLabelData,
+    } = await import('@/triggers/confluence/utils')
+    const providerConfig = (webhook.providerConfig as Record<string, unknown>) || {}
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (triggerId?.startsWith('confluence_comment_')) {
+      return { input: extractCommentData(body) }
+    }
+    if (triggerId?.startsWith('confluence_blog_')) {
+      return { input: extractBlogData(body) }
+    }
+    if (triggerId?.startsWith('confluence_attachment_')) {
+      return { input: extractAttachmentData(body) }
+    }
+    if (triggerId?.startsWith('confluence_space_')) {
+      return { input: extractSpaceData(body) }
+    }
+    if (triggerId?.startsWith('confluence_label_')) {
+      return { input: extractLabelData(body) }
+    }
+    if (triggerId === 'confluence_webhook') {
+      const b = body as Record<string, unknown>
+      return {
+        input: {
+          timestamp: b.timestamp,
+          userAccountId: b.userAccountId,
+          accountType: b.accountType,
+          page: b.page || null,
+          comment: b.comment || null,
+          blog: b.blog || (b as Record<string, unknown>).blogpost || null,
+          attachment: b.attachment || null,
+          space: b.space || null,
+          label: b.label || null,
+          content: b.content || null,
+        },
+      }
+    }
+    return { input: extractPageData(body) }
+  },
+
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+
+    if (triggerId) {
+      const { isConfluencePayloadMatch } = await import('@/triggers/confluence/utils')
+      if (!isConfluencePayloadMatch(triggerId, obj)) {
+        logger.debug(
+          `[${requestId}] Confluence payload mismatch for trigger ${triggerId}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            workflowId: workflow.id,
+            triggerId,
+            bodyKeys: Object.keys(obj),
+          }
+        )
+        return NextResponse.json({
+          message: 'Payload does not match trigger configuration. Ignoring.',
+        })
+      }
+    }
+
+    return true
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/fathom.ts b/apps/sim/lib/webhooks/providers/fathom.ts
new file mode 100644
index 00000000000..c158c73e369
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/fathom.ts
@@ -0,0 +1,173 @@
+import { createLogger } from '@sim/logger'
+import { validateAlphanumericId } from '@/lib/core/security/input-validation'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Fathom')
+
+export const fathomHandler: WebhookProviderHandler = {
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const { webhook, requestId } = ctx
+    try {
+      const providerConfig = getProviderConfig(webhook)
+      const apiKey = providerConfig.apiKey as string | undefined
+      const triggerId = providerConfig.triggerId as string | undefined
+      const triggeredFor = providerConfig.triggeredFor as string | undefined
+      const includeSummary = providerConfig.includeSummary as unknown
+      const includeTranscript = providerConfig.includeTranscript as unknown
+      const includeActionItems = providerConfig.includeActionItems as unknown
+      const includeCrmMatches = providerConfig.includeCrmMatches as unknown
+
+      if (!apiKey) {
+        logger.warn(`[${requestId}] Missing apiKey for Fathom webhook creation.`, {
+          webhookId: webhook.id,
+        })
+        throw new Error(
+          'Fathom API Key is required. Please provide your API key in the trigger configuration.'
+        )
+      }
+
+      const notificationUrl = getNotificationUrl(webhook)
+
+      const triggeredForValue = triggeredFor || 'my_recordings'
+
+      const toBool = (val: unknown, fallback: boolean): boolean => {
+        if (val === undefined) return fallback
+        return val === true || val === 'true'
+      }
+
+      const requestBody: Record<string, unknown> = {
+        destination_url: notificationUrl,
+        triggered_for: [triggeredForValue],
+        include_summary: toBool(includeSummary, true),
+        include_transcript: toBool(includeTranscript, false),
+        include_action_items: toBool(includeActionItems, false),
+        include_crm_matches: toBool(includeCrmMatches, false),
+      }
+
+      logger.info(`[${requestId}] Creating Fathom webhook`, {
+        triggerId,
+        triggeredFor: triggeredForValue,
+        webhookId: webhook.id,
+      })
+
+      const fathomResponse = await fetch('https://api.fathom.ai/external/v1/webhooks', {
+        method: 'POST',
+        headers: {
+          'X-Api-Key': apiKey,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      const responseBody = (await fathomResponse.json().catch(() => ({}))) as Record<
+        string,
+        unknown
+      >
+
+      if (!fathomResponse.ok) {
+        const errorMessage =
+          (responseBody.message as string) ||
+          (responseBody.error as string) ||
+          'Unknown Fathom API error'
+        logger.error(
+          `[${requestId}] Failed to create webhook in Fathom for webhook ${webhook.id}. Status: ${fathomResponse.status}`,
+          { message: errorMessage, response: responseBody }
+        )
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Fathom'
+        if (fathomResponse.status === 401) {
+          userFriendlyMessage = 'Invalid Fathom API Key. Please verify your key is correct.'
+        } else if (fathomResponse.status === 400) {
+          userFriendlyMessage = `Fathom error: ${errorMessage}`
+        } else if (errorMessage && errorMessage !== 'Unknown Fathom API error') {
+          userFriendlyMessage = `Fathom error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      if (!responseBody.id) {
+        logger.error(
+          `[${requestId}] Fathom webhook creation returned success but no webhook ID for ${webhook.id}.`
+        )
+        throw new Error('Fathom webhook created but no ID returned. Please try again.')
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created webhook in Fathom for webhook ${webhook.id}.`,
+        {
+          fathomWebhookId: responseBody.id,
+        }
+      )
+
+      return { providerConfigUpdates: { externalId: responseBody.id } }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${requestId}] Exception during Fathom webhook creation for webhook ${webhook.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const { webhook, requestId } = ctx
+    try {
+      const config = getProviderConfig(webhook)
+      const apiKey = config.apiKey as string | undefined
+      const externalId = config.externalId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(
+          `[${requestId}] Missing apiKey for Fathom webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      if (!externalId) {
+        logger.warn(
+          `[${requestId}] Missing externalId for Fathom webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const idValidation = validateAlphanumericId(externalId, 'Fathom webhook ID', 100)
+      if (!idValidation.isValid) {
+        logger.warn(
+          `[${requestId}] Invalid externalId format for Fathom webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const fathomApiUrl = `https://api.fathom.ai/external/v1/webhooks/${externalId}`
+
+      const fathomResponse = await fetch(fathomApiUrl, {
+        method: 'DELETE',
+        headers: {
+          'X-Api-Key': apiKey,
+          'Content-Type': 'application/json',
+        },
+      })
+
+      if (!fathomResponse.ok && fathomResponse.status !== 404) {
+        logger.warn(
+          `[${requestId}] Failed to delete Fathom webhook (non-fatal): ${fathomResponse.status}`
+        )
+      } else {
+        logger.info(`[${requestId}] Successfully deleted Fathom webhook ${externalId}`)
+      }
+    } catch (error) {
+      logger.warn(`[${requestId}] Error deleting Fathom webhook (non-fatal)`, error)
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/fireflies.ts b/apps/sim/lib/webhooks/providers/fireflies.ts
new file mode 100644
index 00000000000..f3245d5cd3c
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/fireflies.ts
@@ -0,0 +1,63 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Fireflies')
+
+function validateFirefliesSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Fireflies signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+    if (!signature.startsWith('sha256=')) {
+      logger.warn('Fireflies signature has invalid format (expected sha256=)', {
+        signaturePrefix: signature.substring(0, 10),
+      })
+      return false
+    }
+    const providedSignature = signature.substring(7)
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+    logger.debug('Fireflies signature comparison', {
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${providedSignature.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: providedSignature.length,
+      match: computedHash === providedSignature,
+    })
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating Fireflies signature:', error)
+    return false
+  }
+}
+
+export const firefliesHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return {
+      input: {
+        meetingId: (b.meetingId || '') as string,
+        eventType: (b.eventType || 'Transcription completed') as string,
+        clientReferenceId: (b.clientReferenceId || '') as string,
+      },
+    }
+  },
+
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'x-hub-signature',
+    validateFn: validateFirefliesSignature,
+    providerLabel: 'Fireflies',
+  }),
+}
diff --git a/apps/sim/lib/webhooks/providers/generic.ts b/apps/sim/lib/webhooks/providers/generic.ts
new file mode 100644
index 00000000000..712cd09d12e
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/generic.ts
@@ -0,0 +1,145 @@
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import type {
+  AuthContext,
+  EventFilterContext,
+  FormatInputContext,
+  FormatInputResult,
+  ProcessFilesContext,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { verifyTokenAuth } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Generic')
+
+export const genericHandler: WebhookProviderHandler = {
+  verifyAuth({ request, requestId, providerConfig }: AuthContext) {
+    if (providerConfig.requireAuth) {
+      const configToken = providerConfig.token as string | undefined
+      if (!configToken) {
+        return new NextResponse('Unauthorized - Authentication required but no token configured', {
+          status: 401,
+        })
+      }
+
+      const secretHeaderName = providerConfig.secretHeaderName as string | undefined
+      if (!verifyTokenAuth(request, configToken, secretHeaderName)) {
+        return new NextResponse('Unauthorized - Invalid authentication token', { status: 401 })
+      }
+    }
+
+    const allowedIps = providerConfig.allowedIps
+    if (allowedIps && Array.isArray(allowedIps) && allowedIps.length > 0) {
+      const clientIp =
+        request.headers.get('x-forwarded-for')?.split(',')[0].trim() ||
+        request.headers.get('x-real-ip') ||
+        'unknown'
+
+      if (clientIp === 'unknown' || !allowedIps.includes(clientIp)) {
+        logger.warn(`[${requestId}] Forbidden webhook access attempt - IP not allowed: ${clientIp}`)
+        return new NextResponse('Forbidden - IP not allowed', {
+          status: 403,
+        })
+      }
+    }
+
+    return null
+  },
+
+  enrichHeaders({ body, providerConfig }: EventFilterContext, headers: Record<string, string>) {
+    const idempotencyField = providerConfig.idempotencyField as string | undefined
+    if (idempotencyField && body) {
+      const value = idempotencyField
+        .split('.')
+        .reduce(
+          (acc: unknown, key: string) =>
+            acc && typeof acc === 'object' ? (acc as Record<string, unknown>)[key] : undefined,
+          body
+        )
+      if (value !== undefined && value !== null && typeof value !== 'object') {
+        headers['x-sim-idempotency-key'] = String(value)
+      }
+    }
+  },
+
+  formatSuccessResponse(providerConfig: Record<string, unknown>) {
+    if (providerConfig.responseMode === 'custom') {
+      const rawCode = Number(providerConfig.responseStatusCode) || 200
+      const statusCode = rawCode >= 100 && rawCode <= 599 ? rawCode : 200
+      const responseBody = (providerConfig.responseBody as string | undefined)?.trim()
+
+      if (!responseBody) {
+        return new NextResponse(null, { status: statusCode })
+      }
+
+      try {
+        const parsed = JSON.parse(responseBody)
+        return NextResponse.json(parsed, { status: statusCode })
+      } catch {
+        return new NextResponse(responseBody, {
+          status: statusCode,
+          headers: { 'Content-Type': 'text/plain' },
+        })
+      }
+    }
+
+    return null
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    return { input: body }
+  },
+
+  async processInputFiles({
+    input,
+    blocks,
+    blockId,
+    workspaceId,
+    workflowId,
+    executionId,
+    requestId,
+    userId,
+  }: ProcessFilesContext) {
+    const triggerBlock = blocks[blockId] as Record<string, unknown> | undefined
+    const subBlocks = triggerBlock?.subBlocks as Record<string, unknown> | undefined
+    const inputFormatBlock = subBlocks?.inputFormat as Record<string, unknown> | undefined
+
+    if (inputFormatBlock?.value) {
+      const inputFormat = inputFormatBlock.value as Array<{
+        name: string
+        type: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'file[]'
+      }>
+
+      const fileFields = inputFormat.filter((field) => field.type === 'file[]')
+
+      if (fileFields.length > 0) {
+        const { processExecutionFiles } = await import('@/lib/execution/files')
+        const executionContext = {
+          workspaceId,
+          workflowId,
+          executionId,
+        }
+
+        for (const fileField of fileFields) {
+          const fieldValue = input[fileField.name]
+
+          if (fieldValue && typeof fieldValue === 'object') {
+            const uploadedFiles = await processExecutionFiles(
+              fieldValue,
+              executionContext,
+              requestId,
+              userId
+            )
+
+            if (uploadedFiles.length > 0) {
+              input[fileField.name] = uploadedFiles
+              logger.info(
+                `[${requestId}] Successfully processed ${uploadedFiles.length} file(s) for field: ${fileField.name}`
+              )
+            }
+          }
+        }
+      }
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/github.ts b/apps/sim/lib/webhooks/providers/github.ts
new file mode 100644
index 00000000000..a0fd90f2e6d
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/github.ts
@@ -0,0 +1,124 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  AuthContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:GitHub')
+
+function validateGitHubSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('GitHub signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+    let algorithm: 'sha256' | 'sha1'
+    let providedSignature: string
+    if (signature.startsWith('sha256=')) {
+      algorithm = 'sha256'
+      providedSignature = signature.substring(7)
+    } else if (signature.startsWith('sha1=')) {
+      algorithm = 'sha1'
+      providedSignature = signature.substring(5)
+    } else {
+      logger.warn('GitHub signature has invalid format', {
+        signature: `${signature.substring(0, 10)}...`,
+      })
+      return false
+    }
+    const computedHash = crypto.createHmac(algorithm, secret).update(body, 'utf8').digest('hex')
+    logger.debug('GitHub signature comparison', {
+      algorithm,
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${providedSignature.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: providedSignature.length,
+      match: computedHash === providedSignature,
+    })
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating GitHub signature:', error)
+    return false
+  }
+}
+
+export const githubHandler: WebhookProviderHandler = {
+  verifyAuth({ request, rawBody, requestId, providerConfig }: AuthContext) {
+    const secret = providerConfig.webhookSecret as string | undefined
+    if (!secret) {
+      return null
+    }
+
+    const signature =
+      request.headers.get('X-Hub-Signature-256') || request.headers.get('X-Hub-Signature')
+    if (!signature) {
+      logger.warn(`[${requestId}] GitHub webhook missing signature header`)
+      return new NextResponse('Unauthorized - Missing GitHub signature', { status: 401 })
+    }
+
+    if (!validateGitHubSignature(secret, signature, rawBody)) {
+      logger.warn(`[${requestId}] GitHub signature verification failed`, {
+        signatureLength: signature.length,
+        secretLength: secret.length,
+        usingSha256: !!request.headers.get('X-Hub-Signature-256'),
+      })
+      return new NextResponse('Unauthorized - Invalid GitHub signature', { status: 401 })
+    }
+
+    return null
+  },
+
+  async formatInput({ body, headers }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const eventType = headers['x-github-event'] || 'unknown'
+    const ref = (b?.ref as string) || ''
+    const branch = ref.replace('refs/heads/', '')
+    return {
+      input: { ...b, event_type: eventType, action: (b?.action || '') as string, branch },
+    }
+  },
+
+  async matchEvent({
+    webhook,
+    workflow,
+    body,
+    request,
+    requestId,
+    providerConfig,
+  }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+
+    if (triggerId && triggerId !== 'github_webhook') {
+      const eventType = request.headers.get('x-github-event')
+      const action = obj.action as string | undefined
+
+      const { isGitHubEventMatch } = await import('@/triggers/github/utils')
+      if (!isGitHubEventMatch(triggerId, eventType || '', action, obj)) {
+        logger.debug(
+          `[${requestId}] GitHub event mismatch for trigger ${triggerId}. Event: ${eventType}, Action: ${action}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            workflowId: workflow.id,
+            triggerId,
+            receivedEvent: eventType,
+            receivedAction: action,
+          }
+        )
+        return false
+      }
+    }
+
+    return true
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/gmail.ts b/apps/sim/lib/webhooks/providers/gmail.ts
new file mode 100644
index 00000000000..650ebfb0980
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/gmail.ts
@@ -0,0 +1,117 @@
+import { db } from '@sim/db'
+import { account, webhook } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { eq } from 'drizzle-orm'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  PollingConfigContext,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { refreshAccessTokenIfNeeded, resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
+
+const logger = createLogger('WebhookProvider:Gmail')
+
+export const gmailHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    if (b && typeof b === 'object' && 'email' in b) {
+      return { input: { email: b.email, timestamp: b.timestamp } }
+    }
+    return { input: b }
+  },
+
+  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+    logger.info(`[${requestId}] Setting up Gmail polling for webhook ${webhookData.id}`)
+
+    try {
+      const providerConfig = (webhookData.providerConfig as Record<string, unknown>) || {}
+      const credentialId = providerConfig.credentialId as string | undefined
+
+      if (!credentialId) {
+        logger.error(`[${requestId}] Missing credentialId for Gmail webhook ${webhookData.id}`)
+        return false
+      }
+
+      const resolvedGmail = await resolveOAuthAccountId(credentialId)
+      if (!resolvedGmail) {
+        logger.error(
+          `[${requestId}] Could not resolve credential ${credentialId} for Gmail webhook ${webhookData.id}`
+        )
+        return false
+      }
+
+      const rows = await db
+        .select()
+        .from(account)
+        .where(eq(account.id, resolvedGmail.accountId))
+        .limit(1)
+      if (rows.length === 0) {
+        logger.error(
+          `[${requestId}] Credential ${credentialId} not found for Gmail webhook ${webhookData.id}`
+        )
+        return false
+      }
+
+      const effectiveUserId = rows[0].userId
+
+      const accessToken = await refreshAccessTokenIfNeeded(
+        resolvedGmail.accountId,
+        effectiveUserId,
+        requestId
+      )
+      if (!accessToken) {
+        logger.error(
+          `[${requestId}] Failed to refresh/access Gmail token for credential ${credentialId}`
+        )
+        return false
+      }
+
+      const maxEmailsPerPoll =
+        typeof providerConfig.maxEmailsPerPoll === 'string'
+          ? Number.parseInt(providerConfig.maxEmailsPerPoll, 10) || 25
+          : (providerConfig.maxEmailsPerPoll as number) || 25
+
+      const pollingInterval =
+        typeof providerConfig.pollingInterval === 'string'
+          ? Number.parseInt(providerConfig.pollingInterval, 10) || 5
+          : (providerConfig.pollingInterval as number) || 5
+
+      const now = new Date()
+
+      await db
+        .update(webhook)
+        .set({
+          providerConfig: {
+            ...providerConfig,
+            userId: effectiveUserId,
+            credentialId,
+            maxEmailsPerPoll,
+            pollingInterval,
+            markAsRead: providerConfig.markAsRead || false,
+            includeRawEmail: providerConfig.includeRawEmail || false,
+            labelIds: providerConfig.labelIds || ['INBOX'],
+            labelFilterBehavior: providerConfig.labelFilterBehavior || 'INCLUDE',
+            lastCheckedTimestamp:
+              (providerConfig.lastCheckedTimestamp as string) || now.toISOString(),
+            setupCompleted: true,
+          },
+          updatedAt: now,
+        })
+        .where(eq(webhook.id, webhookData.id as string))
+
+      logger.info(
+        `[${requestId}] Successfully configured Gmail polling for webhook ${webhookData.id}`
+      )
+      return true
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(`[${requestId}] Failed to configure Gmail polling`, {
+        webhookId: webhookData.id,
+        error: err.message,
+        stack: err.stack,
+      })
+      return false
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/gong.test.ts b/apps/sim/lib/webhooks/providers/gong.test.ts
new file mode 100644
index 00000000000..d6841cf6194
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/gong.test.ts
@@ -0,0 +1,167 @@
+import { createHash } from 'node:crypto'
+import * as jose from 'jose'
+import { NextRequest } from 'next/server'
+import { describe, expect, it } from 'vitest'
+import {
+  GONG_JWT_PUBLIC_KEY_CONFIG_KEY,
+  gongHandler,
+  normalizeGongPublicKeyPem,
+  verifyGongJwtAuth,
+} from '@/lib/webhooks/providers/gong'
+
+describe('normalizeGongPublicKeyPem', () => {
+  it('passes through PEM', () => {
+    const pem = '-----BEGIN PUBLIC KEY-----\nabc\n-----END PUBLIC KEY-----'
+    expect(normalizeGongPublicKeyPem(pem)).toBe(pem)
+  })
+
+  it('wraps raw base64', () => {
+    const raw = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfj3'
+    const out = normalizeGongPublicKeyPem(raw)
+    expect(out).toContain('BEGIN PUBLIC KEY')
+    expect(out).toContain('END PUBLIC KEY')
+    expect(out).toContain('MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfj3')
+  })
+
+  it('returns null for garbage', () => {
+    expect(normalizeGongPublicKeyPem('not-base64!!!')).toBeNull()
+  })
+})
+
+describe('gongHandler formatInput', () => {
+  it('always returns callId as a string', async () => {
+    const { input } = await gongHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'wf', userId: 'u' },
+      body: { callData: { metaData: {} } },
+      headers: {},
+      requestId: 'gong-format',
+    })
+
+    expect((input as Record<string, unknown>).callId).toBe('')
+  })
+
+  it('exposes content topics and highlights alongside trackers', async () => {
+    const { input } = await gongHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'wf', userId: 'u' },
+      body: {
+        callData: {
+          metaData: { id: '99' },
+          content: {
+            trackers: [{ id: 't1', name: 'Competitor', count: 2 }],
+            topics: [{ name: 'Pricing', duration: 120 }],
+            highlights: [{ title: 'Action items' }],
+          },
+        },
+      },
+      headers: {},
+      requestId: 'gong-format-content',
+    })
+    const rec = input as Record<string, unknown>
+    expect(rec.callId).toBe('99')
+    expect(rec.trackers).toEqual([{ id: 't1', name: 'Competitor', count: 2 }])
+    expect(rec.topics).toEqual([{ name: 'Pricing', duration: 120 }])
+    expect(rec.highlights).toEqual([{ title: 'Action items' }])
+  })
+})
+
+describe('gongHandler verifyAuth (JWT)', () => {
+  it('returns null when JWT public key is not configured', async () => {
+    const request = new NextRequest('https://app.example.com/api/webhooks/trigger/abc', {
+      method: 'POST',
+      body: '{}',
+    })
+    const rawBody = '{}'
+    const res = await verifyGongJwtAuth({
+      webhook: {},
+      workflow: {},
+      request,
+      rawBody,
+      requestId: 't1',
+      providerConfig: {},
+    })
+    expect(res).toBeNull()
+  })
+
+  it('returns 401 when key is configured but Authorization is missing', async () => {
+    const { publicKey } = await jose.generateKeyPair('RS256')
+    const spki = await jose.exportSPKI(publicKey)
+    const request = new NextRequest('https://app.example.com/api/webhooks/trigger/abc', {
+      method: 'POST',
+      body: '{}',
+    })
+    const res = await verifyGongJwtAuth({
+      webhook: {},
+      workflow: {},
+      request,
+      rawBody: '{}',
+      requestId: 't2',
+      providerConfig: { [GONG_JWT_PUBLIC_KEY_CONFIG_KEY]: spki },
+    })
+    expect(res?.status).toBe(401)
+  })
+
+  it('accepts a valid Gong-style JWT', async () => {
+    const { publicKey, privateKey } = await jose.generateKeyPair('RS256')
+    const spki = await jose.exportSPKI(publicKey)
+    const url = 'https://app.example.com/api/webhooks/trigger/test-path'
+    const rawBody = '{"callData":{}}'
+    const bodySha = createHash('sha256').update(rawBody, 'utf8').digest('hex')
+
+    const jwt = await new jose.SignJWT({
+      webhook_url: url,
+      body_sha256: bodySha,
+    })
+      .setProtectedHeader({ alg: 'RS256' })
+      .setExpirationTime('1h')
+      .sign(privateKey)
+
+    const request = new NextRequest(url, {
+      method: 'POST',
+      body: rawBody,
+      headers: { Authorization: `Bearer ${jwt}` },
+    })
+
+    const res = await gongHandler.verifyAuth!({
+      webhook: {},
+      workflow: {},
+      request,
+      rawBody,
+      requestId: 't3',
+      providerConfig: { [GONG_JWT_PUBLIC_KEY_CONFIG_KEY]: spki },
+    })
+    expect(res).toBeNull()
+  })
+
+  it('rejects JWT when body hash does not match', async () => {
+    const { publicKey, privateKey } = await jose.generateKeyPair('RS256')
+    const spki = await jose.exportSPKI(publicKey)
+    const url = 'https://app.example.com/api/webhooks/trigger/x'
+    const rawBody = '{"a":1}'
+
+    const jwt = await new jose.SignJWT({
+      webhook_url: url,
+      body_sha256: 'deadbeef',
+    })
+      .setProtectedHeader({ alg: 'RS256' })
+      .setExpirationTime('1h')
+      .sign(privateKey)
+
+    const request = new NextRequest(url, {
+      method: 'POST',
+      body: rawBody,
+      headers: { Authorization: jwt },
+    })
+
+    const res = await verifyGongJwtAuth({
+      webhook: {},
+      workflow: {},
+      request,
+      rawBody,
+      requestId: 't4',
+      providerConfig: { [GONG_JWT_PUBLIC_KEY_CONFIG_KEY]: spki },
+    })
+    expect(res?.status).toBe(401)
+  })
+})
diff --git a/apps/sim/lib/webhooks/providers/gong.ts b/apps/sim/lib/webhooks/providers/gong.ts
new file mode 100644
index 00000000000..6a45d60ff3f
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/gong.ts
@@ -0,0 +1,163 @@
+import { createHash } from 'node:crypto'
+import { createLogger } from '@sim/logger'
+import * as jose from 'jose'
+import { NextResponse } from 'next/server'
+import type {
+  AuthContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Gong')
+
+/** providerConfig key: PEM or raw base64 RSA public key from Gong (Signed JWT header auth). */
+export const GONG_JWT_PUBLIC_KEY_CONFIG_KEY = 'gongJwtPublicKeyPem'
+
+/**
+ * Gong automation webhooks support either URL secrecy (token in path) or a signed JWT in
+ * `Authorization` (see https://help.gong.io/docs/create-a-webhook-rule).
+ * When {@link GONG_JWT_PUBLIC_KEY_CONFIG_KEY} is set, we verify RS256 per Gong's JWT guide.
+ * When unset, only the unguessable Sim webhook path authenticates the request (same as before).
+ */
+export function normalizeGongPublicKeyPem(input: string): string | null {
+  const trimmed = input.trim()
+  if (!trimmed) return null
+  if (trimmed.includes('BEGIN PUBLIC KEY')) {
+    return trimmed
+  }
+  const b64 = trimmed.replace(/\s/g, '')
+  if (!/^[A-Za-z0-9+/]+=*$/.test(b64)) {
+    return null
+  }
+  const chunked = b64.match(/.{1,64}/g)?.join('\n') ?? b64
+  return `-----BEGIN PUBLIC KEY-----\n${chunked}\n-----END PUBLIC KEY-----`
+}
+
+function normalizeUrlForGongJwtClaim(url: string): string {
+  try {
+    const u = new URL(url)
+    let path = u.pathname
+    if (path.length > 1 && path.endsWith('/')) {
+      path = path.slice(0, -1)
+    }
+    return `${u.protocol}//${u.host.toLowerCase()}${path}`
+  } catch {
+    return url.trim()
+  }
+}
+
+function parseAuthorizationJwt(authHeader: string | null): string | null {
+  if (!authHeader) return null
+  const trimmed = authHeader.trim()
+  if (trimmed.toLowerCase().startsWith('bearer ')) {
+    return trimmed.slice(7).trim() || null
+  }
+  return trimmed || null
+}
+
+export async function verifyGongJwtAuth(ctx: AuthContext): Promise<NextResponse | null> {
+  const { request, rawBody, requestId, providerConfig } = ctx
+  const rawKey = providerConfig[GONG_JWT_PUBLIC_KEY_CONFIG_KEY]
+  if (typeof rawKey !== 'string') {
+    return null
+  }
+
+  const pem = normalizeGongPublicKeyPem(rawKey)
+  if (!pem) {
+    logger.warn(`[${requestId}] Gong JWT public key configured but could not be normalized`)
+    return new NextResponse('Unauthorized - Invalid Gong JWT public key configuration', {
+      status: 401,
+    })
+  }
+
+  const token = parseAuthorizationJwt(request.headers.get('authorization'))
+  if (!token) {
+    logger.warn(`[${requestId}] Gong JWT verification enabled but Authorization header missing`)
+    return new NextResponse('Unauthorized - Missing Gong JWT', { status: 401 })
+  }
+
+  let payload: jose.JWTPayload
+  try {
+    const key = await jose.importSPKI(pem, 'RS256')
+    const verified = await jose.jwtVerify(token, key, { algorithms: ['RS256'] })
+    payload = verified.payload
+  } catch (error) {
+    logger.warn(`[${requestId}] Gong JWT verification failed`, {
+      message: error instanceof Error ? error.message : String(error),
+    })
+    return new NextResponse('Unauthorized - Invalid Gong JWT', { status: 401 })
+  }
+
+  const claimUrl = payload.webhook_url
+  if (typeof claimUrl !== 'string' || !claimUrl) {
+    logger.warn(`[${requestId}] Gong JWT missing webhook_url claim`)
+    return new NextResponse('Unauthorized - Invalid Gong JWT claims', { status: 401 })
+  }
+
+  const claimDigest = payload.body_sha256
+  if (typeof claimDigest !== 'string' || !claimDigest) {
+    logger.warn(`[${requestId}] Gong JWT missing body_sha256 claim`)
+    return new NextResponse('Unauthorized - Invalid Gong JWT claims', { status: 401 })
+  }
+
+  const expectedDigest = createHash('sha256').update(rawBody, 'utf8').digest('hex')
+  if (claimDigest !== expectedDigest) {
+    logger.warn(`[${requestId}] Gong JWT body_sha256 mismatch`)
+    return new NextResponse('Unauthorized - Gong JWT body mismatch', { status: 401 })
+  }
+
+  const receivedNorm = normalizeUrlForGongJwtClaim(request.url)
+  const claimNorm = normalizeUrlForGongJwtClaim(claimUrl)
+  if (receivedNorm !== claimNorm) {
+    logger.warn(`[${requestId}] Gong JWT webhook_url mismatch`, {
+      receivedNorm,
+      claimNorm,
+    })
+    return new NextResponse('Unauthorized - Gong JWT URL mismatch', { status: 401 })
+  }
+
+  return null
+}
+
+export const gongHandler: WebhookProviderHandler = {
+  verifyAuth: verifyGongJwtAuth,
+
+  extractIdempotencyId(body: unknown): string | null {
+    const obj = body as Record<string, unknown>
+    const callData = obj.callData as Record<string, unknown> | undefined
+    const metaData = callData?.metaData as Record<string, unknown> | undefined
+    const id = metaData?.id
+    if (typeof id === 'string' && id) {
+      return `gong:${id}`
+    }
+    if (typeof id === 'number') {
+      return `gong:${id}`
+    }
+    return null
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const callData = b.callData as Record<string, unknown> | undefined
+    const metaData = (callData?.metaData as Record<string, unknown>) || {}
+    const content = callData?.content as Record<string, unknown> | undefined
+    const callId =
+      typeof metaData.id === 'string' || typeof metaData.id === 'number' ? String(metaData.id) : ''
+
+    return {
+      input: {
+        isTest: b.isTest ?? false,
+        callData,
+        metaData,
+        parties: (callData?.parties as unknown[]) || [],
+        context: (callData?.context as unknown[]) || [],
+        trackers: (content?.trackers as unknown[]) || [],
+        topics: (content?.topics as unknown[]) || [],
+        highlights: (content?.highlights as unknown[]) || [],
+        eventType: 'gong.automation_rule',
+        callId,
+      },
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/google-forms.ts b/apps/sim/lib/webhooks/providers/google-forms.ts
new file mode 100644
index 00000000000..67e7fd8c997
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/google-forms.ts
@@ -0,0 +1,60 @@
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import type {
+  AuthContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { verifyTokenAuth } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:GoogleForms')
+
+export const googleFormsHandler: WebhookProviderHandler = {
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const providerConfig = (webhook.providerConfig as Record<string, unknown>) || {}
+    const normalizeAnswers = (src: unknown): Record<string, unknown> => {
+      if (!src || typeof src !== 'object') return {}
+      const out: Record<string, unknown> = {}
+      for (const [k, v] of Object.entries(src as Record<string, unknown>)) {
+        if (Array.isArray(v)) {
+          out[k] = v.length === 1 ? v[0] : v
+        } else {
+          out[k] = v
+        }
+      }
+      return out
+    }
+    const responseId = (b?.responseId || b?.id || '') as string
+    const createTime = (b?.createTime || b?.timestamp || new Date().toISOString()) as string
+    const lastSubmittedTime = (b?.lastSubmittedTime || createTime) as string
+    const formId = (b?.formId || providerConfig.formId || '') as string
+    const includeRaw = providerConfig.includeRawPayload !== false
+    return {
+      input: {
+        responseId,
+        createTime,
+        lastSubmittedTime,
+        formId,
+        answers: normalizeAnswers(b?.answers),
+        ...(includeRaw ? { raw: b?.raw ?? b } : {}),
+      },
+    }
+  },
+
+  verifyAuth({ request, requestId, providerConfig }: AuthContext) {
+    const expectedToken = providerConfig.token as string | undefined
+    if (!expectedToken) {
+      return null
+    }
+
+    const secretHeaderName = providerConfig.secretHeaderName as string | undefined
+    if (!verifyTokenAuth(request, expectedToken, secretHeaderName)) {
+      logger.warn(`[${requestId}] Google Forms webhook authentication failed`)
+      return new NextResponse('Unauthorized - Invalid secret', { status: 401 })
+    }
+
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/grain.ts b/apps/sim/lib/webhooks/providers/grain.ts
new file mode 100644
index 00000000000..39be11cab66
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/grain.ts
@@ -0,0 +1,251 @@
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  EventFilterContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { skipByEventTypes } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Grain')
+
+export const grainHandler: WebhookProviderHandler = {
+  handleReachabilityTest(body: unknown, requestId: string) {
+    const obj = body as Record<string, unknown> | null
+    const isVerificationRequest = !obj || Object.keys(obj).length === 0 || !obj.type
+    if (isVerificationRequest) {
+      logger.info(
+        `[${requestId}] Grain reachability test detected - returning 200 for webhook verification`
+      )
+      return NextResponse.json({
+        status: 'ok',
+        message: 'Webhook endpoint verified',
+      })
+    }
+    return null
+  },
+
+  shouldSkipEvent(ctx: EventFilterContext) {
+    return skipByEventTypes(ctx, 'Grain', logger)
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return { input: { type: b.type, user_id: b.user_id, data: b.data || {} } }
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    const data = obj.data as Record<string, unknown> | undefined
+    if (obj.type && data?.id) {
+      return `${obj.type}:${data.id}`
+    }
+    return null
+  },
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const { webhook, requestId } = ctx
+    try {
+      const providerConfig = getProviderConfig(webhook)
+      const apiKey = providerConfig.apiKey as string | undefined
+      const triggerId = providerConfig.triggerId as string | undefined
+      const viewId = providerConfig.viewId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(`[${requestId}] Missing apiKey for Grain webhook creation.`, {
+          webhookId: webhook.id,
+        })
+        throw new Error(
+          'Grain API Key is required. Please provide your Grain Personal Access Token in the trigger configuration.'
+        )
+      }
+
+      if (!viewId) {
+        logger.warn(`[${requestId}] Missing viewId for Grain webhook creation.`, {
+          webhookId: webhook.id,
+          triggerId,
+        })
+        throw new Error(
+          'Grain view ID is required. Please provide the Grain view ID from GET /_/public-api/views in the trigger configuration.'
+        )
+      }
+
+      const actionMap: Record<string, Array<'added' | 'updated' | 'removed'>> = {
+        grain_item_added: ['added'],
+        grain_item_updated: ['updated'],
+        grain_recording_created: ['added'],
+        grain_recording_updated: ['updated'],
+        grain_highlight_created: ['added'],
+        grain_highlight_updated: ['updated'],
+        grain_story_created: ['added'],
+      }
+
+      const eventTypeMap: Record<string, string[]> = {
+        grain_webhook: [],
+        grain_item_added: [],
+        grain_item_updated: [],
+        grain_recording_created: ['recording_added'],
+        grain_recording_updated: ['recording_updated'],
+        grain_highlight_created: ['highlight_added'],
+        grain_highlight_updated: ['highlight_updated'],
+        grain_story_created: ['story_added'],
+      }
+
+      const actions = actionMap[triggerId ?? ''] ?? []
+      const eventTypes = eventTypeMap[triggerId ?? ''] ?? []
+
+      if (!triggerId || (!(triggerId in actionMap) && triggerId !== 'grain_webhook')) {
+        logger.warn(
+          `[${requestId}] Unknown triggerId for Grain: ${triggerId}, defaulting to all actions`,
+          {
+            webhookId: webhook.id,
+          }
+        )
+      }
+
+      logger.info(`[${requestId}] Creating Grain webhook`, {
+        triggerId,
+        viewId,
+        actions,
+        eventTypes,
+        webhookId: webhook.id,
+      })
+
+      const notificationUrl = getNotificationUrl(webhook)
+
+      const grainApiUrl = 'https://api.grain.com/_/public-api/hooks'
+
+      const requestBody: Record<string, unknown> = {
+        version: 2,
+        hook_url: notificationUrl,
+        view_id: viewId,
+      }
+      if (actions.length > 0) {
+        requestBody.actions = actions
+      }
+
+      const grainResponse = await fetch(grainApiUrl, {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      const responseBody = (await grainResponse.json()) as Record<string, unknown>
+
+      if (!grainResponse.ok || responseBody.error || responseBody.errors) {
+        const errors = responseBody.errors as Record<string, string> | undefined
+        const error = responseBody.error as Record<string, string> | string | undefined
+        const errorMessage =
+          errors?.detail ||
+          (typeof error === 'object' ? error?.message : undefined) ||
+          (typeof error === 'string' ? error : undefined) ||
+          (responseBody.message as string) ||
+          'Unknown Grain API error'
+        logger.error(
+          `[${requestId}] Failed to create webhook in Grain for webhook ${webhook.id}. Status: ${grainResponse.status}`,
+          { message: errorMessage, response: responseBody }
+        )
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Grain'
+        if (grainResponse.status === 401) {
+          userFriendlyMessage =
+            'Invalid Grain API Key. Please verify your Personal Access Token is correct.'
+        } else if (grainResponse.status === 403) {
+          userFriendlyMessage =
+            'Access denied. Please ensure your Grain API Key has appropriate permissions.'
+        } else if (errorMessage && errorMessage !== 'Unknown Grain API error') {
+          userFriendlyMessage = `Grain error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      const grainWebhookId = responseBody.id as string | undefined
+
+      if (!grainWebhookId) {
+        logger.error(
+          `[${requestId}] Grain webhook creation response missing id for webhook ${webhook.id}.`,
+          {
+            response: responseBody,
+          }
+        )
+        throw new Error(
+          'Grain webhook created but no webhook ID was returned in the response. Cannot track subscription.'
+        )
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created webhook in Grain for webhook ${webhook.id}.`,
+        {
+          grainWebhookId,
+          eventTypes,
+        }
+      )
+
+      return { providerConfigUpdates: { externalId: grainWebhookId, eventTypes } }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${requestId}] Exception during Grain webhook creation for webhook ${webhook.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const { webhook, requestId } = ctx
+    try {
+      const config = getProviderConfig(webhook)
+      const apiKey = config.apiKey as string | undefined
+      const externalId = config.externalId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(
+          `[${requestId}] Missing apiKey for Grain webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      if (!externalId) {
+        logger.warn(
+          `[${requestId}] Missing externalId for Grain webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const grainApiUrl = `https://api.grain.com/_/public-api/hooks/${externalId}`
+
+      const grainResponse = await fetch(grainApiUrl, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+        },
+      })
+
+      if (!grainResponse.ok && grainResponse.status !== 404) {
+        const responseBody = await grainResponse.json().catch(() => ({}))
+        logger.warn(
+          `[${requestId}] Failed to delete Grain webhook (non-fatal): ${grainResponse.status}`,
+          { response: responseBody }
+        )
+      } else {
+        logger.info(`[${requestId}] Successfully deleted Grain webhook ${externalId}`)
+      }
+    } catch (error) {
+      logger.warn(`[${requestId}] Error deleting Grain webhook (non-fatal)`, error)
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/greenhouse.ts b/apps/sim/lib/webhooks/providers/greenhouse.ts
new file mode 100644
index 00000000000..241e2221d10
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/greenhouse.ts
@@ -0,0 +1,145 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Greenhouse')
+
+/**
+ * Validates the Greenhouse HMAC-SHA256 signature.
+ * Greenhouse sends: `Signature: sha256 <hexdigest>`
+ */
+function validateGreenhouseSignature(secretKey: string, signature: string, body: string): boolean {
+  try {
+    if (!secretKey || !signature || !body) {
+      return false
+    }
+    const prefix = 'sha256 '
+    if (!signature.startsWith(prefix)) {
+      return false
+    }
+    const providedDigest = signature.substring(prefix.length)
+    const computedDigest = crypto.createHmac('sha256', secretKey).update(body, 'utf8').digest('hex')
+    return safeCompare(computedDigest, providedDigest)
+  } catch {
+    logger.error('Error validating Greenhouse signature')
+    return false
+  }
+}
+
+export const greenhouseHandler: WebhookProviderHandler = {
+  verifyAuth: createHmacVerifier({
+    configKey: 'secretKey',
+    headerName: 'signature',
+    validateFn: validateGreenhouseSignature,
+    providerLabel: 'Greenhouse',
+  }),
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const payload = (b.payload || {}) as Record<string, unknown>
+    const application = (payload.application || {}) as Record<string, unknown>
+    const candidate = (application.candidate || {}) as Record<string, unknown>
+    const jobNested = payload.job
+
+    let applicationId: number | null = null
+    if (typeof application.id === 'number') {
+      applicationId = application.id
+    } else if (typeof payload.application_id === 'number') {
+      applicationId = payload.application_id
+    }
+
+    const candidateId = typeof candidate.id === 'number' ? candidate.id : null
+
+    let jobId: number | null = null
+    if (
+      jobNested &&
+      typeof jobNested === 'object' &&
+      typeof (jobNested as Record<string, unknown>).id === 'number'
+    ) {
+      jobId = (jobNested as Record<string, unknown>).id as number
+    } else if (typeof payload.job_id === 'number') {
+      jobId = payload.job_id
+    }
+
+    return {
+      input: {
+        action: b.action,
+        applicationId,
+        candidateId,
+        jobId,
+        payload: b.payload || {},
+      },
+    }
+  },
+
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const b = body as Record<string, unknown>
+    const action = b.action as string | undefined
+
+    if (triggerId && triggerId !== 'greenhouse_webhook') {
+      const { isGreenhouseEventMatch } = await import('@/triggers/greenhouse/utils')
+      if (!isGreenhouseEventMatch(triggerId, action || '')) {
+        logger.debug(
+          `[${requestId}] Greenhouse event mismatch for trigger ${triggerId}. Action: ${action}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            workflowId: workflow.id,
+            triggerId,
+            receivedAction: action,
+          }
+        )
+
+        return false
+      }
+    }
+
+    return true
+  },
+
+  /**
+   * Fallback when Greenhouse-Event-ID is not available on headers (see idempotency service).
+   * Prefer stable resource keys; offer events include version for new versions.
+   */
+  extractIdempotencyId(body: unknown) {
+    const b = body as Record<string, unknown>
+    const action = typeof b.action === 'string' ? b.action : ''
+    const payload = (b.payload || {}) as Record<string, unknown>
+
+    const application = (payload.application || {}) as Record<string, unknown>
+    const appId = application.id
+    if (appId !== undefined && appId !== null && appId !== '') {
+      return `greenhouse:${action}:application:${String(appId)}`
+    }
+
+    const offerId = payload.id
+    const offerVersion = payload.version
+    if (offerId !== undefined && offerId !== null && offerId !== '') {
+      const v = offerVersion !== undefined && offerVersion !== null ? String(offerVersion) : '0'
+      return `greenhouse:${action}:offer:${String(offerId)}:${v}`
+    }
+
+    const offer = (payload.offer || {}) as Record<string, unknown>
+    const nestedOfferId = offer.id
+    if (nestedOfferId !== undefined && nestedOfferId !== null && nestedOfferId !== '') {
+      const nestedVersion =
+        offer.version !== undefined && offer.version !== null ? String(offer.version) : '0'
+      return `greenhouse:${action}:offer:${String(nestedOfferId)}:${nestedVersion}`
+    }
+
+    const job = (payload.job || {}) as Record<string, unknown>
+    const jobId = job.id
+    if (jobId !== undefined && jobId !== null && jobId !== '') {
+      return `greenhouse:${action}:job:${String(jobId)}`
+    }
+
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/hubspot.ts b/apps/sim/lib/webhooks/providers/hubspot.ts
new file mode 100644
index 00000000000..2591ee40175
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/hubspot.ts
@@ -0,0 +1,75 @@
+import { createLogger } from '@sim/logger'
+import type {
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:HubSpot')
+
+export const hubspotHandler: WebhookProviderHandler = {
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+
+    if (triggerId?.startsWith('hubspot_')) {
+      const events = Array.isArray(body) ? body : [body]
+      const firstEvent = events[0] as Record<string, unknown> | undefined
+      const subscriptionType = firstEvent?.subscriptionType as string | undefined
+
+      const { isHubSpotContactEventMatch } = await import('@/triggers/hubspot/utils')
+      if (!isHubSpotContactEventMatch(triggerId, subscriptionType || '')) {
+        logger.debug(
+          `[${requestId}] HubSpot event mismatch for trigger ${triggerId}. Event: ${subscriptionType}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            workflowId: workflow.id,
+            triggerId,
+            receivedEvent: subscriptionType,
+          }
+        )
+        return false
+      }
+
+      logger.info(
+        `[${requestId}] HubSpot event match confirmed for trigger ${triggerId}. Event: ${subscriptionType}`,
+        {
+          webhookId: webhook.id,
+          workflowId: workflow.id,
+          triggerId,
+          receivedEvent: subscriptionType,
+        }
+      )
+    }
+
+    return true
+  },
+
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const events = Array.isArray(b) ? b : [b]
+    const event = events[0] as Record<string, unknown> | undefined
+    if (!event) {
+      logger.warn('HubSpot webhook received with empty payload')
+      return { input: null }
+    }
+    logger.info('Formatting HubSpot webhook input', {
+      subscriptionType: event.subscriptionType,
+      objectId: event.objectId,
+      portalId: event.portalId,
+    })
+    return {
+      input: { payload: body, provider: 'hubspot', providerConfig: webhook.providerConfig },
+    }
+  },
+
+  extractIdempotencyId(body: unknown) {
+    if (Array.isArray(body) && body.length > 0) {
+      const first = body[0] as Record<string, unknown>
+      if (first?.eventId) {
+        return String(first.eventId)
+      }
+    }
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/imap.ts b/apps/sim/lib/webhooks/providers/imap.ts
new file mode 100644
index 00000000000..aff02b2a341
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/imap.ts
@@ -0,0 +1,84 @@
+import { db } from '@sim/db'
+import { webhook } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { eq } from 'drizzle-orm'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  PollingConfigContext,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Imap')
+
+export const imapHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    if (b && typeof b === 'object' && 'email' in b) {
+      return {
+        input: {
+          messageId: b.messageId,
+          subject: b.subject,
+          from: b.from,
+          to: b.to,
+          cc: b.cc,
+          date: b.date,
+          bodyText: b.bodyText,
+          bodyHtml: b.bodyHtml,
+          mailbox: b.mailbox,
+          hasAttachments: b.hasAttachments,
+          attachments: b.attachments,
+          email: b.email,
+          timestamp: b.timestamp,
+        },
+      }
+    }
+    return { input: b }
+  },
+
+  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+    logger.info(`[${requestId}] Setting up IMAP polling for webhook ${webhookData.id}`)
+
+    try {
+      const providerConfig = (webhookData.providerConfig as Record<string, unknown>) || {}
+      const now = new Date()
+
+      if (!providerConfig.host || !providerConfig.username || !providerConfig.password) {
+        logger.error(
+          `[${requestId}] Missing required IMAP connection settings for webhook ${webhookData.id}`
+        )
+        return false
+      }
+
+      await db
+        .update(webhook)
+        .set({
+          providerConfig: {
+            ...providerConfig,
+            port: providerConfig.port || '993',
+            secure: providerConfig.secure !== false,
+            mailbox: providerConfig.mailbox || 'INBOX',
+            searchCriteria: providerConfig.searchCriteria || 'UNSEEN',
+            markAsRead: providerConfig.markAsRead || false,
+            includeAttachments: providerConfig.includeAttachments !== false,
+            lastCheckedTimestamp: now.toISOString(),
+            setupCompleted: true,
+          },
+          updatedAt: now,
+        })
+        .where(eq(webhook.id, webhookData.id as string))
+
+      logger.info(
+        `[${requestId}] Successfully configured IMAP polling for webhook ${webhookData.id}`
+      )
+      return true
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(`[${requestId}] Failed to configure IMAP polling`, {
+        webhookId: webhookData.id,
+        error: err.message,
+      })
+      return false
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/index.ts b/apps/sim/lib/webhooks/providers/index.ts
new file mode 100644
index 00000000000..dd43ec6c223
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/index.ts
@@ -0,0 +1,24 @@
+export { getProviderHandler } from '@/lib/webhooks/providers/registry'
+export type {
+  AuthContext,
+  EventFilterContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  ProcessFilesContext,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+import { getProviderHandler } from '@/lib/webhooks/providers/registry'
+
+/**
+ * Extract a provider-specific unique identifier from the webhook body for idempotency.
+ */
+export function extractProviderIdentifierFromBody(provider: string, body: unknown): string | null {
+  if (!body || typeof body !== 'object') {
+    return null
+  }
+
+  const handler = getProviderHandler(provider)
+  return handler.extractIdempotencyId?.(body) ?? null
+}
diff --git a/apps/sim/lib/webhooks/providers/intercom.ts b/apps/sim/lib/webhooks/providers/intercom.ts
new file mode 100644
index 00000000000..5957a93b1fe
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/intercom.ts
@@ -0,0 +1,120 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  AuthContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Intercom')
+
+/**
+ * Validate Intercom webhook signature using HMAC-SHA1.
+ * Intercom signs payloads with the app's Client Secret and sends the
+ * signature in the X-Hub-Signature header as "sha1=<hex>".
+ */
+function validateIntercomSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Intercom signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+
+    if (!signature.startsWith('sha1=')) {
+      logger.warn('Intercom signature has invalid format', {
+        signature: `${signature.substring(0, 10)}...`,
+      })
+      return false
+    }
+
+    const providedSignature = signature.substring(5)
+    const computedHash = crypto.createHmac('sha1', secret).update(body, 'utf8').digest('hex')
+
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating Intercom signature:', error)
+    return false
+  }
+}
+
+export const intercomHandler: WebhookProviderHandler = {
+  verifyAuth({ request, rawBody, requestId, providerConfig }: AuthContext) {
+    const secret = providerConfig.webhookSecret as string | undefined
+    if (!secret) {
+      return null
+    }
+
+    const signature = request.headers.get('X-Hub-Signature')
+    if (!signature) {
+      logger.warn(`[${requestId}] Intercom webhook missing X-Hub-Signature header`)
+      return new NextResponse('Unauthorized - Missing Intercom signature', { status: 401 })
+    }
+
+    if (!validateIntercomSignature(secret, signature, rawBody)) {
+      logger.warn(`[${requestId}] Intercom signature verification failed`, {
+        signatureLength: signature.length,
+        secretLength: secret.length,
+      })
+      return new NextResponse('Unauthorized - Invalid Intercom signature', { status: 401 })
+    }
+
+    return null
+  },
+
+  handleReachabilityTest(body: unknown, requestId: string) {
+    const obj = body as Record<string, unknown> | null
+    if (obj?.topic === 'ping') {
+      logger.info(
+        `[${requestId}] Intercom ping event detected - returning 200 without triggering workflow`
+      )
+      return NextResponse.json({
+        status: 'ok',
+        message: 'Webhook endpoint verified',
+      })
+    }
+    return null
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    return { input: body }
+  },
+
+  async matchEvent({ webhook, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+    const topic = obj?.topic as string | undefined
+
+    if (triggerId && triggerId !== 'intercom_webhook') {
+      const { isIntercomEventMatch } = await import('@/triggers/intercom/utils')
+      if (!isIntercomEventMatch(triggerId, topic || '')) {
+        logger.debug(
+          `[${requestId}] Intercom event mismatch for trigger ${triggerId}. Topic: ${topic}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            triggerId,
+            receivedTopic: topic,
+          }
+        )
+        return false
+      }
+    }
+
+    return true
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    if (obj?.id && obj?.type === 'notification_event') {
+      return String(obj.id)
+    }
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/jira.ts b/apps/sim/lib/webhooks/providers/jira.ts
new file mode 100644
index 00000000000..1520238d11e
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/jira.ts
@@ -0,0 +1,104 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Jira')
+
+export function validateJiraSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Jira signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+    if (!signature.startsWith('sha256=')) {
+      logger.warn('Jira signature has invalid format (expected sha256=)', {
+        signaturePrefix: signature.substring(0, 10),
+      })
+      return false
+    }
+    const providedSignature = signature.substring(7)
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+    logger.debug('Jira signature comparison', {
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${providedSignature.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: providedSignature.length,
+      match: computedHash === providedSignature,
+    })
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating Jira signature:', error)
+    return false
+  }
+}
+
+export const jiraHandler: WebhookProviderHandler = {
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'X-Hub-Signature',
+    validateFn: validateJiraSignature,
+    providerLabel: 'Jira',
+  }),
+
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const { extractIssueData, extractCommentData, extractWorklogData } = await import(
+      '@/triggers/jira/utils'
+    )
+    const providerConfig = (webhook.providerConfig as Record<string, unknown>) || {}
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (triggerId === 'jira_issue_commented') {
+      return { input: extractCommentData(body) }
+    }
+    if (triggerId === 'jira_worklog_created') {
+      return { input: extractWorklogData(body) }
+    }
+    return { input: extractIssueData(body) }
+  },
+
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+
+    if (triggerId && triggerId !== 'jira_webhook') {
+      const webhookEvent = obj.webhookEvent as string | undefined
+      const issueEventTypeName = obj.issue_event_type_name as string | undefined
+
+      const { isJiraEventMatch } = await import('@/triggers/jira/utils')
+      if (!isJiraEventMatch(triggerId, webhookEvent || '', issueEventTypeName)) {
+        logger.debug(
+          `[${requestId}] Jira event mismatch for trigger ${triggerId}. Event: ${webhookEvent}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            workflowId: workflow.id,
+            triggerId,
+            receivedEvent: webhookEvent,
+          }
+        )
+        return false
+      }
+    }
+
+    return true
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    const issue = obj.issue as Record<string, unknown> | undefined
+    const project = obj.project as Record<string, unknown> | undefined
+    if (obj.webhookEvent && (issue?.id || project?.id)) {
+      return `${obj.webhookEvent}:${issue?.id || project?.id}`
+    }
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/lemlist.ts b/apps/sim/lib/webhooks/providers/lemlist.ts
new file mode 100644
index 00000000000..2215839b8de
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/lemlist.ts
@@ -0,0 +1,218 @@
+import { createLogger } from '@sim/logger'
+import { validateAlphanumericId } from '@/lib/core/security/input-validation'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Lemlist')
+
+export const lemlistHandler: WebhookProviderHandler = {
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const { webhook, requestId } = ctx
+    try {
+      const providerConfig = getProviderConfig(webhook)
+      const apiKey = providerConfig.apiKey as string | undefined
+      const triggerId = providerConfig.triggerId as string | undefined
+      const campaignId = providerConfig.campaignId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(`[${requestId}] Missing apiKey for Lemlist webhook creation.`, {
+          webhookId: webhook.id,
+        })
+        throw new Error(
+          'Lemlist API Key is required. Please provide your Lemlist API Key in the trigger configuration.'
+        )
+      }
+
+      const eventTypeMap: Record<string, string | undefined> = {
+        lemlist_email_replied: 'emailsReplied',
+        lemlist_linkedin_replied: 'linkedinReplied',
+        lemlist_interested: 'interested',
+        lemlist_not_interested: 'notInterested',
+        lemlist_email_opened: 'emailsOpened',
+        lemlist_email_clicked: 'emailsClicked',
+        lemlist_email_bounced: 'emailsBounced',
+        lemlist_email_sent: 'emailsSent',
+        lemlist_webhook: undefined,
+      }
+
+      const eventType = eventTypeMap[triggerId ?? '']
+      const notificationUrl = getNotificationUrl(webhook)
+      const authString = Buffer.from(`:${apiKey}`).toString('base64')
+
+      logger.info(`[${requestId}] Creating Lemlist webhook`, {
+        triggerId,
+        eventType,
+        hasCampaignId: !!campaignId,
+        webhookId: webhook.id,
+      })
+
+      const lemlistApiUrl = 'https://api.lemlist.com/api/hooks'
+
+      const requestBody: Record<string, unknown> = {
+        targetUrl: notificationUrl,
+      }
+
+      if (eventType) {
+        requestBody.type = eventType
+      }
+
+      if (campaignId) {
+        requestBody.campaignId = campaignId
+      }
+
+      const lemlistResponse = await fetch(lemlistApiUrl, {
+        method: 'POST',
+        headers: {
+          Authorization: `Basic ${authString}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      const responseBody = (await lemlistResponse.json()) as Record<string, unknown>
+
+      if (!lemlistResponse.ok || responseBody.error) {
+        const errorMessage =
+          (responseBody.message as string) ||
+          (responseBody.error as string) ||
+          'Unknown Lemlist API error'
+        logger.error(
+          `[${requestId}] Failed to create webhook in Lemlist for webhook ${webhook.id}. Status: ${lemlistResponse.status}`,
+          { message: errorMessage, response: responseBody }
+        )
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Lemlist'
+        if (lemlistResponse.status === 401) {
+          userFriendlyMessage = 'Invalid Lemlist API Key. Please verify your API Key is correct.'
+        } else if (lemlistResponse.status === 403) {
+          userFriendlyMessage =
+            'Access denied. Please ensure your Lemlist API Key has appropriate permissions.'
+        } else if (errorMessage && errorMessage !== 'Unknown Lemlist API error') {
+          userFriendlyMessage = `Lemlist error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created webhook in Lemlist for webhook ${webhook.id}.`,
+        {
+          lemlistWebhookId: responseBody._id,
+        }
+      )
+
+      return { providerConfigUpdates: { externalId: responseBody._id } }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${requestId}] Exception during Lemlist webhook creation for webhook ${webhook.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const { webhook, requestId } = ctx
+    try {
+      const config = getProviderConfig(webhook)
+      const apiKey = config.apiKey as string | undefined
+      const externalId = config.externalId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(
+          `[${requestId}] Missing apiKey for Lemlist webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const authString = Buffer.from(`:${apiKey}`).toString('base64')
+
+      const deleteById = async (id: string) => {
+        const validation = validateAlphanumericId(id, 'Lemlist hook ID', 50)
+        if (!validation.isValid) {
+          logger.warn(`[${requestId}] Invalid Lemlist hook ID format, skipping deletion`, {
+            id: id.substring(0, 30),
+          })
+          return
+        }
+
+        const lemlistApiUrl = `https://api.lemlist.com/api/hooks/${id}`
+        const lemlistResponse = await fetch(lemlistApiUrl, {
+          method: 'DELETE',
+          headers: {
+            Authorization: `Basic ${authString}`,
+          },
+        })
+
+        if (!lemlistResponse.ok && lemlistResponse.status !== 404) {
+          const responseBody = await lemlistResponse.json().catch(() => ({}))
+          logger.warn(
+            `[${requestId}] Failed to delete Lemlist webhook (non-fatal): ${lemlistResponse.status}`,
+            { response: responseBody }
+          )
+        } else {
+          logger.info(`[${requestId}] Successfully deleted Lemlist webhook ${id}`)
+        }
+      }
+
+      if (externalId) {
+        await deleteById(externalId)
+        return
+      }
+
+      const notificationUrl = getNotificationUrl(webhook)
+      const listResponse = await fetch('https://api.lemlist.com/api/hooks', {
+        method: 'GET',
+        headers: {
+          Authorization: `Basic ${authString}`,
+        },
+      })
+
+      if (!listResponse.ok) {
+        logger.warn(`[${requestId}] Failed to list Lemlist webhooks for cleanup ${webhook.id}`, {
+          status: listResponse.status,
+        })
+        return
+      }
+
+      const listBody = (await listResponse.json().catch(() => null)) as
+        | Record<string, unknown>
+        | Array<Record<string, unknown>>
+        | null
+      const hooks: Array<Record<string, unknown>> = Array.isArray(listBody)
+        ? listBody
+        : ((listBody as Record<string, unknown>)?.hooks as Array<Record<string, unknown>>) ||
+          ((listBody as Record<string, unknown>)?.data as Array<Record<string, unknown>>) ||
+          []
+      const matches = hooks.filter((hook) => {
+        const targetUrl = hook?.targetUrl || hook?.target_url || hook?.url
+        return typeof targetUrl === 'string' && targetUrl === notificationUrl
+      })
+
+      if (matches.length === 0) {
+        logger.info(`[${requestId}] Lemlist webhook not found for cleanup ${webhook.id}`, {
+          notificationUrl,
+        })
+        return
+      }
+
+      for (const hook of matches) {
+        const hookId = (hook?._id || hook?.id) as string | undefined
+        if (typeof hookId === 'string' && hookId.length > 0) {
+          await deleteById(hookId)
+        }
+      }
+    } catch (error) {
+      logger.warn(`[${requestId}] Error deleting Lemlist webhook (non-fatal)`, error)
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/linear.test.ts b/apps/sim/lib/webhooks/providers/linear.test.ts
new file mode 100644
index 00000000000..0f94977f3e7
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/linear.test.ts
@@ -0,0 +1,78 @@
+import crypto from 'node:crypto'
+import { NextRequest } from 'next/server'
+import { describe, expect, it } from 'vitest'
+import { linearHandler } from '@/lib/webhooks/providers/linear'
+
+function signLinearBody(secret: string, rawBody: string): string {
+  return crypto.createHmac('sha256', secret).update(rawBody, 'utf8').digest('hex')
+}
+
+function requestWithLinearSignature(secret: string, rawBody: string): NextRequest {
+  const signature = signLinearBody(secret, rawBody)
+  return new NextRequest('http://localhost/test', {
+    headers: {
+      'Linear-Signature': signature,
+    },
+  })
+}
+
+describe('Linear webhook provider', () => {
+  it('rejects signed requests when webhookTimestamp is missing', async () => {
+    const secret = 'linear-secret'
+    const rawBody = JSON.stringify({
+      action: 'create',
+      type: 'Issue',
+    })
+
+    const res = await linearHandler.verifyAuth!({
+      request: requestWithLinearSignature(secret, rawBody),
+      rawBody,
+      requestId: 'linear-t1',
+      providerConfig: { webhookSecret: secret },
+      webhook: {},
+      workflow: {},
+    })
+
+    expect(res?.status).toBe(401)
+  })
+
+  it('rejects signed requests when webhookTimestamp skew is too large', async () => {
+    const secret = 'linear-secret'
+    const rawBody = JSON.stringify({
+      action: 'update',
+      type: 'Issue',
+      webhookTimestamp: Date.now() - 600_000,
+    })
+
+    const res = await linearHandler.verifyAuth!({
+      request: requestWithLinearSignature(secret, rawBody),
+      rawBody,
+      requestId: 'linear-t2',
+      providerConfig: { webhookSecret: secret },
+      webhook: {},
+      workflow: {},
+    })
+
+    expect(res?.status).toBe(401)
+  })
+
+  it('accepts signed requests within the allowed timestamp window', async () => {
+    const secret = 'linear-secret'
+    const rawBody = JSON.stringify({
+      action: 'update',
+      type: 'Issue',
+      webhookTimestamp: Date.now(),
+    })
+
+    const res = await linearHandler.verifyAuth!({
+      request: requestWithLinearSignature(secret, rawBody),
+      rawBody,
+      requestId: 'linear-t3',
+      providerConfig: { webhookSecret: secret },
+      webhook: {},
+      workflow: {},
+    })
+
+    expect(res).toBeNull()
+  })
+})
diff --git a/apps/sim/lib/webhooks/providers/linear.ts b/apps/sim/lib/webhooks/providers/linear.ts
new file mode 100644
index 00000000000..97e9d79a877
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/linear.ts
@@ -0,0 +1,296 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { generateId } from '@/lib/core/utils/uuid'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  AuthContext,
+  DeleteSubscriptionContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Linear')
+
+function validateLinearSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Linear signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+    logger.debug('Linear signature comparison', {
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${signature.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: signature.length,
+      match: computedHash === signature,
+    })
+    return safeCompare(computedHash, signature)
+  } catch (error) {
+    logger.error('Error validating Linear signature:', error)
+    return false
+  }
+}
+
+const LINEAR_WEBHOOK_TIMESTAMP_SKEW_MS = 5 * 60 * 1000
+
+export const linearHandler: WebhookProviderHandler = {
+  async verifyAuth({
+    request,
+    rawBody,
+    requestId,
+    providerConfig,
+  }: AuthContext): Promise<NextResponse | null> {
+    const secret = providerConfig.webhookSecret as string | undefined
+    if (!secret) {
+      return null
+    }
+
+    const signature = request.headers.get('Linear-Signature')
+    if (!signature) {
+      logger.warn(`[${requestId}] Linear webhook missing signature header`)
+      return new NextResponse('Unauthorized - Missing Linear signature', { status: 401 })
+    }
+
+    if (!validateLinearSignature(secret, signature, rawBody)) {
+      logger.warn(`[${requestId}] Linear signature verification failed`)
+      return new NextResponse('Unauthorized - Invalid Linear signature', { status: 401 })
+    }
+
+    try {
+      const parsed = JSON.parse(rawBody) as Record<string, unknown>
+      const ts = parsed.webhookTimestamp
+      if (typeof ts !== 'number' || !Number.isFinite(ts)) {
+        logger.warn(`[${requestId}] Linear webhookTimestamp missing or invalid`)
+        return new NextResponse('Unauthorized - Invalid webhook timestamp', {
+          status: 401,
+        })
+      }
+
+      if (Math.abs(Date.now() - ts) > LINEAR_WEBHOOK_TIMESTAMP_SKEW_MS) {
+        logger.warn(
+          `[${requestId}] Linear webhookTimestamp outside allowed skew (${LINEAR_WEBHOOK_TIMESTAMP_SKEW_MS}ms)`
+        )
+        return new NextResponse('Unauthorized - Webhook timestamp skew too large', {
+          status: 401,
+        })
+      }
+    } catch (error) {
+      logger.warn(
+        `[${requestId}] Linear webhook body parse failed after signature verification`,
+        error
+      )
+      return new NextResponse('Unauthorized - Invalid webhook body', { status: 401 })
+    }
+
+    return null
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const rawActor = b.actor
+    let actor: unknown = null
+    if (rawActor && typeof rawActor === 'object' && !Array.isArray(rawActor)) {
+      const a = rawActor as Record<string, unknown>
+      const { type: linearActorType, ...rest } = a
+      actor = {
+        ...rest,
+        actorType: typeof linearActorType === 'string' ? linearActorType : null,
+      }
+    }
+
+    return {
+      input: {
+        action: b.action || '',
+        type: b.type || '',
+        webhookId: b.webhookId || '',
+        webhookTimestamp: b.webhookTimestamp || 0,
+        organizationId: b.organizationId || '',
+        createdAt: b.createdAt || '',
+        url: typeof b.url === 'string' ? b.url : '',
+        actor,
+        data: b.data || null,
+        updatedFrom: b.updatedFrom || null,
+      },
+    }
+  },
+
+  async matchEvent({ body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (triggerId && !triggerId.endsWith('_webhook') && !triggerId.endsWith('_webhook_v2')) {
+      const { isLinearEventMatch } = await import('@/triggers/linear/utils')
+      const obj = body as Record<string, unknown>
+      const action = obj.action as string | undefined
+      const type = obj.type as string | undefined
+      if (!isLinearEventMatch(triggerId, type || '', action)) {
+        logger.debug(
+          `[${requestId}] Linear event mismatch for trigger ${triggerId}. Type: ${type}, Action: ${action}. Skipping.`
+        )
+        return false
+      }
+    }
+    return true
+  },
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const config = getProviderConfig(ctx.webhook)
+    const triggerId = config.triggerId as string | undefined
+
+    if (!triggerId || !triggerId.endsWith('_v2')) {
+      return undefined
+    }
+
+    const apiKey = config.apiKey as string | undefined
+    if (!apiKey) {
+      logger.warn(`[${ctx.requestId}] Missing API key for Linear webhook ${ctx.webhook.id}`)
+      throw new Error(
+        'Linear API key is required. Please provide a valid API key in the trigger configuration.'
+      )
+    }
+
+    const { LINEAR_RESOURCE_TYPE_MAP } = await import('@/triggers/linear/utils')
+    const resourceTypes = LINEAR_RESOURCE_TYPE_MAP[triggerId]
+    if (!resourceTypes) {
+      logger.warn(`[${ctx.requestId}] Unknown Linear trigger ID: ${triggerId}`)
+      throw new Error(`Unknown Linear trigger type: ${triggerId}`)
+    }
+
+    const notificationUrl = getNotificationUrl(ctx.webhook)
+    const webhookSecret = generateId()
+    const teamId = config.teamId as string | undefined
+
+    const input: Record<string, unknown> = {
+      url: notificationUrl,
+      resourceTypes,
+      secret: webhookSecret,
+      enabled: true,
+    }
+
+    if (teamId) {
+      input.teamId = teamId
+    } else {
+      input.allPublicTeams = true
+    }
+
+    try {
+      const response = await fetch('https://api.linear.app/graphql', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: apiKey,
+        },
+        body: JSON.stringify({
+          query: `mutation WebhookCreate($input: WebhookCreateInput!) {
+            webhookCreate(input: $input) {
+              success
+              webhook { id enabled }
+            }
+          }`,
+          variables: { input },
+        }),
+      })
+
+      if (!response.ok) {
+        throw new Error(
+          `Linear API returned HTTP ${response.status}. Please verify your API key and try again.`
+        )
+      }
+
+      const data = await response.json()
+      const result = data?.data?.webhookCreate
+
+      if (!result?.success) {
+        const errors = data?.errors?.map((e: { message: string }) => e.message).join(', ')
+        logger.error(`[${ctx.requestId}] Failed to create Linear webhook`, {
+          errors,
+          webhookId: ctx.webhook.id,
+        })
+        throw new Error(errors || 'Failed to create Linear webhook. Please verify your API key.')
+      }
+
+      const externalId = result.webhook?.id
+      if (typeof externalId !== 'string' || !externalId.trim()) {
+        throw new Error(
+          'Linear webhook was created but the API response did not include a webhook id.'
+        )
+      }
+
+      logger.info(
+        `[${ctx.requestId}] Created Linear webhook ${externalId} for webhook ${ctx.webhook.id}`
+      )
+
+      return {
+        providerConfigUpdates: {
+          externalId,
+          webhookSecret,
+        },
+      }
+    } catch (error) {
+      if (error instanceof Error && error.message !== 'fetch failed') {
+        throw error
+      }
+      logger.error(`[${ctx.requestId}] Error creating Linear webhook`, {
+        error: error instanceof Error ? error.message : String(error),
+      })
+      throw new Error('Failed to create Linear webhook. Please verify your API key and try again.')
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const config = getProviderConfig(ctx.webhook)
+    const externalId = config.externalId as string | undefined
+    const apiKey = config.apiKey as string | undefined
+
+    if (!externalId || !apiKey) {
+      return
+    }
+
+    try {
+      const response = await fetch('https://api.linear.app/graphql', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: apiKey,
+        },
+        body: JSON.stringify({
+          query: `mutation WebhookDelete($id: String!) {
+            webhookDelete(id: $id) { success }
+          }`,
+          variables: { id: externalId },
+        }),
+      })
+
+      if (!response.ok) {
+        logger.warn(
+          `[${ctx.requestId}] Linear API returned HTTP ${response.status} during webhook deletion for ${externalId}`
+        )
+        return
+      }
+
+      const data = await response.json()
+      if (data?.data?.webhookDelete?.success) {
+        logger.info(
+          `[${ctx.requestId}] Deleted Linear webhook ${externalId} for webhook ${ctx.webhook.id}`
+        )
+      } else {
+        logger.warn(
+          `[${ctx.requestId}] Linear webhook deletion returned unsuccessful for ${externalId}`
+        )
+      }
+    } catch (error) {
+      logger.warn(`[${ctx.requestId}] Error deleting Linear webhook ${externalId} (non-fatal)`, {
+        error: error instanceof Error ? error.message : String(error),
+      })
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/microsoft-teams.ts b/apps/sim/lib/webhooks/providers/microsoft-teams.ts
new file mode 100644
index 00000000000..62952d94c32
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/microsoft-teams.ts
@@ -0,0 +1,795 @@
+import crypto from 'crypto'
+import { db } from '@sim/db'
+import { account } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { eq } from 'drizzle-orm'
+import { type NextRequest, NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { isMicrosoftContentUrl } from '@/lib/core/security/input-validation'
+import {
+  type SecureFetchResponse,
+  secureFetchWithPinnedIP,
+  validateUrlWithDNS,
+} from '@/lib/core/security/input-validation.server'
+import { sanitizeUrlForLog } from '@/lib/core/utils/logging'
+import {
+  getCredentialOwner,
+  getNotificationUrl,
+  getProviderConfig,
+} from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  AuthContext,
+  DeleteSubscriptionContext,
+  EventFilterContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { refreshAccessTokenIfNeeded, resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
+
+const logger = createLogger('WebhookProvider:MicrosoftTeams')
+
+function validateMicrosoftTeamsSignature(
+  hmacSecret: string,
+  signature: string,
+  body: string
+): boolean {
+  try {
+    if (!hmacSecret || !signature || !body) {
+      return false
+    }
+    if (!signature.startsWith('HMAC ')) {
+      return false
+    }
+    const providedSignature = signature.substring(5)
+    const secretBytes = Buffer.from(hmacSecret, 'base64')
+    const bodyBytes = Buffer.from(body, 'utf8')
+    const computedHash = crypto.createHmac('sha256', secretBytes).update(bodyBytes).digest('base64')
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating Microsoft Teams signature:', error)
+    return false
+  }
+}
+
+function parseFirstNotification(
+  body: unknown
+): { subscriptionId: string; messageId: string } | null {
+  const obj = body as Record<string, unknown>
+  const value = obj.value as unknown[] | undefined
+  if (!Array.isArray(value) || value.length === 0) {
+    return null
+  }
+
+  const notification = value[0] as Record<string, unknown>
+  const subscriptionId = notification.subscriptionId as string | undefined
+  const resourceData = notification.resourceData as Record<string, unknown> | undefined
+  const messageId = resourceData?.id as string | undefined
+
+  if (subscriptionId && messageId) {
+    return { subscriptionId, messageId }
+  }
+  return null
+}
+
+async function fetchWithDNSPinning(
+  url: string,
+  accessToken: string,
+  requestId: string
+): Promise<SecureFetchResponse | null> {
+  try {
+    const urlValidation = await validateUrlWithDNS(url, 'contentUrl')
+    if (!urlValidation.isValid) {
+      logger.warn(`[${requestId}] Invalid content URL: ${urlValidation.error}`, { url })
+      return null
+    }
+    const headers: Record<string, string> = {}
+    if (accessToken) {
+      headers.Authorization = `Bearer ${accessToken}`
+    }
+    const response = await secureFetchWithPinnedIP(url, urlValidation.resolvedIP!, { headers })
+    return response
+  } catch (error) {
+    logger.error(`[${requestId}] Error fetching URL with DNS pinning`, {
+      error: error instanceof Error ? error.message : String(error),
+      url: sanitizeUrlForLog(url),
+    })
+    return null
+  }
+}
+
+/**
+ * Format Microsoft Teams Graph change notification
+ */
+async function formatTeamsGraphNotification(
+  body: Record<string, unknown>,
+  foundWebhook: Record<string, unknown>,
+  foundWorkflow: { id: string; userId: string },
+  request: { headers: Map<string, string> }
+): Promise<unknown> {
+  const notification = (body.value as unknown[])?.[0] as Record<string, unknown> | undefined
+  if (!notification) {
+    logger.warn('Received empty Teams notification body')
+    return null
+  }
+  const changeType = (notification.changeType as string) || 'created'
+  const resource = (notification.resource as string) || ''
+  const subscriptionId = (notification.subscriptionId as string) || ''
+
+  let chatId: string | null = null
+  let messageId: string | null = null
+
+  const fullMatch = resource.match(/chats\/([^/]+)\/messages\/([^/]+)/)
+  if (fullMatch) {
+    chatId = fullMatch[1]
+    messageId = fullMatch[2]
+  }
+
+  if (!chatId || !messageId) {
+    const quotedMatch = resource.match(/chats\('([^']+)'\)\/messages\('([^']+)'\)/)
+    if (quotedMatch) {
+      chatId = quotedMatch[1]
+      messageId = quotedMatch[2]
+    }
+  }
+
+  if (!chatId || !messageId) {
+    const collectionMatch = resource.match(/chats\/([^/]+)\/messages$/)
+    const rdId = ((body?.value as unknown[])?.[0] as Record<string, unknown>)?.resourceData as
+      | Record<string, unknown>
+      | undefined
+    const rdIdValue = rdId?.id as string | undefined
+    if (collectionMatch && rdIdValue) {
+      chatId = collectionMatch[1]
+      messageId = rdIdValue
+    }
+  }
+
+  if (
+    (!chatId || !messageId) &&
+    ((body?.value as unknown[])?.[0] as Record<string, unknown>)?.resourceData
+  ) {
+    const resourceData = ((body.value as unknown[])[0] as Record<string, unknown>)
+      .resourceData as Record<string, unknown>
+    const odataId = resourceData['@odata.id']
+    if (typeof odataId === 'string') {
+      const odataMatch = odataId.match(/chats\('([^']+)'\)\/messages\('([^']+)'\)/)
+      if (odataMatch) {
+        chatId = odataMatch[1]
+        messageId = odataMatch[2]
+      }
+    }
+  }
+
+  if (!chatId || !messageId) {
+    logger.warn('Could not resolve chatId/messageId from Teams notification', {
+      resource,
+      hasResourceDataId: Boolean(
+        ((body?.value as unknown[])?.[0] as Record<string, unknown>)?.resourceData
+      ),
+      valueLength: Array.isArray(body?.value) ? (body.value as unknown[]).length : 0,
+      keys: Object.keys(body || {}),
+    })
+    return {
+      from: null,
+      message: { raw: body },
+      activity: body,
+      conversation: null,
+    }
+  }
+  const resolvedChatId = chatId as string
+  const resolvedMessageId = messageId as string
+  const providerConfig = (foundWebhook?.providerConfig as Record<string, unknown>) || {}
+  const credentialId = providerConfig.credentialId
+  const includeAttachments = providerConfig.includeAttachments !== false
+
+  let message: Record<string, unknown> | null = null
+  const rawAttachments: Array<{ name: string; data: Buffer; contentType: string; size: number }> =
+    []
+  let accessToken: string | null = null
+
+  if (!credentialId) {
+    logger.error('Missing credentialId for Teams chat subscription', {
+      chatId: resolvedChatId,
+      messageId: resolvedMessageId,
+      webhookId: foundWebhook?.id,
+      blockId: foundWebhook?.blockId,
+      providerConfig,
+    })
+  } else {
+    try {
+      const resolved = await resolveOAuthAccountId(credentialId as string)
+      if (!resolved) {
+        logger.error('Teams credential could not be resolved', { credentialId })
+      } else {
+        const rows = await db
+          .select()
+          .from(account)
+          .where(eq(account.id, resolved.accountId))
+          .limit(1)
+        if (rows.length === 0) {
+          logger.error('Teams credential not found', { credentialId, chatId: resolvedChatId })
+        } else {
+          const effectiveUserId = rows[0].userId
+          accessToken = await refreshAccessTokenIfNeeded(
+            resolved.accountId,
+            effectiveUserId,
+            'teams-graph-notification'
+          )
+        }
+      }
+
+      if (accessToken) {
+        const msgUrl = `https://graph.microsoft.com/v1.0/chats/${encodeURIComponent(resolvedChatId)}/messages/${encodeURIComponent(resolvedMessageId)}`
+        const res = await fetch(msgUrl, { headers: { Authorization: `Bearer ${accessToken}` } })
+        if (res.ok) {
+          message = (await res.json()) as Record<string, unknown>
+
+          if (includeAttachments && (message?.attachments as unknown[] | undefined)?.length) {
+            const attachments = Array.isArray(message?.attachments)
+              ? (message.attachments as Record<string, unknown>[])
+              : []
+            for (const att of attachments) {
+              try {
+                const contentUrl =
+                  typeof att?.contentUrl === 'string' ? (att.contentUrl as string) : undefined
+                const contentTypeHint =
+                  typeof att?.contentType === 'string' ? (att.contentType as string) : undefined
+                let attachmentName = (att?.name as string) || 'teams-attachment'
+
+                if (!contentUrl) continue
+
+                let parsedContentUrl: URL
+                try {
+                  parsedContentUrl = new URL(contentUrl)
+                } catch {
+                  continue
+                }
+                const contentHost = parsedContentUrl.hostname.toLowerCase()
+
+                let buffer: Buffer | null = null
+                let mimeType = 'application/octet-stream'
+
+                const isOneDriveShareLink =
+                  contentHost === '1drv.ms' ||
+                  contentHost === '1drv.com' ||
+                  contentHost === 'microsoftpersonalcontent.com' ||
+                  contentHost.endsWith('.microsoftpersonalcontent.com')
+
+                if (isMicrosoftContentUrl(contentUrl) && !isOneDriveShareLink) {
+                  try {
+                    const directRes = await fetchWithDNSPinning(
+                      contentUrl,
+                      accessToken,
+                      'teams-attachment'
+                    )
+
+                    if (directRes?.ok) {
+                      const arrayBuffer = await directRes.arrayBuffer()
+                      buffer = Buffer.from(arrayBuffer)
+                      mimeType =
+                        directRes.headers.get('content-type') ||
+                        contentTypeHint ||
+                        'application/octet-stream'
+                    } else if (directRes) {
+                      const encodedUrl = Buffer.from(contentUrl)
+                        .toString('base64')
+                        .replace(/\+/g, '-')
+                        .replace(/\//g, '_')
+                        .replace(/=+$/, '')
+
+                      const graphUrl = `https://graph.microsoft.com/v1.0/shares/u!${encodedUrl}/driveItem/content`
+                      const graphRes = await fetch(graphUrl, {
+                        headers: { Authorization: `Bearer ${accessToken}` },
+                        redirect: 'follow',
+                      })
+
+                      if (graphRes.ok) {
+                        const arrayBuffer = await graphRes.arrayBuffer()
+                        buffer = Buffer.from(arrayBuffer)
+                        mimeType =
+                          graphRes.headers.get('content-type') ||
+                          contentTypeHint ||
+                          'application/octet-stream'
+                      } else {
+                        continue
+                      }
+                    }
+                  } catch {
+                    continue
+                  }
+                } else if (isOneDriveShareLink) {
+                  try {
+                    let shareToken: string | null = null
+
+                    if (contentHost === '1drv.ms') {
+                      const lastSegment = parsedContentUrl.pathname.split('/').pop()
+                      if (lastSegment) shareToken = lastSegment
+                    } else if (parsedContentUrl.searchParams.has('resid')) {
+                      shareToken = parsedContentUrl.searchParams.get('resid')
+                    }
+
+                    if (!shareToken) {
+                      const base64Url = Buffer.from(contentUrl, 'utf-8')
+                        .toString('base64')
+                        .replace(/\+/g, '-')
+                        .replace(/\//g, '_')
+                        .replace(/=+$/, '')
+                      shareToken = `u!${base64Url}`
+                    } else if (!shareToken.startsWith('u!')) {
+                      const base64Url = Buffer.from(shareToken, 'utf-8')
+                        .toString('base64')
+                        .replace(/\+/g, '-')
+                        .replace(/\//g, '_')
+                        .replace(/=+$/, '')
+                      shareToken = `u!${base64Url}`
+                    }
+
+                    const metadataUrl = `https://graph.microsoft.com/v1.0/shares/${shareToken}/driveItem`
+                    const metadataRes = await fetch(metadataUrl, {
+                      headers: {
+                        Authorization: `Bearer ${accessToken}`,
+                        Accept: 'application/json',
+                      },
+                    })
+
+                    if (!metadataRes.ok) {
+                      const directUrl = `https://graph.microsoft.com/v1.0/shares/${shareToken}/driveItem/content`
+                      const directRes = await fetch(directUrl, {
+                        headers: { Authorization: `Bearer ${accessToken}` },
+                        redirect: 'follow',
+                      })
+
+                      if (directRes.ok) {
+                        const arrayBuffer = await directRes.arrayBuffer()
+                        buffer = Buffer.from(arrayBuffer)
+                        mimeType =
+                          directRes.headers.get('content-type') ||
+                          contentTypeHint ||
+                          'application/octet-stream'
+                      } else {
+                        continue
+                      }
+                    } else {
+                      const metadata = (await metadataRes.json()) as Record<string, unknown>
+                      const downloadUrl = metadata['@microsoft.graph.downloadUrl'] as
+                        | string
+                        | undefined
+
+                      if (downloadUrl) {
+                        const downloadRes = await fetchWithDNSPinning(
+                          downloadUrl,
+                          '',
+                          'teams-onedrive-download'
+                        )
+
+                        if (downloadRes?.ok) {
+                          const arrayBuffer = await downloadRes.arrayBuffer()
+                          buffer = Buffer.from(arrayBuffer)
+                          const fileInfo = metadata.file as Record<string, unknown> | undefined
+                          mimeType =
+                            downloadRes.headers.get('content-type') ||
+                            (fileInfo?.mimeType as string | undefined) ||
+                            contentTypeHint ||
+                            'application/octet-stream'
+
+                          if (metadata.name && metadata.name !== attachmentName) {
+                            attachmentName = metadata.name as string
+                          }
+                        } else {
+                          continue
+                        }
+                      } else {
+                        continue
+                      }
+                    }
+                  } catch {
+                    continue
+                  }
+                } else {
+                  try {
+                    const ares = await fetchWithDNSPinning(
+                      contentUrl,
+                      accessToken,
+                      'teams-attachment-generic'
+                    )
+                    if (ares?.ok) {
+                      const arrayBuffer = await ares.arrayBuffer()
+                      buffer = Buffer.from(arrayBuffer)
+                      mimeType =
+                        ares.headers.get('content-type') ||
+                        contentTypeHint ||
+                        'application/octet-stream'
+                    }
+                  } catch {
+                    continue
+                  }
+                }
+
+                if (!buffer) continue
+
+                const size = buffer.length
+
+                rawAttachments.push({
+                  name: attachmentName,
+                  data: buffer,
+                  contentType: mimeType,
+                  size,
+                })
+              } catch {
+                /* skip attachment on error */
+              }
+            }
+          }
+        }
+      }
+    } catch (error) {
+      logger.error('Failed to fetch Teams message', {
+        error,
+        chatId: resolvedChatId,
+        messageId: resolvedMessageId,
+      })
+    }
+  }
+
+  if (!message) {
+    logger.warn('No message data available for Teams notification', {
+      chatId: resolvedChatId,
+      messageId: resolvedMessageId,
+      hasCredential: !!credentialId,
+    })
+    return {
+      message_id: resolvedMessageId,
+      chat_id: resolvedChatId,
+      from_name: '',
+      text: '',
+      created_at: '',
+      attachments: [],
+    }
+  }
+
+  const messageText = (message.body as Record<string, unknown>)?.content || ''
+  const from = ((message.from as Record<string, unknown>)?.user as Record<string, unknown>) || {}
+  const createdAt = (message.createdDateTime as string) || ''
+
+  return {
+    message_id: resolvedMessageId,
+    chat_id: resolvedChatId,
+    from_name: (from.displayName as string) || '',
+    text: messageText,
+    created_at: createdAt,
+    attachments: rawAttachments,
+  }
+}
+
+export const microsoftTeamsHandler: WebhookProviderHandler = {
+  handleChallenge(_body: unknown, request: NextRequest, requestId: string, path: string) {
+    const url = new URL(request.url)
+    const validationToken = url.searchParams.get('validationToken')
+    if (validationToken) {
+      logger.info(`[${requestId}] Microsoft Graph subscription validation for path: ${path}`)
+      return new NextResponse(validationToken, {
+        status: 200,
+        headers: { 'Content-Type': 'text/plain' },
+      })
+    }
+    return null
+  },
+
+  verifyAuth({ request, rawBody, requestId, providerConfig }: AuthContext) {
+    if (providerConfig.hmacSecret) {
+      const authHeader = request.headers.get('authorization')
+
+      if (!authHeader || !authHeader.startsWith('HMAC ')) {
+        logger.warn(
+          `[${requestId}] Microsoft Teams outgoing webhook missing HMAC authorization header`
+        )
+        return new NextResponse('Unauthorized - Missing HMAC signature', { status: 401 })
+      }
+
+      if (
+        !validateMicrosoftTeamsSignature(providerConfig.hmacSecret as string, authHeader, rawBody)
+      ) {
+        logger.warn(`[${requestId}] Microsoft Teams HMAC signature verification failed`)
+        return new NextResponse('Unauthorized - Invalid HMAC signature', { status: 401 })
+      }
+    }
+
+    return null
+  },
+
+  formatErrorResponse(error: string, status: number) {
+    return NextResponse.json({ type: 'message', text: error }, { status })
+  },
+
+  enrichHeaders({ body }: EventFilterContext, headers: Record<string, string>) {
+    const parsed = parseFirstNotification(body)
+    if (parsed) {
+      headers['x-teams-notification-id'] = `${parsed.subscriptionId}:${parsed.messageId}`
+    }
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const parsed = parseFirstNotification(body)
+    return parsed ? `${parsed.subscriptionId}:${parsed.messageId}` : null
+  },
+
+  formatSuccessResponse(providerConfig: Record<string, unknown>) {
+    if (providerConfig.triggerId === 'microsoftteams_chat_subscription') {
+      return new NextResponse(null, { status: 202 })
+    }
+
+    return NextResponse.json({ type: 'message', text: 'Sim' })
+  },
+
+  formatQueueErrorResponse() {
+    return NextResponse.json(
+      { type: 'message', text: 'Webhook processing failed' },
+      { status: 500 }
+    )
+  },
+
+  async createSubscription({
+    webhook,
+    workflow,
+    userId,
+    requestId,
+    request,
+  }: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const config = getProviderConfig(webhook)
+
+    if (config.triggerId !== 'microsoftteams_chat_subscription') {
+      return undefined
+    }
+
+    const credentialId = config.credentialId as string | undefined
+    const chatId = config.chatId as string | undefined
+
+    if (!credentialId) {
+      logger.warn(`[${requestId}] Missing credentialId for Teams chat subscription ${webhook.id}`)
+      throw new Error(
+        'Microsoft Teams credentials are required. Please connect your Microsoft account in the trigger configuration.'
+      )
+    }
+
+    if (!chatId) {
+      logger.warn(`[${requestId}] Missing chatId for Teams chat subscription ${webhook.id}`)
+      throw new Error(
+        'Chat ID is required to create a Teams subscription. Please provide a valid chat ID.'
+      )
+    }
+
+    const credentialOwner = await getCredentialOwner(credentialId, requestId)
+    const accessToken = credentialOwner
+      ? await refreshAccessTokenIfNeeded(
+          credentialOwner.accountId,
+          credentialOwner.userId,
+          requestId
+        )
+      : null
+    if (!accessToken) {
+      logger.error(`[${requestId}] Failed to get access token for Teams subscription ${webhook.id}`)
+      throw new Error(
+        'Failed to authenticate with Microsoft Teams. Please reconnect your Microsoft account and try again.'
+      )
+    }
+
+    const existingSubscriptionId = config.externalSubscriptionId as string | undefined
+    if (existingSubscriptionId) {
+      try {
+        const checkRes = await fetch(
+          `https://graph.microsoft.com/v1.0/subscriptions/${existingSubscriptionId}`,
+          { method: 'GET', headers: { Authorization: `Bearer ${accessToken}` } }
+        )
+        if (checkRes.ok) {
+          logger.info(
+            `[${requestId}] Teams subscription ${existingSubscriptionId} already exists for webhook ${webhook.id}`
+          )
+          return { providerConfigUpdates: { externalSubscriptionId: existingSubscriptionId } }
+        }
+      } catch {
+        logger.debug(`[${requestId}] Existing subscription check failed, will create new one`)
+      }
+    }
+
+    const notificationUrl = getNotificationUrl(webhook)
+    const resource = `/chats/${chatId}/messages`
+
+    const maxLifetimeMinutes = 4230
+    const expirationDateTime = new Date(Date.now() + maxLifetimeMinutes * 60 * 1000).toISOString()
+
+    const body = {
+      changeType: 'created,updated',
+      notificationUrl,
+      lifecycleNotificationUrl: notificationUrl,
+      resource,
+      includeResourceData: false,
+      expirationDateTime,
+      clientState: webhook.id,
+    }
+
+    try {
+      const res = await fetch('https://graph.microsoft.com/v1.0/subscriptions', {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(body),
+      })
+
+      const payload = await res.json()
+      if (!res.ok) {
+        const errorMessage =
+          payload.error?.message || payload.error?.code || 'Unknown Microsoft Graph API error'
+        logger.error(
+          `[${requestId}] Failed to create Teams subscription for webhook ${webhook.id}`,
+          {
+            status: res.status,
+            error: payload.error,
+          }
+        )
+
+        let userFriendlyMessage = 'Failed to create Teams subscription'
+        if (res.status === 401 || res.status === 403) {
+          userFriendlyMessage =
+            'Authentication failed. Please reconnect your Microsoft Teams account and ensure you have the necessary permissions.'
+        } else if (res.status === 404) {
+          userFriendlyMessage =
+            'Chat not found. Please verify that the Chat ID is correct and that you have access to the specified chat.'
+        } else if (errorMessage && errorMessage !== 'Unknown Microsoft Graph API error') {
+          userFriendlyMessage = `Teams error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created Teams subscription ${payload.id} for webhook ${webhook.id}`
+      )
+      return { providerConfigUpdates: { externalSubscriptionId: payload.id as string } }
+    } catch (error: unknown) {
+      if (
+        error instanceof Error &&
+        (error.message.includes('credentials') ||
+          error.message.includes('Chat ID') ||
+          error.message.includes('authenticate'))
+      ) {
+        throw error
+      }
+
+      logger.error(
+        `[${requestId}] Error creating Teams subscription for webhook ${webhook.id}`,
+        error
+      )
+      throw new Error(
+        error instanceof Error
+          ? error.message
+          : 'Failed to create Teams subscription. Please try again.'
+      )
+    }
+  },
+
+  async deleteSubscription({
+    webhook,
+    workflow,
+    requestId,
+  }: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(webhook)
+
+      if (config.triggerId !== 'microsoftteams_chat_subscription') {
+        return
+      }
+
+      const externalSubscriptionId = config.externalSubscriptionId as string | undefined
+      const credentialId = config.credentialId as string | undefined
+
+      if (!externalSubscriptionId || !credentialId) {
+        logger.info(`[${requestId}] No external subscription to delete for webhook ${webhook.id}`)
+        return
+      }
+
+      const credentialOwner = await getCredentialOwner(credentialId, requestId)
+      const accessToken = credentialOwner
+        ? await refreshAccessTokenIfNeeded(
+            credentialOwner.accountId,
+            credentialOwner.userId,
+            requestId
+          )
+        : null
+      if (!accessToken) {
+        logger.warn(
+          `[${requestId}] Could not get access token to delete Teams subscription for webhook ${webhook.id}`
+        )
+        return
+      }
+
+      const res = await fetch(
+        `https://graph.microsoft.com/v1.0/subscriptions/${externalSubscriptionId}`,
+        {
+          method: 'DELETE',
+          headers: { Authorization: `Bearer ${accessToken}` },
+        }
+      )
+
+      if (res.ok || res.status === 404) {
+        logger.info(
+          `[${requestId}] Successfully deleted Teams subscription ${externalSubscriptionId} for webhook ${webhook.id}`
+        )
+      } else {
+        const errorBody = await res.text()
+        logger.warn(
+          `[${requestId}] Failed to delete Teams subscription ${externalSubscriptionId} for webhook ${webhook.id}. Status: ${res.status}`
+        )
+      }
+    } catch (error) {
+      logger.error(
+        `[${requestId}] Error deleting Teams subscription for webhook ${webhook.id}`,
+        error
+      )
+    }
+  },
+
+  async formatInput({
+    body,
+    webhook,
+    workflow,
+    headers,
+    requestId,
+  }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const value = b?.value as unknown[] | undefined
+
+    if (value && Array.isArray(value) && value.length > 0) {
+      const mockRequest = {
+        headers: new Map(Object.entries(headers)),
+      } as unknown as import('next/server').NextRequest
+      const result = await formatTeamsGraphNotification(
+        b,
+        webhook,
+        workflow,
+        mockRequest as unknown as { headers: Map<string, string> }
+      )
+      return { input: result }
+    }
+
+    const messageText = (b?.text as string) || ''
+    const messageId = (b?.id as string) || ''
+    const timestamp = (b?.timestamp as string) || (b?.localTimestamp as string) || ''
+    const from = (b?.from || {}) as Record<string, unknown>
+    const conversation = (b?.conversation || {}) as Record<string, unknown>
+
+    return {
+      input: {
+        from: {
+          id: (from.id || '') as string,
+          name: (from.name || '') as string,
+          aadObjectId: (from.aadObjectId || '') as string,
+        },
+        message: {
+          raw: {
+            attachments: b?.attachments || [],
+            channelData: b?.channelData || {},
+            conversation: b?.conversation || {},
+            text: messageText,
+            messageType: (b?.type || 'message') as string,
+            channelId: (b?.channelId || '') as string,
+            timestamp,
+          },
+        },
+        activity: b || {},
+        conversation: {
+          id: (conversation.id || '') as string,
+          name: (conversation.name || '') as string,
+          isGroup: (conversation.isGroup || false) as boolean,
+          tenantId: (conversation.tenantId || '') as string,
+          aadObjectId: (conversation.aadObjectId || '') as string,
+          conversationType: (conversation.conversationType || '') as string,
+        },
+      },
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/notion.test.ts b/apps/sim/lib/webhooks/providers/notion.test.ts
new file mode 100644
index 00000000000..2a16911373a
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/notion.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+import { notionHandler } from '@/lib/webhooks/providers/notion'
+import { isNotionPayloadMatch } from '@/triggers/notion/utils'
+
+describe('Notion webhook provider', () => {
+  it('matches both legacy and newer schema updated event names', () => {
+    expect(
+      isNotionPayloadMatch('notion_database_schema_updated', {
+        type: 'database.schema_updated',
+      })
+    ).toBe(true)
+
+    expect(
+      isNotionPayloadMatch('notion_database_schema_updated', {
+        type: 'data_source.schema_updated',
+      })
+    ).toBe(true)
+  })
+
+  it('builds a stable idempotency key from event type and id', () => {
+    const key = notionHandler.extractIdempotencyId!({
+      id: 'evt_123',
+      type: 'page.created',
+    })
+
+    expect(key).toBe('notion:page.created:evt_123')
+  })
+})
diff --git a/apps/sim/lib/webhooks/providers/notion.ts b/apps/sim/lib/webhooks/providers/notion.ts
new file mode 100644
index 00000000000..ed3f1b1c965
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/notion.ts
@@ -0,0 +1,151 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Notion')
+
+/**
+ * Validates a Notion webhook signature using HMAC SHA-256.
+ * Notion sends X-Notion-Signature as "sha256=<hex>".
+ */
+function validateNotionSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      logger.warn('Notion signature validation missing required fields', {
+        hasSecret: !!secret,
+        hasSignature: !!signature,
+        hasBody: !!body,
+      })
+      return false
+    }
+
+    const providedHash = signature.startsWith('sha256=') ? signature.slice(7) : signature
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
+
+    logger.debug('Notion signature comparison', {
+      computedSignature: `${computedHash.substring(0, 10)}...`,
+      providedSignature: `${providedHash.substring(0, 10)}...`,
+      computedLength: computedHash.length,
+      providedLength: providedHash.length,
+      match: computedHash === providedHash,
+    })
+
+    return safeCompare(computedHash, providedHash)
+  } catch (error) {
+    logger.error('Error validating Notion signature:', error)
+    return false
+  }
+}
+
+export const notionHandler: WebhookProviderHandler = {
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'X-Notion-Signature',
+    validateFn: validateNotionSignature,
+    providerLabel: 'Notion',
+  }),
+
+  handleReachabilityTest(body: unknown, requestId: string) {
+    const obj = body as Record<string, unknown> | null
+    const verificationToken = obj?.verification_token
+
+    if (typeof verificationToken === 'string' && verificationToken.length > 0) {
+      logger.info(`[${requestId}] Notion verification request detected - returning 200`)
+      return NextResponse.json({
+        status: 'ok',
+        message: 'Webhook endpoint verified',
+      })
+    }
+
+    return null
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const rawEntity =
+      b.entity && typeof b.entity === 'object' ? (b.entity as Record<string, unknown>) : {}
+    const rawData = b.data && typeof b.data === 'object' ? (b.data as Record<string, unknown>) : {}
+    const rawParent =
+      rawData.parent && typeof rawData.parent === 'object'
+        ? (rawData.parent as Record<string, unknown>)
+        : null
+    const { type: entityType, ...entityRest } = rawEntity
+    const { type: _rawParentType, ...parentRest } = rawParent ?? {}
+
+    return {
+      input: {
+        id: b.id,
+        type: b.type,
+        timestamp: b.timestamp,
+        api_version: b.api_version,
+        workspace_id: b.workspace_id,
+        workspace_name: b.workspace_name,
+        subscription_id: b.subscription_id,
+        integration_id: b.integration_id,
+        attempt_number: b.attempt_number,
+        authors: b.authors || [],
+        accessible_by: b.accessible_by || [],
+        entity: {
+          ...entityRest,
+          entity_type: entityType,
+        },
+        data: {
+          ...rawData,
+          ...(rawParent
+            ? {
+                parent: {
+                  ...parentRest,
+                  parent_type: rawParent.type,
+                },
+              }
+            : {}),
+        },
+      },
+    }
+  },
+
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+
+    if (triggerId && triggerId !== 'notion_webhook') {
+      const { isNotionPayloadMatch } = await import('@/triggers/notion/utils')
+      if (!isNotionPayloadMatch(triggerId, obj)) {
+        const eventType = obj.type as string | undefined
+        logger.debug(
+          `[${requestId}] Notion event mismatch for trigger ${triggerId}. Event: ${eventType}. Skipping execution.`,
+          {
+            webhookId: webhook.id,
+            workflowId: workflow.id,
+            triggerId,
+            receivedEvent: eventType,
+          }
+        )
+        return false
+      }
+    }
+
+    return true
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    const id = obj.id
+    const type = obj.type
+    if (
+      (typeof id === 'string' || typeof id === 'number') &&
+      (typeof type === 'string' || typeof type === 'number')
+    ) {
+      return `notion:${String(type)}:${String(id)}`
+    }
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/outlook.ts b/apps/sim/lib/webhooks/providers/outlook.ts
new file mode 100644
index 00000000000..01f9656bc15
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/outlook.ts
@@ -0,0 +1,113 @@
+import { db } from '@sim/db'
+import { account, webhook } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { eq } from 'drizzle-orm'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  PollingConfigContext,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { refreshAccessTokenIfNeeded, resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
+
+const logger = createLogger('WebhookProvider:Outlook')
+
+export const outlookHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    if (b && typeof b === 'object' && 'email' in b) {
+      return { input: { email: b.email, timestamp: b.timestamp } }
+    }
+    return { input: b }
+  },
+
+  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+    logger.info(`[${requestId}] Setting up Outlook polling for webhook ${webhookData.id}`)
+
+    try {
+      const providerConfig = (webhookData.providerConfig as Record<string, unknown>) || {}
+      const credentialId = providerConfig.credentialId as string | undefined
+
+      if (!credentialId) {
+        logger.error(`[${requestId}] Missing credentialId for Outlook webhook ${webhookData.id}`)
+        return false
+      }
+
+      const resolvedOutlook = await resolveOAuthAccountId(credentialId)
+      if (!resolvedOutlook) {
+        logger.error(
+          `[${requestId}] Could not resolve credential ${credentialId} for Outlook webhook ${webhookData.id}`
+        )
+        return false
+      }
+
+      const rows = await db
+        .select()
+        .from(account)
+        .where(eq(account.id, resolvedOutlook.accountId))
+        .limit(1)
+      if (rows.length === 0) {
+        logger.error(
+          `[${requestId}] Credential ${credentialId} not found for Outlook webhook ${webhookData.id}`
+        )
+        return false
+      }
+
+      const effectiveUserId = rows[0].userId
+
+      const accessToken = await refreshAccessTokenIfNeeded(
+        resolvedOutlook.accountId,
+        effectiveUserId,
+        requestId
+      )
+      if (!accessToken) {
+        logger.error(
+          `[${requestId}] Failed to refresh/access Outlook token for credential ${credentialId}`
+        )
+        return false
+      }
+
+      const now = new Date()
+
+      await db
+        .update(webhook)
+        .set({
+          providerConfig: {
+            ...providerConfig,
+            userId: effectiveUserId,
+            credentialId,
+            maxEmailsPerPoll:
+              typeof providerConfig.maxEmailsPerPoll === 'string'
+                ? Number.parseInt(providerConfig.maxEmailsPerPoll, 10) || 25
+                : (providerConfig.maxEmailsPerPoll as number) || 25,
+            pollingInterval:
+              typeof providerConfig.pollingInterval === 'string'
+                ? Number.parseInt(providerConfig.pollingInterval, 10) || 5
+                : (providerConfig.pollingInterval as number) || 5,
+            markAsRead: providerConfig.markAsRead || false,
+            includeRawEmail: providerConfig.includeRawEmail || false,
+            folderIds: providerConfig.folderIds || ['inbox'],
+            folderFilterBehavior: providerConfig.folderFilterBehavior || 'INCLUDE',
+            lastCheckedTimestamp:
+              (providerConfig.lastCheckedTimestamp as string) || now.toISOString(),
+            setupCompleted: true,
+          },
+          updatedAt: now,
+        })
+        .where(eq(webhook.id, webhookData.id as string))
+
+      logger.info(
+        `[${requestId}] Successfully configured Outlook polling for webhook ${webhookData.id}`
+      )
+      return true
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(`[${requestId}] Failed to configure Outlook polling`, {
+        webhookId: webhookData.id,
+        error: err.message,
+        stack: err.stack,
+      })
+      return false
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/registry.ts b/apps/sim/lib/webhooks/providers/registry.ts
new file mode 100644
index 00000000000..789546a755b
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/registry.ts
@@ -0,0 +1,107 @@
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { airtableHandler } from '@/lib/webhooks/providers/airtable'
+import { ashbyHandler } from '@/lib/webhooks/providers/ashby'
+import { attioHandler } from '@/lib/webhooks/providers/attio'
+import { calcomHandler } from '@/lib/webhooks/providers/calcom'
+import { calendlyHandler } from '@/lib/webhooks/providers/calendly'
+import { circlebackHandler } from '@/lib/webhooks/providers/circleback'
+import { confluenceHandler } from '@/lib/webhooks/providers/confluence'
+import { fathomHandler } from '@/lib/webhooks/providers/fathom'
+import { firefliesHandler } from '@/lib/webhooks/providers/fireflies'
+import { genericHandler } from '@/lib/webhooks/providers/generic'
+import { githubHandler } from '@/lib/webhooks/providers/github'
+import { gmailHandler } from '@/lib/webhooks/providers/gmail'
+import { gongHandler } from '@/lib/webhooks/providers/gong'
+import { googleFormsHandler } from '@/lib/webhooks/providers/google-forms'
+import { grainHandler } from '@/lib/webhooks/providers/grain'
+import { greenhouseHandler } from '@/lib/webhooks/providers/greenhouse'
+import { hubspotHandler } from '@/lib/webhooks/providers/hubspot'
+import { imapHandler } from '@/lib/webhooks/providers/imap'
+import { intercomHandler } from '@/lib/webhooks/providers/intercom'
+import { jiraHandler } from '@/lib/webhooks/providers/jira'
+import { lemlistHandler } from '@/lib/webhooks/providers/lemlist'
+import { linearHandler } from '@/lib/webhooks/providers/linear'
+import { microsoftTeamsHandler } from '@/lib/webhooks/providers/microsoft-teams'
+import { notionHandler } from '@/lib/webhooks/providers/notion'
+import { outlookHandler } from '@/lib/webhooks/providers/outlook'
+import { resendHandler } from '@/lib/webhooks/providers/resend'
+import { rssHandler } from '@/lib/webhooks/providers/rss'
+import { salesforceHandler } from '@/lib/webhooks/providers/salesforce'
+import { slackHandler } from '@/lib/webhooks/providers/slack'
+import { stripeHandler } from '@/lib/webhooks/providers/stripe'
+import { telegramHandler } from '@/lib/webhooks/providers/telegram'
+import { twilioHandler } from '@/lib/webhooks/providers/twilio'
+import { twilioVoiceHandler } from '@/lib/webhooks/providers/twilio-voice'
+import { typeformHandler } from '@/lib/webhooks/providers/typeform'
+import type { WebhookProviderHandler } from '@/lib/webhooks/providers/types'
+import { verifyTokenAuth } from '@/lib/webhooks/providers/utils'
+import { vercelHandler } from '@/lib/webhooks/providers/vercel'
+import { webflowHandler } from '@/lib/webhooks/providers/webflow'
+import { whatsappHandler } from '@/lib/webhooks/providers/whatsapp'
+import { zoomHandler } from '@/lib/webhooks/providers/zoom'
+
+const logger = createLogger('WebhookProviderRegistry')
+
+const PROVIDER_HANDLERS: Record<string, WebhookProviderHandler> = {
+  airtable: airtableHandler,
+  ashby: ashbyHandler,
+  attio: attioHandler,
+  calendly: calendlyHandler,
+  calcom: calcomHandler,
+  circleback: circlebackHandler,
+  confluence: confluenceHandler,
+  fireflies: firefliesHandler,
+  generic: genericHandler,
+  gmail: gmailHandler,
+  github: githubHandler,
+  gong: gongHandler,
+  google_forms: googleFormsHandler,
+  fathom: fathomHandler,
+  grain: grainHandler,
+  greenhouse: greenhouseHandler,
+  hubspot: hubspotHandler,
+  imap: imapHandler,
+  intercom: intercomHandler,
+  jira: jiraHandler,
+  lemlist: lemlistHandler,
+  linear: linearHandler,
+  resend: resendHandler,
+  'microsoft-teams': microsoftTeamsHandler,
+  notion: notionHandler,
+  outlook: outlookHandler,
+  rss: rssHandler,
+  salesforce: salesforceHandler,
+  slack: slackHandler,
+  stripe: stripeHandler,
+  telegram: telegramHandler,
+  twilio: twilioHandler,
+  twilio_voice: twilioVoiceHandler,
+  typeform: typeformHandler,
+  vercel: vercelHandler,
+  webflow: webflowHandler,
+  whatsapp: whatsappHandler,
+  zoom: zoomHandler,
+}
+
+/**
+ * Default handler for unknown/future providers.
+ * Uses timing-safe comparison for bearer token validation.
+ */
+const defaultHandler: WebhookProviderHandler = {
+  verifyAuth({ request, requestId, providerConfig }) {
+    const token = providerConfig.token
+    if (typeof token === 'string') {
+      if (!verifyTokenAuth(request, token)) {
+        logger.warn(`[${requestId}] Unauthorized webhook access attempt - invalid token`)
+        return new NextResponse('Unauthorized', { status: 401 })
+      }
+    }
+    return null
+  },
+}
+
+/** Look up the provider handler, falling back to the default bearer token handler. */
+export function getProviderHandler(provider: string): WebhookProviderHandler {
+  return PROVIDER_HANDLERS[provider] ?? defaultHandler
+}
diff --git a/apps/sim/lib/webhooks/providers/resend.test.ts b/apps/sim/lib/webhooks/providers/resend.test.ts
new file mode 100644
index 00000000000..9919ff22930
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/resend.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it } from 'vitest'
+import { resendHandler } from '@/lib/webhooks/providers/resend'
+
+describe('Resend webhook provider', () => {
+  it('formatInput exposes documented email metadata and distinct data.created_at', async () => {
+    const { input } = await resendHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'wf', userId: 'u' },
+      body: {
+        type: 'email.bounced',
+        created_at: '2024-11-22T23:41:12.126Z',
+        data: {
+          broadcast_id: '8b146471-e88e-4322-86af-016cd36fd216',
+          created_at: '2024-11-22T23:41:11.894719+00:00',
+          email_id: '56761188-7520-42d8-8898-ff6fc54ce618',
+          from: 'Acme <onboarding@resend.dev>',
+          to: ['delivered@resend.dev'],
+          subject: 'Sending this example',
+          template_id: '43f68331-0622-4e15-8202-246a0388854b',
+          tags: { category: 'confirm_email' },
+          bounce: {
+            message: 'Hard bounce',
+            subType: 'Suppressed',
+            type: 'Permanent',
+          },
+        },
+      },
+      headers: {},
+      requestId: 'test',
+    })
+
+    expect(input).toMatchObject({
+      type: 'email.bounced',
+      created_at: '2024-11-22T23:41:12.126Z',
+      data_created_at: '2024-11-22T23:41:11.894719+00:00',
+      email_id: '56761188-7520-42d8-8898-ff6fc54ce618',
+      broadcast_id: '8b146471-e88e-4322-86af-016cd36fd216',
+      template_id: '43f68331-0622-4e15-8202-246a0388854b',
+      tags: { category: 'confirm_email' },
+      bounceType: 'Permanent',
+      bounceSubType: 'Suppressed',
+      bounceMessage: 'Hard bounce',
+    })
+  })
+})
diff --git a/apps/sim/lib/webhooks/providers/resend.ts b/apps/sim/lib/webhooks/providers/resend.ts
new file mode 100644
index 00000000000..2238863525f
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/resend.ts
@@ -0,0 +1,299 @@
+import crypto from 'node:crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  AuthContext,
+  DeleteSubscriptionContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import {
+  RESEND_ALL_WEBHOOK_EVENT_TYPES,
+  RESEND_TRIGGER_TO_EVENT_TYPE,
+} from '@/triggers/resend/utils'
+
+const logger = createLogger('WebhookProvider:Resend')
+
+/**
+ * Verify a Resend webhook signature using the Svix signing scheme.
+ * Resend uses Svix under the hood: HMAC-SHA256 of `${svix-id}.${svix-timestamp}.${body}`
+ * signed with the base64-decoded `whsec_...` secret.
+ */
+function verifySvixSignature(
+  secret: string,
+  msgId: string,
+  timestamp: string,
+  signatures: string,
+  rawBody: string
+): boolean {
+  try {
+    const ts = Number.parseInt(timestamp, 10)
+    const now = Math.floor(Date.now() / 1000)
+    if (Number.isNaN(ts) || Math.abs(now - ts) > 5 * 60) {
+      return false
+    }
+
+    const secretBytes = Buffer.from(secret.replace(/^whsec_/, ''), 'base64')
+    const toSign = `${msgId}.${timestamp}.${rawBody}`
+    const expectedSignature = crypto
+      .createHmac('sha256', secretBytes)
+      .update(toSign, 'utf8')
+      .digest('base64')
+
+    const providedSignatures = signatures.split(' ')
+    for (const versionedSig of providedSignatures) {
+      const parts = versionedSig.split(',')
+      if (parts.length !== 2) continue
+      const sig = parts[1]
+      if (safeCompare(sig, expectedSignature)) {
+        return true
+      }
+    }
+    return false
+  } catch (error) {
+    logger.error('Error verifying Resend Svix signature:', error)
+    return false
+  }
+}
+
+export const resendHandler: WebhookProviderHandler = {
+  async verifyAuth({
+    request,
+    rawBody,
+    requestId,
+    providerConfig,
+  }: AuthContext): Promise<NextResponse | null> {
+    const signingSecret = providerConfig.signingSecret as string | undefined
+    if (!signingSecret?.trim()) {
+      logger.warn(`[${requestId}] Resend webhook missing signing secret in provider configuration`)
+      return new NextResponse('Unauthorized - Resend signing secret is required', { status: 401 })
+    }
+
+    const svixId = request.headers.get('svix-id')
+    const svixTimestamp = request.headers.get('svix-timestamp')
+    const svixSignature = request.headers.get('svix-signature')
+
+    if (!svixId || !svixTimestamp || !svixSignature) {
+      logger.warn(`[${requestId}] Resend webhook missing Svix signature headers`)
+      return new NextResponse('Unauthorized - Missing Resend signature headers', { status: 401 })
+    }
+
+    if (!verifySvixSignature(signingSecret, svixId, svixTimestamp, svixSignature, rawBody)) {
+      logger.warn(`[${requestId}] Resend Svix signature verification failed`)
+      return new NextResponse('Unauthorized - Invalid Resend signature', { status: 401 })
+    }
+
+    return null
+  },
+
+  matchEvent({ body, providerConfig, requestId }: EventMatchContext): boolean {
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (!triggerId || triggerId === 'resend_webhook') {
+      return true
+    }
+
+    const expectedType = RESEND_TRIGGER_TO_EVENT_TYPE[triggerId]
+    if (!expectedType) {
+      logger.debug(`[${requestId}] Unknown Resend triggerId ${triggerId}, skipping.`)
+      return false
+    }
+
+    const actualType = (body as Record<string, unknown>)?.type as string | undefined
+
+    if (actualType !== expectedType) {
+      logger.debug(
+        `[${requestId}] Resend event type mismatch: expected ${expectedType}, got ${actualType}. Skipping.`
+      )
+      return false
+    }
+
+    return true
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const payload = body as Record<string, unknown>
+    const data = payload.data as Record<string, unknown> | undefined
+    const bounce = data?.bounce as Record<string, unknown> | undefined
+    const click = data?.click as Record<string, unknown> | undefined
+    const dataCreatedAt = data?.created_at
+    const dataCreatedAtStr =
+      typeof dataCreatedAt === 'string'
+        ? dataCreatedAt
+        : dataCreatedAt != null
+          ? String(dataCreatedAt)
+          : null
+
+    return {
+      input: {
+        type: payload.type,
+        created_at: payload.created_at,
+        data_created_at: dataCreatedAtStr,
+        data: data ?? null,
+        email_id: data?.email_id ?? null,
+        broadcast_id: data?.broadcast_id ?? null,
+        template_id: data?.template_id ?? null,
+        tags: data?.tags ?? null,
+        from: data?.from ?? null,
+        to: data?.to ?? null,
+        subject: data?.subject ?? null,
+        bounceType: bounce?.type ?? null,
+        bounceSubType: bounce?.subType ?? null,
+        bounceMessage: bounce?.message ?? null,
+        clickIpAddress: click?.ipAddress ?? null,
+        clickLink: click?.link ?? null,
+        clickTimestamp: click?.timestamp ?? null,
+        clickUserAgent: click?.userAgent ?? null,
+      },
+    }
+  },
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const { webhook, requestId } = ctx
+    try {
+      const providerConfig = getProviderConfig(webhook)
+      const apiKey = providerConfig.apiKey as string | undefined
+      const triggerId = providerConfig.triggerId as string | undefined
+
+      if (!apiKey) {
+        logger.warn(`[${requestId}] Missing apiKey for Resend webhook creation.`, {
+          webhookId: webhook.id,
+        })
+        throw new Error(
+          'Resend API Key is required. Please provide your Resend API Key in the trigger configuration.'
+        )
+      }
+
+      const events =
+        triggerId === 'resend_webhook'
+          ? RESEND_ALL_WEBHOOK_EVENT_TYPES
+          : triggerId && RESEND_TRIGGER_TO_EVENT_TYPE[triggerId]
+            ? [RESEND_TRIGGER_TO_EVENT_TYPE[triggerId]]
+            : null
+
+      if (!events?.length) {
+        throw new Error(`Unknown or unsupported Resend trigger type: ${triggerId ?? '(missing)'}`)
+      }
+
+      const notificationUrl = getNotificationUrl(webhook)
+
+      logger.info(`[${requestId}] Creating Resend webhook`, {
+        triggerId,
+        events,
+        webhookId: webhook.id,
+      })
+
+      const resendResponse = await fetch('https://api.resend.com/webhooks', {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          endpoint: notificationUrl,
+          events,
+        }),
+      })
+
+      const responseBody = (await resendResponse.json()) as Record<string, unknown>
+
+      if (!resendResponse.ok) {
+        const errorMessage =
+          (responseBody.message as string) ||
+          (responseBody.name as string) ||
+          'Unknown Resend API error'
+        logger.error(
+          `[${requestId}] Failed to create webhook in Resend for webhook ${webhook.id}. Status: ${resendResponse.status}`,
+          { message: errorMessage, response: responseBody }
+        )
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Resend'
+        if (resendResponse.status === 401 || resendResponse.status === 403) {
+          userFriendlyMessage = 'Invalid Resend API Key. Please verify your API Key is correct.'
+        } else if (errorMessage && errorMessage !== 'Unknown Resend API error') {
+          userFriendlyMessage = `Resend error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      const externalId = responseBody.id
+      const signingSecretOut = responseBody.signing_secret
+
+      if (typeof externalId !== 'string' || !externalId.trim()) {
+        throw new Error(
+          'Resend webhook was created but the API response did not include a webhook id.'
+        )
+      }
+      if (typeof signingSecretOut !== 'string' || !signingSecretOut.trim()) {
+        throw new Error(
+          'Resend webhook was created but the API response did not include a signing secret.'
+        )
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created webhook in Resend for webhook ${webhook.id}.`,
+        {
+          resendWebhookId: externalId,
+        }
+      )
+
+      return {
+        providerConfigUpdates: {
+          externalId,
+          signingSecret: signingSecretOut,
+        },
+      }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${requestId}] Exception during Resend webhook creation for webhook ${webhook.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const { webhook, requestId } = ctx
+    try {
+      const config = getProviderConfig(webhook)
+      const apiKey = config.apiKey as string | undefined
+      const externalId = config.externalId as string | undefined
+
+      if (!apiKey || !externalId) {
+        logger.warn(
+          `[${requestId}] Missing apiKey or externalId for Resend webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const resendResponse = await fetch(`https://api.resend.com/webhooks/${externalId}`, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+        },
+      })
+
+      if (!resendResponse.ok && resendResponse.status !== 404) {
+        const responseBody = await resendResponse.json().catch(() => ({}))
+        logger.warn(
+          `[${requestId}] Failed to delete Resend webhook (non-fatal): ${resendResponse.status}`,
+          { response: responseBody }
+        )
+      } else {
+        logger.info(`[${requestId}] Successfully deleted Resend webhook ${externalId}`)
+      }
+    } catch (error) {
+      logger.warn(`[${requestId}] Error deleting Resend webhook (non-fatal)`, error)
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/rss.ts b/apps/sim/lib/webhooks/providers/rss.ts
new file mode 100644
index 00000000000..e517fd1cda1
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/rss.ts
@@ -0,0 +1,65 @@
+import { db } from '@sim/db'
+import { webhook } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { eq } from 'drizzle-orm'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  PollingConfigContext,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Rss')
+
+export const rssHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    if (b && typeof b === 'object' && 'item' in b) {
+      return {
+        input: {
+          title: b.title,
+          link: b.link,
+          pubDate: b.pubDate,
+          item: b.item,
+          feed: b.feed,
+          timestamp: b.timestamp,
+        },
+      }
+    }
+    return { input: b }
+  },
+
+  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+    logger.info(`[${requestId}] Setting up RSS polling for webhook ${webhookData.id}`)
+
+    try {
+      const providerConfig = (webhookData.providerConfig as Record<string, unknown>) || {}
+      const now = new Date()
+
+      await db
+        .update(webhook)
+        .set({
+          providerConfig: {
+            ...providerConfig,
+            lastCheckedTimestamp: now.toISOString(),
+            lastSeenGuids: [],
+            setupCompleted: true,
+          },
+          updatedAt: now,
+        })
+        .where(eq(webhook.id, webhookData.id as string))
+
+      logger.info(
+        `[${requestId}] Successfully configured RSS polling for webhook ${webhookData.id}`
+      )
+      return true
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(`[${requestId}] Failed to configure RSS polling`, {
+        webhookId: webhookData.id,
+        error: err.message,
+      })
+      return false
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/salesforce.test.ts b/apps/sim/lib/webhooks/providers/salesforce.test.ts
new file mode 100644
index 00000000000..5865fdcb8e0
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/salesforce.test.ts
@@ -0,0 +1,127 @@
+import { NextRequest } from 'next/server'
+import { describe, expect, it } from 'vitest'
+import { salesforceHandler } from '@/lib/webhooks/providers/salesforce'
+import { isSalesforceEventMatch } from '@/triggers/salesforce/utils'
+
+function reqWithHeaders(headers: Record<string, string>): NextRequest {
+  return new NextRequest('http://localhost/test', { headers })
+}
+
+describe('Salesforce webhook provider', () => {
+  it('verifyAuth rejects when webhookSecret is missing', async () => {
+    const res = await salesforceHandler.verifyAuth!({
+      request: reqWithHeaders({}),
+      rawBody: '{}',
+      requestId: 't1',
+      providerConfig: {},
+      webhook: {},
+      workflow: {},
+    })
+    expect(res?.status).toBe(401)
+  })
+
+  it('verifyAuth accepts Authorization Bearer secret', async () => {
+    const res = await salesforceHandler.verifyAuth!({
+      request: reqWithHeaders({ authorization: 'Bearer my-secret-value' }),
+      rawBody: '{}',
+      requestId: 't2',
+      providerConfig: { webhookSecret: 'my-secret-value' },
+      webhook: {},
+      workflow: {},
+    })
+    expect(res).toBeNull()
+  })
+
+  it('verifyAuth accepts X-Sim-Webhook-Secret', async () => {
+    const res = await salesforceHandler.verifyAuth!({
+      request: reqWithHeaders({ 'x-sim-webhook-secret': 'abc' }),
+      rawBody: '{}',
+      requestId: 't3',
+      providerConfig: { webhookSecret: 'abc' },
+      webhook: {},
+      workflow: {},
+    })
+    expect(res).toBeNull()
+  })
+
+  it('isSalesforceEventMatch filters record triggers by eventType', () => {
+    expect(
+      isSalesforceEventMatch('salesforce_record_created', { eventType: 'created' }, undefined)
+    ).toBe(true)
+    expect(
+      isSalesforceEventMatch('salesforce_record_created', { eventType: 'updated' }, undefined)
+    ).toBe(false)
+    expect(isSalesforceEventMatch('salesforce_record_created', {}, undefined)).toBe(false)
+  })
+
+  it('isSalesforceEventMatch enforces objectType config for generic webhook', () => {
+    expect(
+      isSalesforceEventMatch('salesforce_webhook', { objectType: 'Account', Id: 'x' }, 'Account')
+    ).toBe(true)
+    expect(
+      isSalesforceEventMatch('salesforce_webhook', { objectType: 'Contact', Id: 'x' }, 'Account')
+    ).toBe(false)
+    expect(isSalesforceEventMatch('salesforce_webhook', { Id: 'x' }, 'Account')).toBe(false)
+  })
+
+  it('isSalesforceEventMatch fails closed for record triggers when configured objectType is missing', () => {
+    expect(
+      isSalesforceEventMatch(
+        'salesforce_record_created',
+        { eventType: 'created', Id: '001' },
+        'Account'
+      )
+    ).toBe(false)
+  })
+
+  it('formatInput maps record trigger fields', async () => {
+    const { input } = await salesforceHandler.formatInput!({
+      body: {
+        eventType: 'created',
+        simEventType: 'after_insert',
+        objectType: 'Lead',
+        Id: '00Q1',
+        Name: 'Test',
+        OwnerId: '005OWNER',
+        SystemModstamp: '2024-01-01T00:00:00.000Z',
+      },
+      headers: {},
+      requestId: 't4',
+      webhook: { providerConfig: { triggerId: 'salesforce_record_created' } },
+      workflow: { id: 'w', userId: 'u' },
+    })
+    const i = input as Record<string, unknown>
+    expect(i.eventType).toBe('created')
+    expect(i.simEventType).toBe('after_insert')
+    expect(i.objectType).toBe('Lead')
+    expect(i.recordId).toBe('00Q1')
+    const rec = i.record as Record<string, unknown>
+    expect(rec.OwnerId).toBe('005OWNER')
+    expect(rec.SystemModstamp).toBe('2024-01-01T00:00:00.000Z')
+  })
+
+  it('extractIdempotencyId includes record id', () => {
+    const id = salesforceHandler.extractIdempotencyId!({
+      eventType: 'created',
+      Id: '001',
+    })
+    expect(id).toContain('001')
+  })
+
+  it('extractIdempotencyId is stable without timestamps for identical payloads', () => {
+    const body = {
+      eventType: 'updated',
+      objectType: 'Account',
+      Id: '001',
+      Name: 'Acme',
+      changedFields: ['Name'],
+    }
+
+    const first = salesforceHandler.extractIdempotencyId!(body)
+    const second = salesforceHandler.extractIdempotencyId!({ ...body })
+
+    expect(first).toBe(second)
+    expect(first).toContain('001')
+    expect(first).toContain('updated')
+  })
+})
diff --git a/apps/sim/lib/webhooks/providers/salesforce.ts b/apps/sim/lib/webhooks/providers/salesforce.ts
new file mode 100644
index 00000000000..ddd4c7f96c2
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/salesforce.ts
@@ -0,0 +1,340 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import type {
+  AuthContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { verifyTokenAuth } from '@/lib/webhooks/providers/utils'
+
+export function extractSalesforceObjectTypeFromPayload(
+  body: Record<string, unknown>
+): string | undefined {
+  const direct =
+    (typeof body.objectType === 'string' && body.objectType) ||
+    (typeof body.sobjectType === 'string' && body.sobjectType) ||
+    undefined
+  if (direct) {
+    return direct
+  }
+
+  const attrs = body.attributes as Record<string, unknown> | undefined
+  if (typeof attrs?.type === 'string') {
+    return attrs.type
+  }
+
+  const record = body.record
+  if (record && typeof record === 'object' && !Array.isArray(record)) {
+    const r = record as Record<string, unknown>
+    if (typeof r.sobjectType === 'string') {
+      return r.sobjectType
+    }
+    const ra = r.attributes as Record<string, unknown> | undefined
+    if (typeof ra?.type === 'string') {
+      return ra.type
+    }
+  }
+
+  return undefined
+}
+
+const logger = createLogger('WebhookProvider:Salesforce')
+
+function verifySalesforceSharedSecret(request: Request, secret: string): boolean {
+  if (verifyTokenAuth(request, secret, 'x-sim-webhook-secret')) {
+    return true
+  }
+  return verifyTokenAuth(request, secret)
+}
+
+function asRecord(body: unknown): Record<string, unknown> {
+  return body && typeof body === 'object' && !Array.isArray(body)
+    ? (body as Record<string, unknown>)
+    : {}
+}
+
+function extractRecordCore(body: Record<string, unknown>): Record<string, unknown> {
+  const nested = body.record
+  if (nested && typeof nested === 'object' && !Array.isArray(nested)) {
+    return { ...(nested as Record<string, unknown>) }
+  }
+
+  const skip = new Set([
+    'eventType',
+    'simEventType',
+    'changedFields',
+    'previousStage',
+    'newStage',
+    'previousStatus',
+    'newStatus',
+    'payload',
+    'record',
+  ])
+  const out: Record<string, unknown> = {}
+  for (const [k, v] of Object.entries(body)) {
+    if (!skip.has(k)) {
+      out[k] = v
+    }
+  }
+  return out
+}
+
+function pickTimestamp(body: Record<string, unknown>, record: Record<string, unknown>): string {
+  const candidates = [
+    body.timestamp,
+    body.time,
+    record.SystemModstamp,
+    record.LastModifiedDate,
+    record.CreatedDate,
+  ]
+  for (const c of candidates) {
+    if (typeof c === 'string' && c.length > 0) {
+      return c
+    }
+  }
+  return ''
+}
+
+function stableSerialize(value: unknown): string {
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => stableSerialize(item)).join(',')}]`
+  }
+
+  if (value && typeof value === 'object') {
+    return `{${Object.entries(value as Record<string, unknown>)
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([key, nested]) => `${JSON.stringify(key)}:${stableSerialize(nested)}`)
+      .join(',')}}`
+  }
+
+  return JSON.stringify(value)
+}
+
+function buildFallbackDeliveryFingerprint(body: Record<string, unknown>): string {
+  return crypto.createHash('sha256').update(stableSerialize(body), 'utf8').digest('hex')
+}
+
+function pickRecordId(body: Record<string, unknown>, record: Record<string, unknown>): string {
+  const id =
+    (typeof body.recordId === 'string' && body.recordId) ||
+    (typeof record.Id === 'string' && record.Id) ||
+    (typeof body.Id === 'string' && body.Id) ||
+    ''
+  return id
+}
+
+function pickStr(record: Record<string, unknown>, key: string): string {
+  const v = record[key]
+  return typeof v === 'string' ? v : ''
+}
+
+export const salesforceHandler: WebhookProviderHandler = {
+  verifyAuth({ request, requestId, providerConfig }: AuthContext): NextResponse | null {
+    const secret = providerConfig.webhookSecret as string | undefined
+    if (!secret?.trim()) {
+      logger.warn(`[${requestId}] Salesforce webhook missing webhookSecret — rejecting`)
+      return new NextResponse('Unauthorized - Webhook secret not configured', { status: 401 })
+    }
+
+    if (!verifySalesforceSharedSecret(request, secret.trim())) {
+      logger.warn(`[${requestId}] Salesforce webhook secret verification failed`)
+      return new NextResponse('Unauthorized - Invalid webhook secret', { status: 401 })
+    }
+
+    return null
+  },
+
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (!triggerId) {
+      return true
+    }
+
+    const { isSalesforceEventMatch } = await import('@/triggers/salesforce/utils')
+    const configuredObjectType = providerConfig.objectType as string | undefined
+    const obj = asRecord(body)
+
+    if (!isSalesforceEventMatch(triggerId, obj, configuredObjectType)) {
+      logger.debug(
+        `[${requestId}] Salesforce event mismatch for trigger ${triggerId}. Skipping execution.`,
+        { webhookId: webhook.id, workflowId: workflow.id, triggerId }
+      )
+      return false
+    }
+
+    return true
+  },
+
+  async formatInput(ctx: FormatInputContext): Promise<FormatInputResult> {
+    const rawPc = (ctx.webhook as { providerConfig?: unknown }).providerConfig
+    const pc =
+      rawPc && typeof rawPc === 'object' && !Array.isArray(rawPc)
+        ? (rawPc as Record<string, unknown>)
+        : {}
+    const id = typeof pc.triggerId === 'string' ? pc.triggerId : ''
+    const body = asRecord(ctx.body)
+
+    const record = extractRecordCore(body)
+    const objectType =
+      extractSalesforceObjectTypeFromPayload(body) ||
+      (typeof record.attributes === 'object' &&
+      record.attributes &&
+      typeof (record.attributes as Record<string, unknown>).type === 'string'
+        ? String((record.attributes as Record<string, unknown>).type)
+        : '') ||
+      (typeof record.sobjectType === 'string' ? record.sobjectType : '')
+    const recordId = pickRecordId(body, record)
+    const timestamp = pickTimestamp(body, record)
+    const eventTypeRaw =
+      (typeof body.eventType === 'string' && body.eventType) ||
+      (typeof body.simEventType === 'string' && body.simEventType) ||
+      ''
+    const simEventTypeRaw = typeof body.simEventType === 'string' ? body.simEventType : ''
+
+    if (id === 'salesforce_webhook') {
+      return {
+        input: {
+          eventType: eventTypeRaw || 'webhook',
+          objectType: objectType || '',
+          recordId,
+          timestamp,
+          simEventType: simEventTypeRaw,
+          record: Object.keys(record).length > 0 ? record : body,
+          payload: ctx.body,
+        },
+      }
+    }
+
+    if (
+      id === 'salesforce_record_created' ||
+      id === 'salesforce_record_updated' ||
+      id === 'salesforce_record_deleted'
+    ) {
+      const changedFields = body.changedFields
+      return {
+        input: {
+          eventType: eventTypeRaw || id.replace('salesforce_', '').replace(/_/g, ' '),
+          objectType: objectType || '',
+          recordId,
+          timestamp,
+          simEventType: simEventTypeRaw,
+          record: {
+            Id: typeof record.Id === 'string' ? record.Id : recordId,
+            Name: typeof record.Name === 'string' ? record.Name : '',
+            CreatedDate: typeof record.CreatedDate === 'string' ? record.CreatedDate : '',
+            LastModifiedDate:
+              typeof record.LastModifiedDate === 'string' ? record.LastModifiedDate : '',
+            OwnerId: pickStr(record, 'OwnerId'),
+            SystemModstamp: pickStr(record, 'SystemModstamp'),
+          },
+          changedFields: changedFields !== undefined ? changedFields : null,
+          payload: ctx.body,
+        },
+      }
+    }
+
+    if (id === 'salesforce_opportunity_stage_changed') {
+      return {
+        input: {
+          eventType: eventTypeRaw || 'opportunity_stage_changed',
+          objectType: objectType || 'Opportunity',
+          recordId,
+          timestamp,
+          simEventType: simEventTypeRaw,
+          record: {
+            Id: typeof record.Id === 'string' ? record.Id : recordId,
+            Name: typeof record.Name === 'string' ? record.Name : '',
+            StageName: typeof record.StageName === 'string' ? record.StageName : '',
+            Amount: record.Amount !== undefined ? String(record.Amount) : '',
+            CloseDate: typeof record.CloseDate === 'string' ? record.CloseDate : '',
+            Probability: record.Probability !== undefined ? String(record.Probability) : '',
+            AccountId: pickStr(record, 'AccountId'),
+            OwnerId: pickStr(record, 'OwnerId'),
+          },
+          previousStage:
+            typeof body.previousStage === 'string'
+              ? body.previousStage
+              : typeof body.PriorStage === 'string'
+                ? body.PriorStage
+                : '',
+          newStage:
+            typeof body.newStage === 'string'
+              ? body.newStage
+              : typeof record.StageName === 'string'
+                ? record.StageName
+                : '',
+          payload: ctx.body,
+        },
+      }
+    }
+
+    if (id === 'salesforce_case_status_changed') {
+      return {
+        input: {
+          eventType: eventTypeRaw || 'case_status_changed',
+          objectType: objectType || 'Case',
+          recordId,
+          timestamp,
+          simEventType: simEventTypeRaw,
+          record: {
+            Id: typeof record.Id === 'string' ? record.Id : recordId,
+            Subject: typeof record.Subject === 'string' ? record.Subject : '',
+            Status: typeof record.Status === 'string' ? record.Status : '',
+            Priority: typeof record.Priority === 'string' ? record.Priority : '',
+            CaseNumber: typeof record.CaseNumber === 'string' ? record.CaseNumber : '',
+            AccountId: pickStr(record, 'AccountId'),
+            ContactId: pickStr(record, 'ContactId'),
+            OwnerId: pickStr(record, 'OwnerId'),
+          },
+          previousStatus:
+            typeof body.previousStatus === 'string'
+              ? body.previousStatus
+              : typeof body.PriorStatus === 'string'
+                ? body.PriorStatus
+                : '',
+          newStatus:
+            typeof body.newStatus === 'string'
+              ? body.newStatus
+              : typeof record.Status === 'string'
+                ? record.Status
+                : '',
+          payload: ctx.body,
+        },
+      }
+    }
+
+    return {
+      input: {
+        eventType: eventTypeRaw || 'webhook',
+        objectType: objectType || '',
+        recordId,
+        timestamp,
+        simEventType: simEventTypeRaw,
+        record: Object.keys(record).length > 0 ? record : body,
+        payload: ctx.body,
+      },
+    }
+  },
+
+  extractIdempotencyId(body: unknown): string | null {
+    const b = asRecord(body)
+    const record = extractRecordCore(b)
+    const id = pickRecordId(b, record)
+    const et =
+      (typeof b.eventType === 'string' && b.eventType) ||
+      (typeof b.simEventType === 'string' && b.simEventType) ||
+      ''
+    const ts = pickTimestamp(b, record)
+    if (!id) {
+      return null
+    }
+    if (ts) {
+      return `salesforce:${et || 'event'}:${id}:${ts}`
+    }
+
+    return `salesforce:${et || 'event'}:${id}:${buildFallbackDeliveryFingerprint(b)}`
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/slack.ts b/apps/sim/lib/webhooks/providers/slack.ts
new file mode 100644
index 00000000000..1bcedd628b9
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/slack.ts
@@ -0,0 +1,282 @@
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import {
+  secureFetchWithPinnedIP,
+  validateUrlWithDNS,
+} from '@/lib/core/security/input-validation.server'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Slack')
+
+const SLACK_MAX_FILE_SIZE = 50 * 1024 * 1024 // 50 MB
+const SLACK_MAX_FILES = 15
+
+const SLACK_REACTION_EVENTS = new Set(['reaction_added', 'reaction_removed'])
+
+async function resolveSlackFileInfo(
+  fileId: string,
+  botToken: string
+): Promise<{ url_private?: string; name?: string; mimetype?: string; size?: number } | null> {
+  try {
+    const response = await fetch(
+      `https://slack.com/api/files.info?file=${encodeURIComponent(fileId)}`,
+      { headers: { Authorization: `Bearer ${botToken}` } }
+    )
+    const data = (await response.json()) as {
+      ok: boolean
+      error?: string
+      file?: Record<string, unknown>
+    }
+    if (!data.ok || !data.file) {
+      logger.warn('Slack files.info failed', { fileId, error: data.error })
+      return null
+    }
+    return {
+      url_private: data.file.url_private as string | undefined,
+      name: data.file.name as string | undefined,
+      mimetype: data.file.mimetype as string | undefined,
+      size: data.file.size as number | undefined,
+    }
+  } catch (error) {
+    logger.error('Error calling Slack files.info', {
+      fileId,
+      error: error instanceof Error ? error.message : String(error),
+    })
+    return null
+  }
+}
+
+async function downloadSlackFiles(
+  rawFiles: unknown[],
+  botToken: string
+): Promise<Array<{ name: string; data: string; mimeType: string; size: number }>> {
+  const filesToProcess = rawFiles.slice(0, SLACK_MAX_FILES)
+  const downloaded: Array<{ name: string; data: string; mimeType: string; size: number }> = []
+
+  for (const file of filesToProcess) {
+    const f = file as Record<string, unknown>
+    let urlPrivate = f.url_private as string | undefined
+    let fileName = f.name as string | undefined
+    let fileMimeType = f.mimetype as string | undefined
+    let fileSize = f.size as number | undefined
+
+    if (!urlPrivate && f.id) {
+      const resolved = await resolveSlackFileInfo(f.id as string, botToken)
+      if (resolved?.url_private) {
+        urlPrivate = resolved.url_private
+        fileName = fileName || resolved.name
+        fileMimeType = fileMimeType || resolved.mimetype
+        fileSize = fileSize ?? resolved.size
+      }
+    }
+
+    if (!urlPrivate) {
+      logger.warn('Slack file has no url_private and could not be resolved, skipping', {
+        fileId: f.id,
+      })
+      continue
+    }
+
+    const reportedSize = Number(fileSize) || 0
+    if (reportedSize > SLACK_MAX_FILE_SIZE) {
+      logger.warn('Slack file exceeds size limit, skipping', {
+        fileId: f.id,
+        size: reportedSize,
+        limit: SLACK_MAX_FILE_SIZE,
+      })
+      continue
+    }
+
+    try {
+      const urlValidation = await validateUrlWithDNS(urlPrivate, 'url_private')
+      if (!urlValidation.isValid) {
+        logger.warn('Slack file url_private failed DNS validation, skipping', {
+          fileId: f.id,
+          error: urlValidation.error,
+        })
+        continue
+      }
+
+      const response = await secureFetchWithPinnedIP(urlPrivate, urlValidation.resolvedIP!, {
+        headers: { Authorization: `Bearer ${botToken}` },
+      })
+
+      if (!response.ok) {
+        logger.warn('Failed to download Slack file, skipping', {
+          fileId: f.id,
+          status: response.status,
+        })
+        continue
+      }
+
+      const arrayBuffer = await response.arrayBuffer()
+      const buffer = Buffer.from(arrayBuffer)
+
+      if (buffer.length > SLACK_MAX_FILE_SIZE) {
+        logger.warn('Downloaded Slack file exceeds size limit, skipping', {
+          fileId: f.id,
+          actualSize: buffer.length,
+          limit: SLACK_MAX_FILE_SIZE,
+        })
+        continue
+      }
+
+      downloaded.push({
+        name: fileName || 'download',
+        data: buffer.toString('base64'),
+        mimeType: fileMimeType || 'application/octet-stream',
+        size: buffer.length,
+      })
+    } catch (error) {
+      logger.error('Error downloading Slack file, skipping', {
+        fileId: f.id,
+        error: error instanceof Error ? error.message : String(error),
+      })
+    }
+  }
+
+  return downloaded
+}
+
+async function fetchSlackMessageText(
+  channel: string,
+  messageTs: string,
+  botToken: string
+): Promise<string> {
+  try {
+    const params = new URLSearchParams({ channel, timestamp: messageTs })
+    const response = await fetch(`https://slack.com/api/reactions.get?${params}`, {
+      headers: { Authorization: `Bearer ${botToken}` },
+    })
+    const data = (await response.json()) as {
+      ok: boolean
+      error?: string
+      type?: string
+      message?: { text?: string }
+    }
+    if (!data.ok) {
+      logger.warn('Slack reactions.get failed — message text unavailable', {
+        channel,
+        messageTs,
+        error: data.error,
+      })
+      return ''
+    }
+    return data.message?.text ?? ''
+  } catch (error) {
+    logger.warn('Error fetching Slack message text', {
+      channel,
+      messageTs,
+      error: error instanceof Error ? error.message : String(error),
+    })
+    return ''
+  }
+}
+
+/**
+ * Handle Slack verification challenges
+ */
+export function handleSlackChallenge(body: unknown): NextResponse | null {
+  const obj = body as Record<string, unknown>
+  if (obj.type === 'url_verification' && obj.challenge) {
+    return NextResponse.json({ challenge: obj.challenge })
+  }
+
+  return null
+}
+
+export const slackHandler: WebhookProviderHandler = {
+  handleChallenge(body: unknown) {
+    return handleSlackChallenge(body)
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    if (obj.event_id) {
+      return String(obj.event_id)
+    }
+
+    const event = obj.event as Record<string, unknown> | undefined
+    if (event?.ts && obj.team_id) {
+      return `${obj.team_id}:${event.ts}`
+    }
+
+    return null
+  },
+
+  formatSuccessResponse() {
+    return new NextResponse(null, { status: 200 })
+  },
+
+  formatQueueErrorResponse() {
+    return new NextResponse(null, { status: 200 })
+  },
+
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const providerConfig = (webhook.providerConfig as Record<string, unknown>) || {}
+    const botToken = providerConfig.botToken as string | undefined
+    const includeFiles = Boolean(providerConfig.includeFiles)
+
+    const rawEvent = b?.event as Record<string, unknown> | undefined
+
+    if (!rawEvent) {
+      logger.warn('Unknown Slack event type', {
+        type: b?.type,
+        hasEvent: false,
+        bodyKeys: Object.keys(b || {}),
+      })
+    }
+
+    const eventType: string = (rawEvent?.type as string) || (b?.type as string) || 'unknown'
+    const isReactionEvent = SLACK_REACTION_EVENTS.has(eventType)
+
+    const item = rawEvent?.item as Record<string, unknown> | undefined
+    const channel: string = isReactionEvent
+      ? (item?.channel as string) || ''
+      : (rawEvent?.channel as string) || ''
+    const messageTs: string = isReactionEvent
+      ? (item?.ts as string) || ''
+      : (rawEvent?.ts as string) || (rawEvent?.event_ts as string) || ''
+
+    let text: string = (rawEvent?.text as string) || ''
+    if (isReactionEvent && channel && messageTs && botToken) {
+      text = await fetchSlackMessageText(channel, messageTs, botToken)
+    }
+
+    const rawFiles: unknown[] = (rawEvent?.files as unknown[]) ?? []
+    const hasFiles = rawFiles.length > 0
+
+    let files: Array<{ name: string; data: string; mimeType: string; size: number }> = []
+    if (hasFiles && includeFiles && botToken) {
+      files = await downloadSlackFiles(rawFiles, botToken)
+    } else if (hasFiles && includeFiles && !botToken) {
+      logger.warn('Slack message has files and includeFiles is enabled, but no bot token provided')
+    }
+
+    return {
+      input: {
+        event: {
+          event_type: eventType,
+          channel,
+          channel_name: '',
+          user: (rawEvent?.user as string) || '',
+          user_name: '',
+          text,
+          timestamp: messageTs,
+          thread_ts: (rawEvent?.thread_ts as string) || '',
+          team_id: (b?.team_id as string) || (rawEvent?.team as string) || '',
+          event_id: (b?.event_id as string) || '',
+          reaction: (rawEvent?.reaction as string) || '',
+          item_user: (rawEvent?.item_user as string) || '',
+          hasFiles,
+          files,
+        },
+      },
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/stripe.ts b/apps/sim/lib/webhooks/providers/stripe.ts
new file mode 100644
index 00000000000..7b9414ab788
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/stripe.ts
@@ -0,0 +1,28 @@
+import { createLogger } from '@sim/logger'
+import type {
+  EventFilterContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { skipByEventTypes } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Stripe')
+
+export const stripeHandler: WebhookProviderHandler = {
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    return { input: body }
+  },
+
+  shouldSkipEvent(ctx: EventFilterContext) {
+    return skipByEventTypes(ctx, 'Stripe', logger)
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    if (obj.id && obj.object === 'event') {
+      return String(obj.id)
+    }
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/telegram.ts b/apps/sim/lib/webhooks/providers/telegram.ts
new file mode 100644
index 00000000000..77bb623be16
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/telegram.ts
@@ -0,0 +1,214 @@
+import { createLogger } from '@sim/logger'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  AuthContext,
+  DeleteSubscriptionContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Telegram')
+
+export const telegramHandler: WebhookProviderHandler = {
+  verifyAuth({ request, requestId }: AuthContext) {
+    const userAgent = request.headers.get('user-agent')
+    if (!userAgent) {
+      logger.warn(
+        `[${requestId}] Telegram webhook request has empty User-Agent header. This may be blocked by middleware.`
+      )
+    }
+    return null
+  },
+
+  extractIdempotencyId(body: unknown): string | null {
+    const obj = body as Record<string, unknown>
+    const updateId = obj.update_id
+    if (typeof updateId === 'number') {
+      return `telegram:${updateId}`
+    }
+    return null
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const rawMessage = (b?.message ||
+      b?.edited_message ||
+      b?.channel_post ||
+      b?.edited_channel_post) as Record<string, unknown> | undefined
+
+    const updateType = b.message
+      ? 'message'
+      : b.edited_message
+        ? 'edited_message'
+        : b.channel_post
+          ? 'channel_post'
+          : b.edited_channel_post
+            ? 'edited_channel_post'
+            : 'unknown'
+
+    if (rawMessage) {
+      const messageType = rawMessage.photo
+        ? 'photo'
+        : rawMessage.document
+          ? 'document'
+          : rawMessage.audio
+            ? 'audio'
+            : rawMessage.video
+              ? 'video'
+              : rawMessage.voice
+                ? 'voice'
+                : rawMessage.sticker
+                  ? 'sticker'
+                  : rawMessage.location
+                    ? 'location'
+                    : rawMessage.contact
+                      ? 'contact'
+                      : rawMessage.poll
+                        ? 'poll'
+                        : 'text'
+
+      const from = rawMessage.from as Record<string, unknown> | undefined
+      return {
+        input: {
+          message: {
+            id: rawMessage.message_id,
+            text: rawMessage.text,
+            date: rawMessage.date,
+            messageType,
+            raw: rawMessage,
+          },
+          sender: from
+            ? {
+                id: from.id,
+                username: from.username,
+                firstName: from.first_name,
+                lastName: from.last_name,
+                languageCode: from.language_code,
+                isBot: from.is_bot,
+              }
+            : null,
+          updateId: b.update_id,
+          updateType,
+        },
+      }
+    }
+
+    logger.warn('Unknown Telegram update type', {
+      updateId: b.update_id,
+      bodyKeys: Object.keys(b || {}),
+    })
+
+    return {
+      input: {
+        updateId: b.update_id,
+        updateType,
+      },
+    }
+  },
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const config = getProviderConfig(ctx.webhook)
+    const botToken = config.botToken as string | undefined
+
+    if (!botToken) {
+      logger.warn(`[${ctx.requestId}] Missing botToken for Telegram webhook ${ctx.webhook.id}`)
+      throw new Error(
+        'Bot token is required to create a Telegram webhook. Please provide a valid Telegram bot token.'
+      )
+    }
+
+    const notificationUrl = getNotificationUrl(ctx.webhook)
+    const telegramApiUrl = `https://api.telegram.org/bot${botToken}/setWebhook`
+
+    try {
+      const telegramResponse = await fetch(telegramApiUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'User-Agent': 'TelegramBot/1.0',
+        },
+        body: JSON.stringify({ url: notificationUrl }),
+      })
+
+      const responseBody = await telegramResponse.json()
+      if (!telegramResponse.ok || !responseBody.ok) {
+        const errorMessage =
+          responseBody.description ||
+          `Failed to create Telegram webhook. Status: ${telegramResponse.status}`
+        logger.error(`[${ctx.requestId}] ${errorMessage}`, { response: responseBody })
+
+        let userFriendlyMessage = 'Failed to create Telegram webhook'
+        if (telegramResponse.status === 401) {
+          userFriendlyMessage =
+            'Invalid bot token. Please verify that the bot token is correct and try again.'
+        } else if (responseBody.description) {
+          userFriendlyMessage = `Telegram error: ${responseBody.description}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      logger.info(
+        `[${ctx.requestId}] Successfully created Telegram webhook for webhook ${ctx.webhook.id}`
+      )
+      return {}
+    } catch (error: unknown) {
+      if (
+        error instanceof Error &&
+        (error.message.includes('Bot token') || error.message.includes('Telegram error'))
+      ) {
+        throw error
+      }
+
+      logger.error(
+        `[${ctx.requestId}] Error creating Telegram webhook for webhook ${ctx.webhook.id}`,
+        error
+      )
+      throw new Error(
+        error instanceof Error
+          ? error.message
+          : 'Failed to create Telegram webhook. Please try again.'
+      )
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(ctx.webhook)
+      const botToken = config.botToken as string | undefined
+
+      if (!botToken) {
+        logger.warn(
+          `[${ctx.requestId}] Missing botToken for Telegram webhook deletion ${ctx.webhook.id}`
+        )
+        return
+      }
+
+      const telegramApiUrl = `https://api.telegram.org/bot${botToken}/deleteWebhook`
+      const telegramResponse = await fetch(telegramApiUrl, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+      })
+
+      const responseBody = await telegramResponse.json()
+      if (!telegramResponse.ok || !responseBody.ok) {
+        const errorMessage =
+          responseBody.description ||
+          `Failed to delete Telegram webhook. Status: ${telegramResponse.status}`
+        logger.error(`[${ctx.requestId}] ${errorMessage}`, { response: responseBody })
+      } else {
+        logger.info(
+          `[${ctx.requestId}] Successfully deleted Telegram webhook for webhook ${ctx.webhook.id}`
+        )
+      }
+    } catch (error) {
+      logger.error(
+        `[${ctx.requestId}] Error deleting Telegram webhook for webhook ${ctx.webhook.id}`,
+        error
+      )
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/twilio-voice.ts b/apps/sim/lib/webhooks/providers/twilio-voice.ts
new file mode 100644
index 00000000000..be0417ef71d
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/twilio-voice.ts
@@ -0,0 +1,214 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type {
+  AuthContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { convertSquareBracketsToTwiML } from '@/lib/webhooks/utils'
+
+const logger = createLogger('WebhookProvider:TwilioVoice')
+
+async function validateTwilioSignature(
+  authToken: string,
+  signature: string,
+  url: string,
+  params: Record<string, unknown>
+): Promise<boolean> {
+  try {
+    if (!authToken || !signature || !url) {
+      logger.warn('Twilio signature validation missing required fields', {
+        hasAuthToken: !!authToken,
+        hasSignature: !!signature,
+        hasUrl: !!url,
+      })
+      return false
+    }
+    const sortedKeys = Object.keys(params).sort()
+    let data = url
+    for (const key of sortedKeys) {
+      data += key + params[key]
+    }
+    logger.debug('Twilio signature validation string built', {
+      url,
+      sortedKeys,
+      dataLength: data.length,
+    })
+    const encoder = new TextEncoder()
+    const key = await crypto.subtle.importKey(
+      'raw',
+      encoder.encode(authToken),
+      { name: 'HMAC', hash: 'SHA-1' },
+      false,
+      ['sign']
+    )
+    const signatureBytes = await crypto.subtle.sign('HMAC', key, encoder.encode(data))
+    const signatureArray = Array.from(new Uint8Array(signatureBytes))
+    const signatureBase64 = btoa(String.fromCharCode(...signatureArray))
+    logger.debug('Twilio signature comparison', {
+      computedSignature: `${signatureBase64.substring(0, 10)}...`,
+      providedSignature: `${signature.substring(0, 10)}...`,
+      computedLength: signatureBase64.length,
+      providedLength: signature.length,
+      match: signatureBase64 === signature,
+    })
+    return safeCompare(signatureBase64, signature)
+  } catch (error) {
+    logger.error('Error validating Twilio signature:', error)
+    return false
+  }
+}
+
+function getExternalUrl(request: Request): string {
+  const proto = request.headers.get('x-forwarded-proto') || 'https'
+  const host = request.headers.get('x-forwarded-host') || request.headers.get('host')
+
+  if (host) {
+    const url = new URL(request.url)
+    const reconstructed = `${proto}://${host}${url.pathname}${url.search}`
+    return reconstructed
+  }
+
+  return request.url
+}
+
+export const twilioVoiceHandler: WebhookProviderHandler = {
+  async verifyAuth({ request, rawBody, requestId, providerConfig }: AuthContext) {
+    const authToken = providerConfig.authToken as string | undefined
+
+    if (authToken) {
+      const signature = request.headers.get('x-twilio-signature')
+
+      if (!signature) {
+        logger.warn(`[${requestId}] Twilio Voice webhook missing signature header`)
+        return new NextResponse('Unauthorized - Missing Twilio signature', {
+          status: 401,
+        })
+      }
+
+      let params: Record<string, string> = {}
+      try {
+        if (typeof rawBody === 'string') {
+          const urlParams = new URLSearchParams(rawBody)
+          params = Object.fromEntries(urlParams.entries())
+        }
+      } catch (error) {
+        logger.error(
+          `[${requestId}] Error parsing Twilio webhook body for signature validation:`,
+          error
+        )
+        return new NextResponse('Bad Request - Invalid body format', {
+          status: 400,
+        })
+      }
+
+      const fullUrl = getExternalUrl(request)
+      const isValidSignature = await validateTwilioSignature(authToken, signature, fullUrl, params)
+
+      if (!isValidSignature) {
+        logger.warn(`[${requestId}] Twilio Voice signature verification failed`, {
+          url: fullUrl,
+          signatureLength: signature.length,
+          paramsCount: Object.keys(params).length,
+          authTokenLength: authToken.length,
+        })
+        return new NextResponse('Unauthorized - Invalid Twilio signature', {
+          status: 401,
+        })
+      }
+    }
+
+    return null
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    return (obj.MessageSid as string) || (obj.CallSid as string) || null
+  },
+
+  formatSuccessResponse(providerConfig: Record<string, unknown>) {
+    const twimlResponse = (providerConfig.twimlResponse as string | undefined)?.trim()
+
+    if (twimlResponse && twimlResponse.length > 0) {
+      const convertedTwiml = convertSquareBracketsToTwiML(twimlResponse)
+      return new NextResponse(convertedTwiml, {
+        status: 200,
+        headers: {
+          'Content-Type': 'text/xml; charset=utf-8',
+        },
+      })
+    }
+
+    const defaultTwiml = `<?xml version="1.0" encoding="UTF-8"?>
+<Response>
+  <Say>Your call is being processed.</Say>
+  <Pause length="1"/>
+</Response>`
+
+    return new NextResponse(defaultTwiml, {
+      status: 200,
+      headers: {
+        'Content-Type': 'text/xml; charset=utf-8',
+      },
+    })
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    return {
+      input: {
+        callSid: b.CallSid,
+        accountSid: b.AccountSid,
+        from: b.From,
+        to: b.To,
+        callStatus: b.CallStatus,
+        direction: b.Direction,
+        apiVersion: b.ApiVersion,
+        callerName: b.CallerName,
+        forwardedFrom: b.ForwardedFrom,
+        digits: b.Digits,
+        speechResult: b.SpeechResult,
+        recordingUrl: b.RecordingUrl,
+        recordingSid: b.RecordingSid,
+        called: b.Called,
+        caller: b.Caller,
+        toCity: b.ToCity,
+        toState: b.ToState,
+        toZip: b.ToZip,
+        toCountry: b.ToCountry,
+        fromCity: b.FromCity,
+        fromState: b.FromState,
+        fromZip: b.FromZip,
+        fromCountry: b.FromCountry,
+        calledCity: b.CalledCity,
+        calledState: b.CalledState,
+        calledZip: b.CalledZip,
+        calledCountry: b.CalledCountry,
+        callerCity: b.CallerCity,
+        callerState: b.CallerState,
+        callerZip: b.CallerZip,
+        callerCountry: b.CallerCountry,
+        callToken: b.CallToken,
+        raw: JSON.stringify(b),
+      },
+    }
+  },
+
+  formatQueueErrorResponse() {
+    const errorTwiml = `<?xml version="1.0" encoding="UTF-8"?>
+<Response>
+  <Say>We're sorry, but an error occurred processing your call. Please try again later.</Say>
+  <Hangup/>
+</Response>`
+
+    return new NextResponse(errorTwiml, {
+      status: 200,
+      headers: {
+        'Content-Type': 'text/xml',
+      },
+    })
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/twilio.ts b/apps/sim/lib/webhooks/providers/twilio.ts
new file mode 100644
index 00000000000..3ba33decc11
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/twilio.ts
@@ -0,0 +1,8 @@
+import type { WebhookProviderHandler } from '@/lib/webhooks/providers/types'
+
+export const twilioHandler: WebhookProviderHandler = {
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    return (obj.MessageSid as string) || (obj.CallSid as string) || null
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/typeform.ts b/apps/sim/lib/webhooks/providers/typeform.ts
new file mode 100644
index 00000000000..8c96d05907f
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/typeform.ts
@@ -0,0 +1,213 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
+
+const logger = createLogger('WebhookProvider:Typeform')
+
+function validateTypeformSignature(secret: string, signature: string, body: string): boolean {
+  try {
+    if (!secret || !signature || !body) {
+      return false
+    }
+    if (!signature.startsWith('sha256=')) {
+      return false
+    }
+    const providedSignature = signature.substring(7)
+    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('base64')
+    return safeCompare(computedHash, providedSignature)
+  } catch (error) {
+    logger.error('Error validating Typeform signature:', error)
+    return false
+  }
+}
+
+export const typeformHandler: WebhookProviderHandler = {
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const formResponse = (b?.form_response || {}) as Record<string, unknown>
+    const providerConfig = (webhook.providerConfig as Record<string, unknown>) || {}
+    const includeDefinition = providerConfig.includeDefinition === true
+    return {
+      input: {
+        event_id: b?.event_id || '',
+        event_type: b?.event_type || 'form_response',
+        form_id: formResponse.form_id || '',
+        token: formResponse.token || '',
+        submitted_at: formResponse.submitted_at || '',
+        landed_at: formResponse.landed_at || '',
+        calculated: formResponse.calculated || {},
+        variables: formResponse.variables || [],
+        hidden: formResponse.hidden || {},
+        answers: formResponse.answers || [],
+        ...(includeDefinition ? { definition: formResponse.definition || {} } : {}),
+        ending: formResponse.ending || {},
+        raw: b,
+      },
+    }
+  },
+
+  verifyAuth: createHmacVerifier({
+    configKey: 'secret',
+    headerName: 'Typeform-Signature',
+    validateFn: validateTypeformSignature,
+    providerLabel: 'Typeform',
+  }),
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const config = getProviderConfig(ctx.webhook)
+    const formId = config.formId as string | undefined
+    const apiKey = config.apiKey as string | undefined
+    const webhookTag = config.webhookTag as string | undefined
+    const secret = config.secret as string | undefined
+
+    if (!formId) {
+      logger.warn(`[${ctx.requestId}] Missing formId for Typeform webhook ${ctx.webhook.id}`)
+      throw new Error(
+        'Form ID is required to create a Typeform webhook. Please provide a valid form ID.'
+      )
+    }
+
+    if (!apiKey) {
+      logger.warn(`[${ctx.requestId}] Missing apiKey for Typeform webhook ${ctx.webhook.id}`)
+      throw new Error(
+        'Personal Access Token is required to create a Typeform webhook. Please provide your Typeform API key.'
+      )
+    }
+
+    const tag = webhookTag || `sim-${(ctx.webhook.id as string).substring(0, 8)}`
+    const notificationUrl = getNotificationUrl(ctx.webhook)
+
+    try {
+      const typeformApiUrl = `https://api.typeform.com/forms/${formId}/webhooks/${tag}`
+
+      const requestBody: Record<string, unknown> = {
+        url: notificationUrl,
+        enabled: true,
+        verify_ssl: true,
+        event_types: {
+          form_response: true,
+        },
+      }
+
+      if (secret) {
+        requestBody.secret = secret
+      }
+
+      const typeformResponse = await fetch(typeformApiUrl, {
+        method: 'PUT',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      if (!typeformResponse.ok) {
+        const responseBody = await typeformResponse.json().catch(() => ({}))
+        const errorMessage =
+          (responseBody as Record<string, string>).description ||
+          (responseBody as Record<string, string>).message ||
+          'Unknown error'
+
+        logger.error(`[${ctx.requestId}] Typeform API error: ${errorMessage}`, {
+          status: typeformResponse.status,
+          response: responseBody,
+        })
+
+        let userFriendlyMessage = 'Failed to create Typeform webhook'
+        if (typeformResponse.status === 401) {
+          userFriendlyMessage =
+            'Invalid Personal Access Token. Please verify your Typeform API key and try again.'
+        } else if (typeformResponse.status === 403) {
+          userFriendlyMessage =
+            'Access denied. Please ensure you have a Typeform PRO or PRO+ account and the API key has webhook permissions.'
+        } else if (typeformResponse.status === 404) {
+          userFriendlyMessage = 'Form not found. Please verify the form ID is correct.'
+        } else if (
+          (responseBody as Record<string, string>).description ||
+          (responseBody as Record<string, string>).message
+        ) {
+          userFriendlyMessage = `Typeform error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      const responseBody = await typeformResponse.json()
+      logger.info(
+        `[${ctx.requestId}] Successfully created Typeform webhook for webhook ${ctx.webhook.id} with tag ${tag}`,
+        { webhookId: (responseBody as Record<string, unknown>).id }
+      )
+
+      if (!webhookTag && tag) {
+        return { providerConfigUpdates: { webhookTag: tag } }
+      }
+      return {}
+    } catch (error: unknown) {
+      if (
+        error instanceof Error &&
+        (error.message.includes('Form ID') ||
+          error.message.includes('Personal Access Token') ||
+          error.message.includes('Typeform error'))
+      ) {
+        throw error
+      }
+
+      logger.error(
+        `[${ctx.requestId}] Error creating Typeform webhook for webhook ${ctx.webhook.id}`,
+        error
+      )
+      throw new Error(
+        error instanceof Error
+          ? error.message
+          : 'Failed to create Typeform webhook. Please try again.'
+      )
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(ctx.webhook)
+      const formId = config.formId as string | undefined
+      const apiKey = config.apiKey as string | undefined
+      const webhookTag = config.webhookTag as string | undefined
+
+      if (!formId || !apiKey) {
+        logger.warn(
+          `[${ctx.requestId}] Missing formId or apiKey for Typeform webhook deletion ${ctx.webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const tag = webhookTag || `sim-${(ctx.webhook.id as string).substring(0, 8)}`
+      const typeformApiUrl = `https://api.typeform.com/forms/${formId}/webhooks/${tag}`
+
+      const typeformResponse = await fetch(typeformApiUrl, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+        },
+      })
+
+      if (!typeformResponse.ok && typeformResponse.status !== 404) {
+        logger.warn(
+          `[${ctx.requestId}] Failed to delete Typeform webhook (non-fatal): ${typeformResponse.status}`
+        )
+      } else {
+        logger.info(`[${ctx.requestId}] Successfully deleted Typeform webhook with tag ${tag}`)
+      }
+    } catch (error) {
+      logger.warn(`[${ctx.requestId}] Error deleting Typeform webhook (non-fatal)`, error)
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/types.ts b/apps/sim/lib/webhooks/providers/types.ts
new file mode 100644
index 00000000000..dee3e8aca19
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/types.ts
@@ -0,0 +1,145 @@
+import type { NextRequest, NextResponse } from 'next/server'
+
+/** Context for signature/token verification. */
+export interface AuthContext {
+  webhook: Record<string, unknown>
+  workflow: Record<string, unknown>
+  request: NextRequest
+  rawBody: string
+  requestId: string
+  providerConfig: Record<string, unknown>
+}
+
+/** Context for event matching against trigger configuration. */
+export interface EventMatchContext {
+  webhook: Record<string, unknown>
+  workflow: Record<string, unknown>
+  body: unknown
+  request: NextRequest
+  requestId: string
+  providerConfig: Record<string, unknown>
+}
+
+/** Context for event filtering and header enrichment. */
+export interface EventFilterContext {
+  webhook: Record<string, unknown>
+  body: unknown
+  requestId: string
+  providerConfig: Record<string, unknown>
+}
+
+/** Context for custom input preparation during execution. */
+export interface FormatInputContext {
+  webhook: Record<string, unknown>
+  workflow: { id: string; userId: string }
+  body: unknown
+  headers: Record<string, string>
+  requestId: string
+}
+
+/** Result of custom input preparation. */
+export interface FormatInputResult {
+  input: unknown
+  skip?: { message: string }
+}
+
+/** Context for provider-specific file processing before execution. */
+export interface ProcessFilesContext {
+  input: Record<string, unknown>
+  blocks: Record<string, unknown>
+  blockId: string
+  workspaceId: string
+  workflowId: string
+  executionId: string
+  requestId: string
+  userId: string
+}
+
+/** Context for creating an external webhook subscription during deployment. */
+export interface SubscriptionContext {
+  webhook: Record<string, unknown>
+  workflow: Record<string, unknown>
+  userId: string
+  requestId: string
+  request: NextRequest
+}
+
+/** Result of creating an external webhook subscription. */
+export interface SubscriptionResult {
+  /** Fields to merge into providerConfig (externalId, webhookSecret, etc.) */
+  providerConfigUpdates?: Record<string, unknown>
+}
+
+/** Context for deleting an external webhook subscription during undeployment. */
+export interface DeleteSubscriptionContext {
+  webhook: Record<string, unknown>
+  workflow: Record<string, unknown>
+  requestId: string
+}
+
+/** Context for configuring polling after webhook creation. */
+export interface PollingConfigContext {
+  webhook: Record<string, unknown>
+  requestId: string
+}
+
+/**
+ * Strategy interface for provider-specific webhook behavior.
+ * Each provider implements only the methods it needs — all methods are optional.
+ */
+export interface WebhookProviderHandler {
+  /** Verify signature/auth. Return NextResponse(401/403) on failure, null on success. */
+  verifyAuth?(ctx: AuthContext): Promise<NextResponse | null> | NextResponse | null
+
+  /** Handle reachability/verification probes after webhook lookup. */
+  handleReachabilityTest?(body: unknown, requestId: string): NextResponse | null
+
+  /** Format error responses (some providers need special formats). */
+  formatErrorResponse?(error: string, status: number): NextResponse
+
+  /** Return true to skip this event (filtering by event type, collection, etc.). */
+  shouldSkipEvent?(ctx: EventFilterContext): boolean
+
+  /** Return true if event matches, false or NextResponse to skip with a custom response. */
+  matchEvent?(ctx: EventMatchContext): Promise<boolean | NextResponse> | boolean | NextResponse
+
+  /** Add provider-specific headers (idempotency keys, notification IDs, etc.). */
+  enrichHeaders?(ctx: EventFilterContext, headers: Record<string, string>): void
+
+  /** Extract unique identifier for idempotency dedup. */
+  extractIdempotencyId?(body: unknown): string | null
+
+  /** Custom success response after queuing. Return null for default `{message: "Webhook processed"}`. */
+  formatSuccessResponse?(providerConfig: Record<string, unknown>): NextResponse | null
+
+  /** Custom error response when queuing fails. Return null for default 500. */
+  formatQueueErrorResponse?(): NextResponse | null
+
+  /** Custom input preparation. When defined, replaces the default pass-through of the raw body. */
+  formatInput?(ctx: FormatInputContext): Promise<FormatInputResult>
+
+  /** Called when input is null after formatting. Return skip message or null to proceed. */
+  handleEmptyInput?(requestId: string): { message: string } | null
+
+  /** Post-process input to handle file uploads before execution. */
+  processInputFiles?(ctx: ProcessFilesContext): Promise<void>
+
+  /** Create an external webhook subscription (e.g., register with Telegram, Airtable, etc.). */
+  createSubscription?(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined>
+
+  /** Delete an external webhook subscription during cleanup. Errors should not throw. */
+  deleteSubscription?(ctx: DeleteSubscriptionContext): Promise<void>
+
+  /** Configure polling after webhook creation (gmail, outlook, rss, imap). */
+  configurePolling?(ctx: PollingConfigContext): Promise<boolean>
+
+  /** Handle verification challenges before webhook lookup (Slack url_verification, WhatsApp hub.verify_token, Teams validationToken). */
+  handleChallenge?(
+    body: unknown,
+    request: NextRequest,
+    requestId: string,
+    path: string,
+    /** Raw request body bytes (when available); required for signature checks that must match the provider (e.g. Zoom). */
+    rawBody?: string
+  ): Promise<NextResponse | null> | NextResponse | null
+}
diff --git a/apps/sim/lib/webhooks/providers/utils.ts b/apps/sim/lib/webhooks/providers/utils.ts
new file mode 100644
index 00000000000..f2a56047081
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/utils.ts
@@ -0,0 +1,102 @@
+import type { Logger } from '@sim/logger'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import type { AuthContext, EventFilterContext } from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProviderAuth')
+
+interface HmacVerifierOptions {
+  configKey: string
+  headerName: string
+  validateFn: (secret: string, signature: string, rawBody: string) => boolean | Promise<boolean>
+  providerLabel: string
+}
+
+/**
+ * Factory that creates a `verifyAuth` implementation for HMAC-signature-based providers.
+ * Covers the common pattern: get secret → check header → validate signature → return 401 or null.
+ */
+export function createHmacVerifier({
+  configKey,
+  headerName,
+  validateFn,
+  providerLabel,
+}: HmacVerifierOptions) {
+  return async ({
+    request,
+    rawBody,
+    requestId,
+    providerConfig,
+  }: AuthContext): Promise<NextResponse | null> => {
+    const secret = providerConfig[configKey] as string | undefined
+    if (!secret) {
+      return null
+    }
+
+    const signature = request.headers.get(headerName)
+    if (!signature) {
+      logger.warn(`[${requestId}] ${providerLabel} webhook missing signature header`)
+      return new NextResponse(`Unauthorized - Missing ${providerLabel} signature`, { status: 401 })
+    }
+
+    const isValid = await validateFn(secret, signature, rawBody)
+    if (!isValid) {
+      logger.warn(`[${requestId}] ${providerLabel} signature verification failed`, {
+        signatureLength: signature.length,
+        secretLength: secret.length,
+      })
+      return new NextResponse(`Unauthorized - Invalid ${providerLabel} signature`, { status: 401 })
+    }
+
+    return null
+  }
+}
+
+/**
+ * Verify a bearer token or custom header token using timing-safe comparison.
+ * Used by generic webhooks, Google Forms, and the default handler.
+ */
+export function verifyTokenAuth(
+  request: Request,
+  expectedToken: string,
+  secretHeaderName?: string
+): boolean {
+  if (secretHeaderName) {
+    const headerValue = request.headers.get(secretHeaderName.toLowerCase())
+    return !!headerValue && safeCompare(headerValue, expectedToken)
+  }
+
+  const authHeader = request.headers.get('authorization')
+  if (authHeader?.toLowerCase().startsWith('bearer ')) {
+    const token = authHeader.substring(7)
+    return safeCompare(token, expectedToken)
+  }
+
+  return false
+}
+
+/**
+ * Skip events whose `body.type` is not in the `providerConfig.eventTypes` allowlist.
+ * Shared by providers that use a simple event-type filter (Stripe, Grain, etc.).
+ */
+export function skipByEventTypes(
+  { webhook, body, requestId, providerConfig }: EventFilterContext,
+  providerLabel: string,
+  eventLogger: Logger
+): boolean {
+  const eventTypes = providerConfig.eventTypes
+  if (!eventTypes || !Array.isArray(eventTypes) || eventTypes.length === 0) {
+    return false
+  }
+
+  const eventType = (body as Record<string, unknown>)?.type as string | undefined
+  if (eventType && !eventTypes.includes(eventType)) {
+    eventLogger.info(
+      `[${requestId}] ${providerLabel} event type '${eventType}' not in allowed list for webhook ${webhook.id as string}, skipping`
+    )
+    return true
+  }
+
+  return false
+}
diff --git a/apps/sim/lib/webhooks/providers/vercel.test.ts b/apps/sim/lib/webhooks/providers/vercel.test.ts
new file mode 100644
index 00000000000..0792b26c45e
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/vercel.test.ts
@@ -0,0 +1,74 @@
+/**
+ * @vitest-environment node
+ */
+import crypto from 'crypto'
+import { createMockRequest } from '@sim/testing'
+import { describe, expect, it, vi } from 'vitest'
+import { vercelHandler } from '@/lib/webhooks/providers/vercel'
+
+vi.mock('@sim/logger', () => ({
+  createLogger: vi.fn().mockReturnValue({
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+  }),
+}))
+
+describe('vercelHandler', () => {
+  describe('verifyAuth', () => {
+    const secret = 'test-signing-secret'
+    const rawBody = JSON.stringify({ type: 'deployment.created', id: 'del_1' })
+    const signature = crypto.createHmac('sha1', secret).update(rawBody, 'utf8').digest('hex')
+
+    it('returns 401 when webhookSecret is missing', async () => {
+      const request = createMockRequest('POST', JSON.parse(rawBody), {
+        'x-vercel-signature': signature,
+      })
+      const res = await vercelHandler.verifyAuth!({
+        request: request as any,
+        rawBody,
+        requestId: 'r1',
+        providerConfig: {},
+        webhook: {},
+        workflow: {},
+      })
+      expect(res?.status).toBe(401)
+    })
+
+    it('returns 401 when signature header is missing', async () => {
+      const request = createMockRequest('POST', JSON.parse(rawBody), {})
+      const res = await vercelHandler.verifyAuth!({
+        request: request as any,
+        rawBody,
+        requestId: 'r1',
+        providerConfig: { webhookSecret: secret },
+        webhook: {},
+        workflow: {},
+      })
+      expect(res?.status).toBe(401)
+    })
+
+    it('returns null when signature is valid', async () => {
+      const request = createMockRequest('POST', JSON.parse(rawBody), {
+        'x-vercel-signature': signature,
+      })
+      const res = await vercelHandler.verifyAuth!({
+        request: request as any,
+        rawBody,
+        requestId: 'r1',
+        providerConfig: { webhookSecret: secret },
+        webhook: {},
+        workflow: {},
+      })
+      expect(res).toBeNull()
+    })
+  })
+
+  describe('extractIdempotencyId', () => {
+    it('uses top-level delivery id from Vercel payload', () => {
+      expect(vercelHandler.extractIdempotencyId!({ id: 'abc123' })).toBe('vercel:abc123')
+      expect(vercelHandler.extractIdempotencyId!({})).toBeNull()
+    })
+  })
+})
diff --git a/apps/sim/lib/webhooks/providers/vercel.ts b/apps/sim/lib/webhooks/providers/vercel.ts
new file mode 100644
index 00000000000..218afb3d6fd
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/vercel.ts
@@ -0,0 +1,359 @@
+import crypto from 'crypto'
+import { createLogger } from '@sim/logger'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  AuthContext,
+  DeleteSubscriptionContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Vercel')
+
+function verifyVercelSignature(secret: string, signature: string, rawBody: string): boolean {
+  const hash = crypto.createHmac('sha1', secret).update(rawBody, 'utf8').digest('hex')
+  return safeCompare(hash, signature)
+}
+
+export const vercelHandler: WebhookProviderHandler = {
+  verifyAuth({ request, rawBody, requestId, providerConfig }: AuthContext): NextResponse | null {
+    const secret = (providerConfig.webhookSecret as string | undefined)?.trim()
+    if (!secret) {
+      logger.warn(`[${requestId}] Vercel webhook secret missing; rejecting delivery`)
+      return new NextResponse(
+        'Unauthorized - Vercel webhook signing secret is not configured. Re-save the trigger so a webhook can be registered.',
+        { status: 401 }
+      )
+    }
+
+    const signature = request.headers.get('x-vercel-signature')
+    if (!signature) {
+      logger.warn(`[${requestId}] Vercel webhook missing x-vercel-signature header`)
+      return new NextResponse('Unauthorized - Missing Vercel signature', { status: 401 })
+    }
+
+    if (!verifyVercelSignature(secret, signature, rawBody)) {
+      logger.warn(`[${requestId}] Vercel signature verification failed`)
+      return new NextResponse('Unauthorized - Invalid Vercel signature', { status: 401 })
+    }
+
+    return null
+  },
+
+  async matchEvent({ webhook, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+    const eventType = obj.type as string | undefined
+
+    if (triggerId && triggerId !== 'vercel_webhook') {
+      const { isVercelEventMatch } = await import('@/triggers/vercel/utils')
+      if (!isVercelEventMatch(triggerId, eventType)) {
+        logger.debug(`[${requestId}] Vercel event mismatch for trigger ${triggerId}. Skipping.`, {
+          webhookId: webhook.id,
+          workflowId: workflow.id,
+          triggerId,
+          eventType,
+        })
+        return false
+      }
+    }
+
+    return true
+  },
+
+  extractIdempotencyId(body: unknown) {
+    const id = (body as Record<string, unknown>)?.id
+    if (id === undefined || id === null || id === '') {
+      return null
+    }
+    return `vercel:${String(id)}`
+  },
+
+  async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    const { webhook, requestId } = ctx
+    try {
+      const providerConfig = getProviderConfig(webhook)
+      const apiKey = providerConfig.apiKey as string | undefined
+      const triggerId = providerConfig.triggerId as string | undefined
+      const teamId = providerConfig.teamId as string | undefined
+      const filterProjectIds = providerConfig.filterProjectIds as string | undefined
+
+      if (!apiKey) {
+        throw new Error(
+          'Vercel Access Token is required. Please provide your access token in the trigger configuration.'
+        )
+      }
+
+      const { VERCEL_GENERIC_TRIGGER_EVENT_TYPES, VERCEL_TRIGGER_EVENT_TYPES } = await import(
+        '@/triggers/vercel/utils'
+      )
+
+      if (
+        triggerId &&
+        triggerId !== 'vercel_webhook' &&
+        !(triggerId in VERCEL_TRIGGER_EVENT_TYPES)
+      ) {
+        throw new Error(
+          `Unknown Vercel trigger "${triggerId}". Remove and re-add the Vercel trigger, then save again.`
+        )
+      }
+
+      const events =
+        triggerId && triggerId !== 'vercel_webhook'
+          ? [VERCEL_TRIGGER_EVENT_TYPES[triggerId]]
+          : undefined
+      const notificationUrl = getNotificationUrl(webhook)
+
+      logger.info(`[${requestId}] Creating Vercel webhook`, {
+        triggerId,
+        events,
+        hasTeamId: !!teamId,
+        hasProjectIds: !!filterProjectIds,
+        webhookId: webhook.id,
+      })
+
+      /**
+       * Vercel requires an explicit events list — there is no "subscribe to all" option.
+       * For the generic webhook trigger, we subscribe to the most commonly useful events.
+       * Full list: https://vercel.com/docs/webhooks/webhooks-api#event-types
+       */
+      const requestBody: Record<string, unknown> = {
+        url: notificationUrl,
+        events: events || [...VERCEL_GENERIC_TRIGGER_EVENT_TYPES],
+      }
+
+      if (filterProjectIds) {
+        const projectIds = String(filterProjectIds)
+          .split(',')
+          .map((id: string) => id.trim())
+          .filter(Boolean)
+        if (projectIds.length > 0) {
+          requestBody.projectIds = projectIds
+        }
+      }
+
+      const apiUrl = teamId
+        ? `https://api.vercel.com/v1/webhooks?teamId=${encodeURIComponent(teamId)}`
+        : 'https://api.vercel.com/v1/webhooks'
+
+      const vercelResponse = await fetch(apiUrl, {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      const responseBody = (await vercelResponse.json().catch(() => ({}))) as Record<
+        string,
+        unknown
+      >
+
+      if (!vercelResponse.ok) {
+        const errorObj = responseBody.error as Record<string, unknown> | undefined
+        const errorMessage =
+          (errorObj?.message as string) ||
+          (responseBody.message as string) ||
+          'Unknown Vercel API error'
+
+        let userFriendlyMessage = 'Failed to create webhook subscription in Vercel'
+        if (vercelResponse.status === 401 || vercelResponse.status === 403) {
+          userFriendlyMessage =
+            'Invalid or insufficient Vercel Access Token. Please verify your token has the correct permissions.'
+        } else if (errorMessage && errorMessage !== 'Unknown Vercel API error') {
+          userFriendlyMessage = `Vercel error: ${errorMessage}`
+        }
+
+        throw new Error(userFriendlyMessage)
+      }
+
+      const externalId = responseBody.id as string | undefined
+      if (!externalId) {
+        throw new Error('Vercel webhook creation succeeded but no webhook ID was returned')
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created webhook in Vercel for webhook ${webhook.id}.`,
+        { vercelWebhookId: externalId }
+      )
+
+      const signingSecret = responseBody.secret as string | undefined
+      if (!signingSecret) {
+        throw new Error(
+          'Vercel webhook was created but no signing secret was returned. Delete the webhook in Vercel and save this trigger again.'
+        )
+      }
+
+      return {
+        providerConfigUpdates: {
+          externalId,
+          webhookSecret: signingSecret,
+        },
+      }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${requestId}] Exception during Vercel webhook creation for webhook ${webhook.id}.`,
+        { message: err.message, stack: err.stack }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription(ctx: DeleteSubscriptionContext): Promise<void> {
+    const { webhook, requestId } = ctx
+    try {
+      const config = getProviderConfig(webhook)
+      const apiKey = config.apiKey as string | undefined
+      const externalId = config.externalId as string | undefined
+      const teamId = config.teamId as string | undefined
+
+      if (!apiKey || !externalId) {
+        logger.warn(
+          `[${requestId}] Missing apiKey or externalId for Vercel webhook deletion ${webhook.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const apiUrl = teamId
+        ? `https://api.vercel.com/v1/webhooks/${encodeURIComponent(externalId)}?teamId=${encodeURIComponent(teamId)}`
+        : `https://api.vercel.com/v1/webhooks/${encodeURIComponent(externalId)}`
+
+      const response = await fetch(apiUrl, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${apiKey}`,
+        },
+      })
+
+      if (!response.ok && response.status !== 404) {
+        logger.warn(
+          `[${requestId}] Failed to delete Vercel webhook (non-fatal): ${response.status}`
+        )
+      } else {
+        await response.body?.cancel()
+        logger.info(`[${requestId}] Successfully deleted Vercel webhook ${externalId}`)
+      }
+    } catch (error) {
+      logger.warn(`[${requestId}] Error deleting Vercel webhook (non-fatal)`, error)
+    }
+  },
+
+  async formatInput(ctx: FormatInputContext): Promise<FormatInputResult> {
+    const body = ctx.body as Record<string, unknown>
+    const payload = (body.payload || {}) as Record<string, unknown>
+
+    const deployment = payload.deployment ?? null
+    const project = payload.project ?? null
+    const team = payload.team ?? null
+    const user = payload.user ?? null
+    const domain = payload.domain ?? null
+
+    const linksRaw = payload.links
+    let links: { deployment: string; project: string } | null = null
+    if (linksRaw && typeof linksRaw === 'object' && !Array.isArray(linksRaw)) {
+      const L = linksRaw as Record<string, unknown>
+      const dep = L.deployment
+      const proj = L.project
+      if (typeof dep === 'string' || typeof proj === 'string') {
+        links = {
+          deployment: typeof dep === 'string' ? dep : '',
+          project: typeof proj === 'string' ? proj : '',
+        }
+      }
+    }
+
+    const regionsRaw = payload.regions
+    const regions = Array.isArray(regionsRaw) ? regionsRaw : null
+
+    let deploymentMeta: Record<string, unknown> | null = null
+    if (deployment && typeof deployment === 'object') {
+      const meta = (deployment as Record<string, unknown>).meta
+      if (meta && typeof meta === 'object' && !Array.isArray(meta)) {
+        deploymentMeta = meta as Record<string, unknown>
+      }
+    }
+
+    return {
+      input: {
+        type: body.type ?? '',
+        id: body.id != null ? String(body.id) : '',
+        createdAt: (() => {
+          const v = body.createdAt
+          if (typeof v === 'number' && !Number.isNaN(v)) {
+            return v
+          }
+          if (typeof v === 'string') {
+            const parsed = Date.parse(v)
+            return Number.isNaN(parsed) ? 0 : parsed
+          }
+          const n = Number(v)
+          return Number.isNaN(n) ? 0 : n
+        })(),
+        region: body.region != null ? String(body.region) : null,
+        payload,
+        links,
+        regions,
+        deployment:
+          deployment && typeof deployment === 'object'
+            ? {
+                id:
+                  (deployment as Record<string, unknown>).id != null
+                    ? String((deployment as Record<string, unknown>).id)
+                    : '',
+                url: ((deployment as Record<string, unknown>).url as string) ?? '',
+                name: ((deployment as Record<string, unknown>).name as string) ?? '',
+                meta: deploymentMeta,
+              }
+            : null,
+        project:
+          project && typeof project === 'object'
+            ? {
+                id:
+                  (project as Record<string, unknown>).id != null
+                    ? String((project as Record<string, unknown>).id)
+                    : '',
+                name: ((project as Record<string, unknown>).name as string) ?? '',
+              }
+            : null,
+        team:
+          team && typeof team === 'object'
+            ? {
+                id:
+                  (team as Record<string, unknown>).id != null
+                    ? String((team as Record<string, unknown>).id)
+                    : '',
+              }
+            : null,
+        user:
+          user && typeof user === 'object'
+            ? {
+                id:
+                  (user as Record<string, unknown>).id != null
+                    ? String((user as Record<string, unknown>).id)
+                    : '',
+              }
+            : null,
+        target: payload.target != null ? String(payload.target) : null,
+        plan: payload.plan != null ? String(payload.plan) : null,
+        domain:
+          domain && typeof domain === 'object'
+            ? {
+                name: ((domain as Record<string, unknown>).name as string) ?? '',
+                delegated:
+                  typeof (domain as Record<string, unknown>).delegated === 'boolean'
+                    ? ((domain as Record<string, unknown>).delegated as boolean)
+                    : null,
+              }
+            : null,
+      },
+    }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/webflow.ts b/apps/sim/lib/webhooks/providers/webflow.ts
new file mode 100644
index 00000000000..9399bcd54e3
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/webflow.ts
@@ -0,0 +1,307 @@
+import { createLogger } from '@sim/logger'
+import { validateAlphanumericId } from '@/lib/core/security/input-validation'
+import { getBaseUrl } from '@/lib/core/utils/urls'
+import { getCredentialOwner, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
+import type {
+  DeleteSubscriptionContext,
+  EventFilterContext,
+  FormatInputContext,
+  FormatInputResult,
+  SubscriptionContext,
+  SubscriptionResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+import { getOAuthToken, refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
+
+const logger = createLogger('WebhookProvider:Webflow')
+
+export const webflowHandler: WebhookProviderHandler = {
+  async createSubscription({
+    webhook: webhookRecord,
+    workflow,
+    userId,
+    requestId,
+  }: SubscriptionContext): Promise<SubscriptionResult | undefined> {
+    try {
+      const { path, providerConfig } = webhookRecord as Record<string, unknown>
+      const config = (providerConfig as Record<string, unknown>) || {}
+      const { siteId, triggerId, collectionId, formName, credentialId } = config as {
+        siteId?: string
+        triggerId?: string
+        collectionId?: string
+        formName?: string
+        credentialId?: string
+      }
+
+      if (!siteId) {
+        logger.warn(`[${requestId}] Missing siteId for Webflow webhook creation.`, {
+          webhookId: webhookRecord.id,
+        })
+        throw new Error('Site ID is required to create Webflow webhook')
+      }
+
+      const siteIdValidation = validateAlphanumericId(siteId, 'siteId', 100)
+      if (!siteIdValidation.isValid) {
+        throw new Error(siteIdValidation.error)
+      }
+
+      if (!triggerId) {
+        logger.warn(`[${requestId}] Missing triggerId for Webflow webhook creation.`, {
+          webhookId: webhookRecord.id,
+        })
+        throw new Error('Trigger type is required to create Webflow webhook')
+      }
+
+      const credentialOwner = credentialId
+        ? await getCredentialOwner(credentialId, requestId)
+        : null
+      const accessToken = credentialId
+        ? credentialOwner
+          ? await refreshAccessTokenIfNeeded(
+              credentialOwner.accountId,
+              credentialOwner.userId,
+              requestId
+            )
+          : null
+        : await getOAuthToken(userId, 'webflow')
+      if (!accessToken) {
+        logger.warn(
+          `[${requestId}] Could not retrieve Webflow access token for user ${userId}. Cannot create webhook in Webflow.`
+        )
+        throw new Error(
+          'Webflow account connection required. Please connect your Webflow account in the trigger configuration and try again.'
+        )
+      }
+
+      const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
+
+      const triggerTypeMap: Record<string, string> = {
+        webflow_collection_item_created: 'collection_item_created',
+        webflow_collection_item_changed: 'collection_item_changed',
+        webflow_collection_item_deleted: 'collection_item_deleted',
+        webflow_form_submission: 'form_submission',
+      }
+
+      const webflowTriggerType = triggerTypeMap[triggerId]
+      if (!webflowTriggerType) {
+        logger.warn(`[${requestId}] Invalid triggerId for Webflow: ${triggerId}`, {
+          webhookId: webhookRecord.id,
+        })
+        throw new Error(`Invalid Webflow trigger type: ${triggerId}`)
+      }
+
+      const webflowApiUrl = `https://api.webflow.com/v2/sites/${siteId}/webhooks`
+
+      const requestBody: Record<string, unknown> = {
+        triggerType: webflowTriggerType,
+        url: notificationUrl,
+      }
+
+      if (formName && webflowTriggerType === 'form_submission') {
+        requestBody.filter = {
+          name: formName,
+        }
+      }
+
+      const webflowResponse = await fetch(webflowApiUrl, {
+        method: 'POST',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          'Content-Type': 'application/json',
+          accept: 'application/json',
+        },
+        body: JSON.stringify(requestBody),
+      })
+
+      const responseBody = await webflowResponse.json()
+
+      if (!webflowResponse.ok || responseBody.error) {
+        const errorMessage =
+          responseBody.message || responseBody.error || 'Unknown Webflow API error'
+        logger.error(
+          `[${requestId}] Failed to create webhook in Webflow for webhook ${webhookRecord.id}. Status: ${webflowResponse.status}`,
+          { message: errorMessage, response: responseBody }
+        )
+        throw new Error(errorMessage)
+      }
+
+      logger.info(
+        `[${requestId}] Successfully created webhook in Webflow for webhook ${webhookRecord.id}.`,
+        {
+          webflowWebhookId: responseBody.id || responseBody._id,
+        }
+      )
+
+      return { providerConfigUpdates: { externalId: responseBody.id || responseBody._id } }
+    } catch (error: unknown) {
+      const err = error as Error
+      logger.error(
+        `[${requestId}] Exception during Webflow webhook creation for webhook ${webhookRecord.id}.`,
+        {
+          message: err.message,
+          stack: err.stack,
+        }
+      )
+      throw error
+    }
+  },
+
+  async deleteSubscription({
+    webhook: webhookRecord,
+    workflow,
+    requestId,
+  }: DeleteSubscriptionContext): Promise<void> {
+    try {
+      const config = getProviderConfig(webhookRecord)
+      const siteId = config.siteId as string | undefined
+      const externalId = config.externalId as string | undefined
+
+      if (!siteId) {
+        logger.warn(
+          `[${requestId}] Missing siteId for Webflow webhook deletion ${webhookRecord.id}, skipping cleanup`
+        )
+        return
+      }
+
+      if (!externalId) {
+        logger.warn(
+          `[${requestId}] Missing externalId for Webflow webhook deletion ${webhookRecord.id}, skipping cleanup`
+        )
+        return
+      }
+
+      const siteIdValidation = validateAlphanumericId(siteId, 'siteId', 100)
+      if (!siteIdValidation.isValid) {
+        logger.warn(`[${requestId}] Invalid Webflow site ID format, skipping deletion`, {
+          webhookId: webhookRecord.id,
+          siteId: siteId.substring(0, 30),
+        })
+        return
+      }
+
+      const webhookIdValidation = validateAlphanumericId(externalId, 'webhookId', 100)
+      if (!webhookIdValidation.isValid) {
+        logger.warn(`[${requestId}] Invalid Webflow webhook ID format, skipping deletion`, {
+          webhookId: webhookRecord.id,
+          externalId: externalId.substring(0, 30),
+        })
+        return
+      }
+
+      const credentialId = config.credentialId as string | undefined
+      if (!credentialId) {
+        logger.warn(
+          `[${requestId}] Missing credentialId for Webflow webhook deletion ${webhookRecord.id}`
+        )
+        return
+      }
+
+      const credentialOwner = await getCredentialOwner(credentialId, requestId)
+      const accessToken = credentialOwner
+        ? await refreshAccessTokenIfNeeded(
+            credentialOwner.accountId,
+            credentialOwner.userId,
+            requestId
+          )
+        : null
+      if (!accessToken) {
+        logger.warn(
+          `[${requestId}] Could not retrieve Webflow access token. Cannot delete webhook.`,
+          { webhookId: webhookRecord.id }
+        )
+        return
+      }
+
+      const webflowApiUrl = `https://api.webflow.com/v2/sites/${siteId}/webhooks/${externalId}`
+
+      const webflowResponse = await fetch(webflowApiUrl, {
+        method: 'DELETE',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          accept: 'application/json',
+        },
+      })
+
+      if (!webflowResponse.ok && webflowResponse.status !== 404) {
+        const responseBody = await webflowResponse.json().catch(() => ({}))
+        logger.warn(
+          `[${requestId}] Failed to delete Webflow webhook (non-fatal): ${webflowResponse.status}`,
+          { response: responseBody }
+        )
+      } else {
+        logger.info(`[${requestId}] Successfully deleted Webflow webhook ${externalId}`)
+      }
+    } catch (error) {
+      logger.warn(`[${requestId}] Error deleting Webflow webhook (non-fatal)`, error)
+    }
+  },
+
+  async formatInput({ body, webhook }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const providerConfig = (webhook.providerConfig as Record<string, unknown>) || {}
+    const triggerId = providerConfig.triggerId as string | undefined
+    if (triggerId === 'webflow_form_submission') {
+      return {
+        input: {
+          siteId: b?.siteId || '',
+          formId: b?.formId || '',
+          name: b?.name || '',
+          id: b?.id || '',
+          submittedAt: b?.submittedAt || '',
+          data: b?.data || {},
+          schema: b?.schema || {},
+          formElementId: b?.formElementId || '',
+        },
+      }
+    }
+    const { _cid, _id, ...itemFields } = b || ({} as Record<string, unknown>)
+    return {
+      input: {
+        siteId: b?.siteId || '',
+        collectionId: (_cid || b?.collectionId || '') as string,
+        payload: {
+          id: (_id || '') as string,
+          cmsLocaleId: (itemFields as Record<string, unknown>)?.cmsLocaleId || '',
+          lastPublished:
+            (itemFields as Record<string, unknown>)?.lastPublished ||
+            (itemFields as Record<string, unknown>)?.['last-published'] ||
+            '',
+          lastUpdated:
+            (itemFields as Record<string, unknown>)?.lastUpdated ||
+            (itemFields as Record<string, unknown>)?.['last-updated'] ||
+            '',
+          createdOn:
+            (itemFields as Record<string, unknown>)?.createdOn ||
+            (itemFields as Record<string, unknown>)?.['created-on'] ||
+            '',
+          isArchived:
+            (itemFields as Record<string, unknown>)?.isArchived ||
+            (itemFields as Record<string, unknown>)?._archived ||
+            false,
+          isDraft:
+            (itemFields as Record<string, unknown>)?.isDraft ||
+            (itemFields as Record<string, unknown>)?._draft ||
+            false,
+          fieldData: itemFields,
+        },
+      },
+    }
+  },
+
+  shouldSkipEvent({ webhook, body, requestId, providerConfig }: EventFilterContext) {
+    const configuredCollectionId = providerConfig.collectionId as string | undefined
+    if (configuredCollectionId) {
+      const obj = body as Record<string, unknown>
+      const payload = obj.payload as Record<string, unknown> | undefined
+      const payloadCollectionId = (payload?.collectionId ?? obj.collectionId) as string | undefined
+
+      if (payloadCollectionId && payloadCollectionId !== configuredCollectionId) {
+        logger.info(
+          `[${requestId}] Webflow collection '${payloadCollectionId}' doesn't match configured collection '${configuredCollectionId}' for webhook ${webhook.id as string}, skipping`
+        )
+        return true
+      }
+    }
+    return false
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/whatsapp.ts b/apps/sim/lib/webhooks/providers/whatsapp.ts
new file mode 100644
index 00000000000..5f0116b2a1b
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/whatsapp.ts
@@ -0,0 +1,118 @@
+import { db, workflowDeploymentVersion } from '@sim/db'
+import { webhook } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { and, eq, isNull, or } from 'drizzle-orm'
+import { type NextRequest, NextResponse } from 'next/server'
+import type {
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:WhatsApp')
+
+/**
+ * Handle WhatsApp verification requests
+ */
+export async function handleWhatsAppVerification(
+  requestId: string,
+  path: string,
+  mode: string | null,
+  token: string | null,
+  challenge: string | null
+): Promise<NextResponse | null> {
+  if (mode && token && challenge) {
+    logger.info(`[${requestId}] WhatsApp verification request received for path: ${path}`)
+
+    if (mode !== 'subscribe') {
+      logger.warn(`[${requestId}] Invalid WhatsApp verification mode: ${mode}`)
+      return new NextResponse('Invalid mode', { status: 400 })
+    }
+
+    const webhooks = await db
+      .select({ webhook })
+      .from(webhook)
+      .leftJoin(
+        workflowDeploymentVersion,
+        and(
+          eq(workflowDeploymentVersion.workflowId, webhook.workflowId),
+          eq(workflowDeploymentVersion.isActive, true)
+        )
+      )
+      .where(
+        and(
+          eq(webhook.provider, 'whatsapp'),
+          eq(webhook.isActive, true),
+          or(
+            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
+            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
+          )
+        )
+      )
+
+    for (const row of webhooks) {
+      const wh = row.webhook
+      const providerConfig = (wh.providerConfig as Record<string, unknown>) || {}
+      const verificationToken = providerConfig.verificationToken
+
+      if (!verificationToken) {
+        continue
+      }
+
+      if (token === verificationToken) {
+        logger.info(`[${requestId}] WhatsApp verification successful for webhook ${wh.id}`)
+        return new NextResponse(challenge, {
+          status: 200,
+          headers: {
+            'Content-Type': 'text/plain',
+          },
+        })
+      }
+    }
+
+    logger.warn(`[${requestId}] No matching WhatsApp verification token found`)
+    return new NextResponse('Verification failed', { status: 403 })
+  }
+
+  return null
+}
+
+export const whatsappHandler: WebhookProviderHandler = {
+  async handleChallenge(_body: unknown, request: NextRequest, requestId: string, path: string) {
+    const url = new URL(request.url)
+    const mode = url.searchParams.get('hub.mode')
+    const token = url.searchParams.get('hub.verify_token')
+    const challenge = url.searchParams.get('hub.challenge')
+    return handleWhatsAppVerification(requestId, path, mode, token, challenge)
+  },
+
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    const b = body as Record<string, unknown>
+    const entry = b?.entry as Array<Record<string, unknown>> | undefined
+    const changes = entry?.[0]?.changes as Array<Record<string, unknown>> | undefined
+    const data = changes?.[0]?.value as Record<string, unknown> | undefined
+    const messages = (data?.messages as Array<Record<string, unknown>>) || []
+
+    if (messages.length > 0) {
+      const message = messages[0]
+      const metadata = data?.metadata as Record<string, unknown> | undefined
+      const text = message.text as Record<string, unknown> | undefined
+      return {
+        input: {
+          messageId: message.id,
+          from: message.from,
+          phoneNumberId: metadata?.phone_number_id,
+          text: text?.body,
+          timestamp: message.timestamp,
+          raw: JSON.stringify(message),
+        },
+      }
+    }
+    return { input: null }
+  },
+
+  handleEmptyInput(requestId: string) {
+    logger.info(`[${requestId}] No messages in WhatsApp payload, skipping execution`)
+    return { message: 'No messages in WhatsApp payload' }
+  },
+}
diff --git a/apps/sim/lib/webhooks/providers/zoom.test.ts b/apps/sim/lib/webhooks/providers/zoom.test.ts
new file mode 100644
index 00000000000..57751e49cba
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/zoom.test.ts
@@ -0,0 +1,61 @@
+import crypto from 'node:crypto'
+import { NextRequest } from 'next/server'
+import { describe, expect, it } from 'vitest'
+import { validateZoomSignature, zoomHandler } from '@/lib/webhooks/providers/zoom'
+import { isZoomEventMatch } from '@/triggers/zoom/utils'
+
+function reqWithHeaders(headers: Record<string, string>): NextRequest {
+  return new NextRequest('http://localhost/test', { headers })
+}
+
+describe('Zoom webhook provider', () => {
+  it('isZoomEventMatch rejects empty event for specialized triggers', () => {
+    expect(isZoomEventMatch('zoom_meeting_started', '')).toBe(false)
+    expect(isZoomEventMatch('zoom_meeting_started', '   ')).toBe(false)
+    expect(isZoomEventMatch('zoom_meeting_started', 'meeting.started')).toBe(true)
+    expect(isZoomEventMatch('zoom_webhook', '')).toBe(true)
+  })
+
+  it('validateZoomSignature uses raw body bytes, not a re-serialized variant', () => {
+    const secret = 'test-secret'
+    const timestamp = String(Math.floor(Date.now() / 1000))
+    const rawA = '{"a":1,"b":2}'
+    const rawB = '{"b":2,"a":1}'
+    const computed = crypto.createHmac('sha256', secret).update(`v0:${timestamp}:${rawA}`)
+    const hashA = `v0=${computed.digest('hex')}`
+    expect(validateZoomSignature(secret, hashA, timestamp, rawA)).toBe(true)
+    expect(validateZoomSignature(secret, hashA, timestamp, rawB)).toBe(false)
+  })
+
+  it('does not implement extractIdempotencyId (x-zm-request-id handled at service level)', () => {
+    expect(zoomHandler.extractIdempotencyId).toBeUndefined()
+  })
+
+  it('formatInput passes through the Zoom webhook envelope', async () => {
+    const body = {
+      event: 'meeting.started',
+      event_ts: 1700000000000,
+      payload: { account_id: 'acct', object: { id: 1 } },
+    }
+    const { input } = await zoomHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'wf', userId: 'u' },
+      body,
+      headers: {},
+      requestId: 'zoom-format',
+    })
+    expect(input).toBe(body)
+  })
+
+  it('matchEvent never executes endpoint validation payloads', async () => {
+    const result = await zoomHandler.matchEvent!({
+      webhook: { id: 'w' },
+      workflow: { id: 'wf' },
+      body: { event: 'endpoint.url_validation' },
+      request: reqWithHeaders({}),
+      requestId: 't5',
+      providerConfig: { triggerId: 'zoom_webhook' },
+    })
+    expect(result).toBe(false)
+  })
+})
diff --git a/apps/sim/lib/webhooks/providers/zoom.ts b/apps/sim/lib/webhooks/providers/zoom.ts
new file mode 100644
index 00000000000..ac687f14cbf
--- /dev/null
+++ b/apps/sim/lib/webhooks/providers/zoom.ts
@@ -0,0 +1,225 @@
+import crypto from 'crypto'
+import { db, webhook, workflow } from '@sim/db'
+import { createLogger } from '@sim/logger'
+import { and, eq } from 'drizzle-orm'
+import type { NextRequest } from 'next/server'
+import { NextResponse } from 'next/server'
+import { safeCompare } from '@/lib/core/security/encryption'
+import { resolveEnvVarsInObject } from '@/lib/webhooks/env-resolver'
+import type {
+  AuthContext,
+  EventMatchContext,
+  FormatInputContext,
+  FormatInputResult,
+  WebhookProviderHandler,
+} from '@/lib/webhooks/providers/types'
+
+const logger = createLogger('WebhookProvider:Zoom')
+
+/**
+ * Validate Zoom webhook signature using HMAC-SHA256.
+ * Zoom sends `x-zm-signature` as `v0=<hex>` and `x-zm-request-timestamp`.
+ * The message to hash is `v0:{timestamp}:{rawBody}`.
+ */
+/** Exported for tests — Zoom signs `v0:{timestamp}:{rawBody}`. */
+export function validateZoomSignature(
+  secretToken: string,
+  signature: string,
+  timestamp: string,
+  body: string
+): boolean {
+  try {
+    if (!secretToken || !signature || !timestamp || !body) {
+      return false
+    }
+
+    const nowSeconds = Math.floor(Date.now() / 1000)
+    const requestSeconds = Number.parseInt(timestamp, 10)
+    if (Number.isNaN(requestSeconds) || Math.abs(nowSeconds - requestSeconds) > 300) {
+      return false
+    }
+
+    const message = `v0:${timestamp}:${body}`
+    const computedHash = crypto.createHmac('sha256', secretToken).update(message).digest('hex')
+    const expectedSignature = `v0=${computedHash}`
+
+    return safeCompare(expectedSignature, signature)
+  } catch (err) {
+    logger.error('Zoom signature validation error', err)
+    return false
+  }
+}
+
+async function resolveZoomChallengeSecrets(
+  path: string,
+  requestId: string
+): Promise<Array<{ secretToken: string }>> {
+  const rows = await db
+    .select({
+      providerConfig: webhook.providerConfig,
+      userId: workflow.userId,
+      workspaceId: workflow.workspaceId,
+    })
+    .from(webhook)
+    .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
+    .where(and(eq(webhook.path, path), eq(webhook.provider, 'zoom'), eq(webhook.isActive, true)))
+
+  const resolvedRows = await Promise.all(
+    rows.map(async (row) => {
+      const rawConfig =
+        row.providerConfig &&
+        typeof row.providerConfig === 'object' &&
+        !Array.isArray(row.providerConfig)
+          ? (row.providerConfig as Record<string, unknown>)
+          : {}
+
+      try {
+        const config = await resolveEnvVarsInObject(
+          rawConfig,
+          row.userId,
+          row.workspaceId ?? undefined
+        )
+        const secretToken = typeof config.secretToken === 'string' ? config.secretToken : ''
+        return { secretToken }
+      } catch (error) {
+        logger.warn(`[${requestId}] Failed to resolve Zoom webhook secret for challenge`, {
+          error: error instanceof Error ? error.message : String(error),
+          path,
+        })
+        return { secretToken: '' }
+      }
+    })
+  )
+
+  return resolvedRows.filter((row) => row.secretToken)
+}
+
+export const zoomHandler: WebhookProviderHandler = {
+  /**
+   * Zoom delivers the standard app webhook envelope (`event`, `event_ts`, `payload`).
+   * Pass through unchanged so trigger outputs match runtime input.
+   */
+  async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
+    return { input: body }
+  },
+
+  verifyAuth({ request, rawBody, requestId, providerConfig }: AuthContext) {
+    const secretToken = providerConfig.secretToken as string | undefined
+    if (!secretToken) {
+      logger.warn(
+        `[${requestId}] Zoom webhook missing secretToken in providerConfig — rejecting request`
+      )
+      return new NextResponse('Unauthorized - Zoom secret token not configured', { status: 401 })
+    }
+
+    const signature = request.headers.get('x-zm-signature')
+    const timestamp = request.headers.get('x-zm-request-timestamp')
+
+    if (!signature || !timestamp) {
+      logger.warn(`[${requestId}] Zoom webhook missing signature or timestamp header`)
+      return new NextResponse('Unauthorized - Missing Zoom signature', { status: 401 })
+    }
+
+    if (!validateZoomSignature(secretToken, signature, timestamp, rawBody)) {
+      logger.warn(`[${requestId}] Zoom webhook signature verification failed`)
+      return new NextResponse('Unauthorized - Invalid Zoom signature', { status: 401 })
+    }
+
+    return null
+  },
+
+  async matchEvent({ webhook: wh, workflow, body, requestId, providerConfig }: EventMatchContext) {
+    const triggerId = providerConfig.triggerId as string | undefined
+    const obj = body as Record<string, unknown>
+    const event = typeof obj.event === 'string' ? obj.event : ''
+
+    if (event === 'endpoint.url_validation') {
+      return false
+    }
+
+    if (triggerId) {
+      const { isZoomEventMatch } = await import('@/triggers/zoom/utils')
+      if (!isZoomEventMatch(triggerId, event)) {
+        logger.debug(
+          `[${requestId}] Zoom event mismatch for trigger ${triggerId}. Event: ${event}. Skipping execution.`,
+          {
+            webhookId: wh.id,
+            workflowId: workflow.id,
+            triggerId,
+            receivedEvent: event,
+          }
+        )
+        return false
+      }
+    }
+
+    return true
+  },
+
+  /**
+   * Handle Zoom endpoint URL validation challenges.
+   * Zoom sends an `endpoint.url_validation` event with a `plainToken` that must
+   * be hashed with the app's secret token and returned alongside the original token.
+   */
+  async handleChallenge(
+    body: unknown,
+    request: NextRequest,
+    requestId: string,
+    path: string,
+    rawBody?: string
+  ) {
+    const obj = body as Record<string, unknown> | null
+    if (obj?.event !== 'endpoint.url_validation') {
+      return null
+    }
+
+    const payload = obj.payload as Record<string, unknown> | undefined
+    const plainToken = payload?.plainToken as string | undefined
+    if (!plainToken) {
+      return null
+    }
+
+    logger.info(`[${requestId}] Zoom URL validation request received for path: ${path}`)
+
+    const signature = request.headers.get('x-zm-signature')
+    const timestamp = request.headers.get('x-zm-request-timestamp')
+    if (!signature || !timestamp) {
+      logger.warn(`[${requestId}] Zoom challenge request missing signature headers — rejecting`)
+      return null
+    }
+
+    const bodyForSignature =
+      rawBody !== undefined && rawBody !== null ? rawBody : JSON.stringify(body)
+
+    let rows: Array<{ secretToken: string }> = []
+    try {
+      rows = await resolveZoomChallengeSecrets(path, requestId)
+    } catch (err) {
+      logger.warn(`[${requestId}] Failed to look up webhook secret for Zoom validation`, err)
+      return null
+    }
+
+    for (const row of rows) {
+      const secretToken = row.secretToken
+      if (
+        secretToken &&
+        validateZoomSignature(secretToken, signature, timestamp, bodyForSignature)
+      ) {
+        const hashForValidate = crypto
+          .createHmac('sha256', secretToken)
+          .update(plainToken)
+          .digest('hex')
+
+        return NextResponse.json({
+          plainToken,
+          encryptedToken: hashForValidate,
+        })
+      }
+    }
+
+    logger.warn(
+      `[${requestId}] Zoom challenge: no matching secret for path ${path} (${rows.length} webhook row(s))`
+    )
+    return null
+  },
+}
diff --git a/apps/sim/lib/webhooks/utils.server.ts b/apps/sim/lib/webhooks/utils.server.ts
index 49c29227ff4..4e0d3d168be 100644
--- a/apps/sim/lib/webhooks/utils.server.ts
+++ b/apps/sim/lib/webhooks/utils.server.ts
@@ -1,2214 +1,14 @@
-import crypto from 'crypto'
 import { db, workflowDeploymentVersion } from '@sim/db'
-import { account, webhook, workflow } from '@sim/db/schema'
+import { webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, or } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { safeCompare } from '@/lib/core/security/encryption'
-import {
-  type SecureFetchResponse,
-  secureFetchWithPinnedIP,
-  validateUrlWithDNS,
-} from '@/lib/core/security/input-validation.server'
-import { sanitizeUrlForLog } from '@/lib/core/utils/logging'
 import { generateShortId } from '@/lib/core/utils/uuid'
 import type { DbOrTx } from '@/lib/db/types'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
 import { cleanupExternalWebhook } from '@/lib/webhooks/provider-subscriptions'
-import {
-  getCredentialsForCredentialSet,
-  refreshAccessTokenIfNeeded,
-  resolveOAuthAccountId,
-} from '@/app/api/auth/oauth/utils'
+import { getCredentialsForCredentialSet } from '@/app/api/auth/oauth/utils'
 import { isPollingWebhookProvider } from '@/triggers/constants'
 
-const logger = createLogger('WebhookUtils')
-
-/**
- * Handle WhatsApp verification requests
- */
-export async function handleWhatsAppVerification(
-  requestId: string,
-  path: string,
-  mode: string | null,
-  token: string | null,
-  challenge: string | null
-): Promise<NextResponse | null> {
-  if (mode && token && challenge) {
-    logger.info(`[${requestId}] WhatsApp verification request received for path: ${path}`)
-
-    if (mode !== 'subscribe') {
-      logger.warn(`[${requestId}] Invalid WhatsApp verification mode: ${mode}`)
-      return new NextResponse('Invalid mode', { status: 400 })
-    }
-
-    const webhooks = await db
-      .select({ webhook })
-      .from(webhook)
-      .leftJoin(
-        workflowDeploymentVersion,
-        and(
-          eq(workflowDeploymentVersion.workflowId, webhook.workflowId),
-          eq(workflowDeploymentVersion.isActive, true)
-        )
-      )
-      .where(
-        and(
-          eq(webhook.provider, 'whatsapp'),
-          eq(webhook.isActive, true),
-          or(
-            eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
-            and(isNull(workflowDeploymentVersion.id), isNull(webhook.deploymentVersionId))
-          )
-        )
-      )
-
-    for (const row of webhooks) {
-      const wh = row.webhook
-      const providerConfig = (wh.providerConfig as Record<string, any>) || {}
-      const verificationToken = providerConfig.verificationToken
-
-      if (!verificationToken) {
-        continue
-      }
-
-      if (token === verificationToken) {
-        logger.info(`[${requestId}] WhatsApp verification successful for webhook ${wh.id}`)
-        return new NextResponse(challenge, {
-          status: 200,
-          headers: {
-            'Content-Type': 'text/plain',
-          },
-        })
-      }
-    }
-
-    logger.warn(`[${requestId}] No matching WhatsApp verification token found`)
-    return new NextResponse('Verification failed', { status: 403 })
-  }
-
-  return null
-}
-
-/**
- * Handle Slack verification challenges
- */
-export function handleSlackChallenge(body: any): NextResponse | null {
-  if (body.type === 'url_verification' && body.challenge) {
-    return NextResponse.json({ challenge: body.challenge })
-  }
-
-  return null
-}
-
-/**
- * Fetches a URL with DNS pinning to prevent DNS rebinding attacks
- * @param url - The URL to fetch
- * @param accessToken - Authorization token (optional for pre-signed URLs)
- * @param requestId - Request ID for logging
- * @returns The fetch Response or null if validation fails
- */
-async function fetchWithDNSPinning(
-  url: string,
-  accessToken: string,
-  requestId: string
-): Promise<SecureFetchResponse | null> {
-  try {
-    const urlValidation = await validateUrlWithDNS(url, 'contentUrl')
-    if (!urlValidation.isValid) {
-      logger.warn(`[${requestId}] Invalid content URL: ${urlValidation.error}`, {
-        url,
-      })
-      return null
-    }
-
-    const headers: Record<string, string> = {}
-
-    if (accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`
-    }
-
-    const response = await secureFetchWithPinnedIP(url, urlValidation.resolvedIP!, {
-      headers,
-    })
-
-    return response
-  } catch (error) {
-    logger.error(`[${requestId}] Error fetching URL with DNS pinning`, {
-      error: error instanceof Error ? error.message : String(error),
-      url: sanitizeUrlForLog(url),
-    })
-    return null
-  }
-}
-
-/**
- * Format Microsoft Teams Graph change notification
- */
-async function formatTeamsGraphNotification(
-  body: any,
-  foundWebhook: any,
-  foundWorkflow: any,
-  request: NextRequest
-): Promise<any> {
-  const notification = body.value?.[0]
-  if (!notification) {
-    logger.warn('Received empty Teams notification body')
-    return null
-  }
-  const changeType = notification.changeType || 'created'
-  const resource = notification.resource || ''
-  const subscriptionId = notification.subscriptionId || ''
-
-  let chatId: string | null = null
-  let messageId: string | null = null
-
-  const fullMatch = resource.match(/chats\/([^/]+)\/messages\/([^/]+)/)
-  if (fullMatch) {
-    chatId = fullMatch[1]
-    messageId = fullMatch[2]
-  }
-
-  if (!chatId || !messageId) {
-    const quotedMatch = resource.match(/chats\('([^']+)'\)\/messages\('([^']+)'\)/)
-    if (quotedMatch) {
-      chatId = quotedMatch[1]
-      messageId = quotedMatch[2]
-    }
-  }
-
-  if (!chatId || !messageId) {
-    const collectionMatch = resource.match(/chats\/([^/]+)\/messages$/)
-    const rdId = body?.value?.[0]?.resourceData?.id
-    if (collectionMatch && rdId) {
-      chatId = collectionMatch[1]
-      messageId = rdId
-    }
-  }
-
-  if ((!chatId || !messageId) && body?.value?.[0]?.resourceData?.['@odata.id']) {
-    const odataId = String(body.value[0].resourceData['@odata.id'])
-    const odataMatch = odataId.match(/chats\('([^']+)'\)\/messages\('([^']+)'\)/)
-    if (odataMatch) {
-      chatId = odataMatch[1]
-      messageId = odataMatch[2]
-    }
-  }
-
-  if (!chatId || !messageId) {
-    logger.warn('Could not resolve chatId/messageId from Teams notification', {
-      resource,
-      hasResourceDataId: Boolean(body?.value?.[0]?.resourceData?.id),
-      valueLength: Array.isArray(body?.value) ? body.value.length : 0,
-      keys: Object.keys(body || {}),
-    })
-    return {
-      from: null,
-      message: { raw: body },
-      activity: body,
-      conversation: null,
-    }
-  }
-  const resolvedChatId = chatId as string
-  const resolvedMessageId = messageId as string
-  const providerConfig = (foundWebhook?.providerConfig as Record<string, any>) || {}
-  const credentialId = providerConfig.credentialId
-  const includeAttachments = providerConfig.includeAttachments !== false
-
-  let message: any = null
-  const rawAttachments: Array<{ name: string; data: Buffer; contentType: string; size: number }> =
-    []
-  let accessToken: string | null = null
-
-  if (!credentialId) {
-    logger.error('Missing credentialId for Teams chat subscription', {
-      chatId: resolvedChatId,
-      messageId: resolvedMessageId,
-      webhookId: foundWebhook?.id,
-      blockId: foundWebhook?.blockId,
-      providerConfig,
-    })
-  } else {
-    try {
-      const resolved = await resolveOAuthAccountId(credentialId)
-      if (!resolved) {
-        logger.error('Teams credential could not be resolved', { credentialId })
-      } else {
-        const rows = await db
-          .select()
-          .from(account)
-          .where(eq(account.id, resolved.accountId))
-          .limit(1)
-        if (rows.length === 0) {
-          logger.error('Teams credential not found', { credentialId, chatId: resolvedChatId })
-        } else {
-          const effectiveUserId = rows[0].userId
-          accessToken = await refreshAccessTokenIfNeeded(
-            resolved.accountId,
-            effectiveUserId,
-            'teams-graph-notification'
-          )
-        }
-      }
-
-      if (accessToken) {
-        const msgUrl = `https://graph.microsoft.com/v1.0/chats/${encodeURIComponent(resolvedChatId)}/messages/${encodeURIComponent(resolvedMessageId)}`
-        const res = await fetch(msgUrl, { headers: { Authorization: `Bearer ${accessToken}` } })
-        if (res.ok) {
-          message = await res.json()
-
-          if (includeAttachments && message?.attachments?.length > 0) {
-            const attachments = Array.isArray(message?.attachments) ? message.attachments : []
-            for (const att of attachments) {
-              try {
-                const contentUrl =
-                  typeof att?.contentUrl === 'string' ? (att.contentUrl as string) : undefined
-                const contentTypeHint =
-                  typeof att?.contentType === 'string' ? (att.contentType as string) : undefined
-                let attachmentName = (att?.name as string) || 'teams-attachment'
-
-                if (!contentUrl) continue
-
-                let buffer: Buffer | null = null
-                let mimeType = 'application/octet-stream'
-
-                if (contentUrl.includes('sharepoint.com') || contentUrl.includes('onedrive')) {
-                  try {
-                    const directRes = await fetchWithDNSPinning(
-                      contentUrl,
-                      accessToken,
-                      'teams-attachment'
-                    )
-
-                    if (directRes?.ok) {
-                      const arrayBuffer = await directRes.arrayBuffer()
-                      buffer = Buffer.from(arrayBuffer)
-                      mimeType =
-                        directRes.headers.get('content-type') ||
-                        contentTypeHint ||
-                        'application/octet-stream'
-                    } else if (directRes) {
-                      const encodedUrl = Buffer.from(contentUrl)
-                        .toString('base64')
-                        .replace(/\+/g, '-')
-                        .replace(/\//g, '_')
-                        .replace(/=+$/, '')
-
-                      const graphUrl = `https://graph.microsoft.com/v1.0/shares/u!${encodedUrl}/driveItem/content`
-                      const graphRes = await fetch(graphUrl, {
-                        headers: { Authorization: `Bearer ${accessToken}` },
-                        redirect: 'follow',
-                      })
-
-                      if (graphRes.ok) {
-                        const arrayBuffer = await graphRes.arrayBuffer()
-                        buffer = Buffer.from(arrayBuffer)
-                        mimeType =
-                          graphRes.headers.get('content-type') ||
-                          contentTypeHint ||
-                          'application/octet-stream'
-                      } else {
-                        continue
-                      }
-                    }
-                  } catch {
-                    continue
-                  }
-                } else if (
-                  contentUrl.includes('1drv.ms') ||
-                  contentUrl.includes('onedrive.live.com') ||
-                  contentUrl.includes('onedrive.com') ||
-                  contentUrl.includes('my.microsoftpersonalcontent.com')
-                ) {
-                  try {
-                    let shareToken: string | null = null
-
-                    if (contentUrl.includes('1drv.ms')) {
-                      const urlParts = contentUrl.split('/').pop()
-                      if (urlParts) shareToken = urlParts
-                    } else if (contentUrl.includes('resid=')) {
-                      const urlParams = new URL(contentUrl).searchParams
-                      const resId = urlParams.get('resid')
-                      if (resId) shareToken = resId
-                    }
-
-                    if (!shareToken) {
-                      const base64Url = Buffer.from(contentUrl, 'utf-8')
-                        .toString('base64')
-                        .replace(/\+/g, '-')
-                        .replace(/\//g, '_')
-                        .replace(/=+$/, '')
-                      shareToken = `u!${base64Url}`
-                    } else if (!shareToken.startsWith('u!')) {
-                      const base64Url = Buffer.from(shareToken, 'utf-8')
-                        .toString('base64')
-                        .replace(/\+/g, '-')
-                        .replace(/\//g, '_')
-                        .replace(/=+$/, '')
-                      shareToken = `u!${base64Url}`
-                    }
-
-                    const metadataUrl = `https://graph.microsoft.com/v1.0/shares/${shareToken}/driveItem`
-                    const metadataRes = await fetch(metadataUrl, {
-                      headers: {
-                        Authorization: `Bearer ${accessToken}`,
-                        Accept: 'application/json',
-                      },
-                    })
-
-                    if (!metadataRes.ok) {
-                      const directUrl = `https://graph.microsoft.com/v1.0/shares/${shareToken}/driveItem/content`
-                      const directRes = await fetch(directUrl, {
-                        headers: { Authorization: `Bearer ${accessToken}` },
-                        redirect: 'follow',
-                      })
-
-                      if (directRes.ok) {
-                        const arrayBuffer = await directRes.arrayBuffer()
-                        buffer = Buffer.from(arrayBuffer)
-                        mimeType =
-                          directRes.headers.get('content-type') ||
-                          contentTypeHint ||
-                          'application/octet-stream'
-                      } else {
-                        continue
-                      }
-                    } else {
-                      const metadata = await metadataRes.json()
-                      const downloadUrl = metadata['@microsoft.graph.downloadUrl']
-
-                      if (downloadUrl) {
-                        const downloadRes = await fetchWithDNSPinning(
-                          downloadUrl,
-                          '', // downloadUrl is a pre-signed URL, no auth needed
-                          'teams-onedrive-download'
-                        )
-
-                        if (downloadRes?.ok) {
-                          const arrayBuffer = await downloadRes.arrayBuffer()
-                          buffer = Buffer.from(arrayBuffer)
-                          mimeType =
-                            downloadRes.headers.get('content-type') ||
-                            metadata.file?.mimeType ||
-                            contentTypeHint ||
-                            'application/octet-stream'
-
-                          if (metadata.name && metadata.name !== attachmentName) {
-                            attachmentName = metadata.name
-                          }
-                        } else {
-                          continue
-                        }
-                      } else {
-                        continue
-                      }
-                    }
-                  } catch {
-                    continue
-                  }
-                } else {
-                  try {
-                    const ares = await fetchWithDNSPinning(
-                      contentUrl,
-                      accessToken,
-                      'teams-attachment-generic'
-                    )
-                    if (ares?.ok) {
-                      const arrayBuffer = await ares.arrayBuffer()
-                      buffer = Buffer.from(arrayBuffer)
-                      mimeType =
-                        ares.headers.get('content-type') ||
-                        contentTypeHint ||
-                        'application/octet-stream'
-                    }
-                  } catch {
-                    continue
-                  }
-                }
-
-                if (!buffer) continue
-
-                const size = buffer.length
-
-                // Store raw attachment (will be uploaded to execution storage later)
-                rawAttachments.push({
-                  name: attachmentName,
-                  data: buffer,
-                  contentType: mimeType,
-                  size,
-                })
-              } catch {}
-            }
-          }
-        }
-      }
-    } catch (error) {
-      logger.error('Failed to fetch Teams message', {
-        error,
-        chatId: resolvedChatId,
-        messageId: resolvedMessageId,
-      })
-    }
-  }
-
-  if (!message) {
-    logger.warn('No message data available for Teams notification', {
-      chatId: resolvedChatId,
-      messageId: resolvedMessageId,
-      hasCredential: !!credentialId,
-    })
-    return {
-      message_id: resolvedMessageId,
-      chat_id: resolvedChatId,
-      from_name: '',
-      text: '',
-      created_at: '',
-      attachments: [],
-    }
-  }
-
-  const messageText = message.body?.content || ''
-  const from = message.from?.user || {}
-  const createdAt = message.createdDateTime || ''
-
-  return {
-    message_id: resolvedMessageId,
-    chat_id: resolvedChatId,
-    from_name: from.displayName || '',
-    text: messageText,
-    created_at: createdAt,
-    attachments: rawAttachments,
-  }
-}
-
-export async function validateTwilioSignature(
-  authToken: string,
-  signature: string,
-  url: string,
-  params: Record<string, any>
-): Promise<boolean> {
-  try {
-    if (!authToken || !signature || !url) {
-      logger.warn('Twilio signature validation missing required fields', {
-        hasAuthToken: !!authToken,
-        hasSignature: !!signature,
-        hasUrl: !!url,
-      })
-      return false
-    }
-
-    const sortedKeys = Object.keys(params).sort()
-    let data = url
-    for (const key of sortedKeys) {
-      data += key + params[key]
-    }
-
-    logger.debug('Twilio signature validation string built', {
-      url,
-      sortedKeys,
-      dataLength: data.length,
-    })
-
-    const encoder = new TextEncoder()
-    const key = await crypto.subtle.importKey(
-      'raw',
-      encoder.encode(authToken),
-      { name: 'HMAC', hash: 'SHA-1' },
-      false,
-      ['sign']
-    )
-
-    const signatureBytes = await crypto.subtle.sign('HMAC', key, encoder.encode(data))
-
-    const signatureArray = Array.from(new Uint8Array(signatureBytes))
-    const signatureBase64 = btoa(String.fromCharCode(...signatureArray))
-
-    logger.debug('Twilio signature comparison', {
-      computedSignature: `${signatureBase64.substring(0, 10)}...`,
-      providedSignature: `${signature.substring(0, 10)}...`,
-      computedLength: signatureBase64.length,
-      providedLength: signature.length,
-      match: signatureBase64 === signature,
-    })
-
-    return safeCompare(signatureBase64, signature)
-  } catch (error) {
-    logger.error('Error validating Twilio signature:', error)
-    return false
-  }
-}
-
-const SLACK_MAX_FILE_SIZE = 50 * 1024 * 1024 // 50 MB
-const SLACK_MAX_FILES = 15
-
-/**
- * Resolves the full file object from the Slack API when the event payload
- * only contains a partial file (e.g. missing url_private due to file_access restrictions).
- * @see https://docs.slack.dev/reference/methods/files.info
- */
-async function resolveSlackFileInfo(
-  fileId: string,
-  botToken: string
-): Promise<{ url_private?: string; name?: string; mimetype?: string; size?: number } | null> {
-  try {
-    const response = await fetch(
-      `https://slack.com/api/files.info?file=${encodeURIComponent(fileId)}`,
-      {
-        headers: { Authorization: `Bearer ${botToken}` },
-      }
-    )
-
-    const data = (await response.json()) as {
-      ok: boolean
-      error?: string
-      file?: Record<string, any>
-    }
-
-    if (!data.ok || !data.file) {
-      logger.warn('Slack files.info failed', { fileId, error: data.error })
-      return null
-    }
-
-    return {
-      url_private: data.file.url_private,
-      name: data.file.name,
-      mimetype: data.file.mimetype,
-      size: data.file.size,
-    }
-  } catch (error) {
-    logger.error('Error calling Slack files.info', {
-      fileId,
-      error: error instanceof Error ? error.message : String(error),
-    })
-    return null
-  }
-}
-
-/**
- * Downloads file attachments from Slack using the bot token.
- * Returns files in the format expected by WebhookAttachmentProcessor:
- * { name, data (base64 string), mimeType, size }
- *
- * When the event payload contains partial file objects (missing url_private),
- * falls back to the Slack files.info API to resolve the full file metadata.
- *
- * Security:
- * - Uses validateUrlWithDNS + secureFetchWithPinnedIP to prevent SSRF
- * - Enforces per-file size limit and max file count
- */
-async function downloadSlackFiles(
-  rawFiles: any[],
-  botToken: string
-): Promise<Array<{ name: string; data: string; mimeType: string; size: number }>> {
-  const filesToProcess = rawFiles.slice(0, SLACK_MAX_FILES)
-  const downloaded: Array<{ name: string; data: string; mimeType: string; size: number }> = []
-
-  for (const file of filesToProcess) {
-    let urlPrivate = file.url_private as string | undefined
-    let fileName = file.name as string | undefined
-    let fileMimeType = file.mimetype as string | undefined
-    let fileSize = file.size as number | undefined
-
-    // If url_private is missing, resolve via files.info API
-    if (!urlPrivate && file.id) {
-      const resolved = await resolveSlackFileInfo(file.id, botToken)
-      if (resolved?.url_private) {
-        urlPrivate = resolved.url_private
-        fileName = fileName || resolved.name
-        fileMimeType = fileMimeType || resolved.mimetype
-        fileSize = fileSize ?? resolved.size
-      }
-    }
-
-    if (!urlPrivate) {
-      logger.warn('Slack file has no url_private and could not be resolved, skipping', {
-        fileId: file.id,
-      })
-      continue
-    }
-
-    // Skip files that exceed the size limit
-    const reportedSize = Number(fileSize) || 0
-    if (reportedSize > SLACK_MAX_FILE_SIZE) {
-      logger.warn('Slack file exceeds size limit, skipping', {
-        fileId: file.id,
-        size: reportedSize,
-        limit: SLACK_MAX_FILE_SIZE,
-      })
-      continue
-    }
-
-    try {
-      const urlValidation = await validateUrlWithDNS(urlPrivate, 'url_private')
-      if (!urlValidation.isValid) {
-        logger.warn('Slack file url_private failed DNS validation, skipping', {
-          fileId: file.id,
-          error: urlValidation.error,
-        })
-        continue
-      }
-
-      const response = await secureFetchWithPinnedIP(urlPrivate, urlValidation.resolvedIP!, {
-        headers: { Authorization: `Bearer ${botToken}` },
-      })
-
-      if (!response.ok) {
-        logger.warn('Failed to download Slack file, skipping', {
-          fileId: file.id,
-          status: response.status,
-        })
-        continue
-      }
-
-      const arrayBuffer = await response.arrayBuffer()
-      const buffer = Buffer.from(arrayBuffer)
-
-      // Verify the actual downloaded size doesn't exceed our limit
-      if (buffer.length > SLACK_MAX_FILE_SIZE) {
-        logger.warn('Downloaded Slack file exceeds size limit, skipping', {
-          fileId: file.id,
-          actualSize: buffer.length,
-          limit: SLACK_MAX_FILE_SIZE,
-        })
-        continue
-      }
-
-      downloaded.push({
-        name: fileName || 'download',
-        data: buffer.toString('base64'),
-        mimeType: fileMimeType || 'application/octet-stream',
-        size: buffer.length,
-      })
-    } catch (error) {
-      logger.error('Error downloading Slack file, skipping', {
-        fileId: file.id,
-        error: error instanceof Error ? error.message : String(error),
-      })
-    }
-  }
-
-  return downloaded
-}
-
-const SLACK_REACTION_EVENTS = new Set(['reaction_added', 'reaction_removed'])
-
-/**
- * Fetches the text of a reacted-to message from Slack using the reactions.get API.
- * Unlike conversations.history, reactions.get works for both top-level messages and
- * thread replies, since it looks up the item directly by channel + timestamp.
- * Requires the bot token to have the reactions:read scope.
- */
-async function fetchSlackMessageText(
-  channel: string,
-  messageTs: string,
-  botToken: string
-): Promise<string> {
-  try {
-    const params = new URLSearchParams({
-      channel,
-      timestamp: messageTs,
-    })
-    const response = await fetch(`https://slack.com/api/reactions.get?${params}`, {
-      headers: { Authorization: `Bearer ${botToken}` },
-    })
-
-    const data = (await response.json()) as {
-      ok: boolean
-      error?: string
-      type?: string
-      message?: { text?: string }
-    }
-
-    if (!data.ok) {
-      logger.warn('Slack reactions.get failed — message text unavailable', {
-        channel,
-        messageTs,
-        error: data.error,
-      })
-      return ''
-    }
-
-    return data.message?.text ?? ''
-  } catch (error) {
-    logger.warn('Error fetching Slack message text', {
-      channel,
-      messageTs,
-      error: error instanceof Error ? error.message : String(error),
-    })
-    return ''
-  }
-}
-
-/**
- * Format webhook input based on provider
- */
-export async function formatWebhookInput(
-  foundWebhook: any,
-  foundWorkflow: any,
-  body: any,
-  request: NextRequest
-): Promise<any> {
-  if (foundWebhook.provider === 'whatsapp') {
-    const data = body?.entry?.[0]?.changes?.[0]?.value
-    const messages = data?.messages || []
-
-    if (messages.length > 0) {
-      const message = messages[0]
-      return {
-        messageId: message.id,
-        from: message.from,
-        phoneNumberId: data.metadata?.phone_number_id,
-        text: message.text?.body,
-        timestamp: message.timestamp,
-        raw: JSON.stringify(message),
-      }
-    }
-    return null
-  }
-
-  if (foundWebhook.provider === 'telegram') {
-    const rawMessage =
-      body?.message || body?.edited_message || body?.channel_post || body?.edited_channel_post
-
-    const updateType = body.message
-      ? 'message'
-      : body.edited_message
-        ? 'edited_message'
-        : body.channel_post
-          ? 'channel_post'
-          : body.edited_channel_post
-            ? 'edited_channel_post'
-            : 'unknown'
-
-    if (rawMessage) {
-      const messageType = rawMessage.photo
-        ? 'photo'
-        : rawMessage.document
-          ? 'document'
-          : rawMessage.audio
-            ? 'audio'
-            : rawMessage.video
-              ? 'video'
-              : rawMessage.voice
-                ? 'voice'
-                : rawMessage.sticker
-                  ? 'sticker'
-                  : rawMessage.location
-                    ? 'location'
-                    : rawMessage.contact
-                      ? 'contact'
-                      : rawMessage.poll
-                        ? 'poll'
-                        : 'text'
-
-      return {
-        message: {
-          id: rawMessage.message_id,
-          text: rawMessage.text,
-          date: rawMessage.date,
-          messageType,
-          raw: rawMessage,
-        },
-        sender: rawMessage.from
-          ? {
-              id: rawMessage.from.id,
-              username: rawMessage.from.username,
-              firstName: rawMessage.from.first_name,
-              lastName: rawMessage.from.last_name,
-              languageCode: rawMessage.from.language_code,
-              isBot: rawMessage.from.is_bot,
-            }
-          : null,
-        updateId: body.update_id,
-        updateType,
-      }
-    }
-
-    logger.warn('Unknown Telegram update type', {
-      updateId: body.update_id,
-      bodyKeys: Object.keys(body || {}),
-    })
-
-    return {
-      updateId: body.update_id,
-      updateType,
-    }
-  }
-
-  if (foundWebhook.provider === 'twilio_voice') {
-    return {
-      callSid: body.CallSid,
-      accountSid: body.AccountSid,
-      from: body.From,
-      to: body.To,
-      callStatus: body.CallStatus,
-      direction: body.Direction,
-      apiVersion: body.ApiVersion,
-      callerName: body.CallerName,
-      forwardedFrom: body.ForwardedFrom,
-      digits: body.Digits,
-      speechResult: body.SpeechResult,
-      recordingUrl: body.RecordingUrl,
-      recordingSid: body.RecordingSid,
-      called: body.Called,
-      caller: body.Caller,
-      toCity: body.ToCity,
-      toState: body.ToState,
-      toZip: body.ToZip,
-      toCountry: body.ToCountry,
-      fromCity: body.FromCity,
-      fromState: body.FromState,
-      fromZip: body.FromZip,
-      fromCountry: body.FromCountry,
-      calledCity: body.CalledCity,
-      calledState: body.CalledState,
-      calledZip: body.CalledZip,
-      calledCountry: body.CalledCountry,
-      callerCity: body.CallerCity,
-      callerState: body.CallerState,
-      callerZip: body.CallerZip,
-      callerCountry: body.CallerCountry,
-      callToken: body.CallToken,
-      raw: JSON.stringify(body),
-    }
-  }
-
-  if (foundWebhook.provider === 'gmail') {
-    if (body && typeof body === 'object' && 'email' in body) {
-      return {
-        email: body.email,
-        timestamp: body.timestamp,
-      }
-    }
-    return body
-  }
-
-  if (foundWebhook.provider === 'outlook') {
-    if (body && typeof body === 'object' && 'email' in body) {
-      return {
-        email: body.email,
-        timestamp: body.timestamp,
-      }
-    }
-    return body
-  }
-
-  if (foundWebhook.provider === 'rss') {
-    if (body && typeof body === 'object' && 'item' in body) {
-      return {
-        title: body.title,
-        link: body.link,
-        pubDate: body.pubDate,
-        item: body.item,
-        feed: body.feed,
-        timestamp: body.timestamp,
-      }
-    }
-    return body
-  }
-
-  if (foundWebhook.provider === 'imap') {
-    if (body && typeof body === 'object' && 'email' in body) {
-      return {
-        messageId: body.messageId,
-        subject: body.subject,
-        from: body.from,
-        to: body.to,
-        cc: body.cc,
-        date: body.date,
-        bodyText: body.bodyText,
-        bodyHtml: body.bodyHtml,
-        mailbox: body.mailbox,
-        hasAttachments: body.hasAttachments,
-        attachments: body.attachments,
-        email: body.email,
-        timestamp: body.timestamp,
-      }
-    }
-    return body
-  }
-
-  if (foundWebhook.provider === 'hubspot') {
-    const events = Array.isArray(body) ? body : [body]
-    const event = events[0]
-
-    if (!event) {
-      logger.warn('HubSpot webhook received with empty payload')
-      return null
-    }
-
-    logger.info('Formatting HubSpot webhook input', {
-      subscriptionType: event.subscriptionType,
-      objectId: event.objectId,
-      portalId: event.portalId,
-    })
-
-    return {
-      payload: body,
-      provider: 'hubspot',
-      providerConfig: foundWebhook.providerConfig,
-    }
-  }
-
-  if (foundWebhook.provider === 'microsoft-teams') {
-    if (body?.value && Array.isArray(body.value) && body.value.length > 0) {
-      return await formatTeamsGraphNotification(body, foundWebhook, foundWorkflow, request)
-    }
-
-    const messageText = body?.text || ''
-    const messageId = body?.id || ''
-    const timestamp = body?.timestamp || body?.localTimestamp || ''
-    const from = body?.from || {}
-    const conversation = body?.conversation || {}
-
-    const messageObj = {
-      raw: {
-        attachments: body?.attachments || [],
-        channelData: body?.channelData || {},
-        conversation: body?.conversation || {},
-        text: messageText,
-        messageType: body?.type || 'message',
-        channelId: body?.channelId || '',
-        timestamp,
-      },
-    }
-
-    const fromObj = {
-      id: from.id || '',
-      name: from.name || '',
-      aadObjectId: from.aadObjectId || '',
-    }
-
-    const conversationObj = {
-      id: conversation.id || '',
-      name: conversation.name || '',
-      isGroup: conversation.isGroup || false,
-      tenantId: conversation.tenantId || '',
-      aadObjectId: conversation.aadObjectId || '',
-      conversationType: conversation.conversationType || '',
-    }
-
-    const activityObj = body || {}
-
-    return {
-      from: fromObj,
-      message: messageObj,
-      activity: activityObj,
-      conversation: conversationObj,
-    }
-  }
-
-  if (foundWebhook.provider === 'slack') {
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-    const botToken = providerConfig.botToken as string | undefined
-    const includeFiles = Boolean(providerConfig.includeFiles)
-
-    const rawEvent = body?.event
-
-    if (!rawEvent) {
-      logger.warn('Unknown Slack event type', {
-        type: body?.type,
-        hasEvent: false,
-        bodyKeys: Object.keys(body || {}),
-      })
-    }
-
-    const eventType: string = rawEvent?.type || body?.type || 'unknown'
-    const isReactionEvent = SLACK_REACTION_EVENTS.has(eventType)
-
-    // Reaction events nest channel/ts inside event.item
-    const channel: string = isReactionEvent
-      ? rawEvent?.item?.channel || ''
-      : rawEvent?.channel || ''
-    const messageTs: string = isReactionEvent
-      ? rawEvent?.item?.ts || ''
-      : rawEvent?.ts || rawEvent?.event_ts || ''
-
-    // For reaction events, attempt to fetch the original message text
-    let text: string = rawEvent?.text || ''
-    if (isReactionEvent && channel && messageTs && botToken) {
-      text = await fetchSlackMessageText(channel, messageTs, botToken)
-    }
-
-    const rawFiles: any[] = rawEvent?.files ?? []
-    const hasFiles = rawFiles.length > 0
-
-    let files: any[] = []
-    if (hasFiles && includeFiles && botToken) {
-      files = await downloadSlackFiles(rawFiles, botToken)
-    } else if (hasFiles && includeFiles && !botToken) {
-      logger.warn('Slack message has files and includeFiles is enabled, but no bot token provided')
-    }
-
-    return {
-      event: {
-        event_type: eventType,
-        channel,
-        channel_name: '',
-        user: rawEvent?.user || '',
-        user_name: '',
-        text,
-        timestamp: messageTs,
-        thread_ts: rawEvent?.thread_ts || '',
-        team_id: body?.team_id || rawEvent?.team || '',
-        event_id: body?.event_id || '',
-        reaction: rawEvent?.reaction || '',
-        item_user: rawEvent?.item_user || '',
-        hasFiles,
-        files,
-      },
-    }
-  }
-
-  if (foundWebhook.provider === 'webflow') {
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-    const triggerId = providerConfig.triggerId as string | undefined
-
-    // Form submission trigger
-    if (triggerId === 'webflow_form_submission') {
-      return {
-        siteId: body?.siteId || '',
-        formId: body?.formId || '',
-        name: body?.name || '',
-        id: body?.id || '',
-        submittedAt: body?.submittedAt || '',
-        data: body?.data || {},
-        schema: body?.schema || {},
-        formElementId: body?.formElementId || '',
-      }
-    }
-
-    // Collection item triggers (created, changed, deleted)
-    // Webflow uses _cid for collection ID and _id for item ID
-    const { _cid, _id, ...itemFields } = body || {}
-    return {
-      siteId: body?.siteId || '',
-      collectionId: _cid || body?.collectionId || '',
-      payload: {
-        id: _id || '',
-        cmsLocaleId: itemFields?.cmsLocaleId || '',
-        lastPublished: itemFields?.lastPublished || itemFields?.['last-published'] || '',
-        lastUpdated: itemFields?.lastUpdated || itemFields?.['last-updated'] || '',
-        createdOn: itemFields?.createdOn || itemFields?.['created-on'] || '',
-        isArchived: itemFields?.isArchived || itemFields?._archived || false,
-        isDraft: itemFields?.isDraft || itemFields?._draft || false,
-        fieldData: itemFields,
-      },
-    }
-  }
-
-  if (foundWebhook.provider === 'generic') {
-    return body
-  }
-
-  if (foundWebhook.provider === 'google_forms') {
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-
-    const normalizeAnswers = (src: unknown): Record<string, unknown> => {
-      if (!src || typeof src !== 'object') return {}
-      const out: Record<string, unknown> = {}
-      for (const [k, v] of Object.entries(src as Record<string, unknown>)) {
-        if (Array.isArray(v)) {
-          out[k] = v.length === 1 ? v[0] : v
-        } else {
-          out[k] = v as unknown
-        }
-      }
-      return out
-    }
-
-    const responseId = body?.responseId || body?.id || ''
-    const createTime = body?.createTime || body?.timestamp || new Date().toISOString()
-    const lastSubmittedTime = body?.lastSubmittedTime || createTime
-    const formId = body?.formId || providerConfig.formId || ''
-    const includeRaw = providerConfig.includeRawPayload !== false
-
-    return {
-      responseId,
-      createTime,
-      lastSubmittedTime,
-      formId,
-      answers: normalizeAnswers(body?.answers),
-      ...(includeRaw ? { raw: body?.raw ?? body } : {}),
-    }
-  }
-
-  if (foundWebhook.provider === 'github') {
-    const eventType = request.headers.get('x-github-event') || 'unknown'
-    const branch = body?.ref?.replace('refs/heads/', '') || ''
-
-    return {
-      ...body,
-      event_type: eventType,
-      action: body?.action || '',
-      branch,
-    }
-  }
-
-  if (foundWebhook.provider === 'typeform') {
-    const formResponse = body?.form_response || {}
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-    const includeDefinition = providerConfig.includeDefinition === true
-
-    return {
-      event_id: body?.event_id || '',
-      event_type: body?.event_type || 'form_response',
-      form_id: formResponse.form_id || '',
-      token: formResponse.token || '',
-      submitted_at: formResponse.submitted_at || '',
-      landed_at: formResponse.landed_at || '',
-      calculated: formResponse.calculated || {},
-      variables: formResponse.variables || [],
-      hidden: formResponse.hidden || {},
-      answers: formResponse.answers || [],
-      ...(includeDefinition ? { definition: formResponse.definition || {} } : {}),
-      ending: formResponse.ending || {},
-      raw: body,
-    }
-  }
-
-  if (foundWebhook.provider === 'linear') {
-    return {
-      action: body.action || '',
-      type: body.type || '',
-      webhookId: body.webhookId || '',
-      webhookTimestamp: body.webhookTimestamp || 0,
-      organizationId: body.organizationId || '',
-      createdAt: body.createdAt || '',
-      actor: body.actor || null,
-      data: body.data || null,
-      updatedFrom: body.updatedFrom || null,
-    }
-  }
-
-  if (foundWebhook.provider === 'jira') {
-    const { extractIssueData, extractCommentData, extractWorklogData } = await import(
-      '@/triggers/jira/utils'
-    )
-
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-    const triggerId = providerConfig.triggerId as string | undefined
-
-    if (triggerId === 'jira_issue_commented') {
-      return extractCommentData(body)
-    }
-    if (triggerId === 'jira_worklog_created') {
-      return extractWorklogData(body)
-    }
-    return extractIssueData(body)
-  }
-
-  if (foundWebhook.provider === 'confluence') {
-    const {
-      extractPageData,
-      extractCommentData,
-      extractBlogData,
-      extractAttachmentData,
-      extractSpaceData,
-      extractLabelData,
-    } = await import('@/triggers/confluence/utils')
-
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-    const triggerId = providerConfig.triggerId as string | undefined
-
-    if (triggerId?.startsWith('confluence_comment_')) {
-      return extractCommentData(body)
-    }
-    if (triggerId?.startsWith('confluence_blog_')) {
-      return extractBlogData(body)
-    }
-    if (triggerId?.startsWith('confluence_attachment_')) {
-      return extractAttachmentData(body)
-    }
-    if (triggerId?.startsWith('confluence_space_')) {
-      return extractSpaceData(body)
-    }
-    if (triggerId?.startsWith('confluence_label_')) {
-      return extractLabelData(body)
-    }
-    // Generic webhook — preserve all entity fields since event type varies
-    if (triggerId === 'confluence_webhook') {
-      return {
-        timestamp: body.timestamp,
-        userAccountId: body.userAccountId,
-        accountType: body.accountType,
-        page: body.page || null,
-        comment: body.comment || null,
-        blog: body.blog || body.blogpost || null,
-        attachment: body.attachment || null,
-        space: body.space || null,
-        label: body.label || null,
-        content: body.content || null,
-      }
-    }
-    // Default: page events
-    return extractPageData(body)
-  }
-
-  if (foundWebhook.provider === 'ashby') {
-    return {
-      ...(body.data || {}),
-      action: body.action,
-      data: body.data || {},
-    }
-  }
-
-  if (foundWebhook.provider === 'stripe') {
-    return body
-  }
-
-  if (foundWebhook.provider === 'calendly') {
-    return {
-      event: body.event,
-      created_at: body.created_at,
-      created_by: body.created_by,
-      payload: body.payload,
-    }
-  }
-
-  if (foundWebhook.provider === 'circleback') {
-    return {
-      id: body.id,
-      name: body.name,
-      createdAt: body.createdAt,
-      duration: body.duration,
-      url: body.url,
-      recordingUrl: body.recordingUrl,
-      tags: body.tags || [],
-      icalUid: body.icalUid,
-      attendees: body.attendees || [],
-      notes: body.notes || '',
-      actionItems: body.actionItems || [],
-      transcript: body.transcript || [],
-      insights: body.insights || {},
-      meeting: body,
-    }
-  }
-
-  if (foundWebhook.provider === 'grain') {
-    return {
-      type: body.type,
-      user_id: body.user_id,
-      data: body.data || {},
-    }
-  }
-
-  if (foundWebhook.provider === 'fireflies') {
-    return {
-      meetingId: body.meetingId || '',
-      eventType: body.eventType || 'Transcription completed',
-      clientReferenceId: body.clientReferenceId || '',
-    }
-  }
-
-  if (foundWebhook.provider === 'attio') {
-    const {
-      extractAttioRecordData,
-      extractAttioRecordUpdatedData,
-      extractAttioRecordMergedData,
-      extractAttioNoteData,
-      extractAttioTaskData,
-      extractAttioCommentData,
-      extractAttioListEntryData,
-      extractAttioListEntryUpdatedData,
-      extractAttioListData,
-      extractAttioWorkspaceMemberData,
-      extractAttioGenericData,
-    } = await import('@/triggers/attio/utils')
-
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-    const triggerId = providerConfig.triggerId as string | undefined
-
-    if (triggerId === 'attio_record_updated') {
-      return extractAttioRecordUpdatedData(body)
-    }
-    if (triggerId === 'attio_record_merged') {
-      return extractAttioRecordMergedData(body)
-    }
-    if (triggerId === 'attio_record_created' || triggerId === 'attio_record_deleted') {
-      return extractAttioRecordData(body)
-    }
-    if (triggerId?.startsWith('attio_note_')) {
-      return extractAttioNoteData(body)
-    }
-    if (triggerId?.startsWith('attio_task_')) {
-      return extractAttioTaskData(body)
-    }
-    if (triggerId?.startsWith('attio_comment_')) {
-      return extractAttioCommentData(body)
-    }
-    if (triggerId === 'attio_list_entry_updated') {
-      return extractAttioListEntryUpdatedData(body)
-    }
-    if (triggerId === 'attio_list_entry_created' || triggerId === 'attio_list_entry_deleted') {
-      return extractAttioListEntryData(body)
-    }
-    if (
-      triggerId === 'attio_list_created' ||
-      triggerId === 'attio_list_updated' ||
-      triggerId === 'attio_list_deleted'
-    ) {
-      return extractAttioListData(body)
-    }
-    if (triggerId === 'attio_workspace_member_created') {
-      return extractAttioWorkspaceMemberData(body)
-    }
-    return extractAttioGenericData(body)
-  }
-
-  return body
-}
-
-/**
- * Validates a Microsoft Teams outgoing webhook request signature using HMAC SHA-256
- * @param hmacSecret - Microsoft Teams HMAC secret (base64 encoded)
- * @param signature - Authorization header value (should start with 'HMAC ')
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateMicrosoftTeamsSignature(
-  hmacSecret: string,
-  signature: string,
-  body: string
-): boolean {
-  try {
-    if (!hmacSecret || !signature || !body) {
-      return false
-    }
-
-    if (!signature.startsWith('HMAC ')) {
-      return false
-    }
-
-    const providedSignature = signature.substring(5)
-
-    const secretBytes = Buffer.from(hmacSecret, 'base64')
-    const bodyBytes = Buffer.from(body, 'utf8')
-    const computedHash = crypto.createHmac('sha256', secretBytes).update(bodyBytes).digest('base64')
-
-    return safeCompare(computedHash, providedSignature)
-  } catch (error) {
-    logger.error('Error validating Microsoft Teams signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates a Typeform webhook request signature using HMAC SHA-256
- * @param secret - Typeform webhook secret (plain text)
- * @param signature - Typeform-Signature header value (should be in format 'sha256=<signature>')
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateTypeformSignature(
-  secret: string,
-  signature: string,
-  body: string
-): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      return false
-    }
-
-    if (!signature.startsWith('sha256=')) {
-      return false
-    }
-
-    const providedSignature = signature.substring(7)
-
-    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('base64')
-
-    return safeCompare(computedHash, providedSignature)
-  } catch (error) {
-    logger.error('Error validating Typeform signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates a Linear webhook request signature using HMAC SHA-256
- * @param secret - Linear webhook secret (plain text)
- * @param signature - Linear-Signature header value (hex-encoded HMAC SHA-256 signature)
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateLinearSignature(secret: string, signature: string, body: string): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      logger.warn('Linear signature validation missing required fields', {
-        hasSecret: !!secret,
-        hasSignature: !!signature,
-        hasBody: !!body,
-      })
-      return false
-    }
-
-    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
-
-    logger.debug('Linear signature comparison', {
-      computedSignature: `${computedHash.substring(0, 10)}...`,
-      providedSignature: `${signature.substring(0, 10)}...`,
-      computedLength: computedHash.length,
-      providedLength: signature.length,
-      match: computedHash === signature,
-    })
-
-    return safeCompare(computedHash, signature)
-  } catch (error) {
-    logger.error('Error validating Linear signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates an Attio webhook request signature using HMAC SHA-256
- * @param secret - Attio webhook signing secret (plain text)
- * @param signature - Attio-Signature header value (hex-encoded HMAC SHA-256 signature)
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateAttioSignature(secret: string, signature: string, body: string): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      logger.warn('Attio signature validation missing required fields', {
-        hasSecret: !!secret,
-        hasSignature: !!signature,
-        hasBody: !!body,
-      })
-      return false
-    }
-
-    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
-
-    logger.debug('Attio signature comparison', {
-      computedSignature: `${computedHash.substring(0, 10)}...`,
-      providedSignature: `${signature.substring(0, 10)}...`,
-      computedLength: computedHash.length,
-      providedLength: signature.length,
-      match: computedHash === signature,
-    })
-
-    return safeCompare(computedHash, signature)
-  } catch (error) {
-    logger.error('Error validating Attio signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates a Circleback webhook request signature using HMAC SHA-256
- * @param secret - Circleback signing secret (plain text)
- * @param signature - x-signature header value (hex-encoded HMAC SHA-256 signature)
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateCirclebackSignature(
-  secret: string,
-  signature: string,
-  body: string
-): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      logger.warn('Circleback signature validation missing required fields', {
-        hasSecret: !!secret,
-        hasSignature: !!signature,
-        hasBody: !!body,
-      })
-      return false
-    }
-
-    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
-
-    logger.debug('Circleback signature comparison', {
-      computedSignature: `${computedHash.substring(0, 10)}...`,
-      providedSignature: `${signature.substring(0, 10)}...`,
-      computedLength: computedHash.length,
-      providedLength: signature.length,
-      match: computedHash === signature,
-    })
-
-    return safeCompare(computedHash, signature)
-  } catch (error) {
-    logger.error('Error validating Circleback signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates a Jira webhook request signature using HMAC SHA-256
- * @param secret - Jira webhook secret (plain text)
- * @param signature - X-Hub-Signature header value (format: 'sha256=<hex>')
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateJiraSignature(secret: string, signature: string, body: string): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      logger.warn('Jira signature validation missing required fields', {
-        hasSecret: !!secret,
-        hasSignature: !!signature,
-        hasBody: !!body,
-      })
-      return false
-    }
-
-    if (!signature.startsWith('sha256=')) {
-      logger.warn('Jira signature has invalid format (expected sha256=)', {
-        signaturePrefix: signature.substring(0, 10),
-      })
-      return false
-    }
-
-    const providedSignature = signature.substring(7)
-
-    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
-
-    logger.debug('Jira signature comparison', {
-      computedSignature: `${computedHash.substring(0, 10)}...`,
-      providedSignature: `${providedSignature.substring(0, 10)}...`,
-      computedLength: computedHash.length,
-      providedLength: providedSignature.length,
-      match: computedHash === providedSignature,
-    })
-
-    return safeCompare(computedHash, providedSignature)
-  } catch (error) {
-    logger.error('Error validating Jira signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates a Fireflies webhook request signature using HMAC SHA-256
- * @param secret - Fireflies webhook secret (16-32 characters)
- * @param signature - x-hub-signature header value (format: 'sha256=<hex>')
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateFirefliesSignature(
-  secret: string,
-  signature: string,
-  body: string
-): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      logger.warn('Fireflies signature validation missing required fields', {
-        hasSecret: !!secret,
-        hasSignature: !!signature,
-        hasBody: !!body,
-      })
-      return false
-    }
-
-    if (!signature.startsWith('sha256=')) {
-      logger.warn('Fireflies signature has invalid format (expected sha256=)', {
-        signaturePrefix: signature.substring(0, 10),
-      })
-      return false
-    }
-
-    const providedSignature = signature.substring(7)
-
-    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
-
-    logger.debug('Fireflies signature comparison', {
-      computedSignature: `${computedHash.substring(0, 10)}...`,
-      providedSignature: `${providedSignature.substring(0, 10)}...`,
-      computedLength: computedHash.length,
-      providedLength: providedSignature.length,
-      match: computedHash === providedSignature,
-    })
-
-    return safeCompare(computedHash, providedSignature)
-  } catch (error) {
-    logger.error('Error validating Fireflies signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates an Ashby webhook signature using HMAC-SHA256.
- * Ashby signs payloads with the secretToken and sends the digest in the Ashby-Signature header.
- * @param secretToken - The secret token configured when creating the webhook
- * @param signature - Ashby-Signature header value (format: 'sha256=<hex>')
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateAshbySignature(
-  secretToken: string,
-  signature: string,
-  body: string
-): boolean {
-  try {
-    if (!secretToken || !signature || !body) {
-      return false
-    }
-
-    if (!signature.startsWith('sha256=')) {
-      return false
-    }
-
-    const providedSignature = signature.substring(7)
-    const computedHash = crypto.createHmac('sha256', secretToken).update(body, 'utf8').digest('hex')
-
-    return safeCompare(computedHash, providedSignature)
-  } catch (error) {
-    logger.error('Error validating Ashby signature:', error)
-    return false
-  }
-}
-
-/**
- * Validates a GitHub webhook request signature using HMAC SHA-256 or SHA-1
- * @param secret - GitHub webhook secret (plain text)
- * @param signature - X-Hub-Signature-256 or X-Hub-Signature header value (format: 'sha256=<hex>' or 'sha1=<hex>')
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateGitHubSignature(secret: string, signature: string, body: string): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      logger.warn('GitHub signature validation missing required fields', {
-        hasSecret: !!secret,
-        hasSignature: !!signature,
-        hasBody: !!body,
-      })
-      return false
-    }
-
-    let algorithm: 'sha256' | 'sha1'
-    let providedSignature: string
-
-    if (signature.startsWith('sha256=')) {
-      algorithm = 'sha256'
-      providedSignature = signature.substring(7)
-    } else if (signature.startsWith('sha1=')) {
-      algorithm = 'sha1'
-      providedSignature = signature.substring(5)
-    } else {
-      logger.warn('GitHub signature has invalid format', {
-        signature: `${signature.substring(0, 10)}...`,
-      })
-      return false
-    }
-
-    const computedHash = crypto.createHmac(algorithm, secret).update(body, 'utf8').digest('hex')
-
-    logger.debug('GitHub signature comparison', {
-      algorithm,
-      computedSignature: `${computedHash.substring(0, 10)}...`,
-      providedSignature: `${providedSignature.substring(0, 10)}...`,
-      computedLength: computedHash.length,
-      providedLength: providedSignature.length,
-      match: computedHash === providedSignature,
-    })
-
-    return safeCompare(computedHash, providedSignature)
-  } catch (error) {
-    logger.error('Error validating GitHub signature:', error)
-    return false
-  }
-}
-
-/**
- * Process webhook provider-specific verification
- */
-export function verifyProviderWebhook(
-  foundWebhook: any,
-  request: NextRequest,
-  requestId: string
-): NextResponse | null {
-  const authHeader = request.headers.get('authorization')
-  const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-  switch (foundWebhook.provider) {
-    case 'github':
-      break
-    case 'stripe':
-      break
-    case 'gmail':
-      break
-    case 'telegram': {
-      // Check User-Agent to ensure it's not blocked by middleware
-      const userAgent = request.headers.get('user-agent') || ''
-
-      if (!userAgent) {
-        logger.warn(
-          `[${requestId}] Telegram webhook request has empty User-Agent header. This may be blocked by middleware.`
-        )
-      }
-
-      // Telegram uses IP addresses in specific ranges
-      const clientIp =
-        request.headers.get('x-forwarded-for')?.split(',')[0].trim() ||
-        request.headers.get('x-real-ip') ||
-        'unknown'
-
-      break
-    }
-    case 'microsoft-teams':
-      break
-    case 'generic':
-      if (providerConfig.requireAuth) {
-        let isAuthenticated = false
-        if (providerConfig.token) {
-          const bearerMatch = authHeader?.match(/^bearer\s+(.+)$/i)
-          const providedToken = bearerMatch ? bearerMatch[1] : null
-          if (providedToken === providerConfig.token) {
-            isAuthenticated = true
-          }
-          if (!isAuthenticated && providerConfig.secretHeaderName) {
-            const customHeaderValue = request.headers.get(providerConfig.secretHeaderName)
-            if (customHeaderValue === providerConfig.token) {
-              isAuthenticated = true
-            }
-          }
-          if (!isAuthenticated) {
-            logger.warn(`[${requestId}] Unauthorized webhook access attempt - invalid token`)
-            return new NextResponse('Unauthorized - Invalid authentication token', { status: 401 })
-          }
-        }
-      }
-      if (
-        providerConfig.allowedIps &&
-        Array.isArray(providerConfig.allowedIps) &&
-        providerConfig.allowedIps.length > 0
-      ) {
-        const clientIp =
-          request.headers.get('x-forwarded-for')?.split(',')[0].trim() ||
-          request.headers.get('x-real-ip') ||
-          'unknown'
-
-        if (clientIp === 'unknown' || !providerConfig.allowedIps.includes(clientIp)) {
-          logger.warn(
-            `[${requestId}] Forbidden webhook access attempt - IP not allowed: ${clientIp}`
-          )
-          return new NextResponse('Forbidden - IP not allowed', {
-            status: 403,
-          })
-        }
-      }
-      break
-    default:
-      if (providerConfig.token) {
-        const providedToken = authHeader?.startsWith('Bearer ') ? authHeader.substring(7) : null
-        if (!providedToken || providedToken !== providerConfig.token) {
-          logger.warn(`[${requestId}] Unauthorized webhook access attempt - invalid token`)
-          return new NextResponse('Unauthorized', { status: 401 })
-        }
-      }
-  }
-
-  return null
-}
-
-/**
- * Process Airtable payloads
- */
-export async function fetchAndProcessAirtablePayloads(
-  webhookData: any,
-  workflowData: any,
-  requestId: string // Original request ID from the ping, used for the final execution log
-) {
-  // Logging handles all error logging
-  let currentCursor: number | null = null
-  let mightHaveMore = true
-  let payloadsFetched = 0
-  let apiCallCount = 0
-  // Use a Map to consolidate changes per record ID
-  const consolidatedChangesMap = new Map<string, AirtableChange>()
-  // Capture raw payloads from Airtable for exposure to workflows
-  const allPayloads = []
-  const localProviderConfig = {
-    ...((webhookData.providerConfig as Record<string, any>) || {}),
-  }
-
-  try {
-    // --- Essential IDs & Config from localProviderConfig ---
-    const baseId = localProviderConfig.baseId
-    const airtableWebhookId = localProviderConfig.externalId
-
-    if (!baseId || !airtableWebhookId) {
-      logger.error(
-        `[${requestId}] Missing baseId or externalId in providerConfig for webhook ${webhookData.id}. Cannot fetch payloads.`
-      )
-      return
-    }
-
-    const credentialId: string | undefined = localProviderConfig.credentialId
-    if (!credentialId) {
-      logger.error(
-        `[${requestId}] Missing credentialId in providerConfig for Airtable webhook ${webhookData.id}.`
-      )
-      return
-    }
-
-    const resolvedAirtable = await resolveOAuthAccountId(credentialId)
-    if (!resolvedAirtable) {
-      logger.error(
-        `[${requestId}] Could not resolve credential ${credentialId} for Airtable webhook`
-      )
-      return
-    }
-
-    let ownerUserId: string | null = null
-    try {
-      const rows = await db
-        .select()
-        .from(account)
-        .where(eq(account.id, resolvedAirtable.accountId))
-        .limit(1)
-      ownerUserId = rows.length ? rows[0].userId : null
-    } catch (_e) {
-      ownerUserId = null
-    }
-
-    if (!ownerUserId) {
-      logger.error(
-        `[${requestId}] Could not resolve owner for Airtable credential ${credentialId} on webhook ${webhookData.id}`
-      )
-      return
-    }
-
-    const storedCursor = localProviderConfig.externalWebhookCursor
-
-    if (storedCursor === undefined || storedCursor === null) {
-      logger.info(
-        `[${requestId}] No cursor found in providerConfig for webhook ${webhookData.id}, initializing...`
-      )
-      localProviderConfig.externalWebhookCursor = null
-
-      try {
-        await db
-          .update(webhook)
-          .set({
-            providerConfig: {
-              ...localProviderConfig,
-              externalWebhookCursor: null,
-            },
-            updatedAt: new Date(),
-          })
-          .where(eq(webhook.id, webhookData.id))
-
-        localProviderConfig.externalWebhookCursor = null
-        logger.info(`[${requestId}] Successfully initialized cursor for webhook ${webhookData.id}`)
-      } catch (initError: any) {
-        logger.error(`[${requestId}] Failed to initialize cursor in DB`, {
-          webhookId: webhookData.id,
-          error: initError.message,
-          stack: initError.stack,
-        })
-      }
-    }
-
-    if (storedCursor && typeof storedCursor === 'number') {
-      currentCursor = storedCursor
-    } else {
-      currentCursor = null
-    }
-
-    let accessToken: string | null = null
-    try {
-      accessToken = await refreshAccessTokenIfNeeded(
-        resolvedAirtable.accountId,
-        ownerUserId,
-        requestId
-      )
-      if (!accessToken) {
-        logger.error(
-          `[${requestId}] Failed to obtain valid Airtable access token via credential ${credentialId}.`
-        )
-        throw new Error('Airtable access token not found.')
-      }
-    } catch (tokenError: any) {
-      logger.error(
-        `[${requestId}] Failed to get Airtable OAuth token for credential ${credentialId}`,
-        {
-          error: tokenError.message,
-          stack: tokenError.stack,
-          credentialId,
-        }
-      )
-      return
-    }
-
-    const airtableApiBase = 'https://api.airtable.com/v0'
-
-    // --- Polling Loop ---
-    while (mightHaveMore) {
-      apiCallCount++
-      // Safety break
-      if (apiCallCount > 10) {
-        mightHaveMore = false
-        break
-      }
-
-      const apiUrl = `${airtableApiBase}/bases/${baseId}/webhooks/${airtableWebhookId}/payloads`
-      const queryParams = new URLSearchParams()
-      if (currentCursor !== null) {
-        queryParams.set('cursor', currentCursor.toString())
-      }
-      const fullUrl = `${apiUrl}?${queryParams.toString()}`
-
-      try {
-        const fetchStartTime = Date.now()
-        const response = await fetch(fullUrl, {
-          method: 'GET',
-          headers: {
-            Authorization: `Bearer ${accessToken}`,
-            'Content-Type': 'application/json',
-          },
-        })
-
-        const responseBody = await response.json()
-
-        if (!response.ok || responseBody.error) {
-          const errorMessage =
-            responseBody.error?.message ||
-            responseBody.error ||
-            `Airtable API error Status ${response.status}`
-          logger.error(
-            `[${requestId}] Airtable API request to /payloads failed (Call ${apiCallCount})`,
-            {
-              webhookId: webhookData.id,
-              status: response.status,
-              error: errorMessage,
-            }
-          )
-          // Error logging handled by logging session
-          mightHaveMore = false
-          break
-        }
-
-        const receivedPayloads = responseBody.payloads || []
-
-        // --- Process and Consolidate Changes ---
-        if (receivedPayloads.length > 0) {
-          payloadsFetched += receivedPayloads.length
-          // Keep the raw payloads for later exposure to the workflow
-          for (const p of receivedPayloads) {
-            allPayloads.push(p)
-          }
-          let changeCount = 0
-          for (const payload of receivedPayloads) {
-            if (payload.changedTablesById) {
-              for (const [tableId, tableChangesUntyped] of Object.entries(
-                payload.changedTablesById
-              )) {
-                const tableChanges = tableChangesUntyped as any // Assert type
-
-                // Handle created records
-                if (tableChanges.createdRecordsById) {
-                  const createdCount = Object.keys(tableChanges.createdRecordsById).length
-                  changeCount += createdCount
-
-                  for (const [recordId, recordDataUntyped] of Object.entries(
-                    tableChanges.createdRecordsById
-                  )) {
-                    const recordData = recordDataUntyped as any // Assert type
-                    const existingChange = consolidatedChangesMap.get(recordId)
-                    if (existingChange) {
-                      // Record was created and possibly updated within the same batch
-                      existingChange.changedFields = {
-                        ...existingChange.changedFields,
-                        ...(recordData.cellValuesByFieldId || {}),
-                      }
-                      // Keep changeType as 'created' if it started as created
-                    } else {
-                      // New creation
-                      consolidatedChangesMap.set(recordId, {
-                        tableId: tableId,
-                        recordId: recordId,
-                        changeType: 'created',
-                        changedFields: recordData.cellValuesByFieldId || {},
-                      })
-                    }
-                  }
-                }
-
-                // Handle updated records
-                if (tableChanges.changedRecordsById) {
-                  const updatedCount = Object.keys(tableChanges.changedRecordsById).length
-                  changeCount += updatedCount
-
-                  for (const [recordId, recordDataUntyped] of Object.entries(
-                    tableChanges.changedRecordsById
-                  )) {
-                    const recordData = recordDataUntyped as any // Assert type
-                    const existingChange = consolidatedChangesMap.get(recordId)
-                    const currentFields = recordData.current?.cellValuesByFieldId || {}
-
-                    if (existingChange) {
-                      // Existing record was updated again
-                      existingChange.changedFields = {
-                        ...existingChange.changedFields,
-                        ...currentFields,
-                      }
-                      // Ensure type is 'updated' if it was previously 'created'
-                      existingChange.changeType = 'updated'
-                      // Do not update previousFields again
-                    } else {
-                      // First update for this record in the batch
-                      const newChange: AirtableChange = {
-                        tableId: tableId,
-                        recordId: recordId,
-                        changeType: 'updated',
-                        changedFields: currentFields,
-                      }
-                      if (recordData.previous?.cellValuesByFieldId) {
-                        newChange.previousFields = recordData.previous.cellValuesByFieldId
-                      }
-                      consolidatedChangesMap.set(recordId, newChange)
-                    }
-                  }
-                }
-                // TODO: Handle deleted records (`destroyedRecordIds`) if needed
-              }
-            }
-          }
-        }
-
-        const nextCursor = responseBody.cursor
-        mightHaveMore = responseBody.mightHaveMore || false
-
-        if (nextCursor && typeof nextCursor === 'number' && nextCursor !== currentCursor) {
-          currentCursor = nextCursor
-
-          // Follow exactly the old implementation - use awaited update instead of parallel
-          const updatedConfig = {
-            ...localProviderConfig,
-            externalWebhookCursor: currentCursor,
-          }
-          try {
-            // Force a complete object update to ensure consistency in serverless env
-            await db
-              .update(webhook)
-              .set({
-                providerConfig: updatedConfig, // Use full object
-                updatedAt: new Date(),
-              })
-              .where(eq(webhook.id, webhookData.id))
-
-            localProviderConfig.externalWebhookCursor = currentCursor // Update local copy too
-          } catch (dbError: any) {
-            logger.error(`[${requestId}] Failed to persist Airtable cursor to DB`, {
-              webhookId: webhookData.id,
-              cursor: currentCursor,
-              error: dbError.message,
-            })
-            // Error logging handled by logging session
-            mightHaveMore = false
-            throw new Error('Failed to save Airtable cursor, stopping processing.') // Re-throw to break loop clearly
-          }
-        } else if (!nextCursor || typeof nextCursor !== 'number') {
-          logger.warn(`[${requestId}] Invalid or missing cursor received, stopping poll`, {
-            webhookId: webhookData.id,
-            apiCall: apiCallCount,
-            receivedCursor: nextCursor,
-          })
-          mightHaveMore = false
-        } else if (nextCursor === currentCursor) {
-          mightHaveMore = false // Explicitly stop if cursor hasn't changed
-        }
-      } catch (fetchError: any) {
-        logger.error(
-          `[${requestId}] Network error calling Airtable GET /payloads (Call ${apiCallCount}) for webhook ${webhookData.id}`,
-          fetchError
-        )
-        // Error logging handled by logging session
-        mightHaveMore = false
-        break
-      }
-    }
-    // --- End Polling Loop ---
-
-    // Convert map values to array for final processing
-    const finalConsolidatedChanges = Array.from(consolidatedChangesMap.values())
-    logger.info(
-      `[${requestId}] Consolidated ${finalConsolidatedChanges.length} Airtable changes across ${apiCallCount} API calls`
-    )
-
-    // --- Execute Workflow if we have changes (simplified - no lock check) ---
-    if (finalConsolidatedChanges.length > 0 || allPayloads.length > 0) {
-      try {
-        // Build input exposing raw payloads and consolidated changes
-        const latestPayload = allPayloads.length > 0 ? allPayloads[allPayloads.length - 1] : null
-        const input: any = {
-          // Raw Airtable payloads as received from the API
-          payloads: allPayloads,
-          latestPayload,
-          // Consolidated, simplified changes for convenience
-          airtableChanges: finalConsolidatedChanges,
-          // Include webhook metadata for resolver fallbacks
-          webhook: {
-            data: {
-              provider: 'airtable',
-              providerConfig: webhookData.providerConfig,
-              payload: latestPayload,
-            },
-          },
-        }
-
-        // CRITICAL EXECUTION TRACE POINT
-        logger.info(
-          `[${requestId}] CRITICAL_TRACE: Beginning workflow execution with ${finalConsolidatedChanges.length} Airtable changes`,
-          {
-            workflowId: workflowData.id,
-            recordCount: finalConsolidatedChanges.length,
-            timestamp: new Date().toISOString(),
-            firstRecordId: finalConsolidatedChanges[0]?.recordId || 'none',
-          }
-        )
-
-        // Return the processed input for the trigger.dev task to handle
-        logger.info(`[${requestId}] CRITICAL_TRACE: Airtable changes processed, returning input`, {
-          workflowId: workflowData.id,
-          recordCount: finalConsolidatedChanges.length,
-          rawPayloadCount: allPayloads.length,
-          timestamp: new Date().toISOString(),
-        })
-
-        return input
-      } catch (processingError: any) {
-        logger.error(`[${requestId}] CRITICAL_TRACE: Error processing Airtable changes`, {
-          workflowId: workflowData.id,
-          error: processingError.message,
-          stack: processingError.stack,
-          timestamp: new Date().toISOString(),
-        })
-
-        throw processingError
-      }
-    } else {
-      // DEBUG: Log when no changes are found
-      logger.info(`[${requestId}] TRACE: No Airtable changes to process`, {
-        workflowId: workflowData.id,
-        apiCallCount,
-        webhookId: webhookData.id,
-      })
-    }
-  } catch (error) {
-    // Catch any unexpected errors during the setup/polling logic itself
-    logger.error(
-      `[${requestId}] Unexpected error during asynchronous Airtable payload processing task`,
-      {
-        webhookId: webhookData.id,
-        workflowId: workflowData.id,
-        error: (error as Error).message,
-      }
-    )
-    // Error logging handled by logging session
-  }
-}
-
-// Define an interface for AirtableChange
-export interface AirtableChange {
-  tableId: string
-  recordId: string
-  changeType: 'created' | 'updated'
-  changedFields: Record<string, any> // { fieldId: newValue }
-  previousFields?: Record<string, any> // { fieldId: previousValue } (optional)
-}
-
 /**
  * Result of syncing webhooks for a credential set
  */
@@ -2251,7 +51,7 @@ export async function syncWebhooksForCredentialSet(params: {
   basePath: string
   credentialSetId: string
   oauthProviderId: string
-  providerConfig: Record<string, any>
+  providerConfig: Record<string, unknown>
   requestId: string
   tx?: DbOrTx
   deploymentVersionId?: string
@@ -2291,7 +91,6 @@ export async function syncWebhooksForCredentialSet(params: {
     `[${requestId}] Found ${credentials.length} credentials in set ${credentialSetId}`
   )
 
-  // Get existing webhooks for this workflow+block that belong to this credential set
   const existingWebhooks = await dbCtx
     .select()
     .from(webhook)
@@ -2310,7 +109,6 @@ export async function syncWebhooksForCredentialSet(params: {
           )
     )
 
-  // Filter to only webhooks belonging to this credential set
   const credentialSetWebhooks = existingWebhooks.filter(
     (wh) => wh.credentialSetId === credentialSetId
   )
@@ -2319,12 +117,11 @@ export async function syncWebhooksForCredentialSet(params: {
     `[${requestId}] Found ${credentialSetWebhooks.length} existing webhooks for credential set`
   )
 
-  // Build maps for efficient lookup
   const existingByCredentialId = new Map<string, (typeof credentialSetWebhooks)[number]>()
   for (const wh of credentialSetWebhooks) {
-    const config = wh.providerConfig as Record<string, any>
+    const config = wh.providerConfig as Record<string, unknown>
     if (config?.credentialId) {
-      existingByCredentialId.set(config.credentialId, wh)
+      existingByCredentialId.set(config.credentialId as string, wh)
     }
   }
 
@@ -2347,21 +144,18 @@ export async function syncWebhooksForCredentialSet(params: {
     failed: [],
   }
 
-  // Process each credential in the set
   for (const cred of credentials) {
     try {
       const existingWebhook = existingByCredentialId.get(cred.credentialId)
 
       if (existingWebhook) {
-        // Update existing webhook - preserve state fields
-        const existingConfig = existingWebhook.providerConfig as Record<string, any>
+        const existingConfig = existingWebhook.providerConfig as Record<string, unknown>
 
         const updatedConfig = {
           ...providerConfig,
-          basePath, // Store basePath for reliable reconstruction during membership sync
+          basePath,
           credentialId: cred.credentialId,
           credentialSetId: credentialSetId,
-          // Preserve state fields from existing config
           historyId: existingConfig?.historyId,
           lastCheckedTimestamp: existingConfig?.lastCheckedTimestamp,
           setupCompleted: existingConfig?.setupCompleted,
@@ -2390,7 +184,6 @@ export async function syncWebhooksForCredentialSet(params: {
           `[${requestId}] Updated webhook ${existingWebhook.id} for credential ${cred.credentialId}`
         )
       } else {
-        // Create new webhook for this credential
         const webhookId = generateShortId()
         const webhookPath = useUniquePaths
           ? `${basePath}-${cred.credentialId.slice(0, 8)}`
@@ -2398,7 +191,7 @@ export async function syncWebhooksForCredentialSet(params: {
 
         const newConfig = {
           ...providerConfig,
-          basePath, // Store basePath for reliable reconstruction during membership sync
+          basePath,
           credentialId: cred.credentialId,
           credentialSetId: credentialSetId,
           userId: cred.userId,
@@ -2411,7 +204,7 @@ export async function syncWebhooksForCredentialSet(params: {
           path: webhookPath,
           provider,
           providerConfig: newConfig,
-          credentialSetId, // Indexed column for efficient credential set queries
+          credentialSetId,
           isActive: true,
           ...(deploymentVersionId ? { deploymentVersionId } : {}),
           createdAt: new Date(),
@@ -2441,7 +234,6 @@ export async function syncWebhooksForCredentialSet(params: {
     }
   }
 
-  // Delete webhooks for credentials no longer in the set
   for (const [credentialId, existingWebhook] of existingByCredentialId) {
     if (!credentialIdsInSet.has(credentialId)) {
       try {
@@ -2489,7 +281,6 @@ export async function syncAllWebhooksForCredentialSet(
   const syncLogger = createLogger('CredentialSetMembershipSync')
   syncLogger.info(`[${requestId}] Syncing all webhooks for credential set ${credentialSetId}`)
 
-  // Find all webhooks that use this credential set using the indexed column
   const webhooksForSet = await dbCtx
     .select({ webhook })
     .from(webhook)
@@ -2516,12 +307,10 @@ export async function syncAllWebhooksForCredentialSet(
     return { workflowsUpdated: 0, totalCreated: 0, totalDeleted: 0 }
   }
 
-  // Group webhooks by workflow+block to find unique triggers
   const triggerGroups = new Map<string, (typeof webhooksForSet)[number]['webhook']>()
   for (const row of webhooksForSet) {
     const wh = row.webhook
     const key = `${wh.workflowId}:${wh.blockId}`
-    // Keep the first webhook as representative (they all have same config)
     if (!triggerGroups.has(key)) {
       triggerGroups.set(key, wh)
     }
@@ -2541,15 +330,15 @@ export async function syncAllWebhooksForCredentialSet(
       continue
     }
 
-    const config = representativeWebhook.providerConfig as Record<string, any>
+    const config = representativeWebhook.providerConfig as Record<string, unknown>
     const oauthProviderId = getProviderIdFromServiceId(representativeWebhook.provider)
 
     const { credentialId: _cId, userId: _uId, basePath: _bp, ...baseConfig } = config
-    // Use stored basePath if available, otherwise fall back to blockId (for legacy webhooks)
-    const basePath = config.basePath || representativeWebhook.blockId || representativeWebhook.path
+    const basePath =
+      (config.basePath as string) || representativeWebhook.blockId || representativeWebhook.path
 
     try {
-      const result = await syncWebhooksForCredentialSet({
+      const syncResult = await syncWebhooksForCredentialSet({
         workflowId: representativeWebhook.workflowId,
         blockId: representativeWebhook.blockId || '',
         provider: representativeWebhook.provider,
@@ -2563,11 +352,11 @@ export async function syncAllWebhooksForCredentialSet(
       })
 
       workflowsUpdated++
-      totalCreated += result.created
-      totalDeleted += result.deleted
+      totalCreated += syncResult.created
+      totalDeleted += syncResult.deleted
 
       syncLogger.debug(
-        `[${requestId}] Synced webhooks for ${key}: ${result.created} created, ${result.deleted} deleted`
+        `[${requestId}] Synced webhooks for ${key}: ${syncResult.created} created, ${syncResult.deleted} deleted`
       )
     } catch (error) {
       syncLogger.error(`[${requestId}] Error syncing webhooks for ${key}`, error)
@@ -2580,332 +369,3 @@ export async function syncAllWebhooksForCredentialSet(
 
   return { workflowsUpdated, totalCreated, totalDeleted }
 }
-
-/**
- * Configure Gmail polling for a webhook.
- * Each webhook has its own credentialId (credential sets are fanned out at save time).
- */
-export async function configureGmailPolling(webhookData: any, requestId: string): Promise<boolean> {
-  const logger = createLogger('GmailWebhookSetup')
-  logger.info(`[${requestId}] Setting up Gmail polling for webhook ${webhookData.id}`)
-
-  try {
-    const providerConfig = (webhookData.providerConfig as Record<string, any>) || {}
-    const credentialId: string | undefined = providerConfig.credentialId
-
-    if (!credentialId) {
-      logger.error(`[${requestId}] Missing credentialId for Gmail webhook ${webhookData.id}`)
-      return false
-    }
-
-    const resolvedGmail = await resolveOAuthAccountId(credentialId)
-    if (!resolvedGmail) {
-      logger.error(
-        `[${requestId}] Could not resolve credential ${credentialId} for Gmail webhook ${webhookData.id}`
-      )
-      return false
-    }
-
-    const rows = await db
-      .select()
-      .from(account)
-      .where(eq(account.id, resolvedGmail.accountId))
-      .limit(1)
-    if (rows.length === 0) {
-      logger.error(
-        `[${requestId}] Credential ${credentialId} not found for Gmail webhook ${webhookData.id}`
-      )
-      return false
-    }
-
-    const effectiveUserId = rows[0].userId
-
-    const accessToken = await refreshAccessTokenIfNeeded(
-      resolvedGmail.accountId,
-      effectiveUserId,
-      requestId
-    )
-    if (!accessToken) {
-      logger.error(
-        `[${requestId}] Failed to refresh/access Gmail token for credential ${credentialId}`
-      )
-      return false
-    }
-
-    const maxEmailsPerPoll =
-      typeof providerConfig.maxEmailsPerPoll === 'string'
-        ? Number.parseInt(providerConfig.maxEmailsPerPoll, 10) || 25
-        : providerConfig.maxEmailsPerPoll || 25
-
-    const pollingInterval =
-      typeof providerConfig.pollingInterval === 'string'
-        ? Number.parseInt(providerConfig.pollingInterval, 10) || 5
-        : providerConfig.pollingInterval || 5
-
-    const now = new Date()
-
-    await db
-      .update(webhook)
-      .set({
-        providerConfig: {
-          ...providerConfig,
-          userId: effectiveUserId,
-          credentialId,
-          maxEmailsPerPoll,
-          pollingInterval,
-          markAsRead: providerConfig.markAsRead || false,
-          includeRawEmail: providerConfig.includeRawEmail || false,
-          labelIds: providerConfig.labelIds || ['INBOX'],
-          labelFilterBehavior: providerConfig.labelFilterBehavior || 'INCLUDE',
-          lastCheckedTimestamp: providerConfig.lastCheckedTimestamp || now.toISOString(),
-          setupCompleted: true,
-        },
-        updatedAt: now,
-      })
-      .where(eq(webhook.id, webhookData.id))
-
-    logger.info(
-      `[${requestId}] Successfully configured Gmail polling for webhook ${webhookData.id}`
-    )
-    return true
-  } catch (error: any) {
-    logger.error(`[${requestId}] Failed to configure Gmail polling`, {
-      webhookId: webhookData.id,
-      error: error.message,
-      stack: error.stack,
-    })
-    return false
-  }
-}
-
-/**
- * Configure Outlook polling for a webhook.
- * Each webhook has its own credentialId (credential sets are fanned out at save time).
- */
-export async function configureOutlookPolling(
-  webhookData: any,
-  requestId: string
-): Promise<boolean> {
-  const logger = createLogger('OutlookWebhookSetup')
-  logger.info(`[${requestId}] Setting up Outlook polling for webhook ${webhookData.id}`)
-
-  try {
-    const providerConfig = (webhookData.providerConfig as Record<string, any>) || {}
-    const credentialId: string | undefined = providerConfig.credentialId
-
-    if (!credentialId) {
-      logger.error(`[${requestId}] Missing credentialId for Outlook webhook ${webhookData.id}`)
-      return false
-    }
-
-    const resolvedOutlook = await resolveOAuthAccountId(credentialId)
-    if (!resolvedOutlook) {
-      logger.error(
-        `[${requestId}] Could not resolve credential ${credentialId} for Outlook webhook ${webhookData.id}`
-      )
-      return false
-    }
-
-    const rows = await db
-      .select()
-      .from(account)
-      .where(eq(account.id, resolvedOutlook.accountId))
-      .limit(1)
-    if (rows.length === 0) {
-      logger.error(
-        `[${requestId}] Credential ${credentialId} not found for Outlook webhook ${webhookData.id}`
-      )
-      return false
-    }
-
-    const effectiveUserId = rows[0].userId
-
-    const accessToken = await refreshAccessTokenIfNeeded(
-      resolvedOutlook.accountId,
-      effectiveUserId,
-      requestId
-    )
-    if (!accessToken) {
-      logger.error(
-        `[${requestId}] Failed to refresh/access Outlook token for credential ${credentialId}`
-      )
-      return false
-    }
-
-    const now = new Date()
-
-    await db
-      .update(webhook)
-      .set({
-        providerConfig: {
-          ...providerConfig,
-          userId: effectiveUserId,
-          credentialId,
-          maxEmailsPerPoll:
-            typeof providerConfig.maxEmailsPerPoll === 'string'
-              ? Number.parseInt(providerConfig.maxEmailsPerPoll, 10) || 25
-              : providerConfig.maxEmailsPerPoll || 25,
-          pollingInterval:
-            typeof providerConfig.pollingInterval === 'string'
-              ? Number.parseInt(providerConfig.pollingInterval, 10) || 5
-              : providerConfig.pollingInterval || 5,
-          markAsRead: providerConfig.markAsRead || false,
-          includeRawEmail: providerConfig.includeRawEmail || false,
-          folderIds: providerConfig.folderIds || ['inbox'],
-          folderFilterBehavior: providerConfig.folderFilterBehavior || 'INCLUDE',
-          lastCheckedTimestamp: providerConfig.lastCheckedTimestamp || now.toISOString(),
-          setupCompleted: true,
-        },
-        updatedAt: now,
-      })
-      .where(eq(webhook.id, webhookData.id))
-
-    logger.info(
-      `[${requestId}] Successfully configured Outlook polling for webhook ${webhookData.id}`
-    )
-    return true
-  } catch (error: any) {
-    logger.error(`[${requestId}] Failed to configure Outlook polling`, {
-      webhookId: webhookData.id,
-      error: error.message,
-      stack: error.stack,
-    })
-    return false
-  }
-}
-
-/**
- * Configure RSS polling for a webhook
- */
-export async function configureRssPolling(webhookData: any, requestId: string): Promise<boolean> {
-  const logger = createLogger('RssWebhookSetup')
-  logger.info(`[${requestId}] Setting up RSS polling for webhook ${webhookData.id}`)
-
-  try {
-    const providerConfig = (webhookData.providerConfig as Record<string, any>) || {}
-    const now = new Date()
-
-    await db
-      .update(webhook)
-      .set({
-        providerConfig: {
-          ...providerConfig,
-          lastCheckedTimestamp: now.toISOString(),
-          lastSeenGuids: [],
-          setupCompleted: true,
-        },
-        updatedAt: now,
-      })
-      .where(eq(webhook.id, webhookData.id))
-
-    logger.info(`[${requestId}] Successfully configured RSS polling for webhook ${webhookData.id}`)
-    return true
-  } catch (error: any) {
-    logger.error(`[${requestId}] Failed to configure RSS polling`, {
-      webhookId: webhookData.id,
-      error: error.message,
-    })
-    return false
-  }
-}
-
-/**
- * Configure IMAP polling for a webhook
- */
-export async function configureImapPolling(webhookData: any, requestId: string): Promise<boolean> {
-  const logger = createLogger('ImapWebhookSetup')
-  logger.info(`[${requestId}] Setting up IMAP polling for webhook ${webhookData.id}`)
-
-  try {
-    const providerConfig = (webhookData.providerConfig as Record<string, any>) || {}
-    const now = new Date()
-
-    if (!providerConfig.host || !providerConfig.username || !providerConfig.password) {
-      logger.error(
-        `[${requestId}] Missing required IMAP connection settings for webhook ${webhookData.id}`
-      )
-      return false
-    }
-
-    await db
-      .update(webhook)
-      .set({
-        providerConfig: {
-          ...providerConfig,
-          port: providerConfig.port || '993',
-          secure: providerConfig.secure !== false,
-          mailbox: providerConfig.mailbox || 'INBOX',
-          searchCriteria: providerConfig.searchCriteria || 'UNSEEN',
-          markAsRead: providerConfig.markAsRead || false,
-          includeAttachments: providerConfig.includeAttachments !== false,
-          lastCheckedTimestamp: now.toISOString(),
-          setupCompleted: true,
-        },
-        updatedAt: now,
-      })
-      .where(eq(webhook.id, webhookData.id))
-
-    logger.info(`[${requestId}] Successfully configured IMAP polling for webhook ${webhookData.id}`)
-    return true
-  } catch (error: any) {
-    logger.error(`[${requestId}] Failed to configure IMAP polling`, {
-      webhookId: webhookData.id,
-      error: error.message,
-    })
-    return false
-  }
-}
-
-export function convertSquareBracketsToTwiML(twiml: string | undefined): string | undefined {
-  if (!twiml) {
-    return twiml
-  }
-
-  // Replace [Tag] with <Tag> and [/Tag] with </Tag>
-  return twiml.replace(/\[(\/?[^\]]+)\]/g, '<$1>')
-}
-
-/**
- * Validates a Cal.com webhook request signature using HMAC SHA-256
- * @param secret - Cal.com webhook secret (plain text)
- * @param signature - X-Cal-Signature-256 header value (hex-encoded HMAC SHA-256 signature)
- * @param body - Raw request body string
- * @returns Whether the signature is valid
- */
-export function validateCalcomSignature(secret: string, signature: string, body: string): boolean {
-  try {
-    if (!secret || !signature || !body) {
-      logger.warn('Cal.com signature validation missing required fields', {
-        hasSecret: !!secret,
-        hasSignature: !!signature,
-        hasBody: !!body,
-      })
-      return false
-    }
-
-    // Cal.com sends signature in format: sha256=<hex>
-    // We need to strip the prefix before comparing
-    let providedSignature: string
-    if (signature.startsWith('sha256=')) {
-      providedSignature = signature.substring(7)
-    } else {
-      // If no prefix, use as-is (for backwards compatibility)
-      providedSignature = signature
-    }
-
-    const computedHash = crypto.createHmac('sha256', secret).update(body, 'utf8').digest('hex')
-
-    logger.debug('Cal.com signature comparison', {
-      computedSignature: `${computedHash.substring(0, 10)}...`,
-      providedSignature: `${providedSignature.substring(0, 10)}...`,
-      computedLength: computedHash.length,
-      providedLength: providedSignature.length,
-      match: computedHash === providedSignature,
-    })
-
-    return safeCompare(computedHash, providedSignature)
-  } catch (error) {
-    logger.error('Error validating Cal.com signature:', error)
-    return false
-  }
-}
diff --git a/apps/sim/lib/workflows/executor/execute-workflow.ts b/apps/sim/lib/workflows/executor/execute-workflow.ts
index b8c430406c4..18d42472a6f 100644
--- a/apps/sim/lib/workflows/executor/execute-workflow.ts
+++ b/apps/sim/lib/workflows/executor/execute-workflow.ts
@@ -3,7 +3,7 @@ import { generateId } from '@/lib/core/utils/uuid'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
-import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
+import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata, SerializableExecutionState } from '@/executor/execution/types'
 import type { ExecutionResult, StreamingExecution } from '@/executor/types'
@@ -127,41 +127,7 @@ export async function executeWorkflow(
       )
     }
 
-    if (result.status === 'paused') {
-      if (!result.snapshotSeed) {
-        logger.error(`[${requestId}] Missing snapshot seed for paused execution`, {
-          executionId,
-        })
-        await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
-      } else {
-        try {
-          await PauseResumeManager.persistPauseResult({
-            workflowId,
-            executionId,
-            pausePoints: result.pausePoints || [],
-            snapshotSeed: result.snapshotSeed,
-            executorUserId: result.metadata?.userId,
-          })
-        } catch (pauseError) {
-          logger.error(`[${requestId}] Failed to persist pause result`, {
-            executionId,
-            error: pauseError instanceof Error ? pauseError.message : String(pauseError),
-          })
-          await loggingSession.markAsFailed(
-            `Failed to persist pause state: ${pauseError instanceof Error ? pauseError.message : String(pauseError)}`
-          )
-        }
-      }
-    } else {
-      try {
-        await PauseResumeManager.processQueuedResumes(executionId)
-      } catch (resumeError) {
-        logger.error(`[${requestId}] Failed to process queued resumes`, {
-          executionId,
-          error: resumeError instanceof Error ? resumeError.message : String(resumeError),
-        })
-      }
-    }
+    await handlePostExecutionPauseState({ result, workflowId, executionId, loggingSession })
 
     if (streamConfig?.skipLoggingComplete) {
       return {
diff --git a/apps/sim/lib/workflows/executor/execution-events.ts b/apps/sim/lib/workflows/executor/execution-events.ts
index 31eaacae6cd..1fe95bb4657 100644
--- a/apps/sim/lib/workflows/executor/execution-events.ts
+++ b/apps/sim/lib/workflows/executor/execution-events.ts
@@ -8,6 +8,7 @@ import type { SubflowType } from '@/stores/workflows/workflow/types'
 export type ExecutionEventType =
   | 'execution:started'
   | 'execution:completed'
+  | 'execution:paused'
   | 'execution:error'
   | 'execution:cancelled'
   | 'block:started'
@@ -53,6 +54,20 @@ export interface ExecutionCompletedEvent extends BaseExecutionEvent {
   }
 }
 
+/**
+ * Execution paused event (HITL block waiting for human input)
+ */
+export interface ExecutionPausedEvent extends BaseExecutionEvent {
+  type: 'execution:paused'
+  workflowId: string
+  data: {
+    output: any
+    duration: number
+    startTime: string
+    endTime: string
+  }
+}
+
 /**
  * Execution error event
  */
@@ -196,6 +211,7 @@ export interface StreamDoneEvent extends BaseExecutionEvent {
 export type ExecutionEvent =
   | ExecutionStartedEvent
   | ExecutionCompletedEvent
+  | ExecutionPausedEvent
   | ExecutionErrorEvent
   | ExecutionCancelledEvent
   | BlockStartedEvent
@@ -207,6 +223,7 @@ export type ExecutionEvent =
 
 export type ExecutionStartedData = ExecutionStartedEvent['data']
 export type ExecutionCompletedData = ExecutionCompletedEvent['data']
+export type ExecutionPausedData = ExecutionPausedEvent['data']
 export type ExecutionErrorData = ExecutionErrorEvent['data']
 export type ExecutionCancelledData = ExecutionCancelledEvent['data']
 export type BlockStartedData = BlockStartedEvent['data']
diff --git a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts
index 7b9f0c66ece..2c0d00fcbb7 100644
--- a/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts
+++ b/apps/sim/lib/workflows/executor/human-in-the-loop-manager.ts
@@ -5,11 +5,23 @@ import { and, asc, desc, eq, inArray, lt, type SQL, sql } from 'drizzle-orm'
 import type { Edge } from 'reactflow'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
 import { generateId } from '@/lib/core/utils/uuid'
+import { createExecutionEventWriter, setExecutionMeta } from '@/lib/execution/event-buffer'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
+import type { ExecutionEvent } from '@/lib/workflows/executor/execution-events'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
-import type { ExecutionResult, PausePoint, SerializedSnapshot } from '@/executor/types'
+import type {
+  ChildWorkflowContext,
+  ExecutionCallbacks,
+  IterationContext,
+} from '@/executor/execution/types'
+import type {
+  ExecutionResult,
+  PausePoint,
+  SerializedSnapshot,
+  StreamingExecution,
+} from '@/executor/types'
 import { filterOutputForLog } from '@/executor/utils/output-filter'
 import type { SerializedConnection } from '@/serializer/types'
 
@@ -280,7 +292,7 @@ export class PauseResumeManager {
     })
   }
 
-  static async startResumeExecution(args: StartResumeExecutionArgs): Promise<void> {
+  static async startResumeExecution(args: StartResumeExecutionArgs): Promise<ExecutionResult> {
     const { resumeEntryId, resumeExecutionId, pausedExecution, contextId, resumeInput, userId } =
       args
 
@@ -345,6 +357,8 @@ export class PauseResumeManager {
       })
 
       await PauseResumeManager.processQueuedResumes(pausedExecution.executionId)
+
+      return result
     } catch (error) {
       await PauseResumeManager.markResumeFailed({
         resumeEntryId,
@@ -771,36 +785,273 @@ export class PauseResumeManager {
       actorUserId: metadata.userId,
     })
 
+    const workflowId = pausedExecution.workflowId
+    const eventWriter = createExecutionEventWriter(resumeExecutionId)
+    await setExecutionMeta(resumeExecutionId, {
+      status: 'active',
+      userId: metadata.userId,
+      workflowId,
+    })
+
+    let localEventSeq = 0
+    const writeBufferedEvent = (event: ExecutionEvent) => {
+      localEventSeq++
+      event.eventId = localEventSeq
+      eventWriter.write(event).catch(() => {})
+    }
+
+    writeBufferedEvent({
+      type: 'execution:started',
+      timestamp: new Date().toISOString(),
+      executionId: resumeExecutionId,
+      workflowId,
+      data: { startTime: new Date().toISOString() },
+    } as ExecutionEvent)
+
+    const callbacks: ExecutionCallbacks = {
+      onBlockStart: async (
+        blockId: string,
+        blockName: string,
+        blockType: string,
+        executionOrder: number,
+        iterationContext?: IterationContext,
+        childWorkflowContext?: ChildWorkflowContext
+      ) => {
+        writeBufferedEvent({
+          type: 'block:started',
+          timestamp: new Date().toISOString(),
+          executionId: resumeExecutionId,
+          workflowId,
+          data: {
+            blockId,
+            blockName,
+            blockType,
+            executionOrder,
+            ...(iterationContext && {
+              iterationCurrent: iterationContext.iterationCurrent,
+              iterationTotal: iterationContext.iterationTotal,
+              iterationType: iterationContext.iterationType,
+              iterationContainerId: iterationContext.iterationContainerId,
+              ...(iterationContext.parentIterations?.length && {
+                parentIterations: iterationContext.parentIterations,
+              }),
+            }),
+            ...(childWorkflowContext && {
+              childWorkflowBlockId: childWorkflowContext.parentBlockId,
+              childWorkflowName: childWorkflowContext.workflowName,
+            }),
+          },
+        } as ExecutionEvent)
+      },
+      onBlockComplete: async (
+        blockId: string,
+        blockName: string,
+        blockType: string,
+        callbackData: Record<string, unknown>,
+        iterationContext?: IterationContext,
+        childWorkflowContext?: ChildWorkflowContext
+      ) => {
+        const output = callbackData.output as Record<string, unknown> | undefined
+        const hasError = output?.error
+        const sharedData = {
+          blockId,
+          blockName,
+          blockType,
+          input: callbackData.input,
+          durationMs: (callbackData.executionTime as number) || 0,
+          startedAt: callbackData.startedAt,
+          executionOrder: callbackData.executionOrder,
+          endedAt: callbackData.endedAt,
+          ...(iterationContext && {
+            iterationCurrent: iterationContext.iterationCurrent,
+            iterationTotal: iterationContext.iterationTotal,
+            iterationType: iterationContext.iterationType,
+            iterationContainerId: iterationContext.iterationContainerId,
+            ...(iterationContext.parentIterations?.length && {
+              parentIterations: iterationContext.parentIterations,
+            }),
+          }),
+          ...(childWorkflowContext && {
+            childWorkflowBlockId: childWorkflowContext.parentBlockId,
+            childWorkflowName: childWorkflowContext.workflowName,
+          }),
+          ...(callbackData.childWorkflowInstanceId
+            ? { childWorkflowInstanceId: callbackData.childWorkflowInstanceId }
+            : {}),
+        }
+
+        writeBufferedEvent({
+          type: hasError ? 'block:error' : 'block:completed',
+          timestamp: new Date().toISOString(),
+          executionId: resumeExecutionId,
+          workflowId,
+          data: hasError ? { ...sharedData, error: output?.error } : { ...sharedData, output },
+        } as ExecutionEvent)
+      },
+      onChildWorkflowInstanceReady: (
+        blockId: string,
+        childWorkflowInstanceId: string,
+        iterationContext?: IterationContext,
+        executionOrder?: number
+      ) => {
+        writeBufferedEvent({
+          type: 'block:childWorkflowStarted',
+          timestamp: new Date().toISOString(),
+          executionId: resumeExecutionId,
+          workflowId,
+          data: {
+            blockId,
+            childWorkflowInstanceId,
+            ...(iterationContext && {
+              iterationCurrent: iterationContext.iterationCurrent,
+              iterationContainerId: iterationContext.iterationContainerId,
+            }),
+            ...(executionOrder !== undefined && { executionOrder }),
+          },
+        } as ExecutionEvent)
+      },
+      onStream: async (streamingExec: StreamingExecution) => {
+        const blockId = (streamingExec.execution as unknown as Record<string, unknown>)
+          .blockId as string
+        const reader = streamingExec.stream.getReader()
+        const decoder = new TextDecoder()
+        try {
+          while (true) {
+            const { done, value } = await reader.read()
+            if (done) break
+            const chunk = decoder.decode(value, { stream: true })
+            writeBufferedEvent({
+              type: 'stream:chunk',
+              timestamp: new Date().toISOString(),
+              executionId: resumeExecutionId,
+              workflowId,
+              data: { blockId, chunk },
+            } as ExecutionEvent)
+          }
+          writeBufferedEvent({
+            type: 'stream:done',
+            timestamp: new Date().toISOString(),
+            executionId: resumeExecutionId,
+            workflowId,
+            data: { blockId },
+          } as ExecutionEvent)
+        } catch (streamError) {
+          logger.error('Error streaming block content during resume', {
+            resumeExecutionId,
+            blockId,
+            error: streamError instanceof Error ? streamError.message : String(streamError),
+          })
+        } finally {
+          try {
+            await reader.cancel().catch(() => {})
+          } catch {}
+        }
+      },
+    }
+
     const timeoutController = createTimeoutAbortController(
       preprocessingResult.executionTimeout?.async
     )
 
     let result: ExecutionResult
+    let finalMetaStatus: 'complete' | 'error' | 'cancelled' = 'complete'
     try {
       result = await executeWorkflowCore({
         snapshot: resumeSnapshot,
-        callbacks: {},
+        callbacks,
         loggingSession,
-        skipLogCreation: true, // Reuse existing log entry
-        includeFileBase64: true, // Enable base64 hydration
-        base64MaxBytes: undefined, // Use default limit
+        skipLogCreation: true,
+        includeFileBase64: true,
+        base64MaxBytes: undefined,
         abortSignal: timeoutController.signal,
       })
+
+      if (
+        result.status === 'cancelled' &&
+        timeoutController.isTimedOut() &&
+        timeoutController.timeoutMs
+      ) {
+        const timeoutErrorMessage = getTimeoutErrorMessage(null, timeoutController.timeoutMs)
+        logger.info('Resume execution timed out', {
+          resumeExecutionId,
+          timeoutMs: timeoutController.timeoutMs,
+        })
+        await loggingSession.markAsFailed(timeoutErrorMessage)
+
+        writeBufferedEvent({
+          type: 'execution:error',
+          timestamp: new Date().toISOString(),
+          executionId: resumeExecutionId,
+          workflowId,
+          data: {
+            error: timeoutErrorMessage,
+            duration: result.metadata?.duration || 0,
+          },
+        } as ExecutionEvent)
+        finalMetaStatus = 'error'
+      } else if (result.status === 'cancelled') {
+        writeBufferedEvent({
+          type: 'execution:cancelled',
+          timestamp: new Date().toISOString(),
+          executionId: resumeExecutionId,
+          workflowId,
+          data: { duration: result.metadata?.duration || 0 },
+        } as ExecutionEvent)
+        finalMetaStatus = 'cancelled'
+      } else if (result.status === 'paused') {
+        writeBufferedEvent({
+          type: 'execution:paused',
+          timestamp: new Date().toISOString(),
+          executionId: resumeExecutionId,
+          workflowId,
+          data: {
+            output: result.output,
+            duration: result.metadata?.duration || 0,
+            startTime: result.metadata?.startTime || new Date().toISOString(),
+            endTime: result.metadata?.endTime || new Date().toISOString(),
+          },
+        } as ExecutionEvent)
+        finalMetaStatus = 'complete'
+      } else {
+        writeBufferedEvent({
+          type: 'execution:completed',
+          timestamp: new Date().toISOString(),
+          executionId: resumeExecutionId,
+          workflowId,
+          data: {
+            success: result.success,
+            output: result.output,
+            duration: result.metadata?.duration || 0,
+            startTime: result.metadata?.startTime || new Date().toISOString(),
+            endTime: result.metadata?.endTime || new Date().toISOString(),
+          },
+        } as ExecutionEvent)
+        finalMetaStatus = 'complete'
+      }
+    } catch (execError) {
+      writeBufferedEvent({
+        type: 'execution:error',
+        timestamp: new Date().toISOString(),
+        executionId: resumeExecutionId,
+        workflowId,
+        data: {
+          error: execError instanceof Error ? execError.message : String(execError),
+          duration: 0,
+        },
+      } as ExecutionEvent)
+      finalMetaStatus = 'error'
+      throw execError
     } finally {
       timeoutController.cleanup()
-    }
-
-    if (
-      result.status === 'cancelled' &&
-      timeoutController.isTimedOut() &&
-      timeoutController.timeoutMs
-    ) {
-      const timeoutErrorMessage = getTimeoutErrorMessage(null, timeoutController.timeoutMs)
-      logger.info('Resume execution timed out', {
-        resumeExecutionId,
-        timeoutMs: timeoutController.timeoutMs,
-      })
-      await loggingSession.markAsFailed(timeoutErrorMessage)
+      try {
+        await eventWriter.close()
+      } catch (closeError) {
+        logger.warn('Failed to close event writer for resume', {
+          resumeExecutionId,
+          error: closeError instanceof Error ? closeError.message : String(closeError),
+        })
+      }
+      setExecutionMeta(resumeExecutionId, { status: finalMetaStatus }).catch(() => {})
     }
 
     return result
diff --git a/apps/sim/lib/workflows/executor/pause-persistence.ts b/apps/sim/lib/workflows/executor/pause-persistence.ts
new file mode 100644
index 00000000000..c522fb5eeae
--- /dev/null
+++ b/apps/sim/lib/workflows/executor/pause-persistence.ts
@@ -0,0 +1,64 @@
+import { createLogger } from '@sim/logger'
+import type { LoggingSession } from '@/lib/logs/execution/logging-session'
+import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
+import type { ExecutionResult } from '@/executor/types'
+
+const logger = createLogger('PausePersistence')
+
+interface HandlePostExecutionPauseStateArgs {
+  result: ExecutionResult
+  workflowId: string
+  executionId: string
+  loggingSession: LoggingSession
+}
+
+/**
+ * Handles pause persistence and resume queue processing after `executeWorkflowCore` returns.
+ *
+ * Every caller of `executeWorkflowCore` must call this after execution completes
+ * to ensure HITL pause state is persisted to the database and queued resumes are drained.
+ *
+ * - If execution is paused with a valid snapshot: persists to `paused_executions` table
+ * - If execution is paused without a snapshot: marks execution as failed
+ * - If execution is not paused: processes any queued resume entries
+ */
+export async function handlePostExecutionPauseState({
+  result,
+  workflowId,
+  executionId,
+  loggingSession,
+}: HandlePostExecutionPauseStateArgs): Promise<void> {
+  if (result.status === 'paused') {
+    if (!result.snapshotSeed) {
+      logger.error('Missing snapshot seed for paused execution', { executionId })
+      await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
+    } else {
+      try {
+        await PauseResumeManager.persistPauseResult({
+          workflowId,
+          executionId,
+          pausePoints: result.pausePoints || [],
+          snapshotSeed: result.snapshotSeed,
+          executorUserId: result.metadata?.userId,
+        })
+      } catch (pauseError) {
+        logger.error('Failed to persist pause result', {
+          executionId,
+          error: pauseError instanceof Error ? pauseError.message : String(pauseError),
+        })
+        await loggingSession.markAsFailed(
+          `Failed to persist pause state: ${pauseError instanceof Error ? pauseError.message : String(pauseError)}`
+        )
+      }
+    }
+  } else {
+    try {
+      await PauseResumeManager.processQueuedResumes(executionId)
+    } catch (resumeError) {
+      logger.error('Failed to process queued resumes', {
+        executionId,
+        error: resumeError instanceof Error ? resumeError.message : String(resumeError),
+      })
+    }
+  }
+}
diff --git a/apps/sim/lib/workflows/executor/queued-workflow-execution.ts b/apps/sim/lib/workflows/executor/queued-workflow-execution.ts
index c60ba860a11..75831b27b95 100644
--- a/apps/sim/lib/workflows/executor/queued-workflow-execution.ts
+++ b/apps/sim/lib/workflows/executor/queued-workflow-execution.ts
@@ -15,7 +15,7 @@ import {
   createExecutionCallbacks,
   type ExecutionEvent,
 } from '@/lib/workflows/executor/execution-events'
-import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
+import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata, SerializableExecutionState } from '@/executor/execution/types'
 import type { BlockLog, NormalizedBlockOutput } from '@/executor/types'
@@ -194,21 +194,7 @@ export async function executeQueuedWorkflowJob(
       )
     }
 
-    if (result.status === 'paused') {
-      if (!result.snapshotSeed) {
-        await loggingSession.markAsFailed('Missing snapshot seed for paused execution')
-      } else {
-        await PauseResumeManager.persistPauseResult({
-          workflowId,
-          executionId,
-          pausePoints: result.pausePoints || [],
-          snapshotSeed: result.snapshotSeed,
-          executorUserId: result.metadata?.userId,
-        })
-      }
-    } else {
-      await PauseResumeManager.processQueuedResumes(executionId)
-    }
+    await handlePostExecutionPauseState({ result, workflowId, executionId, loggingSession })
 
     const outputWithBase64 = payload.includeFileBase64
       ? await hydrateUserFilesWithBase64(result.output, {
@@ -230,6 +216,20 @@ export async function executeQueuedWorkflowJob(
           },
         })
         await setExecutionMeta(executionId, { status: 'cancelled' })
+      } else if (result.status === 'paused') {
+        await eventWriter.write({
+          type: 'execution:paused',
+          timestamp: new Date().toISOString(),
+          executionId,
+          workflowId,
+          data: {
+            output: outputWithBase64,
+            duration: result.metadata?.duration || 0,
+            startTime: result.metadata?.startTime || metadata.startTime,
+            endTime: result.metadata?.endTime || new Date().toISOString(),
+          },
+        })
+        await setExecutionMeta(executionId, { status: 'complete' })
       } else {
         await eventWriter.write({
           type: 'execution:completed',
diff --git a/apps/sim/lib/workflows/lifecycle.ts b/apps/sim/lib/workflows/lifecycle.ts
index c5ecbb639c7..8867816da21 100644
--- a/apps/sim/lib/workflows/lifecycle.ts
+++ b/apps/sim/lib/workflows/lifecycle.ts
@@ -6,6 +6,7 @@ import {
   webhook,
   workflow,
   workflowDeploymentVersion,
+  workflowFolder,
   workflowMcpTool,
   workflowSchedule,
 } from '@sim/db/schema'
@@ -22,6 +23,7 @@ const logger = createLogger('WorkflowLifecycle')
 interface ArchiveWorkflowOptions {
   requestId: string
   notifySocket?: boolean
+  archivedAt?: Date
 }
 
 async function notifyWorkflowArchived(workflowId: string, requestId: string): Promise<void> {
@@ -120,7 +122,7 @@ export async function archiveWorkflow(
     return { archived: false, workflow: existingWorkflow }
   }
 
-  const now = new Date()
+  const now = options.archivedAt ?? new Date()
   const affectedWorkflowMcpServers = await db
     .select({ serverId: workflowMcpTool.serverId })
     .from(workflowMcpTool)
@@ -257,12 +259,28 @@ export async function restoreWorkflow(
     }
   }
 
+  let clearFolderId = false
+  if (existingWorkflow.folderId) {
+    const [folder] = await db
+      .select({ archivedAt: workflowFolder.archivedAt })
+      .from(workflowFolder)
+      .where(eq(workflowFolder.id, existingWorkflow.folderId))
+
+    if (!folder || folder.archivedAt) {
+      clearFolderId = true
+    }
+  }
+
   const now = new Date()
 
   await db.transaction(async (tx) => {
     await tx
       .update(workflow)
-      .set({ archivedAt: null, updatedAt: now })
+      .set({
+        archivedAt: null,
+        updatedAt: now,
+        ...(clearFolderId && { folderId: null }),
+      })
       .where(eq(workflow.id, workflowId))
 
     await tx
diff --git a/apps/sim/lib/workflows/orchestration/folder-lifecycle.ts b/apps/sim/lib/workflows/orchestration/folder-lifecycle.ts
index 05bc2bc4173..03264f20153 100644
--- a/apps/sim/lib/workflows/orchestration/folder-lifecycle.ts
+++ b/apps/sim/lib/workflows/orchestration/folder-lifecycle.ts
@@ -1,7 +1,16 @@
 import { db } from '@sim/db'
-import { workflow, workflowFolder } from '@sim/db/schema'
+import {
+  a2aAgent,
+  chat,
+  form,
+  webhook,
+  workflow,
+  workflowFolder,
+  workflowMcpTool,
+  workflowSchedule,
+} from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { and, eq, isNull } from 'drizzle-orm'
+import { and, eq, inArray, isNull } from 'drizzle-orm'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
 import { archiveWorkflowsByIdsInWorkspace } from '@/lib/workflows/lifecycle'
 import type { OrchestrationErrorCode } from '@/lib/workflows/orchestration/types'
@@ -15,17 +24,25 @@ const logger = createLogger('FolderLifecycle')
  */
 export async function deleteFolderRecursively(
   folderId: string,
-  workspaceId: string
+  workspaceId: string,
+  archivedAt?: Date
 ): Promise<{ folders: number; workflows: number }> {
+  const timestamp = archivedAt ?? new Date()
   const stats = { folders: 0, workflows: 0 }
 
   const childFolders = await db
     .select({ id: workflowFolder.id })
     .from(workflowFolder)
-    .where(and(eq(workflowFolder.parentId, folderId), eq(workflowFolder.workspaceId, workspaceId)))
+    .where(
+      and(
+        eq(workflowFolder.parentId, folderId),
+        eq(workflowFolder.workspaceId, workspaceId),
+        isNull(workflowFolder.archivedAt)
+      )
+    )
 
   for (const childFolder of childFolders) {
-    const childStats = await deleteFolderRecursively(childFolder.id, workspaceId)
+    const childStats = await deleteFolderRecursively(childFolder.id, workspaceId, timestamp)
     stats.folders += childStats.folders
     stats.workflows += childStats.workflows
   }
@@ -45,12 +62,15 @@ export async function deleteFolderRecursively(
     await archiveWorkflowsByIdsInWorkspace(
       workspaceId,
       workflowsInFolder.map((entry) => entry.id),
-      { requestId: `folder-${folderId}` }
+      { requestId: `folder-${folderId}`, archivedAt: timestamp }
     )
     stats.workflows += workflowsInFolder.length
   }
 
-  await db.delete(workflowFolder).where(eq(workflowFolder.id, folderId))
+  await db
+    .update(workflowFolder)
+    .set({ archivedAt: timestamp })
+    .where(eq(workflowFolder.id, folderId))
   stats.folders += 1
 
   return stats
@@ -81,7 +101,13 @@ export async function countWorkflowsInFolderRecursively(
   const childFolders = await db
     .select({ id: workflowFolder.id })
     .from(workflowFolder)
-    .where(and(eq(workflowFolder.parentId, folderId), eq(workflowFolder.workspaceId, workspaceId)))
+    .where(
+      and(
+        eq(workflowFolder.parentId, folderId),
+        eq(workflowFolder.workspaceId, workspaceId),
+        isNull(workflowFolder.archivedAt)
+      )
+    )
 
   for (const childFolder of childFolders) {
     count += await countWorkflowsInFolderRecursively(childFolder.id, workspaceId)
@@ -153,3 +179,154 @@ export async function performDeleteFolder(
 
   return { success: true, deletedItems: deletionStats }
 }
+
+/**
+ * Recursively restores a folder and its children/workflows within a transaction.
+ * Only restores workflows whose `archivedAt` matches the folder's — workflows
+ * individually deleted before the folder are left archived.
+ */
+async function restoreFolderRecursively(
+  folderId: string,
+  workspaceId: string,
+  folderArchivedAt: Date,
+  tx: Parameters<Parameters<typeof db.transaction>[0]>[0]
+): Promise<{ folders: number; workflows: number }> {
+  const stats = { folders: 0, workflows: 0 }
+
+  await tx.update(workflowFolder).set({ archivedAt: null }).where(eq(workflowFolder.id, folderId))
+  stats.folders += 1
+
+  const archivedWorkflows = await tx
+    .select({ id: workflow.id })
+    .from(workflow)
+    .where(
+      and(
+        eq(workflow.folderId, folderId),
+        eq(workflow.workspaceId, workspaceId),
+        eq(workflow.archivedAt, folderArchivedAt)
+      )
+    )
+
+  if (archivedWorkflows.length > 0) {
+    const workflowIds = archivedWorkflows.map((wf) => wf.id)
+    const now = new Date()
+    const restoreSet = { archivedAt: null, updatedAt: now }
+
+    await tx.update(workflow).set(restoreSet).where(inArray(workflow.id, workflowIds))
+    await tx
+      .update(workflowSchedule)
+      .set(restoreSet)
+      .where(inArray(workflowSchedule.workflowId, workflowIds))
+    await tx.update(webhook).set(restoreSet).where(inArray(webhook.workflowId, workflowIds))
+    await tx.update(chat).set(restoreSet).where(inArray(chat.workflowId, workflowIds))
+    await tx.update(form).set(restoreSet).where(inArray(form.workflowId, workflowIds))
+    await tx
+      .update(workflowMcpTool)
+      .set(restoreSet)
+      .where(inArray(workflowMcpTool.workflowId, workflowIds))
+    await tx.update(a2aAgent).set(restoreSet).where(inArray(a2aAgent.workflowId, workflowIds))
+
+    stats.workflows += archivedWorkflows.length
+  }
+
+  const archivedChildren = await tx
+    .select({ id: workflowFolder.id })
+    .from(workflowFolder)
+    .where(
+      and(
+        eq(workflowFolder.parentId, folderId),
+        eq(workflowFolder.workspaceId, workspaceId),
+        eq(workflowFolder.archivedAt, folderArchivedAt)
+      )
+    )
+
+  for (const child of archivedChildren) {
+    const childStats = await restoreFolderRecursively(child.id, workspaceId, folderArchivedAt, tx)
+    stats.folders += childStats.folders
+    stats.workflows += childStats.workflows
+  }
+
+  return stats
+}
+
+/** Parameters for {@link performRestoreFolder}. */
+export interface PerformRestoreFolderParams {
+  folderId: string
+  workspaceId: string
+  userId: string
+  folderName?: string
+}
+
+/** Outcome of {@link performRestoreFolder}. */
+export interface PerformRestoreFolderResult {
+  success: boolean
+  error?: string
+  restoredItems?: { folders: number; workflows: number }
+}
+
+/**
+ * Restores an archived folder and all its archived children and workflows.
+ * If the folder's parent is still archived, moves it to the root level.
+ */
+export async function performRestoreFolder(
+  params: PerformRestoreFolderParams
+): Promise<PerformRestoreFolderResult> {
+  const { folderId, workspaceId, userId, folderName } = params
+
+  const [folder] = await db
+    .select()
+    .from(workflowFolder)
+    .where(and(eq(workflowFolder.id, folderId), eq(workflowFolder.workspaceId, workspaceId)))
+
+  if (!folder) {
+    return { success: false, error: 'Folder not found' }
+  }
+
+  if (!folder.archivedAt) {
+    return { success: true, restoredItems: { folders: 0, workflows: 0 } }
+  }
+
+  const { getWorkspaceWithOwner } = await import('@/lib/workspaces/permissions/utils')
+  const ws = await getWorkspaceWithOwner(workspaceId)
+  if (!ws || ws.archivedAt) {
+    return { success: false, error: 'Cannot restore folder into an archived workspace' }
+  }
+
+  const restoredStats = await db.transaction(async (tx) => {
+    if (folder.parentId) {
+      const [parentFolder] = await tx
+        .select({ archivedAt: workflowFolder.archivedAt })
+        .from(workflowFolder)
+        .where(eq(workflowFolder.id, folder.parentId))
+
+      if (!parentFolder || parentFolder.archivedAt) {
+        await tx
+          .update(workflowFolder)
+          .set({ parentId: null })
+          .where(eq(workflowFolder.id, folderId))
+      }
+    }
+
+    return restoreFolderRecursively(folderId, workspaceId, folder.archivedAt!, tx)
+  })
+
+  logger.info('Restored folder and all contents:', { folderId, restoredStats })
+
+  recordAudit({
+    workspaceId,
+    actorId: userId,
+    action: AuditAction.FOLDER_RESTORED,
+    resourceType: AuditResourceType.FOLDER,
+    resourceId: folderId,
+    resourceName: folderName ?? folder.name,
+    description: `Restored folder "${folderName ?? folder.name}"`,
+    metadata: {
+      affected: {
+        workflows: restoredStats.workflows,
+        subfolders: restoredStats.folders - 1,
+      },
+    },
+  })
+
+  return { success: true, restoredItems: restoredStats }
+}
diff --git a/apps/sim/lib/workflows/triggers/trigger-utils.ts b/apps/sim/lib/workflows/triggers/trigger-utils.ts
index 276e28ce889..f1ee5ce7450 100644
--- a/apps/sim/lib/workflows/triggers/trigger-utils.ts
+++ b/apps/sim/lib/workflows/triggers/trigger-utils.ts
@@ -74,7 +74,12 @@ function processOutputField(key: string, field: unknown, depth = 0, maxDepth = 1
     return null
   }
 
-  if (field && typeof field === 'object' && 'type' in field) {
+  if (
+    field &&
+    typeof field === 'object' &&
+    'type' in field &&
+    typeof (field as Record<string, unknown>).type === 'string'
+  ) {
     const typedField = field as { type: string; description?: string }
     return generateMockValue(typedField.type, typedField.description, key)
   }
diff --git a/apps/sim/stores/folders/types.ts b/apps/sim/stores/folders/types.ts
index 4daadc0236f..5982f6ed5eb 100644
--- a/apps/sim/stores/folders/types.ts
+++ b/apps/sim/stores/folders/types.ts
@@ -19,6 +19,7 @@ export interface WorkflowFolder {
   sortOrder: number
   createdAt: Date
   updatedAt: Date
+  archivedAt?: Date | null
 }
 
 export interface FolderTreeNode extends WorkflowFolder {
diff --git a/apps/sim/stores/panel/types.ts b/apps/sim/stores/panel/types.ts
index 5d0bf4eca21..f60a3f6a513 100644
--- a/apps/sim/stores/panel/types.ts
+++ b/apps/sim/stores/panel/types.ts
@@ -29,6 +29,7 @@ export type ChatContext =
   | { kind: 'knowledge'; knowledgeId?: string; label: string }
   | { kind: 'table'; tableId: string; label: string }
   | { kind: 'file'; fileId: string; label: string }
+  | { kind: 'folder'; folderId: string; label: string }
   | { kind: 'templates'; templateId?: string; label: string }
   | { kind: 'docs'; label: string }
   | { kind: 'slash_command'; command: string; label: string }
diff --git a/apps/sim/stores/settings/dirty/store.ts b/apps/sim/stores/settings/dirty/store.ts
new file mode 100644
index 00000000000..4dbec7bf720
--- /dev/null
+++ b/apps/sim/stores/settings/dirty/store.ts
@@ -0,0 +1,53 @@
+import { create } from 'zustand'
+import { devtools } from 'zustand/middleware'
+import type { SettingsSection } from '@/app/workspace/[workspaceId]/settings/navigation'
+
+interface SettingsDirtyStore {
+  isDirty: boolean
+  pendingSection: SettingsSection | null
+  setDirty: (dirty: boolean) => void
+  /**
+   * Call before navigating to a new section. Returns `true` if navigation may
+   * proceed immediately; returns `false` if there are unsaved changes — in that
+   * case `pendingSection` is set so a confirmation dialog can be shown.
+   */
+  requestNavigation: (section: SettingsSection) => boolean
+  /** Clears dirty + pending state and returns the section to navigate to. */
+  confirmNavigation: () => SettingsSection | null
+  /** Cancels a pending navigation without clearing dirty state. */
+  cancelNavigation: () => void
+  /** Resets all state — call on component unmount. */
+  reset: () => void
+}
+
+const initialState = {
+  isDirty: false,
+  pendingSection: null as SettingsSection | null,
+}
+
+export const useSettingsDirtyStore = create<SettingsDirtyStore>()(
+  devtools(
+    (set, get) => ({
+      ...initialState,
+
+      setDirty: (dirty) => set({ isDirty: dirty }),
+
+      requestNavigation: (section) => {
+        if (!get().isDirty) return true
+        set({ pendingSection: section })
+        return false
+      },
+
+      confirmNavigation: () => {
+        const { pendingSection } = get()
+        set({ ...initialState })
+        return pendingSection
+      },
+
+      cancelNavigation: () => set({ pendingSection: null }),
+
+      reset: () => set({ ...initialState }),
+    }),
+    { name: 'settings-dirty-store' }
+  )
+)
diff --git a/apps/sim/stores/settings/environment/index.ts b/apps/sim/stores/settings/environment/index.ts
deleted file mode 100644
index 01e93a50d17..00000000000
--- a/apps/sim/stores/settings/environment/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { CachedWorkspaceEnvData, EnvironmentState, EnvironmentVariable } from './types'
diff --git a/apps/sim/stores/settings/environment/types.ts b/apps/sim/stores/settings/environment/types.ts
deleted file mode 100644
index 8dbb67caf77..00000000000
--- a/apps/sim/stores/settings/environment/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export interface EnvironmentVariable {
-  key: string
-  value: string
-}
-
-export interface CachedWorkspaceEnvData {
-  workspace: Record<string, string>
-  personal: Record<string, string>
-  conflicts: string[]
-  cachedAt: number
-}
-
-export interface EnvironmentState {
-  variables: Record<string, EnvironmentVariable>
-  isLoading: boolean
-  error: string | null
-}
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index b39ab298a63..22c04f0b797 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -2197,6 +2197,12 @@ import {
   similarwebVisitDurationTool,
   similarwebWebsiteOverviewTool,
 } from '@/tools/similarweb'
+import {
+  sixtyfourEnrichCompanyTool,
+  sixtyfourEnrichLeadTool,
+  sixtyfourFindEmailTool,
+  sixtyfourFindPhoneTool,
+} from '@/tools/sixtyfour'
 import {
   slackAddReactionTool,
   slackCanvasTool,
@@ -3145,6 +3151,10 @@ export const tools: Record<string, ToolConfig> = {
   servicenow_read_record: servicenowReadRecordTool,
   servicenow_update_record: servicenowUpdateRecordTool,
   servicenow_delete_record: servicenowDeleteRecordTool,
+  sixtyfour_find_phone: sixtyfourFindPhoneTool,
+  sixtyfour_find_email: sixtyfourFindEmailTool,
+  sixtyfour_enrich_lead: sixtyfourEnrichLeadTool,
+  sixtyfour_enrich_company: sixtyfourEnrichCompanyTool,
   tavily_search: tavilySearchTool,
   tavily_extract: tavilyExtractTool,
   tavily_crawl: tavilyCrawlTool,
diff --git a/apps/sim/tools/sixtyfour/enrich_company.ts b/apps/sim/tools/sixtyfour/enrich_company.ts
new file mode 100644
index 00000000000..b296dbca1fb
--- /dev/null
+++ b/apps/sim/tools/sixtyfour/enrich_company.ts
@@ -0,0 +1,143 @@
+import type {
+  SixtyfourEnrichCompanyParams,
+  SixtyfourEnrichCompanyResponse,
+} from '@/tools/sixtyfour/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const sixtyfourEnrichCompanyTool: ToolConfig<
+  SixtyfourEnrichCompanyParams,
+  SixtyfourEnrichCompanyResponse
+> = {
+  id: 'sixtyfour_enrich_company',
+  name: 'Sixtyfour Enrich Company',
+  description:
+    'Enrich company data with additional information and find associated people using Sixtyfour AI.',
+  version: '1.0.0',
+
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Sixtyfour API key',
+    },
+    targetCompany: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Company data as JSON object (e.g. {"name": "Acme Inc", "domain": "acme.com"})',
+    },
+    struct: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Fields to collect as JSON object. Keys are field names, values are descriptions (e.g. {"website": "Company website URL", "num_employees": "Employee count"})',
+    },
+    findPeople: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to find people associated with the company',
+    },
+    fullOrgChart: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to retrieve the full organizational chart',
+    },
+    researchPlan: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Optional strategy describing how the agent should search for information',
+    },
+    peopleFocusPrompt: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Description of people to find (roles, responsibilities)',
+    },
+    leadStruct: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Custom schema for returned lead data as JSON object',
+    },
+  },
+
+  request: {
+    url: 'https://api.sixtyfour.ai/enrich-company',
+    method: 'POST',
+    headers: (params) => ({
+      'Content-Type': 'application/json',
+      'x-api-key': params.apiKey,
+    }),
+    body: (params) => {
+      let targetCompany: unknown
+      try {
+        targetCompany =
+          typeof params.targetCompany === 'string'
+            ? JSON.parse(params.targetCompany)
+            : params.targetCompany
+      } catch {
+        throw new Error('targetCompany must be valid JSON')
+      }
+      let struct: unknown
+      try {
+        struct = typeof params.struct === 'string' ? JSON.parse(params.struct) : params.struct
+      } catch {
+        throw new Error('struct must be valid JSON')
+      }
+      let leadStruct: Record<string, unknown> | undefined
+      try {
+        leadStruct =
+          params.leadStruct && typeof params.leadStruct === 'string'
+            ? (JSON.parse(params.leadStruct) as Record<string, unknown>)
+            : (params.leadStruct as Record<string, unknown> | undefined)
+      } catch {
+        throw new Error('leadStruct must be valid JSON')
+      }
+      return {
+        target_company: targetCompany,
+        struct,
+        ...(params.findPeople !== undefined && { find_people: params.findPeople }),
+        ...(params.fullOrgChart !== undefined && { full_org_chart: params.fullOrgChart }),
+        ...(params.researchPlan && { research_plan: params.researchPlan }),
+        ...(params.peopleFocusPrompt && { people_focus_prompt: params.peopleFocusPrompt }),
+        ...(leadStruct && { lead_struct: leadStruct }),
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error || data.message || data.detail || `API error: ${response.status}`)
+    }
+
+    return {
+      success: true,
+      output: {
+        notes: data.notes ?? null,
+        structuredData: data.structured_data ?? {},
+        references: data.references ?? {},
+        confidenceScore: data.confidence_score ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    notes: { type: 'string', description: 'Research notes about the company', optional: true },
+    structuredData: {
+      type: 'json',
+      description: 'Enriched company data matching the requested struct fields',
+    },
+    references: { type: 'json', description: 'Source URLs and descriptions used for enrichment' },
+    confidenceScore: {
+      type: 'number',
+      description: 'Quality score for the returned data (0-10)',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/sixtyfour/enrich_lead.ts b/apps/sim/tools/sixtyfour/enrich_lead.ts
new file mode 100644
index 00000000000..424a69a383b
--- /dev/null
+++ b/apps/sim/tools/sixtyfour/enrich_lead.ts
@@ -0,0 +1,105 @@
+import type {
+  SixtyfourEnrichLeadParams,
+  SixtyfourEnrichLeadResponse,
+} from '@/tools/sixtyfour/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const sixtyfourEnrichLeadTool: ToolConfig<
+  SixtyfourEnrichLeadParams,
+  SixtyfourEnrichLeadResponse
+> = {
+  id: 'sixtyfour_enrich_lead',
+  name: 'Sixtyfour Enrich Lead',
+  description:
+    'Enrich lead information with contact details, social profiles, and company data using Sixtyfour AI.',
+  version: '1.0.0',
+
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Sixtyfour API key',
+    },
+    leadInfo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Lead information as JSON object with key-value pairs (e.g. name, company, title, linkedin)',
+    },
+    struct: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Fields to collect as JSON object. Keys are field names, values are descriptions (e.g. {"email": "The individual\'s email address", "phone": "Phone number"})',
+    },
+    researchPlan: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Optional research plan to guide enrichment strategy',
+    },
+  },
+
+  request: {
+    url: 'https://api.sixtyfour.ai/enrich-lead',
+    method: 'POST',
+    headers: (params) => ({
+      'Content-Type': 'application/json',
+      'x-api-key': params.apiKey,
+    }),
+    body: (params) => {
+      let leadInfo: unknown
+      try {
+        leadInfo =
+          typeof params.leadInfo === 'string' ? JSON.parse(params.leadInfo) : params.leadInfo
+      } catch {
+        throw new Error('leadInfo must be valid JSON')
+      }
+      let struct: unknown
+      try {
+        struct = typeof params.struct === 'string' ? JSON.parse(params.struct) : params.struct
+      } catch {
+        throw new Error('struct must be valid JSON')
+      }
+      return {
+        lead_info: leadInfo,
+        struct,
+        ...(params.researchPlan && { research_plan: params.researchPlan }),
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error || data.message || data.detail || `API error: ${response.status}`)
+    }
+
+    return {
+      success: true,
+      output: {
+        notes: data.notes ?? null,
+        structuredData: data.structured_data ?? {},
+        references: data.references ?? {},
+        confidenceScore: data.confidence_score ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    notes: { type: 'string', description: 'Research notes about the lead', optional: true },
+    structuredData: {
+      type: 'json',
+      description: 'Enriched lead data matching the requested struct fields',
+    },
+    references: { type: 'json', description: 'Source URLs and descriptions used for enrichment' },
+    confidenceScore: {
+      type: 'number',
+      description: 'Quality score for the returned data (0-10)',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/sixtyfour/find_email.ts b/apps/sim/tools/sixtyfour/find_email.ts
new file mode 100644
index 00000000000..9f993ae40c7
--- /dev/null
+++ b/apps/sim/tools/sixtyfour/find_email.ts
@@ -0,0 +1,144 @@
+import type { SixtyfourFindEmailParams, SixtyfourFindEmailResponse } from '@/tools/sixtyfour/types'
+import type { ToolConfig } from '@/tools/types'
+
+function parseEmails(emailField: unknown): { address: string; status: string; type: string }[] {
+  if (!Array.isArray(emailField)) return []
+  return emailField.map((entry: unknown) => {
+    if (Array.isArray(entry)) {
+      return {
+        address: entry[0] ?? '',
+        status: entry[1] ?? 'UNKNOWN',
+        type: entry[2] ?? 'UNKNOWN',
+      }
+    }
+    return { address: String(entry), status: 'UNKNOWN', type: 'UNKNOWN' }
+  })
+}
+
+export const sixtyfourFindEmailTool: ToolConfig<
+  SixtyfourFindEmailParams,
+  SixtyfourFindEmailResponse
+> = {
+  id: 'sixtyfour_find_email',
+  name: 'Sixtyfour Find Email',
+  description: 'Find email addresses for a lead using Sixtyfour AI.',
+  version: '1.0.0',
+
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Sixtyfour API key',
+    },
+    name: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Full name of the person',
+    },
+    company: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Company name',
+    },
+    linkedinUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'LinkedIn profile URL',
+    },
+    domain: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Company website domain',
+    },
+    phone: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Phone number',
+    },
+    title: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Job title',
+    },
+    mode: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Email discovery mode: PROFESSIONAL (default) or PERSONAL',
+    },
+  },
+
+  request: {
+    url: 'https://api.sixtyfour.ai/find-email',
+    method: 'POST',
+    headers: (params) => ({
+      'Content-Type': 'application/json',
+      'x-api-key': params.apiKey,
+    }),
+    body: (params) => ({
+      lead: {
+        name: params.name,
+        ...(params.company && { company: params.company }),
+        ...(params.linkedinUrl && { linkedin: params.linkedinUrl }),
+        ...(params.domain && { domain: params.domain }),
+        ...(params.phone && { phone: params.phone }),
+        ...(params.title && { title: params.title }),
+      },
+      ...(params.mode && { mode: params.mode }),
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error || data.message || data.detail || `API error: ${response.status}`)
+    }
+
+    return {
+      success: true,
+      output: {
+        name: data.name ?? null,
+        company: data.company ?? null,
+        title: data.title ?? null,
+        phone: data.phone ?? null,
+        linkedinUrl: data.linkedin ?? null,
+        emails: parseEmails(data.email),
+        personalEmails: parseEmails(data.personal_email),
+      },
+    }
+  },
+
+  outputs: {
+    name: { type: 'string', description: 'Name of the person', optional: true },
+    company: { type: 'string', description: 'Company name', optional: true },
+    title: { type: 'string', description: 'Job title', optional: true },
+    phone: { type: 'string', description: 'Phone number', optional: true },
+    linkedinUrl: { type: 'string', description: 'LinkedIn profile URL', optional: true },
+    emails: {
+      type: 'json',
+      description: 'Professional email addresses found',
+      properties: {
+        address: { type: 'string', description: 'Email address' },
+        status: { type: 'string', description: 'Validation status (OK or UNKNOWN)' },
+        type: { type: 'string', description: 'Email type (COMPANY or PERSONAL)' },
+      },
+    },
+    personalEmails: {
+      type: 'json',
+      description: 'Personal email addresses found (only in PERSONAL mode)',
+      optional: true,
+      properties: {
+        address: { type: 'string', description: 'Email address' },
+        status: { type: 'string', description: 'Validation status (OK or UNKNOWN)' },
+        type: { type: 'string', description: 'Email type (COMPANY or PERSONAL)' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/sixtyfour/find_phone.ts b/apps/sim/tools/sixtyfour/find_phone.ts
new file mode 100644
index 00000000000..14e68bffe4f
--- /dev/null
+++ b/apps/sim/tools/sixtyfour/find_phone.ts
@@ -0,0 +1,100 @@
+import type { SixtyfourFindPhoneParams, SixtyfourFindPhoneResponse } from '@/tools/sixtyfour/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const sixtyfourFindPhoneTool: ToolConfig<
+  SixtyfourFindPhoneParams,
+  SixtyfourFindPhoneResponse
+> = {
+  id: 'sixtyfour_find_phone',
+  name: 'Sixtyfour Find Phone',
+  description: 'Find phone numbers for a lead using Sixtyfour AI.',
+  version: '1.0.0',
+
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Sixtyfour API key',
+    },
+    name: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Full name of the person',
+    },
+    company: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Company name',
+    },
+    linkedinUrl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'LinkedIn profile URL',
+    },
+    domain: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Company website domain',
+    },
+    email: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Email address',
+    },
+  },
+
+  request: {
+    url: 'https://api.sixtyfour.ai/find-phone',
+    method: 'POST',
+    headers: (params) => ({
+      'Content-Type': 'application/json',
+      'x-api-key': params.apiKey,
+    }),
+    body: (params) => ({
+      lead: {
+        name: params.name,
+        ...(params.company && { company: params.company }),
+        ...(params.linkedinUrl && { linkedin_url: params.linkedinUrl }),
+        ...(params.domain && { domain: params.domain }),
+        ...(params.email && { email: params.email }),
+      },
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error || data.message || data.detail || `API error: ${response.status}`)
+    }
+
+    let phone: string | null = null
+    if (typeof data.phone === 'string') {
+      phone = data.phone || null
+    } else if (Array.isArray(data.phone)) {
+      phone = data.phone.map((p: { number: string; region?: string }) => p.number).join(', ')
+    }
+
+    return {
+      success: true,
+      output: {
+        name: data.name ?? null,
+        company: data.company ?? null,
+        phone,
+        linkedinUrl: data.linkedin_url ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    name: { type: 'string', description: 'Name of the person', optional: true },
+    company: { type: 'string', description: 'Company name', optional: true },
+    phone: { type: 'string', description: 'Phone number(s) found', optional: true },
+    linkedinUrl: { type: 'string', description: 'LinkedIn profile URL', optional: true },
+  },
+}
diff --git a/apps/sim/tools/sixtyfour/index.ts b/apps/sim/tools/sixtyfour/index.ts
new file mode 100644
index 00000000000..2f12d580636
--- /dev/null
+++ b/apps/sim/tools/sixtyfour/index.ts
@@ -0,0 +1,4 @@
+export { sixtyfourEnrichCompanyTool } from '@/tools/sixtyfour/enrich_company'
+export { sixtyfourEnrichLeadTool } from '@/tools/sixtyfour/enrich_lead'
+export { sixtyfourFindEmailTool } from '@/tools/sixtyfour/find_email'
+export { sixtyfourFindPhoneTool } from '@/tools/sixtyfour/find_phone'
diff --git a/apps/sim/tools/sixtyfour/types.ts b/apps/sim/tools/sixtyfour/types.ts
new file mode 100644
index 00000000000..e50afcab7fb
--- /dev/null
+++ b/apps/sim/tools/sixtyfour/types.ts
@@ -0,0 +1,78 @@
+import type { ToolResponse } from '@/tools/types'
+
+export interface SixtyfourFindPhoneParams {
+  apiKey: string
+  name: string
+  company?: string
+  linkedinUrl?: string
+  domain?: string
+  email?: string
+}
+
+export interface SixtyfourFindEmailParams {
+  apiKey: string
+  name: string
+  company?: string
+  linkedinUrl?: string
+  domain?: string
+  phone?: string
+  title?: string
+  mode?: string
+}
+
+export interface SixtyfourEnrichLeadParams {
+  apiKey: string
+  leadInfo: string
+  struct: string
+  researchPlan?: string
+}
+
+export interface SixtyfourEnrichCompanyParams {
+  apiKey: string
+  targetCompany: string
+  struct: string
+  findPeople?: boolean
+  fullOrgChart?: boolean
+  researchPlan?: string
+  peopleFocusPrompt?: string
+  leadStruct?: string
+}
+
+export interface SixtyfourFindPhoneResponse extends ToolResponse {
+  output: {
+    name: string | null
+    company: string | null
+    phone: string | null
+    linkedinUrl: string | null
+  }
+}
+
+export interface SixtyfourFindEmailResponse extends ToolResponse {
+  output: {
+    name: string | null
+    company: string | null
+    title: string | null
+    phone: string | null
+    linkedinUrl: string | null
+    emails: { address: string; status: string; type: string }[]
+    personalEmails: { address: string; status: string; type: string }[]
+  }
+}
+
+export interface SixtyfourEnrichLeadResponse extends ToolResponse {
+  output: {
+    notes: string | null
+    structuredData: Record<string, unknown>
+    references: Record<string, string>
+    confidenceScore: number | null
+  }
+}
+
+export interface SixtyfourEnrichCompanyResponse extends ToolResponse {
+  output: {
+    notes: string | null
+    structuredData: Record<string, unknown>
+    references: Record<string, string>
+    confidenceScore: number | null
+  }
+}
diff --git a/apps/sim/tools/utils.ts b/apps/sim/tools/utils.ts
index 534dc51797c..397309bbe2f 100644
--- a/apps/sim/tools/utils.ts
+++ b/apps/sim/tools/utils.ts
@@ -1,9 +1,9 @@
 import { createLogger } from '@sim/logger'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
+import type { EnvironmentVariable } from '@/lib/environment/api'
 import { getQueryClient } from '@/app/_shell/providers/get-query-client'
 import type { CustomToolDefinition } from '@/hooks/queries/custom-tools'
 import { environmentKeys } from '@/hooks/queries/environment'
-import type { EnvironmentVariable } from '@/stores/settings/environment'
 import { tools } from '@/tools/registry'
 import type { ToolConfig } from '@/tools/types'
 
diff --git a/apps/sim/triggers/gong/call_completed.ts b/apps/sim/triggers/gong/call_completed.ts
new file mode 100644
index 00000000000..900d09786e2
--- /dev/null
+++ b/apps/sim/triggers/gong/call_completed.ts
@@ -0,0 +1,41 @@
+import { GongIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildCallOutputs,
+  buildGongExtraFields,
+  gongSetupInstructions,
+  gongTriggerOptions,
+} from './utils'
+
+/**
+ * Gong Call Completed Trigger
+ *
+ * Secondary trigger - does NOT include the dropdown (the generic webhook trigger has it).
+ * Use this when the workflow is scoped to “completed call” rules; Gong still filters calls in the rule —
+ * the payload shape is the same as other call webhooks.
+ */
+export const gongCallCompletedTrigger: TriggerConfig = {
+  id: 'gong_call_completed',
+  name: 'Gong Call Completed',
+  provider: 'gong',
+  description: 'Trigger workflow when a call is completed and processed in Gong',
+  version: '1.0.0',
+  icon: GongIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'gong_call_completed',
+    triggerOptions: gongTriggerOptions,
+    setupInstructions: gongSetupInstructions('Call Completed'),
+    extraFields: buildGongExtraFields('gong_call_completed'),
+  }),
+
+  outputs: buildCallOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/gong/index.ts b/apps/sim/triggers/gong/index.ts
new file mode 100644
index 00000000000..e27d2ad6c2a
--- /dev/null
+++ b/apps/sim/triggers/gong/index.ts
@@ -0,0 +1,2 @@
+export { gongCallCompletedTrigger } from './call_completed'
+export { gongWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/gong/utils.ts b/apps/sim/triggers/gong/utils.ts
new file mode 100644
index 00000000000..f218eb86cf5
--- /dev/null
+++ b/apps/sim/triggers/gong/utils.ts
@@ -0,0 +1,143 @@
+import { GONG_JWT_PUBLIC_KEY_CONFIG_KEY } from '@/lib/webhooks/providers/gong'
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Shared trigger dropdown options for all Gong triggers
+ */
+export const gongTriggerOptions = [
+  { label: 'General Webhook (All Events)', id: 'gong_webhook' },
+  { label: 'Call Completed', id: 'gong_call_completed' },
+]
+
+/**
+ * Optional Gong "Signed JWT header" verification (paste the public key from Gong).
+ * When empty, security relies on the unguessable webhook URL path (Gong "URL includes key").
+ */
+export function buildGongExtraFields(triggerId: string): SubBlockConfig[] {
+  return [
+    {
+      id: GONG_JWT_PUBLIC_KEY_CONFIG_KEY,
+      title: 'Gong JWT public key (optional)',
+      type: 'long-input',
+      placeholder:
+        'Paste the full PEM from Gong (-----BEGIN PUBLIC KEY----- …) or raw base64. Leave empty if the rule uses URL-includes-key only.',
+      description:
+        'Required only when your Gong rule uses **Signed JWT header**. Sim verifies RS256, `webhook_url`, and `body_sha256` per Gong. If empty, only the webhook URL path authenticates the request.',
+      mode: 'trigger',
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+/**
+ * Generate setup instructions for a specific Gong event type
+ */
+export function gongSetupInstructions(eventType: string): string {
+  const instructions = [
+    '<strong>Note:</strong> You need admin access to Gong to set up webhooks. See the <a href="https://help.gong.io/docs/create-a-webhook-rule" target="_blank" rel="noopener noreferrer">Gong webhook documentation</a> for details.',
+    'Copy the <strong>Webhook URL</strong> above.',
+    'In Gong, go to <strong>Admin center > Settings > Ecosystem > Automation rules</strong>.',
+    'Click <strong>"+ Add Rule"</strong> to create a new automation rule.',
+    `Configure rule filters in Gong for the calls you want (e.g. <strong>${eventType}</strong>). Gong does not send a separate event name in the JSON payload — filtering happens in the rule.`,
+    'Under Actions, select <strong>"Fire webhook"</strong>.',
+    'Paste this workflow’s Webhook URL into the destination field.',
+    '<strong>Authentication:</strong> Use either <strong>URL includes key</strong> (recommended default — Sim’s URL is already secret) or <strong>Signed JWT header</strong>. If you use Signed JWT, paste Gong’s public key into the field above so Sim can verify the <code>Authorization</code> token.',
+    'Save the rule and click <strong>"Save"</strong> above to activate your trigger.',
+  ]
+
+  return instructions
+    .map((instruction, index) => {
+      if (index === 0) {
+        return `<div class="mb-3">${instruction}</div>`
+      }
+      return `<div class="mb-3"><strong>${index}.</strong> ${instruction}</div>`
+    })
+    .join('')
+}
+
+/**
+ * Build output schema for call events.
+ * Gong webhooks deliver call data including metadata, participants, context, and content analysis.
+ */
+export function buildCallOutputs(): Record<string, TriggerOutput> {
+  return {
+    eventType: {
+      type: 'string',
+      description:
+        'Constant identifier for automation-rule webhooks (`gong.automation_rule`). Gong does not send distinct event names in the payload.',
+    },
+    callId: {
+      type: 'string',
+      description: 'Gong call ID (same value as metaData.id when present)',
+    },
+    isTest: {
+      type: 'boolean',
+      description: 'Whether this is a test webhook from the Gong UI',
+    },
+    callData: {
+      type: 'json',
+      description: 'Full call data object',
+    },
+    metaData: {
+      id: { type: 'string', description: 'Gong call ID' },
+      url: { type: 'string', description: 'URL to the call in Gong' },
+      title: { type: 'string', description: 'Call title' },
+      scheduled: { type: 'string', description: 'Scheduled start time (ISO 8601)' },
+      started: { type: 'string', description: 'Actual start time (ISO 8601)' },
+      duration: { type: 'number', description: 'Call duration in seconds' },
+      primaryUserId: { type: 'string', description: 'Primary Gong user ID' },
+      workspaceId: { type: 'string', description: 'Gong workspace ID' },
+      direction: { type: 'string', description: 'Call direction (Inbound, Outbound, etc.)' },
+      system: { type: 'string', description: 'Communication platform used (e.g. Zoom, Teams)' },
+      scope: { type: 'string', description: 'Call scope (Internal, External, or Unknown)' },
+      media: { type: 'string', description: 'Media type (Video or Audio)' },
+      language: { type: 'string', description: 'Language code (ISO-639-2B)' },
+      sdrDisposition: {
+        type: 'string',
+        description: 'SDR disposition classification (when present)',
+      },
+      clientUniqueId: {
+        type: 'string',
+        description: 'Call identifier from the origin recording system (when present)',
+      },
+      customData: {
+        type: 'string',
+        description: 'Custom metadata from call creation (when present)',
+      },
+      purpose: { type: 'string', description: 'Call purpose (when present)' },
+      meetingUrl: { type: 'string', description: 'Web conference provider URL (when present)' },
+      isPrivate: { type: 'boolean', description: 'Whether the call is private (when present)' },
+      calendarEventId: { type: 'string', description: 'Calendar event identifier (when present)' },
+    },
+    parties: {
+      type: 'array',
+      description: 'Array of call participants with name, email, title, and affiliation',
+    },
+    context: {
+      type: 'array',
+      description: 'Array of CRM context objects (Salesforce opportunities, accounts, etc.)',
+    },
+    trackers: {
+      type: 'array',
+      description:
+        'Keyword and smart trackers from call content (same shape as Gong extensive-calls `content.trackers`)',
+    },
+    topics: {
+      type: 'array',
+      description: 'Topic segments with durations from call content (`content.topics`)',
+    },
+    highlights: {
+      type: 'array',
+      description: 'AI-generated highlights from call content (`content.highlights`)',
+    },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build output schema for generic webhook events.
+ * Uses the same call output structure since Gong webhooks primarily deliver call data.
+ */
+export function buildGenericOutputs(): Record<string, TriggerOutput> {
+  return buildCallOutputs()
+}
diff --git a/apps/sim/triggers/gong/webhook.ts b/apps/sim/triggers/gong/webhook.ts
new file mode 100644
index 00000000000..2e59fd0d2df
--- /dev/null
+++ b/apps/sim/triggers/gong/webhook.ts
@@ -0,0 +1,41 @@
+import { GongIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildGenericOutputs,
+  buildGongExtraFields,
+  gongSetupInstructions,
+  gongTriggerOptions,
+} from './utils'
+
+/**
+ * Gong Generic Webhook Trigger
+ *
+ * Primary trigger - includes the dropdown for selecting trigger type.
+ * Accepts all webhook events from Gong automation rules.
+ */
+export const gongWebhookTrigger: TriggerConfig = {
+  id: 'gong_webhook',
+  name: 'Gong Webhook',
+  provider: 'gong',
+  description: 'Generic webhook trigger for all Gong events',
+  version: '1.0.0',
+  icon: GongIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'gong_webhook',
+    triggerOptions: gongTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: gongSetupInstructions('All Events'),
+    extraFields: buildGongExtraFields('gong_webhook'),
+  }),
+
+  outputs: buildGenericOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/candidate_hired.ts b/apps/sim/triggers/greenhouse/candidate_hired.ts
new file mode 100644
index 00000000000..0805bddcbbe
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/candidate_hired.ts
@@ -0,0 +1,41 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildCandidateHiredOutputs,
+  buildGreenhouseExtraFields,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse Candidate Hired Trigger
+ *
+ * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
+ * Fires when a candidate is marked as hired in Greenhouse.
+ */
+export const greenhouseCandidateHiredTrigger: TriggerConfig = {
+  id: 'greenhouse_candidate_hired',
+  name: 'Greenhouse Candidate Hired',
+  provider: 'greenhouse',
+  description: 'Trigger workflow when a candidate is hired',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_candidate_hired',
+    triggerOptions: greenhouseTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: greenhouseSetupInstructions('Candidate Hired'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_candidate_hired'),
+  }),
+
+  outputs: buildCandidateHiredOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/candidate_rejected.ts b/apps/sim/triggers/greenhouse/candidate_rejected.ts
new file mode 100644
index 00000000000..52f10c038e4
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/candidate_rejected.ts
@@ -0,0 +1,39 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildCandidateRejectedOutputs,
+  buildGreenhouseExtraFields,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse Candidate Rejected Trigger
+ *
+ * Fires when a candidate is rejected from a position.
+ */
+export const greenhouseCandidateRejectedTrigger: TriggerConfig = {
+  id: 'greenhouse_candidate_rejected',
+  name: 'Greenhouse Candidate Rejected',
+  provider: 'greenhouse',
+  description: 'Trigger workflow when a candidate is rejected',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_candidate_rejected',
+    triggerOptions: greenhouseTriggerOptions,
+    setupInstructions: greenhouseSetupInstructions('Candidate Rejected'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_candidate_rejected'),
+  }),
+
+  outputs: buildCandidateRejectedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/candidate_stage_change.ts b/apps/sim/triggers/greenhouse/candidate_stage_change.ts
new file mode 100644
index 00000000000..d9f9505f40d
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/candidate_stage_change.ts
@@ -0,0 +1,39 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildCandidateStageChangeOutputs,
+  buildGreenhouseExtraFields,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse Candidate Stage Change Trigger
+ *
+ * Fires when a candidate moves to a different interview stage.
+ */
+export const greenhouseCandidateStageChangeTrigger: TriggerConfig = {
+  id: 'greenhouse_candidate_stage_change',
+  name: 'Greenhouse Candidate Stage Change',
+  provider: 'greenhouse',
+  description: 'Trigger workflow when a candidate changes interview stages',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_candidate_stage_change',
+    triggerOptions: greenhouseTriggerOptions,
+    setupInstructions: greenhouseSetupInstructions('Candidate Stage Change'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_candidate_stage_change'),
+  }),
+
+  outputs: buildCandidateStageChangeOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/index.ts b/apps/sim/triggers/greenhouse/index.ts
new file mode 100644
index 00000000000..e9508aa154a
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/index.ts
@@ -0,0 +1,8 @@
+export { greenhouseCandidateHiredTrigger } from './candidate_hired'
+export { greenhouseCandidateRejectedTrigger } from './candidate_rejected'
+export { greenhouseCandidateStageChangeTrigger } from './candidate_stage_change'
+export { greenhouseJobCreatedTrigger } from './job_created'
+export { greenhouseJobUpdatedTrigger } from './job_updated'
+export { greenhouseNewApplicationTrigger } from './new_application'
+export { greenhouseOfferCreatedTrigger } from './offer_created'
+export { greenhouseWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/greenhouse/job_created.ts b/apps/sim/triggers/greenhouse/job_created.ts
new file mode 100644
index 00000000000..8cfefd33a12
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/job_created.ts
@@ -0,0 +1,39 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildGreenhouseExtraFields,
+  buildJobCreatedOutputs,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse Job Created Trigger
+ *
+ * Fires when a new job posting is created.
+ */
+export const greenhouseJobCreatedTrigger: TriggerConfig = {
+  id: 'greenhouse_job_created',
+  name: 'Greenhouse Job Created',
+  provider: 'greenhouse',
+  description: 'Trigger workflow when a new job is created',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_job_created',
+    triggerOptions: greenhouseTriggerOptions,
+    setupInstructions: greenhouseSetupInstructions('Job Created'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_job_created'),
+  }),
+
+  outputs: buildJobCreatedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/job_updated.ts b/apps/sim/triggers/greenhouse/job_updated.ts
new file mode 100644
index 00000000000..c669ef22ec0
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/job_updated.ts
@@ -0,0 +1,39 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildGreenhouseExtraFields,
+  buildJobUpdatedOutputs,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse Job Updated Trigger
+ *
+ * Fires when a job posting is updated.
+ */
+export const greenhouseJobUpdatedTrigger: TriggerConfig = {
+  id: 'greenhouse_job_updated',
+  name: 'Greenhouse Job Updated',
+  provider: 'greenhouse',
+  description: 'Trigger workflow when a job is updated',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_job_updated',
+    triggerOptions: greenhouseTriggerOptions,
+    setupInstructions: greenhouseSetupInstructions('Job Updated'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_job_updated'),
+  }),
+
+  outputs: buildJobUpdatedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/new_application.ts b/apps/sim/triggers/greenhouse/new_application.ts
new file mode 100644
index 00000000000..933cd624e14
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/new_application.ts
@@ -0,0 +1,39 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildGreenhouseExtraFields,
+  buildNewApplicationOutputs,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse New Application Trigger
+ *
+ * Fires when a new candidate application is submitted.
+ */
+export const greenhouseNewApplicationTrigger: TriggerConfig = {
+  id: 'greenhouse_new_application',
+  name: 'Greenhouse New Application',
+  provider: 'greenhouse',
+  description: 'Trigger workflow when a new application is submitted',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_new_application',
+    triggerOptions: greenhouseTriggerOptions,
+    setupInstructions: greenhouseSetupInstructions('New Candidate Application'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_new_application'),
+  }),
+
+  outputs: buildNewApplicationOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/offer_created.ts b/apps/sim/triggers/greenhouse/offer_created.ts
new file mode 100644
index 00000000000..7567a9adb63
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/offer_created.ts
@@ -0,0 +1,39 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildGreenhouseExtraFields,
+  buildOfferCreatedOutputs,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse Offer Created Trigger
+ *
+ * Fires when a new offer is created for a candidate.
+ */
+export const greenhouseOfferCreatedTrigger: TriggerConfig = {
+  id: 'greenhouse_offer_created',
+  name: 'Greenhouse Offer Created',
+  provider: 'greenhouse',
+  description: 'Trigger workflow when a new offer is created',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_offer_created',
+    triggerOptions: greenhouseTriggerOptions,
+    setupInstructions: greenhouseSetupInstructions('Offer Created'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_offer_created'),
+  }),
+
+  outputs: buildOfferCreatedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/greenhouse/utils.test.ts b/apps/sim/triggers/greenhouse/utils.test.ts
new file mode 100644
index 00000000000..8883171c445
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/utils.test.ts
@@ -0,0 +1,88 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { greenhouseHandler } from '@/lib/webhooks/providers/greenhouse'
+import { isGreenhouseEventMatch } from '@/triggers/greenhouse/utils'
+
+describe('isGreenhouseEventMatch', () => {
+  it('matches mapped trigger ids to Greenhouse action strings', () => {
+    expect(isGreenhouseEventMatch('greenhouse_new_application', 'new_candidate_application')).toBe(
+      true
+    )
+    expect(isGreenhouseEventMatch('greenhouse_new_application', 'hire_candidate')).toBe(false)
+  })
+
+  it('rejects unknown trigger ids (no permissive fallback)', () => {
+    expect(isGreenhouseEventMatch('greenhouse_unknown', 'new_candidate_application')).toBe(false)
+  })
+
+  it('builds fallback idempotency keys for nested offer payloads', () => {
+    const key = greenhouseHandler.extractIdempotencyId!({
+      action: 'offer_deleted',
+      payload: {
+        offer: {
+          id: 42,
+          version: 3,
+        },
+      },
+    })
+
+    expect(key).toBe('greenhouse:offer_deleted:offer:42:3')
+  })
+})
+
+describe('greenhouseHandler.formatInput', () => {
+  it('exposes application, candidate, and job ids alongside action and payload', async () => {
+    const { input } = await greenhouseHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'w', userId: 'u' },
+      body: {
+        action: 'new_candidate_application',
+        payload: {
+          application: {
+            id: 100,
+            candidate: { id: 200 },
+            jobs: [{ id: 300 }],
+          },
+        },
+      },
+      headers: {},
+      requestId: 't',
+    })
+    expect(input).toMatchObject({
+      action: 'new_candidate_application',
+      applicationId: 100,
+      candidateId: 200,
+      jobId: null,
+    })
+    expect(input).toHaveProperty('payload')
+  })
+
+  it('reads job id from payload.job and offer job_id', async () => {
+    const jobFromNested = await greenhouseHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'w', userId: 'u' },
+      body: {
+        action: 'job_created',
+        payload: { job: { id: 55 } },
+      },
+      headers: {},
+      requestId: 't',
+    })
+    expect((jobFromNested.input as Record<string, unknown>).jobId).toBe(55)
+
+    const jobFromOffer = await greenhouseHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'w', userId: 'u' },
+      body: {
+        action: 'offer_created',
+        payload: { id: 1, application_id: 2, job_id: 66 },
+      },
+      headers: {},
+      requestId: 't',
+    })
+    expect((jobFromOffer.input as Record<string, unknown>).jobId).toBe(66)
+    expect((jobFromOffer.input as Record<string, unknown>).applicationId).toBe(2)
+  })
+})
diff --git a/apps/sim/triggers/greenhouse/utils.ts b/apps/sim/triggers/greenhouse/utils.ts
new file mode 100644
index 00000000000..8210761dc8c
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/utils.ts
@@ -0,0 +1,357 @@
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Top-level ids mirrored from the webhook JSON for ergonomics (see Greenhouse webhook common attributes).
+ * Always present on `formatInput`; use null when not applicable to the event.
+ */
+const greenhouseIndexedOutputs = {
+  applicationId: {
+    type: 'number',
+    description:
+      'Application id when present (`payload.application.id` or flat `payload.application_id` on offers)',
+  },
+  candidateId: {
+    type: 'number',
+    description: 'Candidate id when `payload.application.candidate.id` is present',
+  },
+  jobId: {
+    type: 'number',
+    description: 'Job id from `payload.job.id` or flat `payload.job_id` when present',
+  },
+} as const
+
+/**
+ * Dropdown options for the Greenhouse trigger type selector.
+ */
+export const greenhouseTriggerOptions = [
+  { label: 'Candidate Hired', id: 'greenhouse_candidate_hired' },
+  { label: 'New Application', id: 'greenhouse_new_application' },
+  { label: 'Candidate Stage Change', id: 'greenhouse_candidate_stage_change' },
+  { label: 'Candidate Rejected', id: 'greenhouse_candidate_rejected' },
+  { label: 'Offer Created', id: 'greenhouse_offer_created' },
+  { label: 'Job Created', id: 'greenhouse_job_created' },
+  { label: 'Job Updated', id: 'greenhouse_job_updated' },
+  { label: 'All configured Greenhouse events', id: 'greenhouse_webhook' },
+]
+
+/**
+ * Maps trigger IDs to Greenhouse webhook action strings.
+ * Used for event filtering in the webhook processor.
+ */
+export const GREENHOUSE_EVENT_MAP: Record<string, string> = {
+  greenhouse_candidate_hired: 'hire_candidate',
+  greenhouse_new_application: 'new_candidate_application',
+  greenhouse_candidate_stage_change: 'candidate_stage_change',
+  greenhouse_candidate_rejected: 'reject_candidate',
+  greenhouse_offer_created: 'offer_created',
+  greenhouse_job_created: 'job_created',
+  greenhouse_job_updated: 'job_updated',
+}
+
+/**
+ * Checks whether a Greenhouse webhook payload matches the configured trigger.
+ */
+export function isGreenhouseEventMatch(triggerId: string, action: string): boolean {
+  const expectedAction = GREENHOUSE_EVENT_MAP[triggerId]
+  if (expectedAction === undefined) {
+    return false
+  }
+  return action === expectedAction
+}
+
+/**
+ * Builds extra fields for Greenhouse triggers.
+ * Includes an optional secret key for HMAC signature verification.
+ */
+export function buildGreenhouseExtraFields(triggerId: string): SubBlockConfig[] {
+  return [
+    {
+      id: 'secretKey',
+      title: 'Secret Key (Optional)',
+      type: 'short-input',
+      placeholder: 'Enter the same secret key configured in Greenhouse',
+      description:
+        'When set, requests must include a valid Signature header (HMAC-SHA256). If left empty, the endpoint does not verify signatures—only use on a private URL you fully control.',
+      password: true,
+      mode: 'trigger',
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+function buildSourceOutputs(): Record<string, TriggerOutput> {
+  return {
+    id: { type: 'number', description: 'Source ID' },
+    name: { type: 'string', description: 'Source name when provided by Greenhouse' },
+    public_name: {
+      type: 'string',
+      description: 'Public-facing source name when provided by Greenhouse',
+    },
+  }
+}
+
+/**
+ * Generates HTML setup instructions for Greenhouse webhooks.
+ * Webhooks are manually configured in the Greenhouse admin panel.
+ */
+export function greenhouseSetupInstructions(eventType: string): string {
+  const instructions = [
+    'Copy the <strong>Webhook URL</strong> above.',
+    'In Greenhouse, go to <strong>Configure &gt; Dev Center &gt; Webhooks</strong>.',
+    'Click <strong>Create New Webhook</strong>.',
+    'Paste the Webhook URL into the <strong>Endpoint URL</strong> field.',
+    'Enter a <strong>Secret Key</strong> for HMAC signature verification (recommended). Leave empty only if you accept unauthenticated POSTs to this URL.',
+    `Under <strong>When</strong>, select the appropriate <strong>${eventType}</strong>.`,
+    'Click <strong>Create Webhook</strong> to save.',
+    'Click "Save" above to activate your trigger.',
+  ]
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Build outputs for hire_candidate events.
+ * Greenhouse nests candidate inside application: payload.application.candidate
+ * Uses both singular `job` (deprecated) and `jobs` array.
+ */
+export function buildCandidateHiredOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type (hire_candidate)' },
+    ...greenhouseIndexedOutputs,
+    payload: {
+      application: {
+        id: { type: 'number', description: 'Application ID' },
+        status: { type: 'string', description: 'Application status' },
+        prospect: { type: 'boolean', description: 'Whether the applicant is a prospect' },
+        applied_at: { type: 'string', description: 'When the application was submitted' },
+        url: { type: 'string', description: 'Application URL in Greenhouse' },
+        current_stage: {
+          id: { type: 'number', description: 'Current stage ID' },
+          name: { type: 'string', description: 'Current stage name' },
+        },
+        candidate: {
+          id: { type: 'number', description: 'Candidate ID' },
+          first_name: { type: 'string', description: 'First name' },
+          last_name: { type: 'string', description: 'Last name' },
+          title: { type: 'string', description: 'Current title' },
+          company: { type: 'string', description: 'Current company' },
+          email_addresses: { type: 'json', description: 'Email addresses' },
+          phone_numbers: { type: 'json', description: 'Phone numbers' },
+          recruiter: { type: 'json', description: 'Assigned recruiter' },
+          coordinator: { type: 'json', description: 'Assigned coordinator' },
+        },
+        jobs: { type: 'json', description: 'Associated jobs (array)' },
+        source: buildSourceOutputs(),
+        offer: {
+          id: { type: 'number', description: 'Offer ID' },
+          version: { type: 'number', description: 'Offer version' },
+          starts_at: { type: 'string', description: 'Offer start date' },
+          custom_fields: { type: 'json', description: 'Offer custom fields' },
+        },
+        custom_fields: { type: 'json', description: 'Application custom fields' },
+      },
+    },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for new_candidate_application events.
+ * Candidate is nested inside application: payload.application.candidate
+ */
+export function buildNewApplicationOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type (new_candidate_application)' },
+    ...greenhouseIndexedOutputs,
+    payload: {
+      application: {
+        id: { type: 'number', description: 'Application ID' },
+        status: { type: 'string', description: 'Application status' },
+        prospect: { type: 'boolean', description: 'Whether the applicant is a prospect' },
+        applied_at: { type: 'string', description: 'When the application was submitted' },
+        url: { type: 'string', description: 'Application URL in Greenhouse' },
+        current_stage: {
+          id: { type: 'number', description: 'Current stage ID' },
+          name: { type: 'string', description: 'Current stage name' },
+        },
+        candidate: {
+          id: { type: 'number', description: 'Candidate ID' },
+          first_name: { type: 'string', description: 'First name' },
+          last_name: { type: 'string', description: 'Last name' },
+          title: { type: 'string', description: 'Current title' },
+          company: { type: 'string', description: 'Current company' },
+          created_at: { type: 'string', description: 'When the candidate was created' },
+          email_addresses: { type: 'json', description: 'Email addresses' },
+          phone_numbers: { type: 'json', description: 'Phone numbers' },
+          tags: { type: 'json', description: 'Candidate tags' },
+        },
+        jobs: { type: 'json', description: 'Associated jobs (array)' },
+        source: buildSourceOutputs(),
+        answers: { type: 'json', description: 'Application question answers' },
+        attachments: { type: 'json', description: 'Application attachments' },
+        custom_fields: { type: 'json', description: 'Application custom fields' },
+      },
+    },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for candidate_stage_change events.
+ * Candidate is nested inside application: payload.application.candidate
+ */
+export function buildCandidateStageChangeOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type (candidate_stage_change)' },
+    ...greenhouseIndexedOutputs,
+    payload: {
+      application: {
+        id: { type: 'number', description: 'Application ID' },
+        status: { type: 'string', description: 'Application status' },
+        prospect: { type: 'boolean', description: 'Whether the applicant is a prospect' },
+        applied_at: { type: 'string', description: 'When the application was submitted' },
+        url: { type: 'string', description: 'Application URL in Greenhouse' },
+        current_stage: {
+          id: { type: 'number', description: 'Current stage ID' },
+          name: { type: 'string', description: 'Current stage name' },
+          interviews: { type: 'json', description: 'Interviews in this stage' },
+        },
+        candidate: {
+          id: { type: 'number', description: 'Candidate ID' },
+          first_name: { type: 'string', description: 'First name' },
+          last_name: { type: 'string', description: 'Last name' },
+          title: { type: 'string', description: 'Current title' },
+          company: { type: 'string', description: 'Current company' },
+          email_addresses: { type: 'json', description: 'Email addresses' },
+          phone_numbers: { type: 'json', description: 'Phone numbers' },
+        },
+        jobs: { type: 'json', description: 'Associated jobs (array)' },
+        source: buildSourceOutputs(),
+        custom_fields: { type: 'json', description: 'Application custom fields' },
+      },
+    },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for reject_candidate events.
+ * Candidate is nested inside application: payload.application.candidate
+ */
+export function buildCandidateRejectedOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type (reject_candidate)' },
+    ...greenhouseIndexedOutputs,
+    payload: {
+      application: {
+        id: { type: 'number', description: 'Application ID' },
+        status: { type: 'string', description: 'Application status (rejected)' },
+        prospect: { type: 'boolean', description: 'Whether the applicant is a prospect' },
+        applied_at: { type: 'string', description: 'When the application was submitted' },
+        rejected_at: { type: 'string', description: 'When the candidate was rejected' },
+        url: { type: 'string', description: 'Application URL in Greenhouse' },
+        current_stage: {
+          id: { type: 'number', description: 'Stage ID where rejected' },
+          name: { type: 'string', description: 'Stage name where rejected' },
+        },
+        candidate: {
+          id: { type: 'number', description: 'Candidate ID' },
+          first_name: { type: 'string', description: 'First name' },
+          last_name: { type: 'string', description: 'Last name' },
+          email_addresses: { type: 'json', description: 'Email addresses' },
+          phone_numbers: { type: 'json', description: 'Phone numbers' },
+        },
+        jobs: { type: 'json', description: 'Associated jobs (array)' },
+        rejection_reason: {
+          type: 'json',
+          description: 'Rejection reason object with id, name, and type fields',
+        },
+        rejection_details: { type: 'json', description: 'Rejection details with custom fields' },
+        custom_fields: { type: 'json', description: 'Application custom fields' },
+      },
+    },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for offer_created events.
+ * Offer payload is flat under payload (not nested under payload.offer).
+ */
+export function buildOfferCreatedOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type (offer_created)' },
+    ...greenhouseIndexedOutputs,
+    payload: {
+      id: { type: 'number', description: 'Offer ID' },
+      application_id: { type: 'number', description: 'Associated application ID' },
+      job_id: { type: 'number', description: 'Associated job ID' },
+      user_id: { type: 'number', description: 'User who created the offer' },
+      version: { type: 'number', description: 'Offer version number' },
+      sent_on: { type: 'string', description: 'When the offer was sent' },
+      resolved_at: { type: 'string', description: 'When the offer was resolved' },
+      start_date: { type: 'string', description: 'Offer start date' },
+      notes: { type: 'string', description: 'Offer notes' },
+      offer_status: { type: 'string', description: 'Offer status' },
+      custom_fields: { type: 'json', description: 'Custom field values' },
+    },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Shared job payload shape used by both job_created and job_updated events.
+ */
+function buildJobPayload(): Record<string, TriggerOutput> {
+  return {
+    id: { type: 'number', description: 'Job ID' },
+    name: { type: 'string', description: 'Job title' },
+    requisition_id: { type: 'string', description: 'Requisition ID' },
+    status: { type: 'string', description: 'Job status (open, closed, draft)' },
+    confidential: { type: 'boolean', description: 'Whether the job is confidential' },
+    created_at: { type: 'string', description: 'When the job was created' },
+    opened_at: { type: 'string', description: 'When the job was opened' },
+    closed_at: { type: 'string', description: 'When the job was closed' },
+    departments: { type: 'json', description: 'Associated departments' },
+    offices: { type: 'json', description: 'Associated offices' },
+    hiring_team: { type: 'json', description: 'Hiring team (managers, recruiters, etc.)' },
+    openings: { type: 'json', description: 'Job openings' },
+    custom_fields: { type: 'json', description: 'Custom field values' },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for job_created events.
+ * Job data is nested under payload.job.
+ */
+export function buildJobCreatedOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type (job_created)' },
+    ...greenhouseIndexedOutputs,
+    payload: { job: buildJobPayload() },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for job_updated events.
+ * Same structure as job_created.
+ */
+export function buildJobUpdatedOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type (job_updated)' },
+    ...greenhouseIndexedOutputs,
+    payload: { job: buildJobPayload() },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for generic webhook (all events).
+ */
+export function buildWebhookOutputs(): Record<string, TriggerOutput> {
+  return {
+    action: { type: 'string', description: 'The webhook event type' },
+    ...greenhouseIndexedOutputs,
+    payload: { type: 'json', description: 'Full event payload' },
+  } as Record<string, TriggerOutput>
+}
diff --git a/apps/sim/triggers/greenhouse/webhook.ts b/apps/sim/triggers/greenhouse/webhook.ts
new file mode 100644
index 00000000000..a527442366f
--- /dev/null
+++ b/apps/sim/triggers/greenhouse/webhook.ts
@@ -0,0 +1,39 @@
+import { GreenhouseIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildGreenhouseExtraFields,
+  buildWebhookOutputs,
+  greenhouseSetupInstructions,
+  greenhouseTriggerOptions,
+} from '@/triggers/greenhouse/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Greenhouse generic webhook trigger.
+ * Event filtering is determined by which events you enable on the Greenhouse webhook endpoint.
+ */
+export const greenhouseWebhookTrigger: TriggerConfig = {
+  id: 'greenhouse_webhook',
+  name: 'Greenhouse Webhook (Endpoint Events)',
+  provider: 'greenhouse',
+  description:
+    'Trigger on whichever event types you select for this URL in Greenhouse. Sim does not filter deliveries for this trigger.',
+  version: '1.0.0',
+  icon: GreenhouseIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'greenhouse_webhook',
+    triggerOptions: greenhouseTriggerOptions,
+    setupInstructions: greenhouseSetupInstructions('Greenhouse event types for this URL'),
+    extraFields: buildGreenhouseExtraFields('greenhouse_webhook'),
+  }),
+
+  outputs: buildWebhookOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/company_merged.ts b/apps/sim/triggers/hubspot/company_merged.ts
new file mode 100644
index 00000000000..4d64cf7ad3e
--- /dev/null
+++ b/apps/sim/triggers/hubspot/company_merged.ts
@@ -0,0 +1,217 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildCompanyMergedOutputs,
+  hubspotCompanyTriggerOptions,
+  hubspotSetupInstructions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotCompanyMergedTrigger: TriggerConfig = {
+  id: 'hubspot_company_merged',
+  name: 'HubSpot Company Merged',
+  provider: 'hubspot',
+  description: 'Trigger workflow when companies are merged in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotCompanyTriggerOptions,
+      value: () => 'hubspot_company_merged',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_company_merged',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'company.merge',
+        'The webhook will trigger whenever two companies are merged in your HubSpot account. The objectId will be the winning (primary) company ID.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "company.merge",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to company merge events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526813,
+            subscriptionId: 4629974,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'company.merge',
+            attemptNumber: 0,
+            objectId: 216126906049,
+            changeFlag: 'MERGED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+            mergedObjectIds: [216126906050],
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_merged',
+      },
+    },
+  ],
+
+  outputs: buildCompanyMergedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/company_restored.ts b/apps/sim/triggers/hubspot/company_restored.ts
new file mode 100644
index 00000000000..a30528c6954
--- /dev/null
+++ b/apps/sim/triggers/hubspot/company_restored.ts
@@ -0,0 +1,216 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildCompanyRestoredOutputs,
+  hubspotCompanyTriggerOptions,
+  hubspotSetupInstructions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotCompanyRestoredTrigger: TriggerConfig = {
+  id: 'hubspot_company_restored',
+  name: 'HubSpot Company Restored',
+  provider: 'hubspot',
+  description: 'Trigger workflow when a deleted company is restored in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotCompanyTriggerOptions,
+      value: () => 'hubspot_company_restored',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_company_restored',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'company.restore',
+        'The webhook will trigger whenever a previously deleted company is restored in your HubSpot account.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "company.restore",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to company restore events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526814,
+            subscriptionId: 4629975,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'company.restore',
+            attemptNumber: 0,
+            objectId: 216126906049,
+            changeFlag: 'RESTORED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_company_restored',
+      },
+    },
+  ],
+
+  outputs: buildCompanyRestoredOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/contact_merged.ts b/apps/sim/triggers/hubspot/contact_merged.ts
new file mode 100644
index 00000000000..435399e7706
--- /dev/null
+++ b/apps/sim/triggers/hubspot/contact_merged.ts
@@ -0,0 +1,217 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildContactMergedOutputs,
+  hubspotContactTriggerOptions,
+  hubspotSetupInstructions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotContactMergedTrigger: TriggerConfig = {
+  id: 'hubspot_contact_merged',
+  name: 'HubSpot Contact Merged',
+  provider: 'hubspot',
+  description: 'Trigger workflow when contacts are merged in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotContactTriggerOptions,
+      value: () => 'hubspot_contact_merged',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_contact_merged',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'contact.merge',
+        'The webhook will trigger whenever two contacts are merged in your HubSpot account. The objectId will be the winning (primary) contact ID.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "contact.merge",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to contact merge events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526811,
+            subscriptionId: 4629972,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'contact.merge',
+            attemptNumber: 0,
+            objectId: 316126906049,
+            changeFlag: 'MERGED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+            mergedObjectIds: [316126906050],
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_merged',
+      },
+    },
+  ],
+
+  outputs: buildContactMergedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/contact_restored.ts b/apps/sim/triggers/hubspot/contact_restored.ts
new file mode 100644
index 00000000000..e3ad2113da6
--- /dev/null
+++ b/apps/sim/triggers/hubspot/contact_restored.ts
@@ -0,0 +1,216 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildContactRestoredOutputs,
+  hubspotContactTriggerOptions,
+  hubspotSetupInstructions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotContactRestoredTrigger: TriggerConfig = {
+  id: 'hubspot_contact_restored',
+  name: 'HubSpot Contact Restored',
+  provider: 'hubspot',
+  description: 'Trigger workflow when a deleted contact is restored in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotContactTriggerOptions,
+      value: () => 'hubspot_contact_restored',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_contact_restored',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'contact.restore',
+        'The webhook will trigger whenever a previously deleted contact is restored in your HubSpot account.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "contact.restore",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to contact restore events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526812,
+            subscriptionId: 4629973,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'contact.restore',
+            attemptNumber: 0,
+            objectId: 316126906049,
+            changeFlag: 'RESTORED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_contact_restored',
+      },
+    },
+  ],
+
+  outputs: buildContactRestoredOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/deal_merged.ts b/apps/sim/triggers/hubspot/deal_merged.ts
new file mode 100644
index 00000000000..e6d875af02d
--- /dev/null
+++ b/apps/sim/triggers/hubspot/deal_merged.ts
@@ -0,0 +1,217 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildDealMergedOutputs,
+  hubspotDealTriggerOptions,
+  hubspotSetupInstructions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotDealMergedTrigger: TriggerConfig = {
+  id: 'hubspot_deal_merged',
+  name: 'HubSpot Deal Merged',
+  provider: 'hubspot',
+  description: 'Trigger workflow when deals are merged in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotDealTriggerOptions,
+      value: () => 'hubspot_deal_merged',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_deal_merged',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'deal.merge',
+        'The webhook will trigger whenever two deals are merged in your HubSpot account. The objectId will be the winning (primary) deal ID.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "deal.merge",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to deal merge events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526815,
+            subscriptionId: 4629976,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'deal.merge',
+            attemptNumber: 0,
+            objectId: 416126906049,
+            changeFlag: 'MERGED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+            mergedObjectIds: [416126906050],
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_merged',
+      },
+    },
+  ],
+
+  outputs: buildDealMergedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/deal_restored.ts b/apps/sim/triggers/hubspot/deal_restored.ts
new file mode 100644
index 00000000000..ba3eb28b8c4
--- /dev/null
+++ b/apps/sim/triggers/hubspot/deal_restored.ts
@@ -0,0 +1,216 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildDealRestoredOutputs,
+  hubspotDealTriggerOptions,
+  hubspotSetupInstructions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotDealRestoredTrigger: TriggerConfig = {
+  id: 'hubspot_deal_restored',
+  name: 'HubSpot Deal Restored',
+  provider: 'hubspot',
+  description: 'Trigger workflow when a deleted deal is restored in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotDealTriggerOptions,
+      value: () => 'hubspot_deal_restored',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_deal_restored',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'deal.restore',
+        'The webhook will trigger whenever a previously deleted deal is restored in your HubSpot account.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "deal.restore",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to deal restore events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526816,
+            subscriptionId: 4629977,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'deal.restore',
+            attemptNumber: 0,
+            objectId: 416126906049,
+            changeFlag: 'RESTORED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_deal_restored',
+      },
+    },
+  ],
+
+  outputs: buildDealRestoredOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/index.ts b/apps/sim/triggers/hubspot/index.ts
index 3150c828fec..2c8d6bb88c1 100644
--- a/apps/sim/triggers/hubspot/index.ts
+++ b/apps/sim/triggers/hubspot/index.ts
@@ -1,10 +1,14 @@
 export { hubspotCompanyCreatedTrigger } from './company_created'
 export { hubspotCompanyDeletedTrigger } from './company_deleted'
+export { hubspotCompanyMergedTrigger } from './company_merged'
 export { hubspotCompanyPropertyChangedTrigger } from './company_property_changed'
+export { hubspotCompanyRestoredTrigger } from './company_restored'
 export { hubspotContactCreatedTrigger } from './contact_created'
 export { hubspotContactDeletedTrigger } from './contact_deleted'
+export { hubspotContactMergedTrigger } from './contact_merged'
 export { hubspotContactPrivacyDeletedTrigger } from './contact_privacy_deleted'
 export { hubspotContactPropertyChangedTrigger } from './contact_property_changed'
+export { hubspotContactRestoredTrigger } from './contact_restored'
 export { hubspotConversationCreationTrigger } from './conversation_creation'
 export { hubspotConversationDeletionTrigger } from './conversation_deletion'
 export { hubspotConversationNewMessageTrigger } from './conversation_new_message'
@@ -12,8 +16,13 @@ export { hubspotConversationPrivacyDeletionTrigger } from './conversation_privac
 export { hubspotConversationPropertyChangedTrigger } from './conversation_property_changed'
 export { hubspotDealCreatedTrigger } from './deal_created'
 export { hubspotDealDeletedTrigger } from './deal_deleted'
+export { hubspotDealMergedTrigger } from './deal_merged'
 export { hubspotDealPropertyChangedTrigger } from './deal_property_changed'
+export { hubspotDealRestoredTrigger } from './deal_restored'
 export { hubspotTicketCreatedTrigger } from './ticket_created'
 export { hubspotTicketDeletedTrigger } from './ticket_deleted'
+export { hubspotTicketMergedTrigger } from './ticket_merged'
 export { hubspotTicketPropertyChangedTrigger } from './ticket_property_changed'
+export { hubspotTicketRestoredTrigger } from './ticket_restored'
 export { hubspotAllTriggerOptions, isHubSpotContactEventMatch } from './utils'
+export { hubspotWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/hubspot/ticket_merged.ts b/apps/sim/triggers/hubspot/ticket_merged.ts
new file mode 100644
index 00000000000..ce860ab1465
--- /dev/null
+++ b/apps/sim/triggers/hubspot/ticket_merged.ts
@@ -0,0 +1,217 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildTicketMergedOutputs,
+  hubspotSetupInstructions,
+  hubspotTicketTriggerOptions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotTicketMergedTrigger: TriggerConfig = {
+  id: 'hubspot_ticket_merged',
+  name: 'HubSpot Ticket Merged',
+  provider: 'hubspot',
+  description: 'Trigger workflow when tickets are merged in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotTicketTriggerOptions,
+      value: () => 'hubspot_ticket_merged',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_ticket_merged',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'ticket.merge',
+        'The webhook will trigger whenever two tickets are merged in your HubSpot account. The objectId will be the winning (primary) ticket ID.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "ticket.merge",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to ticket merge events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526817,
+            subscriptionId: 4629978,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'ticket.merge',
+            attemptNumber: 0,
+            objectId: 516126906049,
+            changeFlag: 'MERGED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+            mergedObjectIds: [516126906050],
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_merged',
+      },
+    },
+  ],
+
+  outputs: buildTicketMergedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/ticket_restored.ts b/apps/sim/triggers/hubspot/ticket_restored.ts
new file mode 100644
index 00000000000..028082658b4
--- /dev/null
+++ b/apps/sim/triggers/hubspot/ticket_restored.ts
@@ -0,0 +1,216 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildTicketRestoredOutputs,
+  hubspotSetupInstructions,
+  hubspotTicketTriggerOptions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotTicketRestoredTrigger: TriggerConfig = {
+  id: 'hubspot_ticket_restored',
+  name: 'HubSpot Ticket Restored',
+  provider: 'hubspot',
+  description: 'Trigger workflow when a deleted ticket is restored in HubSpot',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotTicketTriggerOptions,
+      value: () => 'hubspot_ticket_restored',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_ticket_restored',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'ticket.restore',
+        'The webhook will trigger whenever a previously deleted ticket is restored in your HubSpot account.'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "ticket.restore",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to subscribe to ticket restore events',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526818,
+            subscriptionId: 4629979,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'ticket.restore',
+            attemptNumber: 0,
+            objectId: 516126906049,
+            changeFlag: 'RESTORED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_ticket_restored',
+      },
+    },
+  ],
+
+  outputs: buildTicketRestoredOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/hubspot/utils.ts b/apps/sim/triggers/hubspot/utils.ts
index 3a220e70389..fa601b5980a 100644
--- a/apps/sim/triggers/hubspot/utils.ts
+++ b/apps/sim/triggers/hubspot/utils.ts
@@ -6,11 +6,15 @@ import type { TriggerOutput } from '@/triggers/types'
 export const hubspotAllTriggerOptions = [
   { label: 'Contact Created', id: 'hubspot_contact_created' },
   { label: 'Contact Deleted', id: 'hubspot_contact_deleted' },
+  { label: 'Contact Merged', id: 'hubspot_contact_merged' },
   { label: 'Contact Privacy Deleted', id: 'hubspot_contact_privacy_deleted' },
   { label: 'Contact Property Changed', id: 'hubspot_contact_property_changed' },
+  { label: 'Contact Restored', id: 'hubspot_contact_restored' },
   { label: 'Company Created', id: 'hubspot_company_created' },
   { label: 'Company Deleted', id: 'hubspot_company_deleted' },
+  { label: 'Company Merged', id: 'hubspot_company_merged' },
   { label: 'Company Property Changed', id: 'hubspot_company_property_changed' },
+  { label: 'Company Restored', id: 'hubspot_company_restored' },
   { label: 'Conversation Creation', id: 'hubspot_conversation_creation' },
   { label: 'Conversation Deletion', id: 'hubspot_conversation_deletion' },
   { label: 'Conversation New Message', id: 'hubspot_conversation_new_message' },
@@ -18,10 +22,15 @@ export const hubspotAllTriggerOptions = [
   { label: 'Conversation Property Changed', id: 'hubspot_conversation_property_changed' },
   { label: 'Deal Created', id: 'hubspot_deal_created' },
   { label: 'Deal Deleted', id: 'hubspot_deal_deleted' },
+  { label: 'Deal Merged', id: 'hubspot_deal_merged' },
   { label: 'Deal Property Changed', id: 'hubspot_deal_property_changed' },
+  { label: 'Deal Restored', id: 'hubspot_deal_restored' },
   { label: 'Ticket Created', id: 'hubspot_ticket_created' },
   { label: 'Ticket Deleted', id: 'hubspot_ticket_deleted' },
+  { label: 'Ticket Merged', id: 'hubspot_ticket_merged' },
   { label: 'Ticket Property Changed', id: 'hubspot_ticket_property_changed' },
+  { label: 'Ticket Restored', id: 'hubspot_ticket_restored' },
+  { label: 'Generic Webhook (All Events)', id: 'hubspot_webhook' },
 ]
 
 /**
@@ -30,8 +39,10 @@ export const hubspotAllTriggerOptions = [
 export const hubspotContactTriggerOptions = [
   { label: 'Contact Created', id: 'hubspot_contact_created' },
   { label: 'Contact Deleted', id: 'hubspot_contact_deleted' },
+  { label: 'Contact Merged', id: 'hubspot_contact_merged' },
   { label: 'Contact Privacy Deleted', id: 'hubspot_contact_privacy_deleted' },
   { label: 'Contact Property Changed', id: 'hubspot_contact_property_changed' },
+  { label: 'Contact Restored', id: 'hubspot_contact_restored' },
 ]
 
 /**
@@ -40,7 +51,9 @@ export const hubspotContactTriggerOptions = [
 export const hubspotCompanyTriggerOptions = [
   { label: 'Company Created', id: 'hubspot_company_created' },
   { label: 'Company Deleted', id: 'hubspot_company_deleted' },
+  { label: 'Company Merged', id: 'hubspot_company_merged' },
   { label: 'Company Property Changed', id: 'hubspot_company_property_changed' },
+  { label: 'Company Restored', id: 'hubspot_company_restored' },
 ]
 
 /**
@@ -60,7 +73,9 @@ export const hubspotConversationTriggerOptions = [
 export const hubspotDealTriggerOptions = [
   { label: 'Deal Created', id: 'hubspot_deal_created' },
   { label: 'Deal Deleted', id: 'hubspot_deal_deleted' },
+  { label: 'Deal Merged', id: 'hubspot_deal_merged' },
   { label: 'Deal Property Changed', id: 'hubspot_deal_property_changed' },
+  { label: 'Deal Restored', id: 'hubspot_deal_restored' },
 ]
 
 /**
@@ -69,19 +84,34 @@ export const hubspotDealTriggerOptions = [
 export const hubspotTicketTriggerOptions = [
   { label: 'Ticket Created', id: 'hubspot_ticket_created' },
   { label: 'Ticket Deleted', id: 'hubspot_ticket_deleted' },
+  { label: 'Ticket Merged', id: 'hubspot_ticket_merged' },
   { label: 'Ticket Property Changed', id: 'hubspot_ticket_property_changed' },
+  { label: 'Ticket Restored', id: 'hubspot_ticket_restored' },
 ]
 
+/**
+ * Derives the required OAuth scope from a HubSpot event type
+ */
+function getScopeForEventType(eventType: string): string {
+  if (eventType.startsWith('company')) return 'crm.objects.companies.read'
+  if (eventType.startsWith('deal')) return 'crm.objects.deals.read'
+  if (eventType.startsWith('ticket')) return 'tickets'
+  if (eventType === 'All Events')
+    return 'crm.objects.contacts.read, crm.objects.companies.read, crm.objects.deals.read, tickets'
+  return 'crm.objects.contacts.read'
+}
+
 /**
  * Generate setup instructions for a specific HubSpot event type
  */
 export function hubspotSetupInstructions(eventType: string, additionalNotes?: string): string {
+  const scope = getScopeForEventType(eventType)
   const instructions = [
     '<strong>Step 1: Create a HubSpot Developer Account</strong><br/>Sign up for a free developer account at <a href="https://developers.hubspot.com" target="_blank">developers.hubspot.com</a> if you don\'t have one.',
     '<strong>Step 2: Create a Public App via CLI</strong><br/><strong>Note:</strong> HubSpot has deprecated the web UI for creating apps. You must use the HubSpot CLI to create and manage apps. Install the CLI with <code>npm install -g @hubspot/cli</code> and run <code>hs project create</code> to create a new app. See <a href="https://developers.hubspot.com/docs/platform/create-an-app" target="_blank">HubSpot\'s documentation</a> for details.',
     '<strong>Step 3: Configure OAuth Settings</strong><br/>After creating your app via CLI, configure it to add the OAuth Redirect URL: <code>https://www.sim.ai/api/auth/oauth2/callback/hubspot</code>. Then retrieve your <strong>Client ID</strong> and <strong>Client Secret</strong> from your app configuration and enter them in the fields above.',
     "<strong>Step 4: Get App ID and Developer API Key</strong><br/>In your HubSpot developer account, find your <strong>App ID</strong> (shown below your app name) and your <strong>Developer API Key</strong> (in app settings). You'll need both for the next steps.",
-    '<strong>Step 5: Set Required Scopes</strong><br/>Configure your app to include the required OAuth scope: <code>crm.objects.contacts.read</code>',
+    `<strong>Step 5: Set Required Scopes</strong><br/>Configure your app to include the required OAuth scope(s): <code>${scope}</code>`,
     '<strong>Step 6: Configure Webhook in HubSpot via API</strong><br/>After saving above, copy the <strong>Webhook URL</strong> and run the two curl commands below (replace <code>{YOUR_APP_ID}</code>, <code>{YOUR_DEVELOPER_API_KEY}</code>, and <code>{YOUR_WEBHOOK_URL_FROM_ABOVE}</code> with your actual values).',
     "<strong>Step 7: Test Your Webhook</strong><br/>Create or modify a contact in HubSpot to trigger the webhook. Check your workflow execution logs in Sim to verify it's working.",
   ]
@@ -172,6 +202,76 @@ function buildBaseHubSpotOutputs(): Record<string, TriggerOutput> {
   } as any
 }
 
+/**
+ * Merge-specific webhook outputs that include mergedObjectIds
+ */
+function buildMergeHubSpotOutputs(): Record<string, TriggerOutput> {
+  return {
+    payload: {
+      type: 'array',
+      description: 'Full webhook payload array from HubSpot containing merge event details',
+      items: {
+        type: 'object',
+        properties: {
+          objectId: { type: 'number', description: 'HubSpot object ID (winning/primary record)' },
+          subscriptionType: { type: 'string', description: 'Type of subscription event' },
+          portalId: { type: 'number', description: 'HubSpot portal ID' },
+          occurredAt: { type: 'number', description: 'Timestamp when event occurred (ms)' },
+          attemptNumber: { type: 'number', description: 'Webhook delivery attempt number' },
+          eventId: { type: 'number', description: 'Event ID' },
+          changeSource: { type: 'string', description: 'Source of the change' },
+          mergedObjectIds: {
+            type: 'array',
+            description: 'IDs of the objects that were merged into the primary record',
+          },
+        },
+      },
+    },
+    provider: {
+      type: 'string',
+      description: 'Provider name (hubspot)',
+    },
+    providerConfig: {
+      type: 'object',
+      description: 'Provider configuration',
+      properties: {
+        appId: {
+          type: 'string',
+          description: 'HubSpot App ID',
+        },
+        clientId: {
+          type: 'string',
+          description: 'HubSpot Client ID',
+        },
+        triggerId: {
+          type: 'string',
+          description: 'Trigger ID (e.g., hubspot_contact_merged)',
+        },
+        clientSecret: {
+          type: 'string',
+          description: 'HubSpot Client Secret',
+        },
+        developerApiKey: {
+          type: 'string',
+          description: 'HubSpot Developer API Key',
+        },
+        curlSetWebhookUrl: {
+          type: 'string',
+          description: 'curl command to set webhook URL',
+        },
+        curlCreateSubscription: {
+          type: 'string',
+          description: 'curl command to create subscription',
+        },
+        webhookUrlDisplay: {
+          type: 'string',
+          description: 'Webhook URL display value',
+        },
+      },
+    },
+  } as any
+}
+
 /**
  * Build output schema for contact creation events
  */
@@ -200,6 +300,20 @@ export function buildContactPropertyChangedOutputs(): Record<string, TriggerOutp
   return buildBaseHubSpotOutputs()
 }
 
+/**
+ * Build output schema for contact merge events
+ */
+export function buildContactMergedOutputs(): Record<string, TriggerOutput> {
+  return buildMergeHubSpotOutputs()
+}
+
+/**
+ * Build output schema for contact restore events
+ */
+export function buildContactRestoredOutputs(): Record<string, TriggerOutput> {
+  return buildBaseHubSpotOutputs()
+}
+
 /**
  * Build output schema for company creation events
  */
@@ -221,6 +335,20 @@ export function buildCompanyPropertyChangedOutputs(): Record<string, TriggerOutp
   return buildBaseHubSpotOutputs()
 }
 
+/**
+ * Build output schema for company merge events
+ */
+export function buildCompanyMergedOutputs(): Record<string, TriggerOutput> {
+  return buildMergeHubSpotOutputs()
+}
+
+/**
+ * Build output schema for company restore events
+ */
+export function buildCompanyRestoredOutputs(): Record<string, TriggerOutput> {
+  return buildBaseHubSpotOutputs()
+}
+
 /**
  * Build output schema for conversation creation events
  */
@@ -277,6 +405,20 @@ export function buildDealPropertyChangedOutputs(): Record<string, TriggerOutput>
   return buildBaseHubSpotOutputs()
 }
 
+/**
+ * Build output schema for deal merge events
+ */
+export function buildDealMergedOutputs(): Record<string, TriggerOutput> {
+  return buildMergeHubSpotOutputs()
+}
+
+/**
+ * Build output schema for deal restore events
+ */
+export function buildDealRestoredOutputs(): Record<string, TriggerOutput> {
+  return buildBaseHubSpotOutputs()
+}
+
 /**
  * Build output schema for ticket creation events
  */
@@ -298,6 +440,27 @@ export function buildTicketPropertyChangedOutputs(): Record<string, TriggerOutpu
   return buildBaseHubSpotOutputs()
 }
 
+/**
+ * Build output schema for ticket merge events
+ */
+export function buildTicketMergedOutputs(): Record<string, TriggerOutput> {
+  return buildMergeHubSpotOutputs()
+}
+
+/**
+ * Build output schema for ticket restore events
+ */
+export function buildTicketRestoredOutputs(): Record<string, TriggerOutput> {
+  return buildBaseHubSpotOutputs()
+}
+
+/**
+ * Build output schema for generic webhook events
+ */
+export function buildWebhookOutputs(): Record<string, TriggerOutput> {
+  return buildBaseHubSpotOutputs()
+}
+
 /**
  * Check if a HubSpot event matches the expected trigger configuration
  */
@@ -305,11 +468,15 @@ export function isHubSpotContactEventMatch(triggerId: string, eventType: string)
   const eventMap: Record<string, string> = {
     hubspot_contact_created: 'contact.creation',
     hubspot_contact_deleted: 'contact.deletion',
+    hubspot_contact_merged: 'contact.merge',
     hubspot_contact_privacy_deleted: 'contact.privacyDeletion',
     hubspot_contact_property_changed: 'contact.propertyChange',
+    hubspot_contact_restored: 'contact.restore',
     hubspot_company_created: 'company.creation',
     hubspot_company_deleted: 'company.deletion',
+    hubspot_company_merged: 'company.merge',
     hubspot_company_property_changed: 'company.propertyChange',
+    hubspot_company_restored: 'company.restore',
     hubspot_conversation_creation: 'conversation.creation',
     hubspot_conversation_deletion: 'conversation.deletion',
     hubspot_conversation_new_message: 'conversation.newMessage',
@@ -317,10 +484,14 @@ export function isHubSpotContactEventMatch(triggerId: string, eventType: string)
     hubspot_conversation_property_changed: 'conversation.propertyChange',
     hubspot_deal_created: 'deal.creation',
     hubspot_deal_deleted: 'deal.deletion',
+    hubspot_deal_merged: 'deal.merge',
     hubspot_deal_property_changed: 'deal.propertyChange',
+    hubspot_deal_restored: 'deal.restore',
     hubspot_ticket_created: 'ticket.creation',
     hubspot_ticket_deleted: 'ticket.deletion',
+    hubspot_ticket_merged: 'ticket.merge',
     hubspot_ticket_property_changed: 'ticket.propertyChange',
+    hubspot_ticket_restored: 'ticket.restore',
   }
 
   const expectedEventType = eventMap[triggerId]
diff --git a/apps/sim/triggers/hubspot/webhook.ts b/apps/sim/triggers/hubspot/webhook.ts
new file mode 100644
index 00000000000..addcb92b923
--- /dev/null
+++ b/apps/sim/triggers/hubspot/webhook.ts
@@ -0,0 +1,223 @@
+import { HubspotIcon } from '@/components/icons'
+import {
+  buildWebhookOutputs,
+  hubspotAllTriggerOptions,
+  hubspotSetupInstructions,
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+export const hubspotWebhookTrigger: TriggerConfig = {
+  id: 'hubspot_webhook',
+  name: 'HubSpot Webhook (All Events)',
+  provider: 'hubspot',
+  description: 'Trigger workflow on any HubSpot webhook event',
+  version: '1.0.0',
+  icon: HubspotIcon,
+
+  subBlocks: [
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: hubspotAllTriggerOptions,
+      value: () => 'hubspot_webhook',
+      required: true,
+    },
+    {
+      id: 'clientId',
+      title: 'Client ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client ID',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'clientSecret',
+      title: 'Client Secret',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot app Client Secret',
+      description: 'Found in your HubSpot app settings under Auth tab',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'appId',
+      title: 'App ID',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot App ID',
+      description: 'Found in your HubSpot app settings. Used to identify your app.',
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'developerApiKey',
+      title: 'Developer API Key',
+      type: 'short-input',
+      placeholder: 'Enter your HubSpot Developer API Key',
+      description: 'Used for making API calls to HubSpot. Found in your HubSpot app settings.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'webhookUrlDisplay',
+      title: 'Webhook URL',
+      type: 'short-input',
+      readOnly: true,
+      showCopyButton: true,
+      useWebhookUrl: true,
+      placeholder: 'Webhook URL will be generated',
+      description: 'Copy this URL and paste it into your HubSpot app webhook subscription settings',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'triggerSave',
+      title: '',
+      type: 'trigger-save',
+      mode: 'trigger',
+      triggerId: 'hubspot_webhook',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'triggerInstructions',
+      title: 'Setup Instructions',
+      type: 'text',
+      defaultValue: hubspotSetupInstructions(
+        'All Events',
+        'This generic webhook trigger will accept all HubSpot webhook events. Create subscriptions for each event type you want to receive using the curl command below (changing the eventType parameter).'
+      ),
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'curlSetWebhookUrl',
+      title: '1. Set Webhook Target URL',
+      type: 'code',
+      language: 'javascript',
+      value: (params: Record<string, any>) => {
+        const webhookUrl = params.webhookUrlDisplay || '{YOUR_WEBHOOK_URL_FROM_ABOVE}'
+        return `curl -X PUT "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/settings?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "targetUrl": "${webhookUrl}",
+    "throttling": {
+      "maxConcurrentRequests": 10
+    }
+  }'`
+      },
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command to set your webhook URL in HubSpot',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'curlCreateSubscription',
+      title: '2. Create Webhook Subscription',
+      type: 'code',
+      language: 'javascript',
+      defaultValue: `# Create subscriptions for each event type you want to receive.
+# Replace {eventType} with: contact.creation, contact.deletion, contact.propertyChange,
+# contact.merge, contact.restore, company.creation, company.deletion, company.propertyChange,
+# company.merge, company.restore, deal.creation, deal.deletion, deal.propertyChange,
+# deal.merge, deal.restore, ticket.creation, ticket.deletion, ticket.propertyChange,
+# ticket.merge, ticket.restore, etc.
+
+curl -X POST "https://api.hubapi.com/webhooks/v3/{YOUR_APP_ID}/subscriptions?hapikey={YOUR_DEVELOPER_API_KEY}" \\
+  -H "Content-Type: application/json" \\
+  -d '{
+    "eventType": "{eventType}",
+    "active": true
+  }'`,
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      showCopyButton: true,
+      description: 'Run this command for each event type you want to subscribe to',
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+    {
+      id: 'samplePayload',
+      title: 'Event Payload Example',
+      type: 'code',
+      language: 'json',
+      defaultValue: JSON.stringify(
+        [
+          {
+            eventId: 3181526809,
+            subscriptionId: 4629970,
+            portalId: 244315265,
+            appId: 23608917,
+            occurredAt: 1762659213730,
+            subscriptionType: 'contact.creation',
+            attemptNumber: 0,
+            objectId: 316126906049,
+            changeFlag: 'CREATED',
+            changeSource: 'CRM_UI',
+            sourceId: 'userId:84916424',
+          },
+        ],
+        null,
+        2
+      ),
+      readOnly: true,
+      collapsible: true,
+      defaultCollapsed: true,
+      mode: 'trigger',
+      condition: {
+        field: 'selectedTriggerId',
+        value: 'hubspot_webhook',
+      },
+    },
+  ],
+
+  outputs: buildWebhookOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-HubSpot-Signature': 'sha256=...',
+      'X-HubSpot-Request-Id': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'User-Agent': 'HubSpot Webhooks',
+    },
+  },
+}
diff --git a/apps/sim/triggers/intercom/contact_created.ts b/apps/sim/triggers/intercom/contact_created.ts
new file mode 100644
index 00000000000..f9602072c52
--- /dev/null
+++ b/apps/sim/triggers/intercom/contact_created.ts
@@ -0,0 +1,41 @@
+import { IntercomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildIntercomContactOutputs,
+  buildIntercomExtraFields,
+  intercomSetupInstructions,
+  intercomTriggerOptions,
+} from '@/triggers/intercom/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Intercom Contact Created Trigger
+ *
+ * Fires when a new lead is created in Intercom.
+ * Note: In Intercom, contact.created fires for leads only.
+ * For identified users, use the User Created trigger (user.created topic).
+ */
+export const intercomContactCreatedTrigger: TriggerConfig = {
+  id: 'intercom_contact_created',
+  name: 'Intercom Contact Created',
+  provider: 'intercom',
+  description: 'Trigger workflow when a new lead is created in Intercom',
+  version: '1.0.0',
+  icon: IntercomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'intercom_contact_created',
+    triggerOptions: intercomTriggerOptions,
+    setupInstructions: intercomSetupInstructions('contact.created'),
+    extraFields: buildIntercomExtraFields('intercom_contact_created'),
+  }),
+
+  outputs: buildIntercomContactOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/intercom/conversation_closed.ts b/apps/sim/triggers/intercom/conversation_closed.ts
new file mode 100644
index 00000000000..f8b8e23d5c7
--- /dev/null
+++ b/apps/sim/triggers/intercom/conversation_closed.ts
@@ -0,0 +1,39 @@
+import { IntercomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildIntercomConversationOutputs,
+  buildIntercomExtraFields,
+  intercomSetupInstructions,
+  intercomTriggerOptions,
+} from '@/triggers/intercom/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Intercom Conversation Closed Trigger
+ *
+ * Fires when an admin closes a conversation.
+ */
+export const intercomConversationClosedTrigger: TriggerConfig = {
+  id: 'intercom_conversation_closed',
+  name: 'Intercom Conversation Closed',
+  provider: 'intercom',
+  description: 'Trigger workflow when a conversation is closed in Intercom',
+  version: '1.0.0',
+  icon: IntercomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'intercom_conversation_closed',
+    triggerOptions: intercomTriggerOptions,
+    setupInstructions: intercomSetupInstructions('conversation.admin.closed'),
+    extraFields: buildIntercomExtraFields('intercom_conversation_closed'),
+  }),
+
+  outputs: buildIntercomConversationOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/intercom/conversation_created.ts b/apps/sim/triggers/intercom/conversation_created.ts
new file mode 100644
index 00000000000..0d18273f760
--- /dev/null
+++ b/apps/sim/triggers/intercom/conversation_created.ts
@@ -0,0 +1,43 @@
+import { IntercomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildIntercomConversationOutputs,
+  buildIntercomExtraFields,
+  intercomSetupInstructions,
+  intercomTriggerOptions,
+} from '@/triggers/intercom/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Intercom Conversation Created Trigger
+ *
+ * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
+ * Fires when a user/lead starts a new conversation or an admin initiates a 1:1 conversation.
+ */
+export const intercomConversationCreatedTrigger: TriggerConfig = {
+  id: 'intercom_conversation_created',
+  name: 'Intercom Conversation Created',
+  provider: 'intercom',
+  description: 'Trigger workflow when a new conversation is created in Intercom',
+  version: '1.0.0',
+  icon: IntercomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'intercom_conversation_created',
+    triggerOptions: intercomTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: intercomSetupInstructions(
+      'conversation.user.created and/or conversation.admin.single.created'
+    ),
+    extraFields: buildIntercomExtraFields('intercom_conversation_created'),
+  }),
+
+  outputs: buildIntercomConversationOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/intercom/conversation_reply.ts b/apps/sim/triggers/intercom/conversation_reply.ts
new file mode 100644
index 00000000000..df621517ee6
--- /dev/null
+++ b/apps/sim/triggers/intercom/conversation_reply.ts
@@ -0,0 +1,41 @@
+import { IntercomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildIntercomConversationOutputs,
+  buildIntercomExtraFields,
+  intercomSetupInstructions,
+  intercomTriggerOptions,
+} from '@/triggers/intercom/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Intercom Conversation Reply Trigger
+ *
+ * Fires when a user, lead, or admin replies to a conversation.
+ */
+export const intercomConversationReplyTrigger: TriggerConfig = {
+  id: 'intercom_conversation_reply',
+  name: 'Intercom Conversation Reply',
+  provider: 'intercom',
+  description: 'Trigger workflow when someone replies to an Intercom conversation',
+  version: '1.0.0',
+  icon: IntercomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'intercom_conversation_reply',
+    triggerOptions: intercomTriggerOptions,
+    setupInstructions: intercomSetupInstructions(
+      'conversation.user.replied and/or conversation.admin.replied'
+    ),
+    extraFields: buildIntercomExtraFields('intercom_conversation_reply'),
+  }),
+
+  outputs: buildIntercomConversationOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/intercom/index.ts b/apps/sim/triggers/intercom/index.ts
new file mode 100644
index 00000000000..b465a9d42f5
--- /dev/null
+++ b/apps/sim/triggers/intercom/index.ts
@@ -0,0 +1,6 @@
+export { intercomContactCreatedTrigger } from './contact_created'
+export { intercomConversationClosedTrigger } from './conversation_closed'
+export { intercomConversationCreatedTrigger } from './conversation_created'
+export { intercomConversationReplyTrigger } from './conversation_reply'
+export { intercomUserCreatedTrigger } from './user_created'
+export { intercomWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/intercom/user_created.ts b/apps/sim/triggers/intercom/user_created.ts
new file mode 100644
index 00000000000..0c62f53adaf
--- /dev/null
+++ b/apps/sim/triggers/intercom/user_created.ts
@@ -0,0 +1,41 @@
+import { IntercomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildIntercomContactOutputs,
+  buildIntercomExtraFields,
+  intercomSetupInstructions,
+  intercomTriggerOptions,
+} from '@/triggers/intercom/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Intercom User Created Trigger
+ *
+ * Fires when a new identified user is created in Intercom.
+ * Note: In Intercom, user.created fires for identified users only.
+ * For anonymous leads, use the Contact Created trigger (contact.created topic).
+ */
+export const intercomUserCreatedTrigger: TriggerConfig = {
+  id: 'intercom_user_created',
+  name: 'Intercom User Created',
+  provider: 'intercom',
+  description: 'Trigger workflow when a new user is created in Intercom',
+  version: '1.0.0',
+  icon: IntercomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'intercom_user_created',
+    triggerOptions: intercomTriggerOptions,
+    setupInstructions: intercomSetupInstructions('user.created'),
+    extraFields: buildIntercomExtraFields('intercom_user_created'),
+  }),
+
+  outputs: buildIntercomContactOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/intercom/utils.ts b/apps/sim/triggers/intercom/utils.ts
new file mode 100644
index 00000000000..04ef4b883b2
--- /dev/null
+++ b/apps/sim/triggers/intercom/utils.ts
@@ -0,0 +1,128 @@
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Dropdown options for the Intercom trigger type selector.
+ */
+export const intercomTriggerOptions = [
+  { label: 'Conversation Created', id: 'intercom_conversation_created' },
+  { label: 'Conversation Reply', id: 'intercom_conversation_reply' },
+  { label: 'Conversation Closed', id: 'intercom_conversation_closed' },
+  { label: 'Contact Created', id: 'intercom_contact_created' },
+  { label: 'User Created', id: 'intercom_user_created' },
+  { label: 'All Events', id: 'intercom_webhook' },
+]
+
+/**
+ * Generates HTML setup instructions for Intercom webhook triggers.
+ */
+export function intercomSetupInstructions(eventType: string): string {
+  const instructions = [
+    'Copy the <strong>Webhook URL</strong> above.',
+    'Go to your <a href="https://app.intercom.com/a/apps/_/developer-hub" target="_blank" rel="noopener noreferrer">Intercom Developer Hub</a>.',
+    'Select your app, then go to <strong>Webhooks</strong>.',
+    'Paste the webhook URL into the <strong>Endpoint URL</strong> field.',
+    `Select the <strong>${eventType}</strong> topic(s).`,
+    "Copy your app's <strong>Client Secret</strong> from the app's <strong>Basic Information</strong> page and paste it into the <strong>Webhook Secret</strong> field above (recommended for security).",
+    'Save the webhook configuration.',
+    'Deploy your workflow to activate the trigger.',
+  ]
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Extra fields for Intercom triggers (webhook secret for signature verification).
+ */
+export function buildIntercomExtraFields(triggerId: string): SubBlockConfig[] {
+  return [
+    {
+      id: 'webhookSecret',
+      title: 'Webhook Secret',
+      type: 'short-input',
+      placeholder: 'Enter your Intercom app Client Secret',
+      description:
+        "Your app's Client Secret from the Developer Hub. Used to verify webhook authenticity via X-Hub-Signature.",
+      password: true,
+      mode: 'trigger',
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+/**
+ * Maps trigger IDs to the Intercom webhook topics they should match.
+ */
+export const INTERCOM_TRIGGER_TOPIC_MAP: Record<string, string[]> = {
+  intercom_conversation_created: ['conversation.user.created', 'conversation.admin.single.created'],
+  intercom_conversation_reply: ['conversation.user.replied', 'conversation.admin.replied'],
+  intercom_conversation_closed: ['conversation.admin.closed'],
+  intercom_contact_created: ['contact.created'],
+  intercom_user_created: ['user.created'],
+  intercom_webhook: [], // Empty = accept all events
+}
+
+/**
+ * Checks if an Intercom webhook event matches the configured trigger.
+ */
+export function isIntercomEventMatch(triggerId: string, topic: string): boolean {
+  const allowedTopics = INTERCOM_TRIGGER_TOPIC_MAP[triggerId]
+  if (allowedTopics === undefined) return false
+  if (allowedTopics.length === 0) {
+    return true
+  }
+  return allowedTopics.includes(topic)
+}
+
+/**
+ * Shared base outputs for all Intercom webhook triggers.
+ */
+function buildIntercomBaseOutputs(dataDescription: string): Record<string, TriggerOutput> {
+  return {
+    topic: { type: 'string', description: 'The webhook topic (e.g., conversation.user.created)' },
+    id: { type: 'string', description: 'Unique notification ID' },
+    app_id: { type: 'string', description: 'Your Intercom app ID' },
+    created_at: { type: 'number', description: 'Unix timestamp when the event occurred' },
+    delivery_attempts: {
+      type: 'number',
+      description: 'Number of delivery attempts for this notification',
+    },
+    first_sent_at: {
+      type: 'number',
+      description: 'Unix timestamp of first delivery attempt',
+    },
+    data: { type: 'json', description: dataDescription },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for Intercom conversation triggers.
+ */
+export function buildIntercomConversationOutputs(): Record<string, TriggerOutput> {
+  return buildIntercomBaseOutputs(
+    'Event data containing the conversation object. Access via data.item for conversation details including id, state, open, assignee, contacts, conversation_parts, tags, and source'
+  )
+}
+
+/**
+ * Build outputs for Intercom contact triggers.
+ */
+export function buildIntercomContactOutputs(): Record<string, TriggerOutput> {
+  return buildIntercomBaseOutputs(
+    'Event data containing the contact object. Access via data.item for contact details including id, role, email, name, phone, external_id, custom_attributes, location, avatar, tags, companies, and timestamps'
+  )
+}
+
+/**
+ * Build outputs for the generic Intercom webhook trigger.
+ */
+export function buildIntercomGenericOutputs(): Record<string, TriggerOutput> {
+  return buildIntercomBaseOutputs(
+    'Event data containing the affected object. Access via data.item for the resource (conversation, contact, company, ticket, etc.)'
+  )
+}
diff --git a/apps/sim/triggers/intercom/webhook.ts b/apps/sim/triggers/intercom/webhook.ts
new file mode 100644
index 00000000000..ded87c77ca8
--- /dev/null
+++ b/apps/sim/triggers/intercom/webhook.ts
@@ -0,0 +1,41 @@
+import { IntercomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildIntercomExtraFields,
+  buildIntercomGenericOutputs,
+  intercomSetupInstructions,
+  intercomTriggerOptions,
+} from '@/triggers/intercom/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Intercom Generic Webhook Trigger
+ *
+ * Accepts all Intercom webhook events.
+ */
+export const intercomWebhookTrigger: TriggerConfig = {
+  id: 'intercom_webhook',
+  name: 'Intercom Webhook (All Events)',
+  provider: 'intercom',
+  description: 'Trigger workflow on any Intercom webhook event',
+  version: '1.0.0',
+  icon: IntercomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'intercom_webhook',
+    triggerOptions: intercomTriggerOptions,
+    setupInstructions: intercomSetupInstructions(
+      'events you want to receive (conversation, contact, user, company, ticket, etc.)'
+    ),
+    extraFields: buildIntercomExtraFields('intercom_webhook'),
+  }),
+
+  outputs: buildIntercomGenericOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/comment_created.ts b/apps/sim/triggers/linear/comment_created.ts
index 893061cc5ea..f4d9e779011 100644
--- a/apps/sim/triggers/linear/comment_created.ts
+++ b/apps/sim/triggers/linear/comment_created.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCommentOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCommentOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCommentCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCommentCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCommentCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_comment_created_v2',
+  name: 'Linear Comment Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new comment is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_comment_created_v2',
+    eventType: 'Comment (create)',
+  }),
+  outputs: buildCommentOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Comment',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/comment_updated.ts b/apps/sim/triggers/linear/comment_updated.ts
index d837d714944..6bd1761beba 100644
--- a/apps/sim/triggers/linear/comment_updated.ts
+++ b/apps/sim/triggers/linear/comment_updated.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCommentOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCommentOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCommentUpdatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCommentUpdatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCommentUpdatedV2Trigger: TriggerConfig = {
+  id: 'linear_comment_updated_v2',
+  name: 'Linear Comment Updated',
+  provider: 'linear',
+  description: 'Trigger workflow when a comment is updated in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_comment_updated_v2',
+    eventType: 'Comment (update)',
+  }),
+  outputs: buildCommentOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Comment',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/customer_request_created.ts b/apps/sim/triggers/linear/customer_request_created.ts
index b08b16985d6..b8c17da527d 100644
--- a/apps/sim/triggers/linear/customer_request_created.ts
+++ b/apps/sim/triggers/linear/customer_request_created.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCustomerRequestOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCustomerRequestOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCustomerRequestCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCustomerRequestCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCustomerRequestCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_customer_request_created_v2',
+  name: 'Linear Customer Request Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new customer request is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_customer_request_created_v2',
+    eventType: 'Customer Requests',
+  }),
+  outputs: buildCustomerRequestOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'CustomerNeed',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/customer_request_updated.ts b/apps/sim/triggers/linear/customer_request_updated.ts
index e4f91cfa8f1..a76b8c22cab 100644
--- a/apps/sim/triggers/linear/customer_request_updated.ts
+++ b/apps/sim/triggers/linear/customer_request_updated.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCustomerRequestOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCustomerRequestOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCustomerRequestUpdatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCustomerRequestUpdatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCustomerRequestUpdatedV2Trigger: TriggerConfig = {
+  id: 'linear_customer_request_updated_v2',
+  name: 'Linear Customer Request Updated',
+  provider: 'linear',
+  description: 'Trigger workflow when a customer request is updated in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_customer_request_updated_v2',
+    eventType: 'CustomerNeed (update)',
+  }),
+  outputs: buildCustomerRequestOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'CustomerNeed',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/cycle_created.ts b/apps/sim/triggers/linear/cycle_created.ts
index dc80861ab0d..3238dce74fe 100644
--- a/apps/sim/triggers/linear/cycle_created.ts
+++ b/apps/sim/triggers/linear/cycle_created.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCycleOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCycleOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCycleCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCycleCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCycleCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_cycle_created_v2',
+  name: 'Linear Cycle Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new cycle is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_cycle_created_v2',
+    eventType: 'Cycle (create)',
+  }),
+  outputs: buildCycleOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Cycle',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/cycle_updated.ts b/apps/sim/triggers/linear/cycle_updated.ts
index 7922adafcd6..fc996c3a8e8 100644
--- a/apps/sim/triggers/linear/cycle_updated.ts
+++ b/apps/sim/triggers/linear/cycle_updated.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCycleOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCycleOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCycleUpdatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCycleUpdatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCycleUpdatedV2Trigger: TriggerConfig = {
+  id: 'linear_cycle_updated_v2',
+  name: 'Linear Cycle Updated',
+  provider: 'linear',
+  description: 'Trigger workflow when a cycle is updated in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_cycle_updated_v2',
+    eventType: 'Cycle (update)',
+  }),
+  outputs: buildCycleOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Cycle',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/index.ts b/apps/sim/triggers/linear/index.ts
index 26194979226..05b35bd39db 100644
--- a/apps/sim/triggers/linear/index.ts
+++ b/apps/sim/triggers/linear/index.ts
@@ -1,15 +1,24 @@
-export { linearCommentCreatedTrigger } from './comment_created'
-export { linearCommentUpdatedTrigger } from './comment_updated'
-export { linearCustomerRequestCreatedTrigger } from './customer_request_created'
-export { linearCustomerRequestUpdatedTrigger } from './customer_request_updated'
-export { linearCycleCreatedTrigger } from './cycle_created'
-export { linearCycleUpdatedTrigger } from './cycle_updated'
-export { linearIssueCreatedTrigger } from './issue_created'
-export { linearIssueRemovedTrigger } from './issue_removed'
-export { linearIssueUpdatedTrigger } from './issue_updated'
-export { linearLabelCreatedTrigger } from './label_created'
-export { linearLabelUpdatedTrigger } from './label_updated'
-export { linearProjectCreatedTrigger } from './project_created'
-export { linearProjectUpdateCreatedTrigger } from './project_update_created'
-export { linearProjectUpdatedTrigger } from './project_updated'
-export { linearWebhookTrigger } from './webhook'
+export { linearCommentCreatedTrigger, linearCommentCreatedV2Trigger } from './comment_created'
+export { linearCommentUpdatedTrigger, linearCommentUpdatedV2Trigger } from './comment_updated'
+export {
+  linearCustomerRequestCreatedTrigger,
+  linearCustomerRequestCreatedV2Trigger,
+} from './customer_request_created'
+export {
+  linearCustomerRequestUpdatedTrigger,
+  linearCustomerRequestUpdatedV2Trigger,
+} from './customer_request_updated'
+export { linearCycleCreatedTrigger, linearCycleCreatedV2Trigger } from './cycle_created'
+export { linearCycleUpdatedTrigger, linearCycleUpdatedV2Trigger } from './cycle_updated'
+export { linearIssueCreatedTrigger, linearIssueCreatedV2Trigger } from './issue_created'
+export { linearIssueRemovedTrigger, linearIssueRemovedV2Trigger } from './issue_removed'
+export { linearIssueUpdatedTrigger, linearIssueUpdatedV2Trigger } from './issue_updated'
+export { linearLabelCreatedTrigger, linearLabelCreatedV2Trigger } from './label_created'
+export { linearLabelUpdatedTrigger, linearLabelUpdatedV2Trigger } from './label_updated'
+export { linearProjectCreatedTrigger, linearProjectCreatedV2Trigger } from './project_created'
+export {
+  linearProjectUpdateCreatedTrigger,
+  linearProjectUpdateCreatedV2Trigger,
+} from './project_update_created'
+export { linearProjectUpdatedTrigger, linearProjectUpdatedV2Trigger } from './project_updated'
+export { linearWebhookTrigger, linearWebhookV2Trigger } from './webhook'
diff --git a/apps/sim/triggers/linear/issue_created.ts b/apps/sim/triggers/linear/issue_created.ts
index e10b00663f9..4a95974a1e7 100644
--- a/apps/sim/triggers/linear/issue_created.ts
+++ b/apps/sim/triggers/linear/issue_created.ts
@@ -1,6 +1,7 @@
 import { LinearIcon } from '@/components/icons'
 import {
   buildIssueOutputs,
+  buildLinearV2SubBlocks,
   linearSetupInstructions,
   linearTriggerOptions,
 } from '@/triggers/linear/utils'
@@ -91,3 +92,28 @@ export const linearIssueCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearIssueCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_issue_created_v2',
+  name: 'Linear Issue Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new issue is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_issue_created_v2',
+    eventType: 'Issue (create)',
+    includeDropdown: true,
+  }),
+  outputs: buildIssueOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Issue',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/issue_removed.ts b/apps/sim/triggers/linear/issue_removed.ts
index 8f1361acbf8..ca1431ecaeb 100644
--- a/apps/sim/triggers/linear/issue_removed.ts
+++ b/apps/sim/triggers/linear/issue_removed.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildIssueOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildIssueOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearIssueRemovedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearIssueRemovedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearIssueRemovedV2Trigger: TriggerConfig = {
+  id: 'linear_issue_removed_v2',
+  name: 'Linear Issue Removed',
+  provider: 'linear',
+  description: 'Trigger workflow when an issue is removed/deleted in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_issue_removed_v2',
+    eventType: 'Issue (remove)',
+  }),
+  outputs: buildIssueOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Issue',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/issue_updated.ts b/apps/sim/triggers/linear/issue_updated.ts
index 75460268293..2893331a184 100644
--- a/apps/sim/triggers/linear/issue_updated.ts
+++ b/apps/sim/triggers/linear/issue_updated.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildIssueOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildIssueOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearIssueUpdatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearIssueUpdatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearIssueUpdatedV2Trigger: TriggerConfig = {
+  id: 'linear_issue_updated_v2',
+  name: 'Linear Issue Updated',
+  provider: 'linear',
+  description: 'Trigger workflow when an issue is updated in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_issue_updated_v2',
+    eventType: 'Issue (update)',
+  }),
+  outputs: buildIssueOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Issue',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/label_created.ts b/apps/sim/triggers/linear/label_created.ts
index f3e9638aebf..369825c83aa 100644
--- a/apps/sim/triggers/linear/label_created.ts
+++ b/apps/sim/triggers/linear/label_created.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildLabelOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildLabelOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearLabelCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearLabelCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearLabelCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_label_created_v2',
+  name: 'Linear Label Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new label is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_label_created_v2',
+    eventType: 'IssueLabel (create)',
+  }),
+  outputs: buildLabelOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'IssueLabel',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/label_updated.ts b/apps/sim/triggers/linear/label_updated.ts
index 2f0941f72e0..9009165bf5b 100644
--- a/apps/sim/triggers/linear/label_updated.ts
+++ b/apps/sim/triggers/linear/label_updated.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildLabelOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildLabelOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearLabelUpdatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearLabelUpdatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearLabelUpdatedV2Trigger: TriggerConfig = {
+  id: 'linear_label_updated_v2',
+  name: 'Linear Label Updated',
+  provider: 'linear',
+  description: 'Trigger workflow when a label is updated in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_label_updated_v2',
+    eventType: 'IssueLabel (update)',
+  }),
+  outputs: buildLabelOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'IssueLabel',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/project_created.ts b/apps/sim/triggers/linear/project_created.ts
index 4175b78170f..6758466c701 100644
--- a/apps/sim/triggers/linear/project_created.ts
+++ b/apps/sim/triggers/linear/project_created.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildProjectOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildLinearV2SubBlocks,
+  buildProjectOutputs,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearProjectCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearProjectCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearProjectCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_project_created_v2',
+  name: 'Linear Project Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new project is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_project_created_v2',
+    eventType: 'Project (create)',
+  }),
+  outputs: buildProjectOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Project',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/project_update_created.ts b/apps/sim/triggers/linear/project_update_created.ts
index 9d845480255..83321dbf80c 100644
--- a/apps/sim/triggers/linear/project_update_created.ts
+++ b/apps/sim/triggers/linear/project_update_created.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildProjectUpdateOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildLinearV2SubBlocks,
+  buildProjectUpdateOutputs,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearProjectUpdateCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearProjectUpdateCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearProjectUpdateCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_project_update_created_v2',
+  name: 'Linear Project Update Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new project update is posted in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_project_update_created_v2',
+    eventType: 'ProjectUpdate (create)',
+  }),
+  outputs: buildProjectUpdateOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'ProjectUpdate',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/project_updated.ts b/apps/sim/triggers/linear/project_updated.ts
index 1e569e6cbfd..e79eb4cd58a 100644
--- a/apps/sim/triggers/linear/project_updated.ts
+++ b/apps/sim/triggers/linear/project_updated.ts
@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildProjectOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildLinearV2SubBlocks,
+  buildProjectOutputs,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearProjectUpdatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearProjectUpdatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearProjectUpdatedV2Trigger: TriggerConfig = {
+  id: 'linear_project_updated_v2',
+  name: 'Linear Project Updated',
+  provider: 'linear',
+  description: 'Trigger workflow when a project is updated in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_project_updated_v2',
+    eventType: 'Project (update)',
+  }),
+  outputs: buildProjectOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Project',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
diff --git a/apps/sim/triggers/linear/utils.test.ts b/apps/sim/triggers/linear/utils.test.ts
new file mode 100644
index 00000000000..eec0c6a6eba
--- /dev/null
+++ b/apps/sim/triggers/linear/utils.test.ts
@@ -0,0 +1,20 @@
+/**
+ * @vitest-environment node
+ */
+
+import { describe, expect, it } from 'vitest'
+import { isLinearEventMatch } from '@/triggers/linear/utils'
+
+describe('isLinearEventMatch', () => {
+  it('returns false for unknown trigger ids (fail closed)', () => {
+    expect(isLinearEventMatch('linear_unknown_trigger', 'Issue', 'create')).toBe(false)
+  })
+
+  it('returns true when type and action match a known trigger', () => {
+    expect(isLinearEventMatch('linear_issue_created', 'Issue', 'create')).toBe(true)
+  })
+
+  it('normalizes _v2 suffix when matching', () => {
+    expect(isLinearEventMatch('linear_issue_created_v2', 'Issue', 'create')).toBe(true)
+  })
+})
diff --git a/apps/sim/triggers/linear/utils.ts b/apps/sim/triggers/linear/utils.ts
index 5002b3dada3..de9f9122275 100644
--- a/apps/sim/triggers/linear/utils.ts
+++ b/apps/sim/triggers/linear/utils.ts
@@ -1,3 +1,4 @@
+import type { SubBlockConfig } from '@/blocks/types'
 import type { TriggerOutput } from '@/triggers/types'
 
 /**
@@ -22,7 +23,37 @@ export const linearTriggerOptions = [
 ]
 
 /**
- * Generate setup instructions for a specific Linear event type
+ * Maps trigger IDs to Linear resource types for webhook creation.
+ * Used by the automatic webhook registration in provider-subscriptions.
+ */
+export const LINEAR_RESOURCE_TYPE_MAP: Record<string, string[]> = {
+  linear_issue_created_v2: ['Issue'],
+  linear_issue_updated_v2: ['Issue'],
+  linear_issue_removed_v2: ['Issue'],
+  linear_comment_created_v2: ['Comment'],
+  linear_comment_updated_v2: ['Comment'],
+  linear_project_created_v2: ['Project'],
+  linear_project_updated_v2: ['Project'],
+  linear_cycle_created_v2: ['Cycle'],
+  linear_cycle_updated_v2: ['Cycle'],
+  linear_label_created_v2: ['IssueLabel'],
+  linear_label_updated_v2: ['IssueLabel'],
+  linear_project_update_created_v2: ['ProjectUpdate'],
+  linear_customer_request_created_v2: ['CustomerNeed'],
+  linear_customer_request_updated_v2: ['CustomerNeed'],
+  linear_webhook_v2: [
+    'Issue',
+    'Comment',
+    'Project',
+    'Cycle',
+    'IssueLabel',
+    'ProjectUpdate',
+    'CustomerNeed',
+  ],
+}
+
+/**
+ * Generate setup instructions for manual Linear webhook configuration (v1 triggers)
  */
 export function linearSetupInstructions(eventType: string, additionalNotes?: string): string {
   const instructions = [
@@ -48,8 +79,123 @@ export function linearSetupInstructions(eventType: string, additionalNotes?: str
 }
 
 /**
- * Shared user/actor output schema
- * Note: Linear webhooks only include id, name, and type in actor objects
+ * Generate setup instructions for automatic Linear webhook creation (v2 triggers)
+ */
+export function linearV2SetupInstructions(eventType: string, additionalNotes?: string): string {
+  const instructions = [
+    'Enter your Linear API Key above. You can create one in Linear at <a href="https://linear.app/settings/api" target="_blank" rel="noopener noreferrer">Settings &gt; API &gt; Personal API keys</a>.',
+    'Optionally enter a <strong>Team ID</strong> to scope the webhook to a single team. Leave it empty to receive events from all public teams. You can find Team IDs in Linear under <a href="https://linear.app/settings" target="_blank" rel="noopener noreferrer">Settings &gt; Teams</a> or via the API.',
+    `Click <strong>"Save Configuration"</strong> to automatically create the webhook in Linear for <strong>${eventType}</strong> events.`,
+    'The webhook will be automatically deleted when you remove this trigger.',
+  ]
+
+  if (additionalNotes) {
+    instructions.push(additionalNotes)
+  }
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * V2 trigger dropdown options with _v2 suffixed IDs
+ */
+export const linearV2TriggerOptions = [
+  { label: 'Issue Created', id: 'linear_issue_created_v2' },
+  { label: 'Issue Updated', id: 'linear_issue_updated_v2' },
+  { label: 'Issue Removed', id: 'linear_issue_removed_v2' },
+  { label: 'Comment Created', id: 'linear_comment_created_v2' },
+  { label: 'Comment Updated', id: 'linear_comment_updated_v2' },
+  { label: 'Project Created', id: 'linear_project_created_v2' },
+  { label: 'Project Updated', id: 'linear_project_updated_v2' },
+  { label: 'Cycle Created', id: 'linear_cycle_created_v2' },
+  { label: 'Cycle Updated', id: 'linear_cycle_updated_v2' },
+  { label: 'Label Created', id: 'linear_label_created_v2' },
+  { label: 'Label Updated', id: 'linear_label_updated_v2' },
+  { label: 'Project Update Created', id: 'linear_project_update_created_v2' },
+  { label: 'Customer Request Created', id: 'linear_customer_request_created_v2' },
+  { label: 'Customer Request Updated', id: 'linear_customer_request_updated_v2' },
+  { label: 'General Webhook (All Events)', id: 'linear_webhook_v2' },
+]
+
+/**
+ * Builds the complete subBlocks array for a v2 Linear trigger.
+ * Webhooks are managed via API, so no webhook URL is displayed.
+ *
+ * Structure: [dropdown?] -> apiKey -> triggerSave -> instructions
+ */
+export function buildLinearV2SubBlocks(options: {
+  triggerId: string
+  eventType: string
+  includeDropdown?: boolean
+  additionalNotes?: string
+}): SubBlockConfig[] {
+  const { triggerId, eventType, includeDropdown = false, additionalNotes } = options
+  const blocks: SubBlockConfig[] = []
+
+  if (includeDropdown) {
+    blocks.push({
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: linearV2TriggerOptions,
+      value: () => triggerId,
+      required: true,
+    })
+  }
+
+  blocks.push({
+    id: 'apiKey',
+    title: 'API Key',
+    type: 'short-input',
+    placeholder: 'Enter your Linear API key',
+    password: true,
+    required: true,
+    paramVisibility: 'user-only',
+    mode: 'trigger',
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  })
+
+  blocks.push({
+    id: 'teamId',
+    title: 'Team ID',
+    type: 'short-input',
+    placeholder: 'All teams (optional)',
+    mode: 'trigger',
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  })
+
+  blocks.push({
+    id: 'triggerSave',
+    title: '',
+    type: 'trigger-save',
+    hideFromPreview: true,
+    mode: 'trigger',
+    triggerId,
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  })
+
+  blocks.push({
+    id: 'triggerInstructions',
+    title: 'Setup Instructions',
+    hideFromPreview: true,
+    type: 'text',
+    defaultValue: linearV2SetupInstructions(eventType, additionalNotes),
+    mode: 'trigger',
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  })
+
+  return blocks
+}
+
+/**
+ * Shared user/actor output schema (Linear data-change webhook `actor` object).
+ * @see https://linear.app/developers/webhooks — actor may be a User, OauthClient, or Integration; `type` is mapped to `actorType` (TriggerOutput reserves nested `type` for field kinds).
  */
 export const userOutputs = {
   id: {
@@ -60,9 +206,18 @@ export const userOutputs = {
     type: 'string',
     description: 'User display name',
   },
-  user_type: {
+  /** Linear sends this as `actor.type`; exposed as `actorType` here (TriggerOutput reserves `type`). */
+  actorType: {
     type: 'string',
-    description: 'Actor type (user, bot, etc.)',
+    description: 'Actor type from Linear (e.g. user, OauthClient, Integration)',
+  },
+  email: {
+    type: 'string',
+    description: 'Actor email (present for user actors in Linear webhook payloads)',
+  },
+  url: {
+    type: 'string',
+    description: 'Actor profile URL in Linear (distinct from the top-level subject entity `url`)',
   },
 } as const
 
@@ -151,6 +306,10 @@ export function buildIssueOutputs(): Record<string, TriggerOutput> {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       id: {
@@ -298,7 +457,7 @@ export function buildIssueOutputs(): Record<string, TriggerOutput> {
       type: 'object',
       description: 'Previous values for changed fields (only present on update)',
     },
-  } as any
+  } as unknown as Record<string, TriggerOutput>
 }
 
 /**
@@ -330,6 +489,10 @@ export function buildCommentOutputs(): Record<string, TriggerOutput> {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       id: {
@@ -340,6 +503,10 @@ export function buildCommentOutputs(): Record<string, TriggerOutput> {
         type: 'string',
         description: 'Comment body text',
       },
+      edited: {
+        type: 'boolean',
+        description: 'Whether the comment body has been edited (Linear webhook payload field)',
+      },
       url: {
         type: 'string',
         description: 'Comment URL',
@@ -385,7 +552,7 @@ export function buildCommentOutputs(): Record<string, TriggerOutput> {
       type: 'object',
       description: 'Previous values for changed fields (only present on update)',
     },
-  } as any
+  } as unknown as Record<string, TriggerOutput>
 }
 
 /**
@@ -417,6 +584,10 @@ export function buildProjectOutputs(): Record<string, TriggerOutput> {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       id: {
@@ -528,7 +699,7 @@ export function buildProjectOutputs(): Record<string, TriggerOutput> {
       type: 'object',
       description: 'Previous values for changed fields (only present on update)',
     },
-  } as any
+  } as unknown as Record<string, TriggerOutput>
 }
 
 /**
@@ -560,6 +731,10 @@ export function buildCycleOutputs(): Record<string, TriggerOutput> {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       id: {
@@ -631,7 +806,7 @@ export function buildCycleOutputs(): Record<string, TriggerOutput> {
       type: 'object',
       description: 'Previous values for changed fields (only present on update)',
     },
-  } as any
+  } as unknown as Record<string, TriggerOutput>
 }
 
 /**
@@ -663,6 +838,10 @@ export function buildLabelOutputs(): Record<string, TriggerOutput> {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       id: {
@@ -718,7 +897,7 @@ export function buildLabelOutputs(): Record<string, TriggerOutput> {
       type: 'object',
       description: 'Previous values for changed fields (only present on update)',
     },
-  } as any
+  } as unknown as Record<string, TriggerOutput>
 }
 
 /**
@@ -750,6 +929,10 @@ export function buildProjectUpdateOutputs(): Record<string, TriggerOutput> {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       id: {
@@ -793,7 +976,7 @@ export function buildProjectUpdateOutputs(): Record<string, TriggerOutput> {
       type: 'object',
       description: 'Previous values for changed fields (only present on update)',
     },
-  } as any
+  } as unknown as Record<string, TriggerOutput>
 }
 
 /**
@@ -825,6 +1008,10 @@ export function buildCustomerRequestOutputs(): Record<string, TriggerOutput> {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       id: {
@@ -876,7 +1063,7 @@ export function buildCustomerRequestOutputs(): Record<string, TriggerOutput> {
       type: 'object',
       description: 'Previous values for changed fields (only present on update)',
     },
-  } as any
+  } as unknown as Record<string, TriggerOutput>
 }
 
 /**
@@ -900,9 +1087,10 @@ export function isLinearEventMatch(triggerId: string, eventType: string, action?
     linear_customer_request_updated: { type: 'CustomerNeed', actions: ['update'] },
   }
 
-  const config = eventMap[triggerId]
+  const normalizedId = triggerId.replace(/_v2$/, '')
+  const config = eventMap[normalizedId]
   if (!config) {
-    return true // Unknown trigger, allow through
+    return false
   }
 
   // Check event type
diff --git a/apps/sim/triggers/linear/webhook.ts b/apps/sim/triggers/linear/webhook.ts
index 9239e4b494f..83ad6d6a25d 100644
--- a/apps/sim/triggers/linear/webhook.ts
+++ b/apps/sim/triggers/linear/webhook.ts
@@ -1,12 +1,17 @@
 import { LinearIcon } from '@/components/icons'
-import { linearSetupInstructions, userOutputs } from '@/triggers/linear/utils'
+import {
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+  userOutputs,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearWebhookTrigger: TriggerConfig = {
   id: 'linear_webhook',
   name: 'Linear Webhook',
   provider: 'linear',
-  description: 'Trigger workflow from any Linear webhook event',
+  description:
+    'Trigger workflow from Linear events you select when creating the webhook in Linear (not guaranteed to be every model or event type).',
   version: '1.0.0',
   icon: LinearIcon,
 
@@ -58,7 +63,7 @@ export const linearWebhookTrigger: TriggerConfig = {
       type: 'text',
       defaultValue: linearSetupInstructions(
         'all events',
-        'This webhook will receive all Linear events. Use the <code>type</code> and <code>action</code> fields in the payload to filter and handle different event types.'
+        'When you select resource types in Linear, you receive those data-change events only (see <a href="https://linear.app/developers/webhooks" target="_blank" rel="noopener noreferrer">Linear webhooks</a> for supported models). This is not every possible Linear event. Use the <code>type</code> and <code>action</code> fields in the payload to filter further.'
       ),
       mode: 'trigger',
       condition: {
@@ -93,6 +98,10 @@ export const linearWebhookTrigger: TriggerConfig = {
       type: 'string',
       description: 'Event creation timestamp',
     },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
     actor: userOutputs,
     data: {
       type: 'object',
@@ -104,6 +113,71 @@ export const linearWebhookTrigger: TriggerConfig = {
     },
   },
 
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Issue',
+      'Linear-Delivery': '234d1a4e-b617-4388-90fe-adc3633d6b72',
+      'Linear-Signature': '766e1d90a96e2f5ecec342a99c5552999dd95d49250171b902d703fd674f5086',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}
+
+export const linearWebhookV2Trigger: TriggerConfig = {
+  id: 'linear_webhook_v2',
+  name: 'Linear Webhook',
+  provider: 'linear',
+  description:
+    'Trigger workflow from Linear events you select when creating the webhook in Linear (not guaranteed to be every model or event type).',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_webhook_v2',
+    eventType: 'All Events',
+    additionalNotes:
+      'This webhook will receive all Linear events. Use the <code>type</code> and <code>action</code> fields in the payload to filter and handle different event types.',
+  }),
+  outputs: {
+    action: {
+      type: 'string',
+      description: 'Action performed (create, update, remove)',
+    },
+    type: {
+      type: 'string',
+      description: 'Entity type (Issue, Comment, Project, Cycle, IssueLabel, ProjectUpdate, etc.)',
+    },
+    webhookId: {
+      type: 'string',
+      description: 'Webhook ID',
+    },
+    webhookTimestamp: {
+      type: 'number',
+      description: 'Webhook timestamp (milliseconds)',
+    },
+    organizationId: {
+      type: 'string',
+      description: 'Organization ID',
+    },
+    createdAt: {
+      type: 'string',
+      description: 'Event creation timestamp',
+    },
+    url: {
+      type: 'string',
+      description: 'URL of the subject entity in Linear (top-level webhook payload)',
+    },
+    actor: userOutputs,
+    data: {
+      type: 'object',
+      description: 'Complete entity data object',
+    },
+    updatedFrom: {
+      type: 'object',
+      description: 'Previous values for changed fields (only present on update)',
+    },
+  },
   webhook: {
     method: 'POST',
     headers: {
diff --git a/apps/sim/triggers/notion/comment_created.ts b/apps/sim/triggers/notion/comment_created.ts
new file mode 100644
index 00000000000..afa154b2d22
--- /dev/null
+++ b/apps/sim/triggers/notion/comment_created.ts
@@ -0,0 +1,38 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildCommentEventOutputs,
+  buildNotionExtraFields,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Comment Created Trigger
+ */
+export const notionCommentCreatedTrigger: TriggerConfig = {
+  id: 'notion_comment_created',
+  name: 'Notion Comment Created',
+  provider: 'notion',
+  description: 'Trigger workflow when a comment or suggested edit is added in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_comment_created',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('comment.created'),
+    extraFields: buildNotionExtraFields('notion_comment_created'),
+  }),
+
+  outputs: buildCommentEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/database_created.ts b/apps/sim/triggers/notion/database_created.ts
new file mode 100644
index 00000000000..62d9d8cb133
--- /dev/null
+++ b/apps/sim/triggers/notion/database_created.ts
@@ -0,0 +1,38 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildDatabaseEventOutputs,
+  buildNotionExtraFields,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Database Created Trigger
+ */
+export const notionDatabaseCreatedTrigger: TriggerConfig = {
+  id: 'notion_database_created',
+  name: 'Notion Database Created',
+  provider: 'notion',
+  description: 'Trigger workflow when a new database is created in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_database_created',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('database.created'),
+    extraFields: buildNotionExtraFields('notion_database_created'),
+  }),
+
+  outputs: buildDatabaseEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/database_deleted.ts b/apps/sim/triggers/notion/database_deleted.ts
new file mode 100644
index 00000000000..0bd05796adb
--- /dev/null
+++ b/apps/sim/triggers/notion/database_deleted.ts
@@ -0,0 +1,38 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildDatabaseEventOutputs,
+  buildNotionExtraFields,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Database Deleted Trigger
+ */
+export const notionDatabaseDeletedTrigger: TriggerConfig = {
+  id: 'notion_database_deleted',
+  name: 'Notion Database Deleted',
+  provider: 'notion',
+  description: 'Trigger workflow when a database is deleted in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_database_deleted',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('database.deleted'),
+    extraFields: buildNotionExtraFields('notion_database_deleted'),
+  }),
+
+  outputs: buildDatabaseEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/database_schema_updated.ts b/apps/sim/triggers/notion/database_schema_updated.ts
new file mode 100644
index 00000000000..85b3511f43b
--- /dev/null
+++ b/apps/sim/triggers/notion/database_schema_updated.ts
@@ -0,0 +1,40 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildDatabaseEventOutputs,
+  buildNotionExtraFields,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Database Schema Updated Trigger
+ *
+ * Fires when a database schema (properties/columns) is modified.
+ */
+export const notionDatabaseSchemaUpdatedTrigger: TriggerConfig = {
+  id: 'notion_database_schema_updated',
+  name: 'Notion Database Schema Updated',
+  provider: 'notion',
+  description: 'Trigger workflow when a database schema is modified in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_database_schema_updated',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('database.schema_updated'),
+    extraFields: buildNotionExtraFields('notion_database_schema_updated'),
+  }),
+
+  outputs: buildDatabaseEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/index.ts b/apps/sim/triggers/notion/index.ts
new file mode 100644
index 00000000000..b21334103a3
--- /dev/null
+++ b/apps/sim/triggers/notion/index.ts
@@ -0,0 +1,9 @@
+export { notionCommentCreatedTrigger } from './comment_created'
+export { notionDatabaseCreatedTrigger } from './database_created'
+export { notionDatabaseDeletedTrigger } from './database_deleted'
+export { notionDatabaseSchemaUpdatedTrigger } from './database_schema_updated'
+export { notionPageContentUpdatedTrigger } from './page_content_updated'
+export { notionPageCreatedTrigger } from './page_created'
+export { notionPageDeletedTrigger } from './page_deleted'
+export { notionPagePropertiesUpdatedTrigger } from './page_properties_updated'
+export { notionWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/notion/page_content_updated.ts b/apps/sim/triggers/notion/page_content_updated.ts
new file mode 100644
index 00000000000..1fb7134ad4d
--- /dev/null
+++ b/apps/sim/triggers/notion/page_content_updated.ts
@@ -0,0 +1,40 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildNotionExtraFields,
+  buildPageEventOutputs,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Page Content Updated Trigger
+ *
+ * Fires when page content changes. High-frequency events may be batched.
+ */
+export const notionPageContentUpdatedTrigger: TriggerConfig = {
+  id: 'notion_page_content_updated',
+  name: 'Notion Page Content Updated',
+  provider: 'notion',
+  description: 'Trigger workflow when page content is changed in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_page_content_updated',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('page.content_updated'),
+    extraFields: buildNotionExtraFields('notion_page_content_updated'),
+  }),
+
+  outputs: buildPageEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/page_created.ts b/apps/sim/triggers/notion/page_created.ts
new file mode 100644
index 00000000000..da176d4ff53
--- /dev/null
+++ b/apps/sim/triggers/notion/page_created.ts
@@ -0,0 +1,41 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildNotionExtraFields,
+  buildPageEventOutputs,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Page Created Trigger
+ *
+ * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
+ */
+export const notionPageCreatedTrigger: TriggerConfig = {
+  id: 'notion_page_created',
+  name: 'Notion Page Created',
+  provider: 'notion',
+  description: 'Trigger workflow when a new page is created in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_page_created',
+    triggerOptions: notionTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: notionSetupInstructions('page.created'),
+    extraFields: buildNotionExtraFields('notion_page_created'),
+  }),
+
+  outputs: buildPageEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/page_deleted.ts b/apps/sim/triggers/notion/page_deleted.ts
new file mode 100644
index 00000000000..641fa0f3cb2
--- /dev/null
+++ b/apps/sim/triggers/notion/page_deleted.ts
@@ -0,0 +1,38 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildNotionExtraFields,
+  buildPageEventOutputs,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Page Deleted Trigger
+ */
+export const notionPageDeletedTrigger: TriggerConfig = {
+  id: 'notion_page_deleted',
+  name: 'Notion Page Deleted',
+  provider: 'notion',
+  description: 'Trigger workflow when a page is deleted in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_page_deleted',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('page.deleted'),
+    extraFields: buildNotionExtraFields('notion_page_deleted'),
+  }),
+
+  outputs: buildPageEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/page_properties_updated.ts b/apps/sim/triggers/notion/page_properties_updated.ts
new file mode 100644
index 00000000000..76a578eec59
--- /dev/null
+++ b/apps/sim/triggers/notion/page_properties_updated.ts
@@ -0,0 +1,40 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildNotionExtraFields,
+  buildPageEventOutputs,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Page Properties Updated Trigger
+ *
+ * Fires when page properties (title, status, tags, etc.) are modified.
+ */
+export const notionPagePropertiesUpdatedTrigger: TriggerConfig = {
+  id: 'notion_page_properties_updated',
+  name: 'Notion Page Properties Updated',
+  provider: 'notion',
+  description: 'Trigger workflow when page properties are modified in Notion',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_page_properties_updated',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('page.properties_updated'),
+    extraFields: buildNotionExtraFields('notion_page_properties_updated'),
+  }),
+
+  outputs: buildPageEventOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/notion/utils.ts b/apps/sim/triggers/notion/utils.ts
new file mode 100644
index 00000000000..c220252de22
--- /dev/null
+++ b/apps/sim/triggers/notion/utils.ts
@@ -0,0 +1,270 @@
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Dropdown options for the Notion trigger type selector.
+ */
+export const notionTriggerOptions = [
+  { label: 'Page Created', id: 'notion_page_created' },
+  { label: 'Page Properties Updated', id: 'notion_page_properties_updated' },
+  { label: 'Page Content Updated', id: 'notion_page_content_updated' },
+  { label: 'Page Deleted', id: 'notion_page_deleted' },
+  { label: 'Database Created', id: 'notion_database_created' },
+  { label: 'Database Schema Updated', id: 'notion_database_schema_updated' },
+  { label: 'Database Deleted', id: 'notion_database_deleted' },
+  { label: 'Comment Created', id: 'notion_comment_created' },
+  { label: 'Generic Webhook (All Events)', id: 'notion_webhook' },
+]
+
+/**
+ * Generates HTML setup instructions for Notion webhook triggers.
+ * Notion webhooks must be configured manually through the integration settings UI.
+ */
+export function notionSetupInstructions(eventType: string): string {
+  const instructions = [
+    'Go to <a href="https://www.notion.so/profile/integrations" target="_blank" rel="noopener noreferrer"><strong>notion.so/profile/integrations</strong></a> and select your integration (or create one).',
+    'Navigate to the <strong>Webhooks</strong> tab.',
+    'Click <strong>"Create a subscription"</strong>.',
+    'Paste the <strong>Webhook URL</strong> above into the URL field.',
+    `Select the <strong>${eventType}</strong> event type(s).`,
+    'Notion will send a verification request. Copy the <strong>verification_token</strong> from the payload and paste it into the Notion UI to complete verification.',
+    'Paste the same <strong>verification_token</strong> into the <strong>Webhook Secret</strong> field above to enable signature verification on incoming events.',
+    'Ensure the integration has access to the pages/databases you want to monitor (share them with the integration).',
+  ]
+
+  if (eventType === 'comment.created') {
+    instructions.splice(
+      7,
+      0,
+      'Enable the <strong>comment read</strong> capability in your Notion integration settings so comment events can be delivered.'
+    )
+  }
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Extra fields for Notion triggers (no extra fields needed since setup is manual).
+ */
+export function buildNotionExtraFields(triggerId: string): SubBlockConfig[] {
+  return [
+    {
+      id: 'webhookSecret',
+      title: 'Webhook Secret',
+      type: 'short-input',
+      placeholder: 'Enter your Notion verification_token',
+      description:
+        'The verification_token sent by Notion during webhook setup. This same token is used to verify X-Notion-Signature HMAC headers on all subsequent webhook deliveries.',
+      password: true,
+      required: false,
+      mode: 'trigger',
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+/**
+ * Base webhook outputs common to all Notion triggers.
+ */
+function buildBaseOutputs(): Record<string, TriggerOutput> {
+  return {
+    id: { type: 'string', description: 'Webhook event ID' },
+    type: {
+      type: 'string',
+      description: 'Event type (e.g., page.created, database.schema_updated)',
+    },
+    timestamp: { type: 'string', description: 'ISO 8601 timestamp of the event' },
+    api_version: { type: 'string', description: 'Notion API version included with the event' },
+    workspace_id: { type: 'string', description: 'Workspace ID where the event occurred' },
+    workspace_name: { type: 'string', description: 'Workspace name' },
+    subscription_id: { type: 'string', description: 'Webhook subscription ID' },
+    integration_id: { type: 'string', description: 'Integration ID that received the event' },
+    attempt_number: {
+      type: 'number',
+      description: 'Delivery attempt number (1-8 per Notion retries)',
+    },
+    accessible_by: {
+      type: 'array',
+      description:
+        'Users and bots with access to the entity (`id` + `type` per object); `type` is `person` or `bot`. Omitted on some deliveries (treat as empty).',
+    },
+  }
+}
+
+/**
+ * Entity output schema (the resource that was affected).
+ */
+function buildEntityOutputs(): Record<string, TriggerOutput> {
+  return {
+    id: {
+      type: 'string',
+      description: 'Entity ID (page, database, block, comment, or data source ID)',
+    },
+    entity_type: {
+      type: 'string',
+      description: 'Entity type: `page`, `database`, `block`, `comment`, or `data_source`',
+    },
+  }
+}
+
+/**
+ * Build outputs for page event triggers.
+ */
+export function buildPageEventOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseOutputs(),
+    authors: {
+      type: 'array',
+      description:
+        'Actors who triggered the event (`id` + `type` per object); `type` is `person`, `bot`, or `agent` per Notion',
+    },
+    entity: buildEntityOutputs(),
+    data: {
+      updated_blocks: {
+        type: 'array',
+        description: 'Blocks updated as part of the event, when provided by Notion',
+      },
+      updated_properties: {
+        type: 'array',
+        description: 'Property IDs updated as part of the event, when provided by Notion',
+      },
+      parent: {
+        id: {
+          type: 'string',
+          description: 'Parent page, database, workspace (space), or block ID',
+        },
+        parent_type: {
+          type: 'string',
+          description: 'Parent type: `page`, `database`, `block`, `workspace`, or `space`',
+        },
+      },
+    },
+  }
+}
+
+/**
+ * Build outputs for database event triggers.
+ */
+export function buildDatabaseEventOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseOutputs(),
+    authors: {
+      type: 'array',
+      description:
+        'Actors who triggered the event (`id` + `type` per object); `type` is `person`, `bot`, or `agent` per Notion',
+    },
+    entity: buildEntityOutputs(),
+    data: {
+      updated_blocks: {
+        type: 'array',
+        description: 'Blocks updated as part of the event, when provided by Notion',
+      },
+      updated_properties: {
+        type: 'array',
+        description: 'Database properties updated as part of the event, when provided by Notion',
+      },
+      parent: {
+        id: { type: 'string', description: 'Parent page, database, workspace, or space ID' },
+        parent_type: {
+          type: 'string',
+          description: 'Parent type: `page`, `database`, `workspace`, or `space`',
+        },
+      },
+    },
+  }
+}
+
+/**
+ * Build outputs for comment event triggers.
+ */
+export function buildCommentEventOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseOutputs(),
+    authors: {
+      type: 'array',
+      description:
+        'Actors who triggered the event (`id` + `type` per object); `type` is `person`, `bot`, or `agent` per Notion',
+    },
+    entity: {
+      id: { type: 'string', description: 'Comment ID' },
+      entity_type: { type: 'string', description: 'Entity type (comment)' },
+    },
+    data: {
+      page_id: { type: 'string', description: 'Page ID that owns the comment thread' },
+      parent: {
+        id: { type: 'string', description: 'Parent page or block ID' },
+        parent_type: { type: 'string', description: 'Parent type (page or block)' },
+      },
+    },
+  }
+}
+
+/**
+ * Build outputs for the generic webhook trigger (all events).
+ */
+export function buildGenericWebhookOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseOutputs(),
+    authors: {
+      type: 'array',
+      description:
+        'Actors who triggered the event (`id` + `type` per object); `type` is `person`, `bot`, or `agent` per Notion',
+    },
+    entity: buildEntityOutputs(),
+    data: {
+      parent: {
+        id: { type: 'string', description: 'Parent entity ID, when provided by Notion' },
+        parent_type: {
+          type: 'string',
+          description:
+            'Parent type (`page`, `database`, `block`, `workspace`, `space`, …), when present',
+        },
+      },
+      page_id: { type: 'string', description: 'Page ID related to the event, when present' },
+      updated_blocks: {
+        type: 'array',
+        description: 'Blocks updated as part of the event, when provided by Notion',
+      },
+      updated_properties: {
+        type: 'array',
+        description: 'Updated properties included with the event, when provided by Notion',
+      },
+    },
+  }
+}
+
+/**
+ * Maps trigger IDs to the Notion event type strings they accept.
+ */
+const TRIGGER_EVENT_MAP: Record<string, string[]> = {
+  notion_page_created: ['page.created'],
+  notion_page_properties_updated: ['page.properties_updated'],
+  notion_page_content_updated: ['page.content_updated'],
+  notion_page_deleted: ['page.deleted'],
+  notion_database_created: ['database.created'],
+  notion_database_schema_updated: ['database.schema_updated', 'data_source.schema_updated'],
+  notion_database_deleted: ['database.deleted'],
+  notion_comment_created: ['comment.created'],
+}
+
+/**
+ * Checks if a Notion webhook payload matches a trigger.
+ */
+export function isNotionPayloadMatch(triggerId: string, body: Record<string, unknown>): boolean {
+  if (triggerId === 'notion_webhook') {
+    return true
+  }
+
+  const eventType = body.type as string | undefined
+  if (!eventType) {
+    return false
+  }
+
+  const acceptedEvents = TRIGGER_EVENT_MAP[triggerId]
+  return acceptedEvents ? acceptedEvents.includes(eventType) : false
+}
diff --git a/apps/sim/triggers/notion/webhook.ts b/apps/sim/triggers/notion/webhook.ts
new file mode 100644
index 00000000000..db3a824df0d
--- /dev/null
+++ b/apps/sim/triggers/notion/webhook.ts
@@ -0,0 +1,38 @@
+import { NotionIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildGenericWebhookOutputs,
+  buildNotionExtraFields,
+  notionSetupInstructions,
+  notionTriggerOptions,
+} from '@/triggers/notion/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Notion Generic Webhook Trigger (All Events)
+ */
+export const notionWebhookTrigger: TriggerConfig = {
+  id: 'notion_webhook',
+  name: 'Notion Webhook (All Events)',
+  provider: 'notion',
+  description: 'Trigger workflow on any Notion webhook event',
+  version: '1.0.0',
+  icon: NotionIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'notion_webhook',
+    triggerOptions: notionTriggerOptions,
+    setupInstructions: notionSetupInstructions('all desired'),
+    extraFields: buildNotionExtraFields('notion_webhook'),
+  }),
+
+  outputs: buildGenericWebhookOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Notion-Signature': 'sha256=...',
+    },
+  },
+}
diff --git a/apps/sim/triggers/registry.ts b/apps/sim/triggers/registry.ts
index 4390bfeefff..6db1582457c 100644
--- a/apps/sim/triggers/registry.ts
+++ b/apps/sim/triggers/registry.ts
@@ -89,6 +89,7 @@ import {
   githubWorkflowRunTrigger,
 } from '@/triggers/github'
 import { gmailPollingTrigger } from '@/triggers/gmail'
+import { gongCallCompletedTrigger, gongWebhookTrigger } from '@/triggers/gong'
 import { googleFormsWebhookTrigger } from '@/triggers/googleforms'
 import {
   grainHighlightCreatedTrigger,
@@ -100,14 +101,28 @@ import {
   grainStoryCreatedTrigger,
   grainWebhookTrigger,
 } from '@/triggers/grain'
+import {
+  greenhouseCandidateHiredTrigger,
+  greenhouseCandidateRejectedTrigger,
+  greenhouseCandidateStageChangeTrigger,
+  greenhouseJobCreatedTrigger,
+  greenhouseJobUpdatedTrigger,
+  greenhouseNewApplicationTrigger,
+  greenhouseOfferCreatedTrigger,
+  greenhouseWebhookTrigger,
+} from '@/triggers/greenhouse'
 import {
   hubspotCompanyCreatedTrigger,
   hubspotCompanyDeletedTrigger,
+  hubspotCompanyMergedTrigger,
   hubspotCompanyPropertyChangedTrigger,
+  hubspotCompanyRestoredTrigger,
   hubspotContactCreatedTrigger,
   hubspotContactDeletedTrigger,
+  hubspotContactMergedTrigger,
   hubspotContactPrivacyDeletedTrigger,
   hubspotContactPropertyChangedTrigger,
+  hubspotContactRestoredTrigger,
   hubspotConversationCreationTrigger,
   hubspotConversationDeletionTrigger,
   hubspotConversationNewMessageTrigger,
@@ -115,12 +130,25 @@ import {
   hubspotConversationPropertyChangedTrigger,
   hubspotDealCreatedTrigger,
   hubspotDealDeletedTrigger,
+  hubspotDealMergedTrigger,
   hubspotDealPropertyChangedTrigger,
+  hubspotDealRestoredTrigger,
   hubspotTicketCreatedTrigger,
   hubspotTicketDeletedTrigger,
+  hubspotTicketMergedTrigger,
   hubspotTicketPropertyChangedTrigger,
+  hubspotTicketRestoredTrigger,
+  hubspotWebhookTrigger,
 } from '@/triggers/hubspot'
 import { imapPollingTrigger } from '@/triggers/imap'
+import {
+  intercomContactCreatedTrigger,
+  intercomConversationClosedTrigger,
+  intercomConversationCreatedTrigger,
+  intercomConversationReplyTrigger,
+  intercomUserCreatedTrigger,
+  intercomWebhookTrigger,
+} from '@/triggers/intercom'
 import {
   jiraIssueCommentedTrigger,
   jiraIssueCreatedTrigger,
@@ -142,33 +170,87 @@ import {
 } from '@/triggers/lemlist'
 import {
   linearCommentCreatedTrigger,
+  linearCommentCreatedV2Trigger,
   linearCommentUpdatedTrigger,
+  linearCommentUpdatedV2Trigger,
   linearCustomerRequestCreatedTrigger,
+  linearCustomerRequestCreatedV2Trigger,
   linearCustomerRequestUpdatedTrigger,
+  linearCustomerRequestUpdatedV2Trigger,
   linearCycleCreatedTrigger,
+  linearCycleCreatedV2Trigger,
   linearCycleUpdatedTrigger,
+  linearCycleUpdatedV2Trigger,
   linearIssueCreatedTrigger,
+  linearIssueCreatedV2Trigger,
   linearIssueRemovedTrigger,
+  linearIssueRemovedV2Trigger,
   linearIssueUpdatedTrigger,
+  linearIssueUpdatedV2Trigger,
   linearLabelCreatedTrigger,
+  linearLabelCreatedV2Trigger,
   linearLabelUpdatedTrigger,
+  linearLabelUpdatedV2Trigger,
   linearProjectCreatedTrigger,
+  linearProjectCreatedV2Trigger,
   linearProjectUpdateCreatedTrigger,
+  linearProjectUpdateCreatedV2Trigger,
   linearProjectUpdatedTrigger,
+  linearProjectUpdatedV2Trigger,
   linearWebhookTrigger,
+  linearWebhookV2Trigger,
 } from '@/triggers/linear'
 import {
   microsoftTeamsChatSubscriptionTrigger,
   microsoftTeamsWebhookTrigger,
 } from '@/triggers/microsoftteams'
+import {
+  notionCommentCreatedTrigger,
+  notionDatabaseCreatedTrigger,
+  notionDatabaseDeletedTrigger,
+  notionDatabaseSchemaUpdatedTrigger,
+  notionPageContentUpdatedTrigger,
+  notionPageCreatedTrigger,
+  notionPageDeletedTrigger,
+  notionPagePropertiesUpdatedTrigger,
+  notionWebhookTrigger,
+} from '@/triggers/notion'
 import { outlookPollingTrigger } from '@/triggers/outlook'
+import {
+  resendEmailBouncedTrigger,
+  resendEmailClickedTrigger,
+  resendEmailComplainedTrigger,
+  resendEmailDeliveredTrigger,
+  resendEmailFailedTrigger,
+  resendEmailOpenedTrigger,
+  resendEmailSentTrigger,
+  resendWebhookTrigger,
+} from '@/triggers/resend'
 import { rssPollingTrigger } from '@/triggers/rss'
+import {
+  salesforceCaseStatusChangedTrigger,
+  salesforceOpportunityStageChangedTrigger,
+  salesforceRecordCreatedTrigger,
+  salesforceRecordDeletedTrigger,
+  salesforceRecordUpdatedTrigger,
+  salesforceWebhookTrigger,
+} from '@/triggers/salesforce'
 import { slackWebhookTrigger } from '@/triggers/slack'
 import { stripeWebhookTrigger } from '@/triggers/stripe'
 import { telegramWebhookTrigger } from '@/triggers/telegram'
 import { twilioVoiceWebhookTrigger } from '@/triggers/twilio_voice'
 import { typeformWebhookTrigger } from '@/triggers/typeform'
 import type { TriggerRegistry } from '@/triggers/types'
+import {
+  vercelDeploymentCanceledTrigger,
+  vercelDeploymentCreatedTrigger,
+  vercelDeploymentErrorTrigger,
+  vercelDeploymentReadyTrigger,
+  vercelDomainCreatedTrigger,
+  vercelProjectCreatedTrigger,
+  vercelProjectRemovedTrigger,
+  vercelWebhookTrigger,
+} from '@/triggers/vercel'
 import {
   webflowCollectionItemChangedTrigger,
   webflowCollectionItemCreatedTrigger,
@@ -176,6 +258,14 @@ import {
   webflowFormSubmissionTrigger,
 } from '@/triggers/webflow'
 import { whatsappWebhookTrigger } from '@/triggers/whatsapp'
+import {
+  zoomMeetingEndedTrigger,
+  zoomMeetingStartedTrigger,
+  zoomParticipantJoinedTrigger,
+  zoomParticipantLeftTrigger,
+  zoomRecordingCompletedTrigger,
+  zoomWebhookTrigger,
+} from '@/triggers/zoom'
 
 export const TRIGGER_REGISTRY: TriggerRegistry = {
   slack_webhook: slackWebhookTrigger,
@@ -238,6 +328,14 @@ export const TRIGGER_REGISTRY: TriggerRegistry = {
   confluence_label_added: confluenceLabelAddedTrigger,
   confluence_label_removed: confluenceLabelRemovedTrigger,
   generic_webhook: genericWebhookTrigger,
+  greenhouse_candidate_hired: greenhouseCandidateHiredTrigger,
+  greenhouse_new_application: greenhouseNewApplicationTrigger,
+  greenhouse_candidate_stage_change: greenhouseCandidateStageChangeTrigger,
+  greenhouse_candidate_rejected: greenhouseCandidateRejectedTrigger,
+  greenhouse_offer_created: greenhouseOfferCreatedTrigger,
+  greenhouse_job_created: greenhouseJobCreatedTrigger,
+  greenhouse_job_updated: greenhouseJobUpdatedTrigger,
+  greenhouse_webhook: greenhouseWebhookTrigger,
   github_webhook: githubWebhookTrigger,
   github_issue_opened: githubIssueOpenedTrigger,
   github_issue_closed: githubIssueClosedTrigger,
@@ -254,6 +352,8 @@ export const TRIGGER_REGISTRY: TriggerRegistry = {
   fathom_new_meeting: fathomNewMeetingTrigger,
   fathom_webhook: fathomWebhookTrigger,
   gmail_poller: gmailPollingTrigger,
+  gong_call_completed: gongCallCompletedTrigger,
+  gong_webhook: gongWebhookTrigger,
   grain_webhook: grainWebhookTrigger,
   grain_item_added: grainItemAddedTrigger,
   grain_item_updated: grainItemUpdatedTrigger,
@@ -295,27 +395,77 @@ export const TRIGGER_REGISTRY: TriggerRegistry = {
   linear_project_update_created: linearProjectUpdateCreatedTrigger,
   linear_customer_request_created: linearCustomerRequestCreatedTrigger,
   linear_customer_request_updated: linearCustomerRequestUpdatedTrigger,
+  linear_webhook_v2: linearWebhookV2Trigger,
+  linear_issue_created_v2: linearIssueCreatedV2Trigger,
+  linear_issue_updated_v2: linearIssueUpdatedV2Trigger,
+  linear_issue_removed_v2: linearIssueRemovedV2Trigger,
+  linear_comment_created_v2: linearCommentCreatedV2Trigger,
+  linear_comment_updated_v2: linearCommentUpdatedV2Trigger,
+  linear_project_created_v2: linearProjectCreatedV2Trigger,
+  linear_project_updated_v2: linearProjectUpdatedV2Trigger,
+  linear_cycle_created_v2: linearCycleCreatedV2Trigger,
+  linear_cycle_updated_v2: linearCycleUpdatedV2Trigger,
+  linear_label_created_v2: linearLabelCreatedV2Trigger,
+  linear_label_updated_v2: linearLabelUpdatedV2Trigger,
+  linear_project_update_created_v2: linearProjectUpdateCreatedV2Trigger,
+  linear_customer_request_created_v2: linearCustomerRequestCreatedV2Trigger,
+  linear_customer_request_updated_v2: linearCustomerRequestUpdatedV2Trigger,
   microsoftteams_webhook: microsoftTeamsWebhookTrigger,
   microsoftteams_chat_subscription: microsoftTeamsChatSubscriptionTrigger,
+  notion_page_created: notionPageCreatedTrigger,
+  notion_page_properties_updated: notionPagePropertiesUpdatedTrigger,
+  notion_page_content_updated: notionPageContentUpdatedTrigger,
+  notion_page_deleted: notionPageDeletedTrigger,
+  notion_database_created: notionDatabaseCreatedTrigger,
+  notion_database_schema_updated: notionDatabaseSchemaUpdatedTrigger,
+  notion_database_deleted: notionDatabaseDeletedTrigger,
+  notion_comment_created: notionCommentCreatedTrigger,
+  notion_webhook: notionWebhookTrigger,
   outlook_poller: outlookPollingTrigger,
+  resend_email_sent: resendEmailSentTrigger,
+  resend_email_delivered: resendEmailDeliveredTrigger,
+  resend_email_bounced: resendEmailBouncedTrigger,
+  resend_email_complained: resendEmailComplainedTrigger,
+  resend_email_opened: resendEmailOpenedTrigger,
+  resend_email_clicked: resendEmailClickedTrigger,
+  resend_email_failed: resendEmailFailedTrigger,
+  resend_webhook: resendWebhookTrigger,
   rss_poller: rssPollingTrigger,
+  salesforce_record_created: salesforceRecordCreatedTrigger,
+  salesforce_record_updated: salesforceRecordUpdatedTrigger,
+  salesforce_record_deleted: salesforceRecordDeletedTrigger,
+  salesforce_opportunity_stage_changed: salesforceOpportunityStageChangedTrigger,
+  salesforce_case_status_changed: salesforceCaseStatusChangedTrigger,
+  salesforce_webhook: salesforceWebhookTrigger,
   stripe_webhook: stripeWebhookTrigger,
   telegram_webhook: telegramWebhookTrigger,
   typeform_webhook: typeformWebhookTrigger,
   whatsapp_webhook: whatsappWebhookTrigger,
   google_forms_webhook: googleFormsWebhookTrigger,
   twilio_voice_webhook: twilioVoiceWebhookTrigger,
+  vercel_deployment_created: vercelDeploymentCreatedTrigger,
+  vercel_deployment_ready: vercelDeploymentReadyTrigger,
+  vercel_deployment_error: vercelDeploymentErrorTrigger,
+  vercel_deployment_canceled: vercelDeploymentCanceledTrigger,
+  vercel_project_created: vercelProjectCreatedTrigger,
+  vercel_project_removed: vercelProjectRemovedTrigger,
+  vercel_domain_created: vercelDomainCreatedTrigger,
+  vercel_webhook: vercelWebhookTrigger,
   webflow_collection_item_created: webflowCollectionItemCreatedTrigger,
   webflow_collection_item_changed: webflowCollectionItemChangedTrigger,
   webflow_collection_item_deleted: webflowCollectionItemDeletedTrigger,
   webflow_form_submission: webflowFormSubmissionTrigger,
   hubspot_contact_created: hubspotContactCreatedTrigger,
   hubspot_contact_deleted: hubspotContactDeletedTrigger,
+  hubspot_contact_merged: hubspotContactMergedTrigger,
   hubspot_contact_privacy_deleted: hubspotContactPrivacyDeletedTrigger,
   hubspot_contact_property_changed: hubspotContactPropertyChangedTrigger,
+  hubspot_contact_restored: hubspotContactRestoredTrigger,
   hubspot_company_created: hubspotCompanyCreatedTrigger,
   hubspot_company_deleted: hubspotCompanyDeletedTrigger,
+  hubspot_company_merged: hubspotCompanyMergedTrigger,
   hubspot_company_property_changed: hubspotCompanyPropertyChangedTrigger,
+  hubspot_company_restored: hubspotCompanyRestoredTrigger,
   hubspot_conversation_creation: hubspotConversationCreationTrigger,
   hubspot_conversation_deletion: hubspotConversationDeletionTrigger,
   hubspot_conversation_new_message: hubspotConversationNewMessageTrigger,
@@ -323,9 +473,26 @@ export const TRIGGER_REGISTRY: TriggerRegistry = {
   hubspot_conversation_property_changed: hubspotConversationPropertyChangedTrigger,
   hubspot_deal_created: hubspotDealCreatedTrigger,
   hubspot_deal_deleted: hubspotDealDeletedTrigger,
+  hubspot_deal_merged: hubspotDealMergedTrigger,
   hubspot_deal_property_changed: hubspotDealPropertyChangedTrigger,
+  hubspot_deal_restored: hubspotDealRestoredTrigger,
   hubspot_ticket_created: hubspotTicketCreatedTrigger,
   hubspot_ticket_deleted: hubspotTicketDeletedTrigger,
+  hubspot_ticket_merged: hubspotTicketMergedTrigger,
   hubspot_ticket_property_changed: hubspotTicketPropertyChangedTrigger,
+  hubspot_ticket_restored: hubspotTicketRestoredTrigger,
+  hubspot_webhook: hubspotWebhookTrigger,
   imap_poller: imapPollingTrigger,
+  intercom_conversation_created: intercomConversationCreatedTrigger,
+  intercom_conversation_reply: intercomConversationReplyTrigger,
+  intercom_conversation_closed: intercomConversationClosedTrigger,
+  intercom_contact_created: intercomContactCreatedTrigger,
+  intercom_user_created: intercomUserCreatedTrigger,
+  intercom_webhook: intercomWebhookTrigger,
+  zoom_meeting_started: zoomMeetingStartedTrigger,
+  zoom_meeting_ended: zoomMeetingEndedTrigger,
+  zoom_participant_joined: zoomParticipantJoinedTrigger,
+  zoom_participant_left: zoomParticipantLeftTrigger,
+  zoom_recording_completed: zoomRecordingCompletedTrigger,
+  zoom_webhook: zoomWebhookTrigger,
 }
diff --git a/apps/sim/triggers/resend/email_bounced.ts b/apps/sim/triggers/resend/email_bounced.ts
new file mode 100644
index 00000000000..8d2c4779b5a
--- /dev/null
+++ b/apps/sim/triggers/resend/email_bounced.ts
@@ -0,0 +1,38 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailBouncedOutputs,
+  buildResendExtraFields,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Resend Email Bounced Trigger
+ * Triggers when an email permanently bounces.
+ */
+export const resendEmailBouncedTrigger: TriggerConfig = {
+  id: 'resend_email_bounced',
+  name: 'Resend Email Bounced',
+  provider: 'resend',
+  description: 'Trigger workflow when an email bounces',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_email_bounced',
+    triggerOptions: resendTriggerOptions,
+    setupInstructions: resendSetupInstructions('email.bounced'),
+    extraFields: buildResendExtraFields('resend_email_bounced'),
+  }),
+
+  outputs: buildEmailBouncedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/resend/email_clicked.ts b/apps/sim/triggers/resend/email_clicked.ts
new file mode 100644
index 00000000000..437f3c9a30b
--- /dev/null
+++ b/apps/sim/triggers/resend/email_clicked.ts
@@ -0,0 +1,38 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailClickedOutputs,
+  buildResendExtraFields,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Resend Email Clicked Trigger
+ * Triggers when a recipient clicks a link in an email.
+ */
+export const resendEmailClickedTrigger: TriggerConfig = {
+  id: 'resend_email_clicked',
+  name: 'Resend Email Clicked',
+  provider: 'resend',
+  description: 'Trigger workflow when a link in an email is clicked',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_email_clicked',
+    triggerOptions: resendTriggerOptions,
+    setupInstructions: resendSetupInstructions('email.clicked'),
+    extraFields: buildResendExtraFields('resend_email_clicked'),
+  }),
+
+  outputs: buildEmailClickedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/resend/email_complained.ts b/apps/sim/triggers/resend/email_complained.ts
new file mode 100644
index 00000000000..211ab85bd8c
--- /dev/null
+++ b/apps/sim/triggers/resend/email_complained.ts
@@ -0,0 +1,38 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailComplainedOutputs,
+  buildResendExtraFields,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Resend Email Complained Trigger
+ * Triggers when a recipient marks an email as spam.
+ */
+export const resendEmailComplainedTrigger: TriggerConfig = {
+  id: 'resend_email_complained',
+  name: 'Resend Email Complained',
+  provider: 'resend',
+  description: 'Trigger workflow when an email is marked as spam',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_email_complained',
+    triggerOptions: resendTriggerOptions,
+    setupInstructions: resendSetupInstructions('email.complained'),
+    extraFields: buildResendExtraFields('resend_email_complained'),
+  }),
+
+  outputs: buildEmailComplainedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/resend/email_delivered.ts b/apps/sim/triggers/resend/email_delivered.ts
new file mode 100644
index 00000000000..ac7a0d9e914
--- /dev/null
+++ b/apps/sim/triggers/resend/email_delivered.ts
@@ -0,0 +1,38 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailDeliveredOutputs,
+  buildResendExtraFields,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Resend Email Delivered Trigger
+ * Triggers when an email is successfully delivered to the recipient's mail server.
+ */
+export const resendEmailDeliveredTrigger: TriggerConfig = {
+  id: 'resend_email_delivered',
+  name: 'Resend Email Delivered',
+  provider: 'resend',
+  description: 'Trigger workflow when an email is delivered',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_email_delivered',
+    triggerOptions: resendTriggerOptions,
+    setupInstructions: resendSetupInstructions('email.delivered'),
+    extraFields: buildResendExtraFields('resend_email_delivered'),
+  }),
+
+  outputs: buildEmailDeliveredOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/resend/email_failed.ts b/apps/sim/triggers/resend/email_failed.ts
new file mode 100644
index 00000000000..f1a753aece0
--- /dev/null
+++ b/apps/sim/triggers/resend/email_failed.ts
@@ -0,0 +1,38 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailFailedOutputs,
+  buildResendExtraFields,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Resend Email Failed Trigger
+ * Triggers when an email fails to send.
+ */
+export const resendEmailFailedTrigger: TriggerConfig = {
+  id: 'resend_email_failed',
+  name: 'Resend Email Failed',
+  provider: 'resend',
+  description: 'Trigger workflow when an email fails to send',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_email_failed',
+    triggerOptions: resendTriggerOptions,
+    setupInstructions: resendSetupInstructions('email.failed'),
+    extraFields: buildResendExtraFields('resend_email_failed'),
+  }),
+
+  outputs: buildEmailFailedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/resend/email_opened.ts b/apps/sim/triggers/resend/email_opened.ts
new file mode 100644
index 00000000000..0aaee9bb7cc
--- /dev/null
+++ b/apps/sim/triggers/resend/email_opened.ts
@@ -0,0 +1,38 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailOpenedOutputs,
+  buildResendExtraFields,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Resend Email Opened Trigger
+ * Triggers when a recipient opens an email.
+ */
+export const resendEmailOpenedTrigger: TriggerConfig = {
+  id: 'resend_email_opened',
+  name: 'Resend Email Opened',
+  provider: 'resend',
+  description: 'Trigger workflow when an email is opened',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_email_opened',
+    triggerOptions: resendTriggerOptions,
+    setupInstructions: resendSetupInstructions('email.opened'),
+    extraFields: buildResendExtraFields('resend_email_opened'),
+  }),
+
+  outputs: buildEmailOpenedOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/resend/email_sent.ts b/apps/sim/triggers/resend/email_sent.ts
new file mode 100644
index 00000000000..d4abd6e7adb
--- /dev/null
+++ b/apps/sim/triggers/resend/email_sent.ts
@@ -0,0 +1,41 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailSentOutputs,
+  buildResendExtraFields,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Resend Email Sent Trigger
+ * Triggers when an email is sent by Resend.
+ *
+ * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
+ */
+export const resendEmailSentTrigger: TriggerConfig = {
+  id: 'resend_email_sent',
+  name: 'Resend Email Sent',
+  provider: 'resend',
+  description: 'Trigger workflow when an email is sent',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_email_sent',
+    triggerOptions: resendTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: resendSetupInstructions('email.sent'),
+    extraFields: buildResendExtraFields('resend_email_sent'),
+  }),
+
+  outputs: buildEmailSentOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/resend/index.ts b/apps/sim/triggers/resend/index.ts
new file mode 100644
index 00000000000..86cac19449b
--- /dev/null
+++ b/apps/sim/triggers/resend/index.ts
@@ -0,0 +1,8 @@
+export { resendEmailBouncedTrigger } from './email_bounced'
+export { resendEmailClickedTrigger } from './email_clicked'
+export { resendEmailComplainedTrigger } from './email_complained'
+export { resendEmailDeliveredTrigger } from './email_delivered'
+export { resendEmailFailedTrigger } from './email_failed'
+export { resendEmailOpenedTrigger } from './email_opened'
+export { resendEmailSentTrigger } from './email_sent'
+export { resendWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/resend/utils.ts b/apps/sim/triggers/resend/utils.ts
new file mode 100644
index 00000000000..13f79262838
--- /dev/null
+++ b/apps/sim/triggers/resend/utils.ts
@@ -0,0 +1,259 @@
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Maps Sim Resend trigger IDs to a single Resend webhook event type.
+ * Kept in sync with subscription registration in `resend` webhook provider.
+ */
+export const RESEND_TRIGGER_TO_EVENT_TYPE: Record<string, string> = {
+  resend_email_sent: 'email.sent',
+  resend_email_delivered: 'email.delivered',
+  resend_email_bounced: 'email.bounced',
+  resend_email_complained: 'email.complained',
+  resend_email_opened: 'email.opened',
+  resend_email_clicked: 'email.clicked',
+  resend_email_failed: 'email.failed',
+}
+
+/**
+ * Event types registered for the catch-all `resend_webhook` trigger (API + matchEvent).
+ */
+export const RESEND_ALL_WEBHOOK_EVENT_TYPES: string[] = [
+  'email.sent',
+  'email.delivered',
+  'email.delivery_delayed',
+  'email.bounced',
+  'email.complained',
+  'email.opened',
+  'email.clicked',
+  'email.failed',
+  'email.received',
+  'email.scheduled',
+  'email.suppressed',
+  'contact.created',
+  'contact.updated',
+  'contact.deleted',
+  'domain.created',
+  'domain.updated',
+  'domain.deleted',
+]
+
+/**
+ * Shared trigger dropdown options for all Resend triggers
+ */
+export const resendTriggerOptions = [
+  { label: 'Email Sent', id: 'resend_email_sent' },
+  { label: 'Email Delivered', id: 'resend_email_delivered' },
+  { label: 'Email Bounced', id: 'resend_email_bounced' },
+  { label: 'Email Complained', id: 'resend_email_complained' },
+  { label: 'Email Opened', id: 'resend_email_opened' },
+  { label: 'Email Clicked', id: 'resend_email_clicked' },
+  { label: 'Email Failed', id: 'resend_email_failed' },
+  { label: 'Generic Webhook (All Events)', id: 'resend_webhook' },
+]
+
+/**
+ * Generates setup instructions for Resend webhooks.
+ * The webhook is automatically created in Resend when you save.
+ */
+export function resendSetupInstructions(eventType: string): string {
+  const instructions = [
+    'Enter your Resend API Key above.',
+    'You can find your API key in Resend at <strong>Settings > API Keys</strong>. See the <a href="https://resend.com/docs/dashboard/api-keys/introduction" target="_blank" rel="noopener noreferrer">Resend API documentation</a> for details.',
+    `Click <strong>"Save Configuration"</strong> to automatically create the webhook in Resend for <strong>${eventType}</strong> events.`,
+    'The webhook will be automatically deleted when you remove this trigger.',
+  ]
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Helper to build Resend-specific extra fields.
+ * Includes API key (required).
+ * Use with the generic buildTriggerSubBlocks from @/triggers.
+ */
+export function buildResendExtraFields(triggerId: string) {
+  return [
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input' as const,
+      placeholder: 'Enter your Resend API key (re_...)',
+      description: 'Required to create the webhook in Resend.',
+      password: true,
+      paramVisibility: 'user-only' as const,
+      required: true,
+      mode: 'trigger' as const,
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+/**
+ * Common fields present in all Resend email webhook payloads
+ * (see https://resend.com/docs/dashboard/webhooks/introduction — example `data` object).
+ */
+const commonEmailOutputs = {
+  type: {
+    type: 'string',
+    description: 'Event type (e.g., email.sent, email.delivered)',
+  },
+  created_at: {
+    type: 'string',
+    description: 'Webhook event creation timestamp (ISO 8601), top-level `created_at`',
+  },
+  data_created_at: {
+    type: 'string',
+    description:
+      'Email record timestamp from payload `data.created_at` (ISO 8601), when present — distinct from top-level `created_at`',
+  },
+  email_id: {
+    type: 'string',
+    description: 'Unique email identifier',
+  },
+  broadcast_id: {
+    type: 'string',
+    description: 'Broadcast ID associated with the email, when sent as part of a broadcast',
+  },
+  template_id: {
+    type: 'string',
+    description: 'Template ID used to send the email, when applicable',
+  },
+  tags: {
+    type: 'json',
+    description: 'Tag key/value metadata attached to the email (payload `data.tags`)',
+  },
+  from: {
+    type: 'string',
+    description: 'Sender email address',
+  },
+  subject: {
+    type: 'string',
+    description: 'Email subject line',
+  },
+} as const
+
+/**
+ * Recipient fields present in email webhook payloads
+ */
+const recipientOutputs = {
+  to: {
+    type: 'json',
+    description: 'Array of recipient email addresses',
+  },
+} as const
+
+const resendEventDataOutput: Record<string, TriggerOutput> = {
+  data: {
+    type: 'json',
+    description:
+      'Raw event `data` from Resend (shape varies by event type: email, contact, domain, etc.)',
+  },
+}
+
+/**
+ * Build outputs for email sent events
+ */
+export function buildEmailSentOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for email delivered events
+ */
+export function buildEmailDeliveredOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for email bounced events
+ */
+export function buildEmailBouncedOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+    bounceType: { type: 'string', description: 'Bounce type (e.g., Permanent)' },
+    bounceSubType: { type: 'string', description: 'Bounce sub-type (e.g., Suppressed)' },
+    bounceMessage: { type: 'string', description: 'Bounce error message' },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for email complained events
+ */
+export function buildEmailComplainedOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for email opened events
+ */
+export function buildEmailOpenedOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for email clicked events
+ */
+export function buildEmailClickedOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+    clickIpAddress: { type: 'string', description: 'IP address of the click' },
+    clickLink: { type: 'string', description: 'URL that was clicked' },
+    clickTimestamp: { type: 'string', description: 'Click timestamp (ISO 8601)' },
+    clickUserAgent: { type: 'string', description: 'Browser user agent string' },
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for email failed events
+ */
+export function buildEmailFailedOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for generic webhook (all events).
+ * Includes all possible fields across event types.
+ */
+export function buildResendOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...commonEmailOutputs,
+    ...recipientOutputs,
+    ...resendEventDataOutput,
+    bounceType: { type: 'string', description: 'Bounce type (e.g., Permanent)' },
+    bounceSubType: { type: 'string', description: 'Bounce sub-type (e.g., Suppressed)' },
+    bounceMessage: { type: 'string', description: 'Bounce error message' },
+    clickIpAddress: { type: 'string', description: 'IP address of the click' },
+    clickLink: { type: 'string', description: 'URL that was clicked' },
+    clickTimestamp: { type: 'string', description: 'Click timestamp (ISO 8601)' },
+    clickUserAgent: { type: 'string', description: 'Browser user agent string' },
+  } as Record<string, TriggerOutput>
+}
diff --git a/apps/sim/triggers/resend/webhook.ts b/apps/sim/triggers/resend/webhook.ts
new file mode 100644
index 00000000000..e5990a5d1ab
--- /dev/null
+++ b/apps/sim/triggers/resend/webhook.ts
@@ -0,0 +1,39 @@
+import { ResendIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildResendExtraFields,
+  buildResendOutputs,
+  resendSetupInstructions,
+  resendTriggerOptions,
+} from '@/triggers/resend/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Generic Resend Webhook Trigger
+ * Captures all Resend webhook events
+ */
+export const resendWebhookTrigger: TriggerConfig = {
+  id: 'resend_webhook',
+  name: 'Resend Webhook (All Events)',
+  provider: 'resend',
+  description:
+    'Trigger on Resend webhook events we subscribe to (email lifecycle, contacts, domains—see Resend docs). Flattened email fields may be null for non-email events; use <code>data</code> for the full payload.',
+  version: '1.0.0',
+  icon: ResendIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'resend_webhook',
+    triggerOptions: resendTriggerOptions,
+    setupInstructions: resendSetupInstructions('All Events'),
+    extraFields: buildResendExtraFields('resend_webhook'),
+  }),
+
+  outputs: buildResendOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/salesforce/case_status_changed.ts b/apps/sim/triggers/salesforce/case_status_changed.ts
new file mode 100644
index 00000000000..9506c615f87
--- /dev/null
+++ b/apps/sim/triggers/salesforce/case_status_changed.ts
@@ -0,0 +1,37 @@
+import { SalesforceIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildSalesforceAuthOnlyFields,
+  buildSalesforceCaseStatusOutputs,
+  salesforceSetupInstructions,
+  salesforceTriggerOptions,
+} from '@/triggers/salesforce/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Salesforce Case Status Changed Trigger
+ */
+export const salesforceCaseStatusChangedTrigger: TriggerConfig = {
+  id: 'salesforce_case_status_changed',
+  name: 'Salesforce Case Status Changed',
+  provider: 'salesforce',
+  description: 'Trigger workflow when a case status changes',
+  version: '1.0.0',
+  icon: SalesforceIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'salesforce_case_status_changed',
+    triggerOptions: salesforceTriggerOptions,
+    setupInstructions: salesforceSetupInstructions('Case Status Changed'),
+    extraFields: buildSalesforceAuthOnlyFields('salesforce_case_status_changed'),
+  }),
+
+  outputs: buildSalesforceCaseStatusOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/salesforce/index.ts b/apps/sim/triggers/salesforce/index.ts
new file mode 100644
index 00000000000..93d02ffb9f9
--- /dev/null
+++ b/apps/sim/triggers/salesforce/index.ts
@@ -0,0 +1,6 @@
+export { salesforceCaseStatusChangedTrigger } from './case_status_changed'
+export { salesforceOpportunityStageChangedTrigger } from './opportunity_stage_changed'
+export { salesforceRecordCreatedTrigger } from './record_created'
+export { salesforceRecordDeletedTrigger } from './record_deleted'
+export { salesforceRecordUpdatedTrigger } from './record_updated'
+export { salesforceWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/salesforce/opportunity_stage_changed.ts b/apps/sim/triggers/salesforce/opportunity_stage_changed.ts
new file mode 100644
index 00000000000..495757a732c
--- /dev/null
+++ b/apps/sim/triggers/salesforce/opportunity_stage_changed.ts
@@ -0,0 +1,37 @@
+import { SalesforceIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildSalesforceAuthOnlyFields,
+  buildSalesforceOpportunityStageOutputs,
+  salesforceSetupInstructions,
+  salesforceTriggerOptions,
+} from '@/triggers/salesforce/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Salesforce Opportunity Stage Changed Trigger
+ */
+export const salesforceOpportunityStageChangedTrigger: TriggerConfig = {
+  id: 'salesforce_opportunity_stage_changed',
+  name: 'Salesforce Opportunity Stage Changed',
+  provider: 'salesforce',
+  description: 'Trigger workflow when an opportunity stage changes',
+  version: '1.0.0',
+  icon: SalesforceIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'salesforce_opportunity_stage_changed',
+    triggerOptions: salesforceTriggerOptions,
+    setupInstructions: salesforceSetupInstructions('Opportunity Stage Changed'),
+    extraFields: buildSalesforceAuthOnlyFields('salesforce_opportunity_stage_changed'),
+  }),
+
+  outputs: buildSalesforceOpportunityStageOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/salesforce/record_created.ts b/apps/sim/triggers/salesforce/record_created.ts
new file mode 100644
index 00000000000..a1d3adf4224
--- /dev/null
+++ b/apps/sim/triggers/salesforce/record_created.ts
@@ -0,0 +1,40 @@
+import { SalesforceIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildSalesforceExtraFields,
+  buildSalesforceRecordOutputs,
+  salesforceSetupInstructions,
+  salesforceTriggerOptions,
+} from '@/triggers/salesforce/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Salesforce Record Created Trigger
+ *
+ * PRIMARY trigger — includes the dropdown for selecting trigger type.
+ */
+export const salesforceRecordCreatedTrigger: TriggerConfig = {
+  id: 'salesforce_record_created',
+  name: 'Salesforce Record Created',
+  provider: 'salesforce',
+  description: 'Trigger workflow when a Salesforce record is created',
+  version: '1.0.0',
+  icon: SalesforceIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'salesforce_record_created',
+    triggerOptions: salesforceTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: salesforceSetupInstructions('Record Created'),
+    extraFields: buildSalesforceExtraFields('salesforce_record_created'),
+  }),
+
+  outputs: buildSalesforceRecordOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/salesforce/record_deleted.ts b/apps/sim/triggers/salesforce/record_deleted.ts
new file mode 100644
index 00000000000..72275317ec1
--- /dev/null
+++ b/apps/sim/triggers/salesforce/record_deleted.ts
@@ -0,0 +1,37 @@
+import { SalesforceIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildSalesforceExtraFields,
+  buildSalesforceRecordOutputs,
+  salesforceSetupInstructions,
+  salesforceTriggerOptions,
+} from '@/triggers/salesforce/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Salesforce Record Deleted Trigger
+ */
+export const salesforceRecordDeletedTrigger: TriggerConfig = {
+  id: 'salesforce_record_deleted',
+  name: 'Salesforce Record Deleted',
+  provider: 'salesforce',
+  description: 'Trigger workflow when a Salesforce record is deleted',
+  version: '1.0.0',
+  icon: SalesforceIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'salesforce_record_deleted',
+    triggerOptions: salesforceTriggerOptions,
+    setupInstructions: salesforceSetupInstructions('Record Deleted'),
+    extraFields: buildSalesforceExtraFields('salesforce_record_deleted'),
+  }),
+
+  outputs: buildSalesforceRecordOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/salesforce/record_updated.ts b/apps/sim/triggers/salesforce/record_updated.ts
new file mode 100644
index 00000000000..aac05c02a1c
--- /dev/null
+++ b/apps/sim/triggers/salesforce/record_updated.ts
@@ -0,0 +1,37 @@
+import { SalesforceIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildSalesforceExtraFields,
+  buildSalesforceRecordOutputs,
+  salesforceSetupInstructions,
+  salesforceTriggerOptions,
+} from '@/triggers/salesforce/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Salesforce Record Updated Trigger
+ */
+export const salesforceRecordUpdatedTrigger: TriggerConfig = {
+  id: 'salesforce_record_updated',
+  name: 'Salesforce Record Updated',
+  provider: 'salesforce',
+  description: 'Trigger workflow when a Salesforce record is updated',
+  version: '1.0.0',
+  icon: SalesforceIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'salesforce_record_updated',
+    triggerOptions: salesforceTriggerOptions,
+    setupInstructions: salesforceSetupInstructions('Record Updated'),
+    extraFields: buildSalesforceExtraFields('salesforce_record_updated'),
+  }),
+
+  outputs: buildSalesforceRecordOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/salesforce/utils.ts b/apps/sim/triggers/salesforce/utils.ts
new file mode 100644
index 00000000000..233274bc702
--- /dev/null
+++ b/apps/sim/triggers/salesforce/utils.ts
@@ -0,0 +1,345 @@
+import { extractSalesforceObjectTypeFromPayload } from '@/lib/webhooks/providers/salesforce'
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Dropdown options for the Salesforce trigger type selector.
+ */
+export const salesforceTriggerOptions = [
+  { label: 'Record Created', id: 'salesforce_record_created' },
+  { label: 'Record Updated', id: 'salesforce_record_updated' },
+  { label: 'Record Deleted', id: 'salesforce_record_deleted' },
+  { label: 'Opportunity Stage Changed', id: 'salesforce_opportunity_stage_changed' },
+  { label: 'Case Status Changed', id: 'salesforce_case_status_changed' },
+  { label: 'Generic Webhook (All Events)', id: 'salesforce_webhook' },
+]
+
+function normalizeToken(s: string): string {
+  return s
+    .trim()
+    .toLowerCase()
+    .replace(/[\s-]+/g, '_')
+}
+
+const RECORD_CREATED = new Set([
+  'record_created',
+  'created',
+  'create',
+  'after_insert',
+  'afterinsert',
+  'insert',
+])
+
+const RECORD_UPDATED = new Set([
+  'record_updated',
+  'updated',
+  'update',
+  'after_update',
+  'afterupdate',
+])
+
+const RECORD_DELETED = new Set([
+  'record_deleted',
+  'deleted',
+  'delete',
+  'after_delete',
+  'afterdelete',
+])
+
+const OPP_STAGE = new Set([
+  'opportunity_stage_changed',
+  'stage_changed',
+  'stage_change',
+  'opportunity_stage_change',
+  'opportunitystagechanged',
+])
+
+const CASE_STATUS = new Set([
+  'case_status_changed',
+  'status_changed',
+  'status_change',
+  'case_status_change',
+  'casestatuschanged',
+])
+
+function matchesRecordTrigger(triggerId: string, normalizedEvent: string): boolean {
+  if (triggerId === 'salesforce_record_created') {
+    return RECORD_CREATED.has(normalizedEvent)
+  }
+  if (triggerId === 'salesforce_record_updated') {
+    return RECORD_UPDATED.has(normalizedEvent)
+  }
+  if (triggerId === 'salesforce_record_deleted') {
+    return RECORD_DELETED.has(normalizedEvent)
+  }
+  return false
+}
+
+/**
+ * Server-side filter for Salesforce Flow (JSON) payloads.
+ * Users should send a string `eventType` (or `simEventType`) from the Flow body.
+ * Optional `objectType` in provider config is enforced against payload when set.
+ */
+export function isSalesforceEventMatch(
+  triggerId: string,
+  body: Record<string, unknown>,
+  configuredObjectType?: string
+): boolean {
+  if (triggerId === 'salesforce_webhook') {
+    const want = configuredObjectType?.trim()
+    if (!want) {
+      return true
+    }
+    const got = extractSalesforceObjectTypeFromPayload(body)
+    if (!got) {
+      return false
+    }
+    return normalizeToken(got) === normalizeToken(want)
+  }
+
+  const wantType = configuredObjectType?.trim()
+  const gotType = extractSalesforceObjectTypeFromPayload(body)
+  if (wantType) {
+    if (!gotType) {
+      return false
+    }
+    if (normalizeToken(gotType) !== normalizeToken(wantType)) {
+      return false
+    }
+  }
+
+  if (triggerId === 'salesforce_opportunity_stage_changed') {
+    if (gotType && normalizeToken(gotType) !== 'opportunity') {
+      return false
+    }
+    const etRaw =
+      (typeof body.eventType === 'string' && body.eventType) ||
+      (typeof body.simEventType === 'string' && body.simEventType) ||
+      ''
+    if (!etRaw.trim()) {
+      return Boolean(gotType && normalizeToken(gotType) === 'opportunity')
+    }
+    return OPP_STAGE.has(normalizeToken(etRaw))
+  }
+
+  if (triggerId === 'salesforce_case_status_changed') {
+    if (gotType && normalizeToken(gotType) !== 'case') {
+      return false
+    }
+    const etRaw =
+      (typeof body.eventType === 'string' && body.eventType) ||
+      (typeof body.simEventType === 'string' && body.simEventType) ||
+      ''
+    if (!etRaw.trim()) {
+      return Boolean(gotType && normalizeToken(gotType) === 'case')
+    }
+    return CASE_STATUS.has(normalizeToken(etRaw))
+  }
+
+  const etRaw =
+    (typeof body.eventType === 'string' && body.eventType) ||
+    (typeof body.simEventType === 'string' && body.simEventType) ||
+    ''
+
+  if (!etRaw.trim()) {
+    return false
+  }
+
+  const normalized = normalizeToken(etRaw)
+  return matchesRecordTrigger(triggerId, normalized)
+}
+
+/**
+ * Generates HTML setup instructions for the Salesforce trigger.
+ * Use Flow HTTP Callouts with a JSON body. Outbound Messages are SOAP/XML and are not supported.
+ */
+export function salesforceSetupInstructions(eventType: string): string {
+  const isGeneric = eventType === 'All Events'
+
+  const instructions = isGeneric
+    ? [
+        'Copy the <strong>Webhook URL</strong> above and generate a <strong>Webhook Secret</strong> (any strong random string). Paste the secret in the <strong>Webhook Secret</strong> field here.',
+        'In your Flow’s HTTP Callout, set header <code>Authorization: Bearer &lt;your secret&gt;</code> or <code>X-Sim-Webhook-Secret: &lt;your secret&gt;</code> (same value).',
+        'In Salesforce, go to <strong>Setup → Flows</strong> and click <strong>New Flow</strong>.',
+        'Select <strong>Record-Triggered Flow</strong> and choose the object(s) you want to monitor.',
+        'Add an <strong>Action</strong> that performs an <strong>HTTP Callout</strong> — method <strong>POST</strong>, <code>Content-Type: application/json</code>, and paste the webhook URL.',
+        'Build the request body as <strong>JSON</strong> (not SOAP/XML). Include <code>eventType</code> and record fields (e.g. <code>Id</code>, <code>Name</code>). Outbound Messages use SOAP and will not work with this trigger.',
+        'Save and <strong>Activate</strong> the Flow(s).',
+        '<strong>Save this trigger in Sim first</strong> so the URL is registered; Salesforce connectivity checks may arrive before the Flow runs.',
+        'Click <strong>"Save"</strong> above to activate your trigger.',
+      ]
+    : [
+        'Copy the <strong>Webhook URL</strong> above and set a <strong>Webhook Secret</strong>. In the Flow HTTP Callout, send the same value as <code>Authorization: Bearer …</code> or <code>X-Sim-Webhook-Secret: …</code>.',
+        'In Salesforce, go to <strong>Setup → Flows</strong> and click <strong>New Flow</strong>.',
+        `Select <strong>Record-Triggered Flow</strong> for the right object and <strong>${eventType}</strong> as the entry condition.`,
+        'Add an <strong>HTTP Callout</strong> — <strong>POST</strong>, JSON body, URL = webhook URL.',
+        `Include <code>eventType</code> in the JSON body using a value this trigger accepts (e.g. for Record Created use <code>record_created</code>, <code>created</code>, or <code>after_insert</code>).`,
+        'If you use <strong>Object Type (Optional)</strong>, you must also include matching type metadata in the JSON body (for example <code>objectType</code>, <code>sobjectType</code>, or <code>attributes.type</code>) or the event will be rejected.',
+        'Save and <strong>Activate</strong> the Flow.',
+        'Click <strong>"Save"</strong> above to activate your trigger.',
+      ]
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+function salesforceWebhookSecretField(triggerId: string): SubBlockConfig {
+  return {
+    id: 'webhookSecret',
+    title: 'Webhook Secret',
+    type: 'short-input',
+    placeholder: 'Generate a secret and paste it here',
+    description:
+      'Required. Use the same value in your Salesforce HTTP Callout as Bearer token or X-Sim-Webhook-Secret.',
+    password: true,
+    required: true,
+    mode: 'trigger',
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  }
+}
+
+function salesforceObjectTypeField(triggerId: string): SubBlockConfig {
+  return {
+    id: 'objectType',
+    title: 'Object Type (Optional)',
+    type: 'short-input',
+    placeholder: 'e.g., Account, Contact, Opportunity',
+    description:
+      'When set, the payload must include matching object type metadata (for example objectType, sobjectType, or attributes.type) or the event is rejected.',
+    mode: 'trigger',
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  }
+}
+
+/** Secret + optional object filter (record triggers and generic webhook). */
+export function buildSalesforceExtraFields(triggerId: string): SubBlockConfig[] {
+  return [salesforceWebhookSecretField(triggerId), salesforceObjectTypeField(triggerId)]
+}
+
+/** Webhook secret only (Opportunity / Case specialized triggers — object is implied). */
+export function buildSalesforceAuthOnlyFields(triggerId: string): SubBlockConfig[] {
+  return [salesforceWebhookSecretField(triggerId)]
+}
+
+/**
+ * Outputs for record lifecycle events (created, updated, deleted).
+ */
+export function buildSalesforceRecordOutputs(): Record<string, TriggerOutput> {
+  return {
+    eventType: {
+      type: 'string',
+      description: 'The type of event (e.g., created, updated, deleted)',
+    },
+    /** Present when the Flow JSON body uses `simEventType` instead of or in addition to `eventType`. */
+    simEventType: {
+      type: 'string',
+      description:
+        'Optional alias from the payload (`simEventType`). Empty when only `eventType` is sent.',
+    },
+    objectType: {
+      type: 'string',
+      description: 'Salesforce object type (e.g., Account, Contact, Lead)',
+    },
+    recordId: { type: 'string', description: 'ID of the affected record' },
+    timestamp: { type: 'string', description: 'When the event occurred (ISO 8601)' },
+    record: {
+      Id: { type: 'string', description: 'Record ID' },
+      Name: { type: 'string', description: 'Record name' },
+      CreatedDate: { type: 'string', description: 'Record creation date' },
+      LastModifiedDate: { type: 'string', description: 'Last modification date' },
+      OwnerId: {
+        type: 'string',
+        description: 'Record owner ID (standard field when sent in the Flow body)',
+      },
+      SystemModstamp: {
+        type: 'string',
+        description: 'System modstamp from the record (ISO 8601) when included in the payload',
+      },
+    },
+    changedFields: { type: 'json', description: 'Fields that were changed (for update events)' },
+    payload: { type: 'json', description: 'Full webhook payload' },
+  }
+}
+
+/**
+ * Outputs for opportunity stage change events.
+ */
+export function buildSalesforceOpportunityStageOutputs(): Record<string, TriggerOutput> {
+  return {
+    eventType: { type: 'string', description: 'The type of event' },
+    simEventType: {
+      type: 'string',
+      description:
+        'Optional alias from the payload (`simEventType`). Empty when only `eventType` is sent.',
+    },
+    objectType: { type: 'string', description: 'Salesforce object type (Opportunity)' },
+    recordId: { type: 'string', description: 'Opportunity ID' },
+    timestamp: { type: 'string', description: 'When the event occurred (ISO 8601)' },
+    record: {
+      Id: { type: 'string', description: 'Opportunity ID' },
+      Name: { type: 'string', description: 'Opportunity name' },
+      StageName: { type: 'string', description: 'Current stage name' },
+      Amount: { type: 'string', description: 'Deal amount' },
+      CloseDate: { type: 'string', description: 'Expected close date' },
+      Probability: { type: 'string', description: 'Win probability' },
+      AccountId: { type: 'string', description: 'Related Account ID (standard Opportunity field)' },
+      OwnerId: { type: 'string', description: 'Opportunity owner ID' },
+    },
+    previousStage: { type: 'string', description: 'Previous stage name' },
+    newStage: { type: 'string', description: 'New stage name' },
+    payload: { type: 'json', description: 'Full webhook payload' },
+  }
+}
+
+/**
+ * Outputs for case status change events.
+ */
+export function buildSalesforceCaseStatusOutputs(): Record<string, TriggerOutput> {
+  return {
+    eventType: { type: 'string', description: 'The type of event' },
+    simEventType: {
+      type: 'string',
+      description:
+        'Optional alias from the payload (`simEventType`). Empty when only `eventType` is sent.',
+    },
+    objectType: { type: 'string', description: 'Salesforce object type (Case)' },
+    recordId: { type: 'string', description: 'Case ID' },
+    timestamp: { type: 'string', description: 'When the event occurred (ISO 8601)' },
+    record: {
+      Id: { type: 'string', description: 'Case ID' },
+      Subject: { type: 'string', description: 'Case subject' },
+      Status: { type: 'string', description: 'Current case status' },
+      Priority: { type: 'string', description: 'Case priority' },
+      CaseNumber: { type: 'string', description: 'Case number' },
+      AccountId: { type: 'string', description: 'Related Account ID' },
+      ContactId: { type: 'string', description: 'Related Contact ID' },
+      OwnerId: { type: 'string', description: 'Case owner ID' },
+    },
+    previousStatus: { type: 'string', description: 'Previous case status' },
+    newStatus: { type: 'string', description: 'New case status' },
+    payload: { type: 'json', description: 'Full webhook payload' },
+  }
+}
+
+/**
+ * Outputs for the generic webhook trigger.
+ */
+export function buildSalesforceWebhookOutputs(): Record<string, TriggerOutput> {
+  return {
+    eventType: { type: 'string', description: 'The type of event' },
+    simEventType: {
+      type: 'string',
+      description:
+        'Optional alias from the payload (`simEventType`). Empty when only `eventType` is sent.',
+    },
+    objectType: { type: 'string', description: 'Salesforce object type' },
+    recordId: { type: 'string', description: 'ID of the affected record' },
+    timestamp: { type: 'string', description: 'When the event occurred (ISO 8601)' },
+    record: { type: 'json', description: 'Full record data' },
+    payload: { type: 'json', description: 'Full webhook payload' },
+  }
+}
diff --git a/apps/sim/triggers/salesforce/webhook.ts b/apps/sim/triggers/salesforce/webhook.ts
new file mode 100644
index 00000000000..855f17174ec
--- /dev/null
+++ b/apps/sim/triggers/salesforce/webhook.ts
@@ -0,0 +1,39 @@
+import { SalesforceIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildSalesforceExtraFields,
+  buildSalesforceWebhookOutputs,
+  salesforceSetupInstructions,
+  salesforceTriggerOptions,
+} from '@/triggers/salesforce/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Salesforce Generic Webhook Trigger
+ *
+ * Receives all Salesforce events via a single webhook endpoint.
+ */
+export const salesforceWebhookTrigger: TriggerConfig = {
+  id: 'salesforce_webhook',
+  name: 'Salesforce Webhook (All Events)',
+  provider: 'salesforce',
+  description: 'Trigger workflow on any Salesforce webhook event',
+  version: '1.0.0',
+  icon: SalesforceIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'salesforce_webhook',
+    triggerOptions: salesforceTriggerOptions,
+    setupInstructions: salesforceSetupInstructions('All Events'),
+    extraFields: buildSalesforceExtraFields('salesforce_webhook'),
+  }),
+
+  outputs: buildSalesforceWebhookOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/deployment_canceled.ts b/apps/sim/triggers/vercel/deployment_canceled.ts
new file mode 100644
index 00000000000..3cf110912ef
--- /dev/null
+++ b/apps/sim/triggers/vercel/deployment_canceled.ts
@@ -0,0 +1,37 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildDeploymentOutputs,
+  buildVercelExtraFields,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel Deployment Canceled Trigger
+ */
+export const vercelDeploymentCanceledTrigger: TriggerConfig = {
+  id: 'vercel_deployment_canceled',
+  name: 'Vercel Deployment Canceled',
+  provider: 'vercel',
+  description: 'Trigger workflow when a deployment is canceled',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_deployment_canceled',
+    triggerOptions: vercelTriggerOptions,
+    setupInstructions: vercelSetupInstructions('Deployment Canceled'),
+    extraFields: buildVercelExtraFields('vercel_deployment_canceled'),
+  }),
+
+  outputs: buildDeploymentOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/deployment_created.ts b/apps/sim/triggers/vercel/deployment_created.ts
new file mode 100644
index 00000000000..67b7817405d
--- /dev/null
+++ b/apps/sim/triggers/vercel/deployment_created.ts
@@ -0,0 +1,40 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildDeploymentOutputs,
+  buildVercelExtraFields,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel Deployment Created Trigger
+ *
+ * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
+ */
+export const vercelDeploymentCreatedTrigger: TriggerConfig = {
+  id: 'vercel_deployment_created',
+  name: 'Vercel Deployment Created',
+  provider: 'vercel',
+  description: 'Trigger workflow when a new deployment is created',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_deployment_created',
+    triggerOptions: vercelTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: vercelSetupInstructions('Deployment Created'),
+    extraFields: buildVercelExtraFields('vercel_deployment_created'),
+  }),
+
+  outputs: buildDeploymentOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/deployment_error.ts b/apps/sim/triggers/vercel/deployment_error.ts
new file mode 100644
index 00000000000..8b14d390b0c
--- /dev/null
+++ b/apps/sim/triggers/vercel/deployment_error.ts
@@ -0,0 +1,37 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildDeploymentOutputs,
+  buildVercelExtraFields,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel Deployment Error Trigger
+ */
+export const vercelDeploymentErrorTrigger: TriggerConfig = {
+  id: 'vercel_deployment_error',
+  name: 'Vercel Deployment Error',
+  provider: 'vercel',
+  description: 'Trigger workflow when a deployment fails',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_deployment_error',
+    triggerOptions: vercelTriggerOptions,
+    setupInstructions: vercelSetupInstructions('Deployment Error'),
+    extraFields: buildVercelExtraFields('vercel_deployment_error'),
+  }),
+
+  outputs: buildDeploymentOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/deployment_ready.ts b/apps/sim/triggers/vercel/deployment_ready.ts
new file mode 100644
index 00000000000..979fe3bdebc
--- /dev/null
+++ b/apps/sim/triggers/vercel/deployment_ready.ts
@@ -0,0 +1,37 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildDeploymentOutputs,
+  buildVercelExtraFields,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel Deployment Ready Trigger
+ */
+export const vercelDeploymentReadyTrigger: TriggerConfig = {
+  id: 'vercel_deployment_ready',
+  name: 'Vercel Deployment Ready',
+  provider: 'vercel',
+  description: 'Trigger workflow when a deployment is ready to serve traffic',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_deployment_ready',
+    triggerOptions: vercelTriggerOptions,
+    setupInstructions: vercelSetupInstructions('Deployment Ready'),
+    extraFields: buildVercelExtraFields('vercel_deployment_ready'),
+  }),
+
+  outputs: buildDeploymentOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/domain_created.ts b/apps/sim/triggers/vercel/domain_created.ts
new file mode 100644
index 00000000000..d3dd35c1282
--- /dev/null
+++ b/apps/sim/triggers/vercel/domain_created.ts
@@ -0,0 +1,37 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildDomainOutputs,
+  buildVercelExtraFields,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel Domain Created Trigger
+ */
+export const vercelDomainCreatedTrigger: TriggerConfig = {
+  id: 'vercel_domain_created',
+  name: 'Vercel Domain Created',
+  provider: 'vercel',
+  description: 'Trigger workflow when a domain is created',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_domain_created',
+    triggerOptions: vercelTriggerOptions,
+    setupInstructions: vercelSetupInstructions('Domain Created'),
+    extraFields: buildVercelExtraFields('vercel_domain_created'),
+  }),
+
+  outputs: buildDomainOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/index.ts b/apps/sim/triggers/vercel/index.ts
new file mode 100644
index 00000000000..da5ad6c7759
--- /dev/null
+++ b/apps/sim/triggers/vercel/index.ts
@@ -0,0 +1,13 @@
+/**
+ * Vercel Triggers
+ * Export all Vercel webhook triggers
+ */
+
+export { vercelDeploymentCanceledTrigger } from './deployment_canceled'
+export { vercelDeploymentCreatedTrigger } from './deployment_created'
+export { vercelDeploymentErrorTrigger } from './deployment_error'
+export { vercelDeploymentReadyTrigger } from './deployment_ready'
+export { vercelDomainCreatedTrigger } from './domain_created'
+export { vercelProjectCreatedTrigger } from './project_created'
+export { vercelProjectRemovedTrigger } from './project_removed'
+export { vercelWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/vercel/project_created.ts b/apps/sim/triggers/vercel/project_created.ts
new file mode 100644
index 00000000000..2baadc631cf
--- /dev/null
+++ b/apps/sim/triggers/vercel/project_created.ts
@@ -0,0 +1,37 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildProjectOutputs,
+  buildVercelExtraFields,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel Project Created Trigger
+ */
+export const vercelProjectCreatedTrigger: TriggerConfig = {
+  id: 'vercel_project_created',
+  name: 'Vercel Project Created',
+  provider: 'vercel',
+  description: 'Trigger workflow when a new project is created',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_project_created',
+    triggerOptions: vercelTriggerOptions,
+    setupInstructions: vercelSetupInstructions('Project Created'),
+    extraFields: buildVercelExtraFields('vercel_project_created'),
+  }),
+
+  outputs: buildProjectOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/project_removed.ts b/apps/sim/triggers/vercel/project_removed.ts
new file mode 100644
index 00000000000..451c63063c7
--- /dev/null
+++ b/apps/sim/triggers/vercel/project_removed.ts
@@ -0,0 +1,37 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildProjectOutputs,
+  buildVercelExtraFields,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel Project Removed Trigger
+ */
+export const vercelProjectRemovedTrigger: TriggerConfig = {
+  id: 'vercel_project_removed',
+  name: 'Vercel Project Removed',
+  provider: 'vercel',
+  description: 'Trigger workflow when a project is removed',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_project_removed',
+    triggerOptions: vercelTriggerOptions,
+    setupInstructions: vercelSetupInstructions('Project Removed'),
+    extraFields: buildVercelExtraFields('vercel_project_removed'),
+  }),
+
+  outputs: buildProjectOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/vercel/utils.test.ts b/apps/sim/triggers/vercel/utils.test.ts
new file mode 100644
index 00000000000..baa3927265c
--- /dev/null
+++ b/apps/sim/triggers/vercel/utils.test.ts
@@ -0,0 +1,61 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { vercelHandler } from '@/lib/webhooks/providers/vercel'
+import { isVercelEventMatch } from '@/triggers/vercel/utils'
+
+describe('isVercelEventMatch', () => {
+  it('matches specialized triggers to Vercel type strings', () => {
+    expect(isVercelEventMatch('vercel_deployment_created', 'deployment.created')).toBe(true)
+    expect(isVercelEventMatch('vercel_deployment_created', 'deployment.ready')).toBe(false)
+  })
+
+  it('does not match unknown trigger ids', () => {
+    expect(isVercelEventMatch('vercel_unknown_trigger', 'deployment.created')).toBe(false)
+  })
+
+  it('allows any event type for the curated generic trigger id', () => {
+    expect(isVercelEventMatch('vercel_webhook', 'deployment.succeeded')).toBe(true)
+    expect(isVercelEventMatch('vercel_webhook', undefined)).toBe(true)
+  })
+})
+
+describe('vercelHandler.formatInput', () => {
+  it('passes through documented deployment links, regions, meta, and domain.delegated', async () => {
+    const { input } = await vercelHandler.formatInput!({
+      webhook: {},
+      workflow: { id: 'w', userId: 'u' },
+      body: {
+        type: 'deployment.created',
+        id: 'evt_1',
+        createdAt: 1_700_000_000_000,
+        region: 'iad1',
+        payload: {
+          deployment: {
+            id: 'd1',
+            url: 'https://x.vercel.app',
+            name: 'x',
+            meta: { k: 'v' },
+          },
+          links: { deployment: 'https://vercel.com/d', project: 'https://vercel.com/p' },
+          regions: ['iad1', 'sfo1'],
+          domain: { name: 'example.com', delegated: true },
+        },
+      },
+      headers: {},
+      requestId: 't',
+    })
+    const i = input as Record<string, unknown>
+    expect(i.links).toEqual({
+      deployment: 'https://vercel.com/d',
+      project: 'https://vercel.com/p',
+    })
+    expect(i.regions).toEqual(['iad1', 'sfo1'])
+    expect(i.deployment).toMatchObject({
+      id: 'd1',
+      meta: { k: 'v' },
+    })
+    expect(i.domain).toMatchObject({ name: 'example.com', delegated: true })
+  })
+})
diff --git a/apps/sim/triggers/vercel/utils.ts b/apps/sim/triggers/vercel/utils.ts
new file mode 100644
index 00000000000..ee895efac2f
--- /dev/null
+++ b/apps/sim/triggers/vercel/utils.ts
@@ -0,0 +1,309 @@
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Dropdown options for the Vercel trigger type selector
+ */
+export const vercelTriggerOptions = [
+  { label: 'Deployment Created', id: 'vercel_deployment_created' },
+  { label: 'Deployment Ready', id: 'vercel_deployment_ready' },
+  { label: 'Deployment Error', id: 'vercel_deployment_error' },
+  { label: 'Deployment Canceled', id: 'vercel_deployment_canceled' },
+  { label: 'Project Created', id: 'vercel_project_created' },
+  { label: 'Project Removed', id: 'vercel_project_removed' },
+  { label: 'Domain Created', id: 'vercel_domain_created' },
+  { label: 'Common events (curated list)', id: 'vercel_webhook' },
+]
+
+/** Maps Sim trigger IDs to Vercel webhook `type` strings (see Vercel Webhooks API). */
+export const VERCEL_TRIGGER_EVENT_TYPES: Record<string, string> = {
+  vercel_deployment_created: 'deployment.created',
+  vercel_deployment_ready: 'deployment.ready',
+  vercel_deployment_error: 'deployment.error',
+  vercel_deployment_canceled: 'deployment.canceled',
+  vercel_project_created: 'project.created',
+  vercel_project_removed: 'project.removed',
+  vercel_domain_created: 'domain.created',
+}
+
+/** Curated set used by the generic Vercel webhook trigger. */
+export const VERCEL_GENERIC_TRIGGER_EVENT_TYPES = [
+  'deployment.created',
+  'deployment.ready',
+  'deployment.succeeded',
+  'deployment.error',
+  'deployment.canceled',
+  'deployment.promoted',
+  'project.created',
+  'project.removed',
+  'domain.created',
+  'edge-config.created',
+  'edge-config.deleted',
+] as const
+
+/**
+ * Returns whether the incoming Vercel event matches the configured trigger.
+ * `vercel_webhook` is handled only at subscription time; deliveries are not filtered here.
+ */
+export function isVercelEventMatch(triggerId: string, eventType: string | undefined): boolean {
+  if (triggerId === 'vercel_webhook') {
+    return true
+  }
+  const expected = VERCEL_TRIGGER_EVENT_TYPES[triggerId]
+  if (!expected) {
+    return false
+  }
+  return eventType === expected
+}
+
+/**
+ * Generates setup instructions for Vercel webhooks.
+ * Webhooks are automatically created via the Vercel API.
+ */
+export function vercelSetupInstructions(eventType: string): string {
+  const instructions = [
+    'Enter your Vercel Access Token above.',
+    'You can create a token at <strong>Vercel Dashboard > Settings > Tokens</strong>.',
+    `Click <strong>"Save Configuration"</strong> to automatically create the webhook in Vercel for <strong>${eventType}</strong> events.`,
+    'The webhook will be automatically deleted when you remove this trigger.',
+  ]
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Vercel-specific extra fields for triggers.
+ * Includes API token (required) and optional project/team filters.
+ */
+export function buildVercelExtraFields(triggerId: string): SubBlockConfig[] {
+  return [
+    {
+      id: 'apiKey',
+      title: 'Access Token',
+      type: 'short-input' as const,
+      placeholder: 'Enter your Vercel access token',
+      description: 'Required to create the webhook in Vercel.',
+      password: true,
+      required: true,
+      paramVisibility: 'user-only',
+      mode: 'trigger' as const,
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+    {
+      id: 'teamId',
+      title: 'Team ID (Optional)',
+      type: 'short-input' as const,
+      placeholder: 'team_xxxxx (leave empty for personal account)',
+      description: 'Scope webhook to a specific team',
+      mode: 'trigger' as const,
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+    {
+      id: 'filterProjectIds',
+      title: 'Project IDs (Optional)',
+      type: 'short-input' as const,
+      placeholder: 'prj_xxx,prj_yyy (comma-separated)',
+      description: 'Limit webhook to specific projects',
+      mode: 'trigger' as const,
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+/**
+ * Core outputs present in all Vercel webhook payloads
+ */
+const coreOutputs = {
+  type: {
+    type: 'string',
+    description: 'Event type (e.g., deployment.created)',
+  },
+  id: {
+    type: 'string',
+    description: 'Unique webhook delivery ID (string)',
+  },
+  createdAt: {
+    type: 'number',
+    description: 'Event timestamp in milliseconds',
+  },
+  region: {
+    type: 'string',
+    description: 'Region where the event occurred',
+  },
+} as const
+
+/** Raw `payload` object from the Vercel webhook body (event-specific shape). */
+const payloadOutput = {
+  payload: { type: 'json' as const, description: 'Raw event payload from Vercel' },
+} as const
+
+/**
+ * Dashboard deep links included on many deployment webhook events (Vercel Webhooks API).
+ */
+const linksOutputs = {
+  links: {
+    deployment: {
+      type: 'string',
+      description: 'Vercel Dashboard URL for the deployment',
+    },
+    project: {
+      type: 'string',
+      description: 'Vercel Dashboard URL for the project',
+    },
+  },
+  regions: {
+    type: 'json',
+    description: 'Regions associated with the deployment (array), when provided by Vercel',
+  },
+} as const
+
+/** Normalized deployment object from `formatInput` (null when no deployment on the event). */
+const deploymentResourceOutputs = {
+  deployment: {
+    id: { type: 'string', description: 'Deployment ID' },
+    url: { type: 'string', description: 'Deployment URL' },
+    name: { type: 'string', description: 'Deployment name' },
+    meta: {
+      type: 'json',
+      description: 'Deployment metadata map (e.g. Git metadata), per Vercel Webhooks API',
+    },
+  },
+} as const
+
+/**
+ * Deployment-specific output fields
+ */
+const deploymentOutputs = {
+  ...linksOutputs,
+  ...deploymentResourceOutputs,
+  project: {
+    id: { type: 'string', description: 'Project ID' },
+    name: { type: 'string', description: 'Project name' },
+  },
+  team: {
+    id: { type: 'string', description: 'Team ID' },
+  },
+  user: {
+    id: { type: 'string', description: 'User ID' },
+  },
+  target: {
+    type: 'string',
+    description: 'Deployment target (production, staging, or preview)',
+  },
+  plan: {
+    type: 'string',
+    description: 'Account plan type',
+  },
+  domain: {
+    name: { type: 'string', description: 'Domain name' },
+    delegated: {
+      type: 'boolean',
+      description: 'Whether the domain was delegated/shared when present on the payload',
+    },
+  },
+} as const
+
+const deploymentTargetPlanDomain = {
+  target: deploymentOutputs.target,
+  plan: deploymentOutputs.plan,
+  domain: deploymentOutputs.domain,
+} as const
+
+/**
+ * Project-specific output fields
+ */
+const projectOutputs = {
+  project: {
+    id: { type: 'string', description: 'Project ID' },
+    name: { type: 'string', description: 'Project name' },
+  },
+  team: {
+    id: { type: 'string', description: 'Team ID' },
+  },
+  user: {
+    id: { type: 'string', description: 'User ID' },
+  },
+} as const
+
+/**
+ * Domain-specific output fields
+ */
+const domainOutputs = {
+  domain: {
+    name: { type: 'string', description: 'Domain name' },
+    delegated: {
+      type: 'boolean',
+      description:
+        'Whether the domain was delegated/shared (domain.created), per Vercel Webhooks API',
+    },
+  },
+  project: {
+    id: { type: 'string', description: 'Project ID' },
+  },
+  team: {
+    id: { type: 'string', description: 'Team ID' },
+  },
+  user: {
+    id: { type: 'string', description: 'User ID' },
+  },
+} as const
+
+/**
+ * Build outputs for deployment events
+ */
+export function buildDeploymentOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...coreOutputs,
+    ...payloadOutput,
+    ...deploymentOutputs,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for project events
+ */
+export function buildProjectOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...coreOutputs,
+    ...payloadOutput,
+    ...linksOutputs,
+    ...deploymentResourceOutputs,
+    ...projectOutputs,
+    ...deploymentTargetPlanDomain,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for domain events
+ */
+export function buildDomainOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...coreOutputs,
+    ...payloadOutput,
+    ...linksOutputs,
+    ...deploymentResourceOutputs,
+    ...deploymentTargetPlanDomain,
+    ...domainOutputs,
+  } as Record<string, TriggerOutput>
+}
+
+/**
+ * Build outputs for the generic webhook (all events)
+ */
+export function buildVercelOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...coreOutputs,
+    payload: { type: 'json', description: 'Full event payload' },
+    ...linksOutputs,
+    ...deploymentResourceOutputs,
+    project: deploymentOutputs.project,
+    team: deploymentOutputs.team,
+    user: deploymentOutputs.user,
+    ...deploymentTargetPlanDomain,
+  } as Record<string, TriggerOutput>
+}
diff --git a/apps/sim/triggers/vercel/webhook.ts b/apps/sim/triggers/vercel/webhook.ts
new file mode 100644
index 00000000000..e4c0a00634f
--- /dev/null
+++ b/apps/sim/triggers/vercel/webhook.ts
@@ -0,0 +1,41 @@
+import { VercelIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildVercelExtraFields,
+  buildVercelOutputs,
+  vercelSetupInstructions,
+  vercelTriggerOptions,
+} from '@/triggers/vercel/utils'
+
+/**
+ * Vercel webhook trigger for a curated bundle of frequent event types.
+ * Vercel requires an explicit event list; this is not every event in their catalog.
+ */
+export const vercelWebhookTrigger: TriggerConfig = {
+  id: 'vercel_webhook',
+  name: 'Vercel Webhook (Common Events)',
+  provider: 'vercel',
+  description:
+    'Trigger on a curated set of common Vercel events (deployments, projects, domains, edge config). Pick a specific trigger to listen to one event type only.',
+  version: '1.0.0',
+  icon: VercelIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'vercel_webhook',
+    triggerOptions: vercelTriggerOptions,
+    setupInstructions: vercelSetupInstructions(
+      'common deployment, project, domain, and edge-config events'
+    ),
+    extraFields: buildVercelExtraFields('vercel_webhook'),
+  }),
+
+  outputs: buildVercelOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/zoom/index.ts b/apps/sim/triggers/zoom/index.ts
new file mode 100644
index 00000000000..b6aad68878b
--- /dev/null
+++ b/apps/sim/triggers/zoom/index.ts
@@ -0,0 +1,6 @@
+export { zoomMeetingEndedTrigger } from './meeting_ended'
+export { zoomMeetingStartedTrigger } from './meeting_started'
+export { zoomParticipantJoinedTrigger } from './participant_joined'
+export { zoomParticipantLeftTrigger } from './participant_left'
+export { zoomRecordingCompletedTrigger } from './recording_completed'
+export { zoomWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/zoom/meeting_ended.ts b/apps/sim/triggers/zoom/meeting_ended.ts
new file mode 100644
index 00000000000..6d11d590d22
--- /dev/null
+++ b/apps/sim/triggers/zoom/meeting_ended.ts
@@ -0,0 +1,37 @@
+import { ZoomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildMeetingOutputs,
+  zoomSecretTokenField,
+  zoomSetupInstructions,
+  zoomTriggerOptions,
+} from '@/triggers/zoom/utils'
+
+/**
+ * Zoom Meeting Ended Trigger
+ */
+export const zoomMeetingEndedTrigger: TriggerConfig = {
+  id: 'zoom_meeting_ended',
+  name: 'Zoom Meeting Ended',
+  provider: 'zoom',
+  description: 'Trigger workflow when a Zoom meeting ends',
+  version: '1.0.0',
+  icon: ZoomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'zoom_meeting_ended',
+    triggerOptions: zoomTriggerOptions,
+    setupInstructions: zoomSetupInstructions('meeting_ended'),
+    extraFields: [zoomSecretTokenField('zoom_meeting_ended')],
+  }),
+
+  outputs: buildMeetingOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/zoom/meeting_started.ts b/apps/sim/triggers/zoom/meeting_started.ts
new file mode 100644
index 00000000000..b1e559f532b
--- /dev/null
+++ b/apps/sim/triggers/zoom/meeting_started.ts
@@ -0,0 +1,40 @@
+import { ZoomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildMeetingOutputs,
+  zoomSecretTokenField,
+  zoomSetupInstructions,
+  zoomTriggerOptions,
+} from '@/triggers/zoom/utils'
+
+/**
+ * Zoom Meeting Started Trigger
+ *
+ * Primary trigger - includes the dropdown for selecting trigger type.
+ */
+export const zoomMeetingStartedTrigger: TriggerConfig = {
+  id: 'zoom_meeting_started',
+  name: 'Zoom Meeting Started',
+  provider: 'zoom',
+  description: 'Trigger workflow when a Zoom meeting starts',
+  version: '1.0.0',
+  icon: ZoomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'zoom_meeting_started',
+    triggerOptions: zoomTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: zoomSetupInstructions('meeting_started'),
+    extraFields: [zoomSecretTokenField('zoom_meeting_started')],
+  }),
+
+  outputs: buildMeetingOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/zoom/participant_joined.ts b/apps/sim/triggers/zoom/participant_joined.ts
new file mode 100644
index 00000000000..573adbbe113
--- /dev/null
+++ b/apps/sim/triggers/zoom/participant_joined.ts
@@ -0,0 +1,37 @@
+import { ZoomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildParticipantOutputs,
+  zoomSecretTokenField,
+  zoomSetupInstructions,
+  zoomTriggerOptions,
+} from '@/triggers/zoom/utils'
+
+/**
+ * Zoom Participant Joined Trigger
+ */
+export const zoomParticipantJoinedTrigger: TriggerConfig = {
+  id: 'zoom_participant_joined',
+  name: 'Zoom Participant Joined',
+  provider: 'zoom',
+  description: 'Trigger workflow when a participant joins a Zoom meeting',
+  version: '1.0.0',
+  icon: ZoomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'zoom_participant_joined',
+    triggerOptions: zoomTriggerOptions,
+    setupInstructions: zoomSetupInstructions('participant_joined'),
+    extraFields: [zoomSecretTokenField('zoom_participant_joined')],
+  }),
+
+  outputs: buildParticipantOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/zoom/participant_left.ts b/apps/sim/triggers/zoom/participant_left.ts
new file mode 100644
index 00000000000..d88e325448a
--- /dev/null
+++ b/apps/sim/triggers/zoom/participant_left.ts
@@ -0,0 +1,37 @@
+import { ZoomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildParticipantOutputs,
+  zoomSecretTokenField,
+  zoomSetupInstructions,
+  zoomTriggerOptions,
+} from '@/triggers/zoom/utils'
+
+/**
+ * Zoom Participant Left Trigger
+ */
+export const zoomParticipantLeftTrigger: TriggerConfig = {
+  id: 'zoom_participant_left',
+  name: 'Zoom Participant Left',
+  provider: 'zoom',
+  description: 'Trigger workflow when a participant leaves a Zoom meeting',
+  version: '1.0.0',
+  icon: ZoomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'zoom_participant_left',
+    triggerOptions: zoomTriggerOptions,
+    setupInstructions: zoomSetupInstructions('participant_left'),
+    extraFields: [zoomSecretTokenField('zoom_participant_left')],
+  }),
+
+  outputs: buildParticipantOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/zoom/recording_completed.ts b/apps/sim/triggers/zoom/recording_completed.ts
new file mode 100644
index 00000000000..bbae2eb6340
--- /dev/null
+++ b/apps/sim/triggers/zoom/recording_completed.ts
@@ -0,0 +1,37 @@
+import { ZoomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildRecordingOutputs,
+  zoomSecretTokenField,
+  zoomSetupInstructions,
+  zoomTriggerOptions,
+} from '@/triggers/zoom/utils'
+
+/**
+ * Zoom Recording Completed Trigger
+ */
+export const zoomRecordingCompletedTrigger: TriggerConfig = {
+  id: 'zoom_recording_completed',
+  name: 'Zoom Recording Completed',
+  provider: 'zoom',
+  description: 'Trigger workflow when a Zoom cloud recording is completed',
+  version: '1.0.0',
+  icon: ZoomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'zoom_recording_completed',
+    triggerOptions: zoomTriggerOptions,
+    setupInstructions: zoomSetupInstructions('recording_completed'),
+    extraFields: [zoomSecretTokenField('zoom_recording_completed')],
+  }),
+
+  outputs: buildRecordingOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/zoom/utils.ts b/apps/sim/triggers/zoom/utils.ts
new file mode 100644
index 00000000000..1b95df47ace
--- /dev/null
+++ b/apps/sim/triggers/zoom/utils.ts
@@ -0,0 +1,295 @@
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Maps trigger IDs to the Zoom webhook event names they should match.
+ */
+const ZOOM_TRIGGER_EVENT_MAP: Record<string, string[]> = {
+  zoom_meeting_started: ['meeting.started'],
+  zoom_meeting_ended: ['meeting.ended'],
+  zoom_participant_joined: ['meeting.participant_joined'],
+  zoom_participant_left: ['meeting.participant_left'],
+  zoom_recording_completed: ['recording.completed'],
+}
+
+/**
+ * Checks whether a Zoom webhook payload matches the configured trigger type.
+ * Returns true for the generic `zoom_webhook` trigger (accepts all events).
+ */
+export function isZoomEventMatch(triggerId: string, event: string): boolean {
+  if (triggerId === 'zoom_webhook') {
+    return true
+  }
+
+  const allowedEvents = ZOOM_TRIGGER_EVENT_MAP[triggerId]
+  if (!allowedEvents) {
+    return false
+  }
+
+  const ev = event?.trim()
+  if (!ev) {
+    return false
+  }
+
+  return allowedEvents.includes(ev)
+}
+
+/**
+ * Dropdown options for the Zoom trigger type selector.
+ */
+export const zoomTriggerOptions = [
+  { label: 'Meeting Started', id: 'zoom_meeting_started' },
+  { label: 'Meeting Ended', id: 'zoom_meeting_ended' },
+  { label: 'Participant Joined', id: 'zoom_participant_joined' },
+  { label: 'Participant Left', id: 'zoom_participant_left' },
+  { label: 'Recording Completed', id: 'zoom_recording_completed' },
+  { label: 'Generic Webhook (All Events)', id: 'zoom_webhook' },
+]
+
+type ZoomEventType =
+  | 'meeting_started'
+  | 'meeting_ended'
+  | 'participant_joined'
+  | 'participant_left'
+  | 'recording_completed'
+  | 'generic'
+
+/**
+ * Generates setup instructions HTML for Zoom triggers.
+ */
+export function zoomSetupInstructions(eventType: ZoomEventType): string {
+  const eventNames: Record<ZoomEventType, string> = {
+    meeting_started: 'meeting.started',
+    meeting_ended: 'meeting.ended',
+    participant_joined: 'meeting.participant_joined',
+    participant_left: 'meeting.participant_left',
+    recording_completed: 'recording.completed',
+    generic: 'your desired event type(s)',
+  }
+
+  const instructions = [
+    'Copy the <strong>Webhook URL</strong> above.',
+    'Go to the <a href="https://marketplace.zoom.us/" target="_blank" rel="noopener noreferrer">Zoom Marketplace</a> and create or open a <strong>Webhook-only</strong> or general app with <strong>Event Subscriptions</strong> enabled (Meeting / Recording events as needed). Admin approval may be required for account-level webhooks.',
+    "Copy the <strong>Secret Token</strong> from your Zoom app's <strong>Features</strong> page and paste it in the <strong>Secret Token</strong> field above.",
+    'Click <strong>"Save Configuration"</strong> above to activate the trigger.',
+    'Navigate to <strong>Features > Event Subscriptions</strong> and click <strong>Add Event Subscription</strong>.',
+    'Enter a subscription name and paste the webhook URL into the <strong>Event notification endpoint URL</strong> field.',
+    'Click <strong>Validate</strong> to verify the endpoint.',
+    `Click <strong>Add Events</strong> and select the <strong>${eventNames[eventType]}</strong> event type.`,
+    'Save the event subscription in Zoom.',
+  ]
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Creates the secret token field subBlock for a Zoom trigger.
+ */
+export function zoomSecretTokenField(triggerId: string): SubBlockConfig {
+  return {
+    id: 'secretToken',
+    title: 'Secret Token',
+    type: 'short-input',
+    placeholder: 'Enter your Zoom app Secret Token',
+    description:
+      "Found in your Zoom app's Features page. Required for endpoint validation and webhook signature verification.",
+    password: true,
+    required: true,
+    mode: 'trigger',
+    condition: {
+      field: 'selectedTriggerId',
+      value: triggerId,
+    },
+  }
+}
+
+/**
+ * Builds outputs for meeting lifecycle events (started/ended).
+ */
+export function buildMeetingOutputs(): Record<string, TriggerOutput> {
+  return {
+    event: {
+      type: 'string',
+      description: 'The webhook event type (e.g., meeting.started)',
+    },
+    event_ts: {
+      type: 'number',
+      description: 'Unix timestamp in milliseconds when the event occurred',
+    },
+    payload: {
+      account_id: {
+        type: 'string',
+        description: 'Zoom account ID',
+      },
+      object: {
+        type: 'object',
+        description: 'Meeting details (shape aligns with Zoom Meetings webhook object fields)',
+        id: { type: 'number', description: 'Meeting ID' },
+        uuid: { type: 'string', description: 'Meeting UUID' },
+        topic: { type: 'string', description: 'Meeting topic' },
+        meeting_type: {
+          type: 'number',
+          description: 'Meeting type (1=instant, 2=scheduled, etc.; maps to Zoom `type`)',
+        },
+        host_id: { type: 'string', description: 'Host user ID' },
+        host_email: {
+          type: 'string',
+          description: 'Host email address (when provided by Zoom)',
+        },
+        start_time: { type: 'string', description: 'Meeting start time (ISO 8601)' },
+        end_time: {
+          type: 'string',
+          description: 'Meeting end time (ISO 8601, present on meeting.ended)',
+        },
+        timezone: { type: 'string', description: 'Meeting timezone' },
+        duration: { type: 'number', description: 'Meeting duration in minutes' },
+        agenda: {
+          type: 'string',
+          description: 'Meeting agenda or description (when provided)',
+        },
+        join_url: {
+          type: 'string',
+          description: 'URL for participants to join (when provided)',
+        },
+        password: {
+          type: 'string',
+          description: 'Meeting password (when provided)',
+        },
+        status: {
+          type: 'string',
+          description: 'Meeting status (e.g. waiting, started; when provided)',
+        },
+        created_at: {
+          type: 'string',
+          description: 'Creation timestamp in ISO 8601 format (when provided)',
+        },
+      },
+    },
+  }
+}
+
+/**
+ * Builds outputs for participant events (joined/left).
+ */
+export function buildParticipantOutputs(): Record<string, TriggerOutput> {
+  return {
+    event: {
+      type: 'string',
+      description: 'The webhook event type (e.g., meeting.participant_joined)',
+    },
+    event_ts: {
+      type: 'number',
+      description: 'Unix timestamp in milliseconds when the event occurred',
+    },
+    payload: {
+      account_id: {
+        type: 'string',
+        description: 'Zoom account ID',
+      },
+      object: {
+        type: 'object',
+        description: 'Meeting and participant details',
+        id: { type: 'number', description: 'Meeting ID' },
+        uuid: { type: 'string', description: 'Meeting UUID' },
+        topic: { type: 'string', description: 'Meeting topic' },
+        host_id: { type: 'string', description: 'Host user ID' },
+        join_url: {
+          type: 'string',
+          description: 'URL for participants to join (when provided)',
+        },
+        participant: {
+          type: 'object',
+          description: 'Participant details',
+          id: { type: 'string', description: 'Participant identifier' },
+          user_id: { type: 'string', description: 'Participant user ID (when a Zoom user)' },
+          user_name: { type: 'string', description: 'Participant display name' },
+          email: { type: 'string', description: 'Participant email (when available)' },
+          join_time: { type: 'string', description: 'Time participant joined (ISO 8601)' },
+          leave_time: {
+            type: 'string',
+            description: 'Time participant left (ISO 8601, present on participant_left)',
+          },
+          duration: {
+            type: 'number',
+            description: 'Seconds the participant was in the meeting (when provided)',
+          },
+        },
+      },
+    },
+  }
+}
+
+/**
+ * Builds outputs for recording completed events.
+ */
+export function buildRecordingOutputs(): Record<string, TriggerOutput> {
+  return {
+    event: {
+      type: 'string',
+      description: 'The webhook event type (recording.completed)',
+    },
+    event_ts: {
+      type: 'number',
+      description: 'Unix timestamp in milliseconds when the event occurred',
+    },
+    payload: {
+      account_id: {
+        type: 'string',
+        description: 'Zoom account ID',
+      },
+      object: {
+        type: 'object',
+        description: 'Cloud recording details (aligns with Zoom cloud recording objects)',
+        id: { type: 'number', description: 'Meeting ID' },
+        uuid: { type: 'string', description: 'Meeting UUID' },
+        topic: { type: 'string', description: 'Meeting topic' },
+        meeting_type: {
+          type: 'number',
+          description: 'Meeting type (when provided; maps to Zoom `type`)',
+        },
+        host_id: { type: 'string', description: 'Host user ID' },
+        host_email: { type: 'string', description: 'Host email' },
+        start_time: { type: 'string', description: 'Recording start time (ISO 8601)' },
+        timezone: { type: 'string', description: 'Meeting timezone (when provided)' },
+        agenda: {
+          type: 'string',
+          description: 'Meeting agenda (when provided)',
+        },
+        duration: { type: 'number', description: 'Recording duration in minutes' },
+        total_size: { type: 'number', description: 'Total recording size in bytes' },
+        recording_count: { type: 'number', description: 'Number of recording files' },
+        share_url: { type: 'string', description: 'URL to share the recording' },
+        recording_files: {
+          type: 'json',
+          description:
+            'Array of recording file objects (e.g. id, file_type, play_url, download_url) per Zoom cloud recording payloads',
+        },
+      },
+    },
+  }
+}
+
+/**
+ * Builds outputs for generic webhook (any event type).
+ */
+export function buildGenericOutputs(): Record<string, TriggerOutput> {
+  return {
+    event: {
+      type: 'string',
+      description: 'The webhook event type (e.g., meeting.started, recording.completed)',
+    },
+    event_ts: {
+      type: 'number',
+      description: 'Unix timestamp in milliseconds when the event occurred',
+    },
+    payload: {
+      type: 'json',
+      description: 'Complete webhook payload (structure varies by event type)',
+    },
+  }
+}
diff --git a/apps/sim/triggers/zoom/webhook.ts b/apps/sim/triggers/zoom/webhook.ts
new file mode 100644
index 00000000000..b7695c2fa52
--- /dev/null
+++ b/apps/sim/triggers/zoom/webhook.ts
@@ -0,0 +1,37 @@
+import { ZoomIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import type { TriggerConfig } from '@/triggers/types'
+import {
+  buildGenericOutputs,
+  zoomSecretTokenField,
+  zoomSetupInstructions,
+  zoomTriggerOptions,
+} from '@/triggers/zoom/utils'
+
+/**
+ * Generic Zoom webhook trigger that accepts any event type.
+ */
+export const zoomWebhookTrigger: TriggerConfig = {
+  id: 'zoom_webhook',
+  name: 'Zoom Webhook (All Events)',
+  provider: 'zoom',
+  description: 'Trigger workflow on any Zoom webhook event',
+  version: '1.0.0',
+  icon: ZoomIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'zoom_webhook',
+    triggerOptions: zoomTriggerOptions,
+    setupInstructions: zoomSetupInstructions('generic'),
+    extraFields: [zoomSecretTokenField('zoom_webhook')],
+  }),
+
+  outputs: buildGenericOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/packages/db/migrations/0186_greedy_jocasta.sql b/packages/db/migrations/0186_greedy_jocasta.sql
new file mode 100644
index 00000000000..0df31a03e4f
--- /dev/null
+++ b/packages/db/migrations/0186_greedy_jocasta.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "workflow_folder" ADD COLUMN "archived_at" timestamp;--> statement-breakpoint
+CREATE INDEX "workflow_folder_archived_at_idx" ON "workflow_folder" USING btree ("archived_at");
\ No newline at end of file
diff --git a/packages/db/migrations/meta/0186_snapshot.json b/packages/db/migrations/meta/0186_snapshot.json
new file mode 100644
index 00000000000..6c16065a2bd
--- /dev/null
+++ b/packages/db/migrations/meta/0186_snapshot.json
@@ -0,0 +1,14639 @@
+{
+  "id": "c30a5e0e-2a25-4755-91cf-16ec58d7e0ec",
+  "prevId": "6e2ceca4-71d2-4efa-8d27-1141174a92c2",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.a2a_agent": {
+      "name": "a2a_agent",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "version": {
+          "name": "version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'1.0.0'"
+        },
+        "capabilities": {
+          "name": "capabilities",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "skills": {
+          "name": "skills",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "authentication": {
+          "name": "authentication",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "signatures": {
+          "name": "signatures",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "is_published": {
+          "name": "is_published",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "published_at": {
+          "name": "published_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "a2a_agent_workflow_id_idx": {
+          "name": "a2a_agent_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_created_by_idx": {
+          "name": "a2a_agent_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_workspace_workflow_unique": {
+          "name": "a2a_agent_workspace_workflow_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"a2a_agent\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_agent_archived_at_idx": {
+          "name": "a2a_agent_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_agent_workspace_id_workspace_id_fk": {
+          "name": "a2a_agent_workspace_id_workspace_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "a2a_agent_workflow_id_workflow_id_fk": {
+          "name": "a2a_agent_workflow_id_workflow_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "a2a_agent_created_by_user_id_fk": {
+          "name": "a2a_agent_created_by_user_id_fk",
+          "tableFrom": "a2a_agent",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.a2a_push_notification_config": {
+      "name": "a2a_push_notification_config",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "auth_schemes": {
+          "name": "auth_schemes",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "auth_credentials": {
+          "name": "auth_credentials",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "a2a_push_notification_config_task_unique": {
+          "name": "a2a_push_notification_config_task_unique",
+          "columns": [
+            {
+              "expression": "task_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_push_notification_config_task_id_a2a_task_id_fk": {
+          "name": "a2a_push_notification_config_task_id_a2a_task_id_fk",
+          "tableFrom": "a2a_push_notification_config",
+          "tableTo": "a2a_task",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.a2a_task": {
+      "name": "a2a_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "agent_id": {
+          "name": "agent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "a2a_task_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'submitted'"
+        },
+        "messages": {
+          "name": "messages",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "artifacts": {
+          "name": "artifacts",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "a2a_task_agent_id_idx": {
+          "name": "a2a_task_agent_id_idx",
+          "columns": [
+            {
+              "expression": "agent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_session_id_idx": {
+          "name": "a2a_task_session_id_idx",
+          "columns": [
+            {
+              "expression": "session_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_status_idx": {
+          "name": "a2a_task_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_execution_id_idx": {
+          "name": "a2a_task_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "a2a_task_created_at_idx": {
+          "name": "a2a_task_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "a2a_task_agent_id_a2a_agent_id_fk": {
+          "name": "a2a_task_agent_id_a2a_agent_id_fk",
+          "tableFrom": "a2a_task",
+          "tableTo": "a2a_agent",
+          "columnsFrom": ["agent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.academy_certificate": {
+      "name": "academy_certificate",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "academy_cert_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "issued_at": {
+          "name": "issued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "certificate_number": {
+          "name": "certificate_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "academy_certificate_user_id_idx": {
+          "name": "academy_certificate_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_course_id_idx": {
+          "name": "academy_certificate_course_id_idx",
+          "columns": [
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_user_course_unique": {
+          "name": "academy_certificate_user_course_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_number_idx": {
+          "name": "academy_certificate_number_idx",
+          "columns": [
+            {
+              "expression": "certificate_number",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_status_idx": {
+          "name": "academy_certificate_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "academy_certificate_user_id_user_id_fk": {
+          "name": "academy_certificate_user_id_user_id_fk",
+          "tableFrom": "academy_certificate",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "academy_certificate_certificate_number_unique": {
+          "name": "academy_certificate_certificate_number_unique",
+          "nullsNotDistinct": false,
+          "columns": ["certificate_number"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "account_user_id_idx": {
+          "name": "account_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_account_on_account_id_provider_id": {
+          "name": "idx_account_on_account_id_provider_id",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "account_user_id_user_id_fk": {
+          "name": "account_user_id_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_key": {
+      "name": "api_key",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'personal'"
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "api_key_workspace_type_idx": {
+          "name": "api_key_workspace_type_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "api_key_user_type_idx": {
+          "name": "api_key_user_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "api_key_user_id_user_id_fk": {
+          "name": "api_key_user_id_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_workspace_id_workspace_id_fk": {
+          "name": "api_key_workspace_id_workspace_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_created_by_user_id_fk": {
+          "name": "api_key_created_by_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_key_key_unique": {
+          "name": "api_key_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {
+        "workspace_type_check": {
+          "name": "workspace_type_check",
+          "value": "(type = 'workspace' AND workspace_id IS NOT NULL) OR (type = 'personal' AND workspace_id IS NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.async_jobs": {
+      "name": "async_jobs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_at": {
+          "name": "run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 3
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "output": {
+          "name": "output",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "async_jobs_status_started_at_idx": {
+          "name": "async_jobs_status_started_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "async_jobs_status_completed_at_idx": {
+          "name": "async_jobs_status_completed_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.audit_log": {
+      "name": "audit_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_id": {
+          "name": "actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_type": {
+          "name": "resource_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_id": {
+          "name": "resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_name": {
+          "name": "actor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_email": {
+          "name": "actor_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resource_name": {
+          "name": "resource_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "audit_log_workspace_created_idx": {
+          "name": "audit_log_workspace_created_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_actor_created_idx": {
+          "name": "audit_log_actor_created_idx",
+          "columns": [
+            {
+              "expression": "actor_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_resource_idx": {
+          "name": "audit_log_resource_idx",
+          "columns": [
+            {
+              "expression": "resource_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_action_idx": {
+          "name": "audit_log_action_idx",
+          "columns": [
+            {
+              "expression": "action",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "audit_log_workspace_id_workspace_id_fk": {
+          "name": "audit_log_workspace_id_workspace_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "audit_log_actor_id_user_id_fk": {
+          "name": "audit_log_actor_id_user_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "user",
+          "columnsFrom": ["actor_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chat": {
+      "name": "chat",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "output_configs": {
+          "name": "output_configs",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "identifier_idx": {
+          "name": "identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"chat\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "chat_archived_at_idx": {
+          "name": "chat_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "chat_workflow_id_workflow_id_fk": {
+          "name": "chat_workflow_id_workflow_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "chat_user_id_user_id_fk": {
+          "name": "chat_user_id_user_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_async_tool_calls": {
+      "name": "copilot_async_tool_calls",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "checkpoint_id": {
+          "name": "checkpoint_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tool_call_id": {
+          "name": "tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "args": {
+          "name": "args",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_async_tool_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "result": {
+          "name": "result",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_async_tool_calls_run_id_idx": {
+          "name": "copilot_async_tool_calls_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_checkpoint_id_idx": {
+          "name": "copilot_async_tool_calls_checkpoint_id_idx",
+          "columns": [
+            {
+              "expression": "checkpoint_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_idx": {
+          "name": "copilot_async_tool_calls_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_status_idx": {
+          "name": "copilot_async_tool_calls_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_run_status_idx": {
+          "name": "copilot_async_tool_calls_run_status_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_unique": {
+          "name": "copilot_async_tool_calls_tool_call_id_unique",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_async_tool_calls_run_id_copilot_runs_id_fk": {
+          "name": "copilot_async_tool_calls_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk": {
+          "name": "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_run_checkpoints",
+          "columnsFrom": ["checkpoint_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_chats": {
+      "name": "copilot_chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "chat_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'copilot'"
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "messages": {
+          "name": "messages",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'claude-3-7-sonnet-latest'"
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "preview_yaml": {
+          "name": "preview_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan_artifact": {
+          "name": "plan_artifact",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resources": {
+          "name": "resources",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_chats_user_id_idx": {
+          "name": "copilot_chats_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_workflow_id_idx": {
+          "name": "copilot_chats_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workflow_idx": {
+          "name": "copilot_chats_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workspace_idx": {
+          "name": "copilot_chats_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_created_at_idx": {
+          "name": "copilot_chats_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_updated_at_idx": {
+          "name": "copilot_chats_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_chats_user_id_user_id_fk": {
+          "name": "copilot_chats_user_id_user_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workflow_id_workflow_id_fk": {
+          "name": "copilot_chats_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workspace_id_workspace_id_fk": {
+          "name": "copilot_chats_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_feedback": {
+      "name": "copilot_feedback",
+      "schema": "",
+      "columns": {
+        "feedback_id": {
+          "name": "feedback_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_query": {
+          "name": "user_query",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent_response": {
+          "name": "agent_response",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_positive": {
+          "name": "is_positive",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "feedback": {
+          "name": "feedback",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_yaml": {
+          "name": "workflow_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_feedback_user_id_idx": {
+          "name": "copilot_feedback_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_chat_id_idx": {
+          "name": "copilot_feedback_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_user_chat_idx": {
+          "name": "copilot_feedback_user_chat_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_is_positive_idx": {
+          "name": "copilot_feedback_is_positive_idx",
+          "columns": [
+            {
+              "expression": "is_positive",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_created_at_idx": {
+          "name": "copilot_feedback_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_feedback_user_id_user_id_fk": {
+          "name": "copilot_feedback_user_id_user_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_feedback_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_feedback_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_run_checkpoints": {
+      "name": "copilot_run_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pending_tool_call_id": {
+          "name": "pending_tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "conversation_snapshot": {
+          "name": "conversation_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "agent_state": {
+          "name": "agent_state",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "provider_request": {
+          "name": "provider_request",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_run_checkpoints_run_id_idx": {
+          "name": "copilot_run_checkpoints_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_pending_tool_call_id_idx": {
+          "name": "copilot_run_checkpoints_pending_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_run_pending_tool_unique": {
+          "name": "copilot_run_checkpoints_run_pending_tool_unique",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_run_checkpoints_run_id_copilot_runs_id_fk": {
+          "name": "copilot_run_checkpoints_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_run_checkpoints",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_runs": {
+      "name": "copilot_runs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_run_id": {
+          "name": "parent_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stream_id": {
+          "name": "stream_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent": {
+          "name": "agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_run_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "request_context": {
+          "name": "request_context",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "copilot_runs_execution_id_idx": {
+          "name": "copilot_runs_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_parent_run_id_idx": {
+          "name": "copilot_runs_parent_run_id_idx",
+          "columns": [
+            {
+              "expression": "parent_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_id_idx": {
+          "name": "copilot_runs_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_user_id_idx": {
+          "name": "copilot_runs_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workflow_id_idx": {
+          "name": "copilot_runs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workspace_id_idx": {
+          "name": "copilot_runs_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_status_idx": {
+          "name": "copilot_runs_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_execution_idx": {
+          "name": "copilot_runs_chat_execution_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_execution_started_at_idx": {
+          "name": "copilot_runs_execution_started_at_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_stream_id_unique": {
+          "name": "copilot_runs_stream_id_unique",
+          "columns": [
+            {
+              "expression": "stream_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_runs_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_runs_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_user_id_user_id_fk": {
+          "name": "copilot_runs_user_id_user_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workflow_id_workflow_id_fk": {
+          "name": "copilot_runs_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workspace_id_workspace_id_fk": {
+          "name": "copilot_runs_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_workflow_read_hashes": {
+      "name": "copilot_workflow_read_hashes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_workflow_read_hashes_chat_id_idx": {
+          "name": "copilot_workflow_read_hashes_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_workflow_id_idx": {
+          "name": "copilot_workflow_read_hashes_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_chat_workflow_unique": {
+          "name": "copilot_workflow_read_hashes_chat_workflow_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_workflow_read_hashes_workflow_id_workflow_id_fk": {
+          "name": "copilot_workflow_read_hashes_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential": {
+      "name": "credential",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "credential_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_key": {
+          "name": "env_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_owner_user_id": {
+          "name": "env_owner_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_service_account_key": {
+          "name": "encrypted_service_account_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_workspace_id_idx": {
+          "name": "credential_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_type_idx": {
+          "name": "credential_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_provider_id_idx": {
+          "name": "credential_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_account_id_idx": {
+          "name": "credential_account_id_idx",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_env_owner_user_id_idx": {
+          "name": "credential_env_owner_user_id_idx",
+          "columns": [
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_account_unique": {
+          "name": "credential_workspace_account_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "account_id IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_env_unique": {
+          "name": "credential_workspace_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_workspace'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_personal_env_unique": {
+          "name": "credential_workspace_personal_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_personal'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_workspace_id_workspace_id_fk": {
+          "name": "credential_workspace_id_workspace_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_account_id_account_id_fk": {
+          "name": "credential_account_id_account_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "account",
+          "columnsFrom": ["account_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_env_owner_user_id_user_id_fk": {
+          "name": "credential_env_owner_user_id_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["env_owner_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_created_by_user_id_fk": {
+          "name": "credential_created_by_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "credential_oauth_source_check": {
+          "name": "credential_oauth_source_check",
+          "value": "(type <> 'oauth') OR (account_id IS NOT NULL AND provider_id IS NOT NULL)"
+        },
+        "credential_workspace_env_source_check": {
+          "name": "credential_workspace_env_source_check",
+          "value": "(type <> 'env_workspace') OR (env_key IS NOT NULL AND env_owner_user_id IS NULL)"
+        },
+        "credential_personal_env_source_check": {
+          "name": "credential_personal_env_source_check",
+          "value": "(type <> 'env_personal') OR (env_key IS NOT NULL AND env_owner_user_id IS NOT NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.credential_member": {
+      "name": "credential_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "credential_member_role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_member_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_member_user_id_idx": {
+          "name": "credential_member_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_role_idx": {
+          "name": "credential_member_role_idx",
+          "columns": [
+            {
+              "expression": "role",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_status_idx": {
+          "name": "credential_member_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_unique": {
+          "name": "credential_member_unique",
+          "columns": [
+            {
+              "expression": "credential_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_member_credential_id_credential_id_fk": {
+          "name": "credential_member_credential_id_credential_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_user_id_user_id_fk": {
+          "name": "credential_member_user_id_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_invited_by_user_id_fk": {
+          "name": "credential_member_invited_by_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set": {
+      "name": "credential_set",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_created_by_idx": {
+          "name": "credential_set_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_org_name_unique": {
+          "name": "credential_set_org_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_provider_id_idx": {
+          "name": "credential_set_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_organization_id_organization_id_fk": {
+          "name": "credential_set_organization_id_organization_id_fk",
+          "tableFrom": "credential_set",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_created_by_user_id_fk": {
+          "name": "credential_set_created_by_user_id_fk",
+          "tableFrom": "credential_set",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set_invitation": {
+      "name": "credential_set_invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_set_invitation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "accepted_at": {
+          "name": "accepted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "accepted_by_user_id": {
+          "name": "accepted_by_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_invitation_set_id_idx": {
+          "name": "credential_set_invitation_set_id_idx",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_token_idx": {
+          "name": "credential_set_invitation_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_status_idx": {
+          "name": "credential_set_invitation_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_invitation_expires_at_idx": {
+          "name": "credential_set_invitation_expires_at_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_invitation_credential_set_id_credential_set_id_fk": {
+          "name": "credential_set_invitation_credential_set_id_credential_set_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_invitation_invited_by_user_id_fk": {
+          "name": "credential_set_invitation_invited_by_user_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_invitation_accepted_by_user_id_user_id_fk": {
+          "name": "credential_set_invitation_accepted_by_user_id_user_id_fk",
+          "tableFrom": "credential_set_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["accepted_by_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "credential_set_invitation_token_unique": {
+          "name": "credential_set_invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential_set_member": {
+      "name": "credential_set_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_set_member_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_set_member_user_id_idx": {
+          "name": "credential_set_member_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_member_unique": {
+          "name": "credential_set_member_unique",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_set_member_status_idx": {
+          "name": "credential_set_member_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_set_member_credential_set_id_credential_set_id_fk": {
+          "name": "credential_set_member_credential_set_id_credential_set_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_member_user_id_user_id_fk": {
+          "name": "credential_set_member_user_id_user_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_set_member_invited_by_user_id_fk": {
+          "name": "credential_set_member_invited_by_user_id_fk",
+          "tableFrom": "credential_set_member",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.custom_tools": {
+      "name": "custom_tools",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schema": {
+          "name": "schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "custom_tools_workspace_id_idx": {
+          "name": "custom_tools_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "custom_tools_workspace_title_unique": {
+          "name": "custom_tools_workspace_title_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "title",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "custom_tools_workspace_id_workspace_id_fk": {
+          "name": "custom_tools_workspace_id_workspace_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "custom_tools_user_id_user_id_fk": {
+          "name": "custom_tools_user_id_user_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.docs_embeddings": {
+      "name": "docs_embeddings",
+      "schema": "",
+      "columns": {
+        "chunk_id": {
+          "name": "chunk_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chunk_text": {
+          "name": "chunk_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_document": {
+          "name": "source_document",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_link": {
+          "name": "source_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_text": {
+          "name": "header_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_level": {
+          "name": "header_level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "chunk_text_tsv": {
+          "name": "chunk_text_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"docs_embeddings\".\"chunk_text\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "docs_emb_source_document_idx": {
+          "name": "docs_emb_source_document_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_header_level_idx": {
+          "name": "docs_emb_header_level_idx",
+          "columns": [
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_source_header_idx": {
+          "name": "docs_emb_source_header_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_model_idx": {
+          "name": "docs_emb_model_idx",
+          "columns": [
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_created_at_idx": {
+          "name": "docs_emb_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_embedding_vector_hnsw_idx": {
+          "name": "docs_embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "docs_emb_metadata_gin_idx": {
+          "name": "docs_emb_metadata_gin_idx",
+          "columns": [
+            {
+              "expression": "metadata",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "docs_emb_chunk_text_fts_idx": {
+          "name": "docs_emb_chunk_text_fts_idx",
+          "columns": [
+            {
+              "expression": "chunk_text_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "docs_embedding_not_null_check": {
+          "name": "docs_embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        },
+        "docs_header_level_check": {
+          "name": "docs_header_level_check",
+          "value": "\"header_level\" >= 1 AND \"header_level\" <= 6"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.document": {
+      "name": "document",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_url": {
+          "name": "file_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_size": {
+          "name": "file_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mime_type": {
+          "name": "mime_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_count": {
+          "name": "chunk_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "character_count": {
+          "name": "character_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "processing_status": {
+          "name": "processing_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_completed_at": {
+          "name": "processing_completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_error": {
+          "name": "processing_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_excluded": {
+          "name": "user_excluded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_url": {
+          "name": "source_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "doc_kb_id_idx": {
+          "name": "doc_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_filename_idx": {
+          "name": "doc_filename_idx",
+          "columns": [
+            {
+              "expression": "filename",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_processing_status_idx": {
+          "name": "doc_processing_status_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "processing_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_external_id_idx": {
+          "name": "doc_connector_external_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "external_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"document\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_id_idx": {
+          "name": "doc_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_archived_at_idx": {
+          "name": "doc_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_deleted_at_idx": {
+          "name": "doc_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag1_idx": {
+          "name": "doc_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag2_idx": {
+          "name": "doc_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag3_idx": {
+          "name": "doc_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag4_idx": {
+          "name": "doc_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag5_idx": {
+          "name": "doc_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag6_idx": {
+          "name": "doc_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag7_idx": {
+          "name": "doc_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number1_idx": {
+          "name": "doc_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number2_idx": {
+          "name": "doc_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number3_idx": {
+          "name": "doc_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number4_idx": {
+          "name": "doc_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number5_idx": {
+          "name": "doc_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date1_idx": {
+          "name": "doc_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date2_idx": {
+          "name": "doc_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean1_idx": {
+          "name": "doc_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean2_idx": {
+          "name": "doc_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean3_idx": {
+          "name": "doc_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "document_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "document_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "document_connector_id_knowledge_connector_id_fk": {
+          "name": "document_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.embedding": {
+      "name": "embedding",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_id": {
+          "name": "document_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_index": {
+          "name": "chunk_index",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_hash": {
+          "name": "chunk_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content_length": {
+          "name": "content_length",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "start_offset": {
+          "name": "start_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "end_offset": {
+          "name": "end_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "content_tsv": {
+          "name": "content_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"embedding\".\"content\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "emb_kb_id_idx": {
+          "name": "emb_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_id_idx": {
+          "name": "emb_doc_id_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_chunk_idx": {
+          "name": "emb_doc_chunk_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chunk_index",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_model_idx": {
+          "name": "emb_kb_model_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_enabled_idx": {
+          "name": "emb_kb_enabled_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_enabled_idx": {
+          "name": "emb_doc_enabled_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "embedding_vector_hnsw_idx": {
+          "name": "embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "emb_tag1_idx": {
+          "name": "emb_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag2_idx": {
+          "name": "emb_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag3_idx": {
+          "name": "emb_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag4_idx": {
+          "name": "emb_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag5_idx": {
+          "name": "emb_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag6_idx": {
+          "name": "emb_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag7_idx": {
+          "name": "emb_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number1_idx": {
+          "name": "emb_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number2_idx": {
+          "name": "emb_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number3_idx": {
+          "name": "emb_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number4_idx": {
+          "name": "emb_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number5_idx": {
+          "name": "emb_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date1_idx": {
+          "name": "emb_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date2_idx": {
+          "name": "emb_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean1_idx": {
+          "name": "emb_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean2_idx": {
+          "name": "emb_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean3_idx": {
+          "name": "emb_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_content_fts_idx": {
+          "name": "emb_content_fts_idx",
+          "columns": [
+            {
+              "expression": "content_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "embedding_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "embedding_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "embedding_document_id_document_id_fk": {
+          "name": "embedding_document_id_document_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "document",
+          "columnsFrom": ["document_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "embedding_not_null_check": {
+          "name": "embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.environment": {
+      "name": "environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_user_id_user_id_fk": {
+          "name": "environment_user_id_user_id_fk",
+          "tableFrom": "environment",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "environment_user_id_unique": {
+          "name": "environment_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.form": {
+      "name": "form",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "show_branding": {
+          "name": "show_branding",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "form_identifier_idx": {
+          "name": "form_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"form\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_workflow_id_idx": {
+          "name": "form_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_user_id_idx": {
+          "name": "form_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "form_archived_at_idx": {
+          "name": "form_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "form_workflow_id_workflow_id_fk": {
+          "name": "form_workflow_id_workflow_id_fk",
+          "tableFrom": "form",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "form_user_id_user_id_fk": {
+          "name": "form_user_id_user_id_fk",
+          "tableFrom": "form",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.idempotency_key": {
+      "name": "idempotency_key",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "result": {
+          "name": "result",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idempotency_key_created_at_idx": {
+          "name": "idempotency_key_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation": {
+      "name": "invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "invitation_email_idx": {
+          "name": "invitation_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_organization_id_idx": {
+          "name": "invitation_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_inviter_id_user_id_fk": {
+          "name": "invitation_inviter_id_user_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "user",
+          "columnsFrom": ["inviter_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_organization_id_organization_id_fk": {
+          "name": "invitation_organization_id_organization_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.job_execution_logs": {
+      "name": "job_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "schedule_id": {
+          "name": "schedule_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "job_execution_logs_schedule_id_idx": {
+          "name": "job_execution_logs_schedule_id_idx",
+          "columns": [
+            {
+              "expression": "schedule_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_workspace_started_at_idx": {
+          "name": "job_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_execution_id_unique": {
+          "name": "job_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_trigger_idx": {
+          "name": "job_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "job_execution_logs_schedule_id_workflow_schedule_id_fk": {
+          "name": "job_execution_logs_schedule_id_workflow_schedule_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workflow_schedule",
+          "columnsFrom": ["schedule_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "job_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "job_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.jwks": {
+      "name": "jwks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "public_key": {
+          "name": "public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "private_key": {
+          "name": "private_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base": {
+      "name": "knowledge_base",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "embedding_dimension": {
+          "name": "embedding_dimension",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1536
+        },
+        "chunking_config": {
+          "name": "chunking_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{\"maxSize\": 1024, \"minSize\": 1, \"overlap\": 200}'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_user_id_idx": {
+          "name": "kb_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_id_idx": {
+          "name": "kb_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_user_workspace_idx": {
+          "name": "kb_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_deleted_at_idx": {
+          "name": "kb_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_name_active_unique": {
+          "name": "kb_workspace_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"knowledge_base\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_user_id_user_id_fk": {
+          "name": "knowledge_base_user_id_user_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "knowledge_base_workspace_id_workspace_id_fk": {
+          "name": "knowledge_base_workspace_id_workspace_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base_tag_definitions": {
+      "name": "knowledge_base_tag_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag_slot": {
+          "name": "tag_slot",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "field_type": {
+          "name": "field_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_tag_definitions_kb_slot_idx": {
+          "name": "kb_tag_definitions_kb_slot_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "tag_slot",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_display_name_idx": {
+          "name": "kb_tag_definitions_kb_display_name_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_id_idx": {
+          "name": "kb_tag_definitions_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_base_tag_definitions",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector": {
+      "name": "knowledge_connector",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connector_type": {
+          "name": "connector_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_config": {
+          "name": "source_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sync_mode": {
+          "name": "sync_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'full'"
+        },
+        "sync_interval_minutes": {
+          "name": "sync_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1440
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_sync_at": {
+          "name": "last_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_error": {
+          "name": "last_sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_doc_count": {
+          "name": "last_sync_doc_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_sync_at": {
+          "name": "next_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "consecutive_failures": {
+          "name": "consecutive_failures",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kc_knowledge_base_id_idx": {
+          "name": "kc_knowledge_base_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_status_next_sync_idx": {
+          "name": "kc_status_next_sync_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_sync_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_archived_at_idx": {
+          "name": "kc_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_deleted_at_idx": {
+          "name": "kc_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_connector_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_connector",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector_sync_log": {
+      "name": "knowledge_connector_sync_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "docs_added": {
+          "name": "docs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_updated": {
+          "name": "docs_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_deleted": {
+          "name": "docs_deleted",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_unchanged": {
+          "name": "docs_unchanged",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_failed": {
+          "name": "docs_failed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kcsl_connector_id_idx": {
+          "name": "kcsl_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk": {
+          "name": "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "knowledge_connector_sync_log",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mcp_servers": {
+      "name": "mcp_servers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "transport": {
+          "name": "transport",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "headers": {
+          "name": "headers",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "timeout": {
+          "name": "timeout",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 30000
+        },
+        "retries": {
+          "name": "retries",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 3
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_connected": {
+          "name": "last_connected",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connection_status": {
+          "name": "connection_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'disconnected'"
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_config": {
+          "name": "status_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "tool_count": {
+          "name": "tool_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_tools_refresh": {
+          "name": "last_tools_refresh",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_requests": {
+          "name": "total_requests",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mcp_servers_workspace_enabled_idx": {
+          "name": "mcp_servers_workspace_enabled_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "mcp_servers_workspace_deleted_idx": {
+          "name": "mcp_servers_workspace_deleted_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mcp_servers_workspace_id_workspace_id_fk": {
+          "name": "mcp_servers_workspace_id_workspace_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mcp_servers_created_by_user_id_fk": {
+          "name": "mcp_servers_created_by_user_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.member": {
+      "name": "member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "member_user_id_unique": {
+          "name": "member_user_id_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "member_organization_id_idx": {
+          "name": "member_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "member_user_id_user_id_fk": {
+          "name": "member_user_id_user_id_fk",
+          "tableFrom": "member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "member_organization_id_organization_id_fk": {
+          "name": "member_organization_id_organization_id_fk",
+          "tableFrom": "member",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.memory": {
+      "name": "memory",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "memory_key_idx": {
+          "name": "memory_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_idx": {
+          "name": "memory_workspace_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_key_idx": {
+          "name": "memory_workspace_key_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "memory_workspace_id_workspace_id_fk": {
+          "name": "memory_workspace_id_workspace_id_fk",
+          "tableFrom": "memory",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_allowed_sender": {
+      "name": "mothership_inbox_allowed_sender",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "label": {
+          "name": "label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "added_by": {
+          "name": "added_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "inbox_sender_ws_email_idx": {
+          "name": "inbox_sender_ws_email_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_allowed_sender_added_by_user_id_fk": {
+          "name": "mothership_inbox_allowed_sender_added_by_user_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "user",
+          "columnsFrom": ["added_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_task": {
+      "name": "mothership_inbox_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_email": {
+          "name": "from_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_name": {
+          "name": "from_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subject": {
+          "name": "subject",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body_preview": {
+          "name": "body_preview",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_text": {
+          "name": "body_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_html": {
+          "name": "body_html",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_message_id": {
+          "name": "email_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "in_reply_to": {
+          "name": "in_reply_to",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_message_id": {
+          "name": "response_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "agentmail_message_id": {
+          "name": "agentmail_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'received'"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_job_id": {
+          "name": "trigger_job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "result_summary": {
+          "name": "result_summary",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejection_reason": {
+          "name": "rejection_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_attachments": {
+          "name": "has_attachments",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "cc_recipients": {
+          "name": "cc_recipients",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "inbox_task_ws_created_at_idx": {
+          "name": "inbox_task_ws_created_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_ws_status_idx": {
+          "name": "inbox_task_ws_status_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_response_msg_id_idx": {
+          "name": "inbox_task_response_msg_id_idx",
+          "columns": [
+            {
+              "expression": "response_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_email_msg_id_idx": {
+          "name": "inbox_task_email_msg_id_idx",
+          "columns": [
+            {
+              "expression": "email_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_task_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_task_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_task_chat_id_copilot_chats_id_fk": {
+          "name": "mothership_inbox_task_chat_id_copilot_chats_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_webhook": {
+      "name": "mothership_inbox_webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "webhook_id": {
+          "name": "webhook_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "mothership_inbox_webhook_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_webhook_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_webhook",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "mothership_inbox_webhook_workspace_id_unique": {
+          "name": "mothership_inbox_webhook_workspace_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["workspace_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_access_token": {
+      "name": "oauth_access_token",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_access_token_access_token_idx": {
+          "name": "oauth_access_token_access_token_idx",
+          "columns": [
+            {
+              "expression": "access_token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "oauth_access_token_refresh_token_idx": {
+          "name": "oauth_access_token_refresh_token_idx",
+          "columns": [
+            {
+              "expression": "refresh_token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_access_token_client_id_oauth_application_client_id_fk": {
+          "name": "oauth_access_token_client_id_oauth_application_client_id_fk",
+          "tableFrom": "oauth_access_token",
+          "tableTo": "oauth_application",
+          "columnsFrom": ["client_id"],
+          "columnsTo": ["client_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_access_token_user_id_user_id_fk": {
+          "name": "oauth_access_token_user_id_user_id_fk",
+          "tableFrom": "oauth_access_token",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_access_token_access_token_unique": {
+          "name": "oauth_access_token_access_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["access_token"]
+        },
+        "oauth_access_token_refresh_token_unique": {
+          "name": "oauth_access_token_refresh_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["refresh_token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_application": {
+      "name": "oauth_application",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_secret": {
+          "name": "client_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "redirect_urls": {
+          "name": "redirect_urls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_application_client_id_idx": {
+          "name": "oauth_application_client_id_idx",
+          "columns": [
+            {
+              "expression": "client_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_application_user_id_user_id_fk": {
+          "name": "oauth_application_user_id_user_id_fk",
+          "tableFrom": "oauth_application",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_application_client_id_unique": {
+          "name": "oauth_application_client_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["client_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_consent": {
+      "name": "oauth_consent",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "client_id": {
+          "name": "client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scopes": {
+          "name": "scopes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "consent_given": {
+          "name": "consent_given",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "oauth_consent_user_client_idx": {
+          "name": "oauth_consent_user_client_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "client_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_consent_client_id_oauth_application_client_id_fk": {
+          "name": "oauth_consent_client_id_oauth_application_client_id_fk",
+          "tableFrom": "oauth_consent",
+          "tableTo": "oauth_application",
+          "columnsFrom": ["client_id"],
+          "columnsTo": ["client_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "oauth_consent_user_id_user_id_fk": {
+          "name": "oauth_consent_user_id_user_id_fk",
+          "tableFrom": "oauth_consent",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organization": {
+      "name": "organization",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_usage_limit": {
+          "name": "org_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "departed_member_usage": {
+          "name": "departed_member_usage",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.paused_executions": {
+      "name": "paused_executions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_snapshot": {
+          "name": "execution_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pause_points": {
+          "name": "pause_points",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_pause_count": {
+          "name": "total_pause_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resumed_count": {
+          "name": "resumed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'paused'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "paused_at": {
+          "name": "paused_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "paused_executions_workflow_id_idx": {
+          "name": "paused_executions_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_status_idx": {
+          "name": "paused_executions_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_execution_id_unique": {
+          "name": "paused_executions_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "paused_executions_workflow_id_workflow_id_fk": {
+          "name": "paused_executions_workflow_id_workflow_id_fk",
+          "tableFrom": "paused_executions",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.pending_credential_draft": {
+      "name": "pending_credential_draft",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "pending_draft_user_provider_ws": {
+          "name": "pending_draft_user_provider_ws",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "pending_credential_draft_user_id_user_id_fk": {
+          "name": "pending_credential_draft_user_id_user_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_workspace_id_workspace_id_fk": {
+          "name": "pending_credential_draft_workspace_id_workspace_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_credential_id_credential_id_fk": {
+          "name": "pending_credential_draft_credential_id_credential_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group": {
+      "name": "permission_group",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "auto_add_new_members": {
+          "name": "auto_add_new_members",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "permission_group_created_by_idx": {
+          "name": "permission_group_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_org_name_unique": {
+          "name": "permission_group_org_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_org_auto_add_unique": {
+          "name": "permission_group_org_auto_add_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "auto_add_new_members = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_organization_id_organization_id_fk": {
+          "name": "permission_group_organization_id_organization_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_created_by_user_id_fk": {
+          "name": "permission_group_created_by_user_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group_member": {
+      "name": "permission_group_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "permission_group_id": {
+          "name": "permission_group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "assigned_by": {
+          "name": "assigned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "assigned_at": {
+          "name": "assigned_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permission_group_member_group_id_idx": {
+          "name": "permission_group_member_group_id_idx",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_member_user_id_unique": {
+          "name": "permission_group_member_user_id_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_member_permission_group_id_permission_group_id_fk": {
+          "name": "permission_group_member_permission_group_id_permission_group_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "permission_group",
+          "columnsFrom": ["permission_group_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_user_id_user_id_fk": {
+          "name": "permission_group_member_user_id_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_assigned_by_user_id_fk": {
+          "name": "permission_group_member_assigned_by_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["assigned_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permissions": {
+      "name": "permissions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_type": {
+          "name": "entity_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_id": {
+          "name": "entity_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission_type": {
+          "name": "permission_type",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permissions_user_id_idx": {
+          "name": "permissions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_entity_idx": {
+          "name": "permissions_entity_idx",
+          "columns": [
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_type_idx": {
+          "name": "permissions_user_entity_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_permission_idx": {
+          "name": "permissions_user_entity_permission_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "permission_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_idx": {
+          "name": "permissions_user_entity_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_unique_constraint": {
+          "name": "permissions_unique_constraint",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permissions_user_id_user_id_fk": {
+          "name": "permissions_user_id_user_id_fk",
+          "tableFrom": "permissions",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.rate_limit_bucket": {
+      "name": "rate_limit_bucket",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "tokens": {
+          "name": "tokens",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_refill_at": {
+          "name": "last_refill_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.resume_queue": {
+      "name": "resume_queue",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "paused_execution_id": {
+          "name": "paused_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_execution_id": {
+          "name": "parent_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "new_execution_id": {
+          "name": "new_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "context_id": {
+          "name": "context_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resume_input": {
+          "name": "resume_input",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "queued_at": {
+          "name": "queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "failure_reason": {
+          "name": "failure_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "resume_queue_parent_status_idx": {
+          "name": "resume_queue_parent_status_idx",
+          "columns": [
+            {
+              "expression": "parent_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "queued_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "resume_queue_new_execution_idx": {
+          "name": "resume_queue_new_execution_idx",
+          "columns": [
+            {
+              "expression": "new_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "resume_queue_paused_execution_id_paused_executions_id_fk": {
+          "name": "resume_queue_paused_execution_id_paused_executions_id_fk",
+          "tableFrom": "resume_queue",
+          "tableTo": "paused_executions",
+          "columnsFrom": ["paused_execution_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "impersonated_by": {
+          "name": "impersonated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "session_user_id_idx": {
+          "name": "session_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "session_token_idx": {
+          "name": "session_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "session_active_organization_id_organization_id_fk": {
+          "name": "session_active_organization_id_organization_id_fk",
+          "tableFrom": "session",
+          "tableTo": "organization",
+          "columnsFrom": ["active_organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "session_token_unique": {
+          "name": "session_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.settings": {
+      "name": "settings",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "theme": {
+          "name": "theme",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'system'"
+        },
+        "auto_connect": {
+          "name": "auto_connect",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "telemetry_enabled": {
+          "name": "telemetry_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "email_preferences": {
+          "name": "email_preferences",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "billing_usage_notifications_enabled": {
+          "name": "billing_usage_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "show_training_controls": {
+          "name": "show_training_controls",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "super_user_mode_enabled": {
+          "name": "super_user_mode_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "error_notifications_enabled": {
+          "name": "error_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "snap_to_grid_size": {
+          "name": "snap_to_grid_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "show_action_bar": {
+          "name": "show_action_bar",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "copilot_enabled_models": {
+          "name": "copilot_enabled_models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "copilot_auto_allowed_tools": {
+          "name": "copilot_auto_allowed_tools",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "settings_user_id_user_id_fk": {
+          "name": "settings_user_id_user_id_fk",
+          "tableFrom": "settings",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "settings_user_id_unique": {
+          "name": "settings_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.skill": {
+      "name": "skill",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "skill_workspace_name_unique": {
+          "name": "skill_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "skill_workspace_id_workspace_id_fk": {
+          "name": "skill_workspace_id_workspace_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "skill_user_id_user_id_fk": {
+          "name": "skill_user_id_user_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sso_provider": {
+      "name": "sso_provider",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "domain": {
+          "name": "domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "oidc_config": {
+          "name": "oidc_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "saml_config": {
+          "name": "saml_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "sso_provider_provider_id_idx": {
+          "name": "sso_provider_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_domain_idx": {
+          "name": "sso_provider_domain_idx",
+          "columns": [
+            {
+              "expression": "domain",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_user_id_idx": {
+          "name": "sso_provider_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_organization_id_idx": {
+          "name": "sso_provider_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sso_provider_user_id_user_id_fk": {
+          "name": "sso_provider_user_id_user_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "sso_provider_organization_id_organization_id_fk": {
+          "name": "sso_provider_organization_id_organization_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.subscription": {
+      "name": "subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan": {
+          "name": "plan",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_subscription_id": {
+          "name": "stripe_subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_start": {
+          "name": "period_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_end": {
+          "name": "period_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at_period_end": {
+          "name": "cancel_at_period_end",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "seats": {
+          "name": "seats",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_start": {
+          "name": "trial_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_end": {
+          "name": "trial_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "subscription_reference_status_idx": {
+          "name": "subscription_reference_status_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "check_enterprise_metadata": {
+          "name": "check_enterprise_metadata",
+          "value": "plan != 'enterprise' OR metadata IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.template_creators": {
+      "name": "template_creators",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "reference_type": {
+          "name": "reference_type",
+          "type": "template_creator_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "profile_image_url": {
+          "name": "profile_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "details": {
+          "name": "details",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "verified": {
+          "name": "verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "template_creators_reference_idx": {
+          "name": "template_creators_reference_idx",
+          "columns": [
+            {
+              "expression": "reference_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_creators_reference_id_idx": {
+          "name": "template_creators_reference_id_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_creators_created_by_idx": {
+          "name": "template_creators_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "template_creators_created_by_user_id_fk": {
+          "name": "template_creators_created_by_user_id_fk",
+          "tableFrom": "template_creators",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.template_stars": {
+      "name": "template_stars",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "template_id": {
+          "name": "template_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "starred_at": {
+          "name": "starred_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "template_stars_user_id_idx": {
+          "name": "template_stars_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_id_idx": {
+          "name": "template_stars_template_id_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_user_template_idx": {
+          "name": "template_stars_user_template_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_user_idx": {
+          "name": "template_stars_template_user_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_starred_at_idx": {
+          "name": "template_stars_starred_at_idx",
+          "columns": [
+            {
+              "expression": "starred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_template_starred_at_idx": {
+          "name": "template_stars_template_starred_at_idx",
+          "columns": [
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "starred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "template_stars_user_template_unique": {
+          "name": "template_stars_user_template_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "template_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "template_stars_user_id_user_id_fk": {
+          "name": "template_stars_user_id_user_id_fk",
+          "tableFrom": "template_stars",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "template_stars_template_id_templates_id_fk": {
+          "name": "template_stars_template_id_templates_id_fk",
+          "tableFrom": "template_stars",
+          "tableTo": "templates",
+          "columnsFrom": ["template_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.templates": {
+      "name": "templates",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "details": {
+          "name": "details",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "creator_id": {
+          "name": "creator_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "views": {
+          "name": "views",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "stars": {
+          "name": "stars",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "template_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "tags": {
+          "name": "tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "required_credentials": {
+          "name": "required_credentials",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "state": {
+          "name": "state",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "og_image_url": {
+          "name": "og_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "templates_status_idx": {
+          "name": "templates_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_creator_id_idx": {
+          "name": "templates_creator_id_idx",
+          "columns": [
+            {
+              "expression": "creator_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_views_idx": {
+          "name": "templates_views_idx",
+          "columns": [
+            {
+              "expression": "views",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_stars_idx": {
+          "name": "templates_stars_idx",
+          "columns": [
+            {
+              "expression": "stars",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_status_views_idx": {
+          "name": "templates_status_views_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "views",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_status_stars_idx": {
+          "name": "templates_status_stars_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "stars",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_created_at_idx": {
+          "name": "templates_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "templates_updated_at_idx": {
+          "name": "templates_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "templates_workflow_id_workflow_id_fk": {
+          "name": "templates_workflow_id_workflow_id_fk",
+          "tableFrom": "templates",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "templates_creator_id_template_creators_id_fk": {
+          "name": "templates_creator_id_template_creators_id_fk",
+          "tableFrom": "templates",
+          "tableTo": "template_creators",
+          "columnsFrom": ["creator_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.usage_log": {
+      "name": "usage_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "category": {
+          "name": "category",
+          "type": "usage_log_category",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "usage_log_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "usage_log_user_created_at_idx": {
+          "name": "usage_log_user_created_at_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_source_idx": {
+          "name": "usage_log_source_idx",
+          "columns": [
+            {
+              "expression": "source",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workspace_id_idx": {
+          "name": "usage_log_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workflow_id_idx": {
+          "name": "usage_log_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "usage_log_user_id_user_id_fk": {
+          "name": "usage_log_user_id_user_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "usage_log_workspace_id_workspace_id_fk": {
+          "name": "usage_log_workspace_id_workspace_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "usage_log_workflow_id_workflow_id_fk": {
+          "name": "usage_log_workflow_id_workflow_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "normalized_email": {
+          "name": "normalized_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'user'"
+        },
+        "banned": {
+          "name": "banned",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "ban_reason": {
+          "name": "ban_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ban_expires": {
+          "name": "ban_expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        },
+        "user_normalized_email_unique": {
+          "name": "user_normalized_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["normalized_email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_stats": {
+      "name": "user_stats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_manual_executions": {
+          "name": "total_manual_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_api_calls": {
+          "name": "total_api_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_webhook_triggers": {
+          "name": "total_webhook_triggers",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_scheduled_executions": {
+          "name": "total_scheduled_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_chat_executions": {
+          "name": "total_chat_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_executions": {
+          "name": "total_mcp_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_a2a_executions": {
+          "name": "total_a2a_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_tokens_used": {
+          "name": "total_tokens_used",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_usage_limit": {
+          "name": "current_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'5'"
+        },
+        "usage_limit_updated_at": {
+          "name": "usage_limit_updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "current_period_cost": {
+          "name": "current_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_cost": {
+          "name": "last_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "billed_overage_this_period": {
+          "name": "billed_overage_this_period",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "pro_period_cost_snapshot": {
+          "name": "pro_period_cost_snapshot",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "total_copilot_cost": {
+          "name": "total_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_copilot_cost": {
+          "name": "current_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_copilot_cost": {
+          "name": "last_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "total_copilot_tokens": {
+          "name": "total_copilot_tokens",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_copilot_calls": {
+          "name": "total_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_calls": {
+          "name": "total_mcp_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_cost": {
+          "name": "total_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_mcp_copilot_cost": {
+          "name": "current_period_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_active": {
+          "name": "last_active",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "billing_blocked": {
+          "name": "billing_blocked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "billing_blocked_reason": {
+          "name": "billing_blocked_reason",
+          "type": "billing_blocked_reason",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_stats_user_id_user_id_fk": {
+          "name": "user_stats_user_id_user_id_fk",
+          "tableFrom": "user_stats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_stats_user_id_unique": {
+          "name": "user_stats_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_definitions": {
+      "name": "user_table_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "schema": {
+          "name": "schema",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_rows": {
+          "name": "max_rows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10000
+        },
+        "row_count": {
+          "name": "row_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "user_table_def_workspace_id_idx": {
+          "name": "user_table_def_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_workspace_name_unique": {
+          "name": "user_table_def_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"user_table_definitions\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_archived_at_idx": {
+          "name": "user_table_def_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_definitions_workspace_id_workspace_id_fk": {
+          "name": "user_table_definitions_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_definitions_created_by_user_id_fk": {
+          "name": "user_table_definitions_created_by_user_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_rows": {
+      "name": "user_table_rows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "user_table_rows_table_id_idx": {
+          "name": "user_table_rows_table_id_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_data_gin_idx": {
+          "name": "user_table_rows_data_gin_idx",
+          "columns": [
+            {
+              "expression": "data",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "user_table_rows_workspace_table_idx": {
+          "name": "user_table_rows_workspace_table_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_table_position_idx": {
+          "name": "user_table_rows_table_position_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "position",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_rows_table_id_user_table_definitions_id_fk": {
+          "name": "user_table_rows_table_id_user_table_definitions_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_workspace_id_workspace_id_fk": {
+          "name": "user_table_rows_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_created_by_user_id_fk": {
+          "name": "user_table_rows_created_by_user_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.verification": {
+      "name": "verification",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "verification_identifier_idx": {
+          "name": "verification_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "verification_expires_at_idx": {
+          "name": "verification_expires_at_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.waitlist": {
+      "name": "waitlist",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "waitlist_email_unique": {
+          "name": "waitlist_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.webhook": {
+      "name": "webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_config": {
+          "name": "provider_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credential_set_id": {
+          "name": "credential_set_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "path_deployment_unique": {
+          "name": "path_deployment_unique",
+          "columns": [
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"webhook\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_webhook_on_workflow_id_block_id": {
+          "name": "idx_webhook_on_workflow_id_block_id",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_workflow_deployment_idx": {
+          "name": "webhook_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_credential_set_id_idx": {
+          "name": "webhook_credential_set_id_idx",
+          "columns": [
+            {
+              "expression": "credential_set_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_archived_at_idx": {
+          "name": "webhook_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "webhook_workflow_id_workflow_id_fk": {
+          "name": "webhook_workflow_id_workflow_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "webhook_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "webhook_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "webhook_credential_set_id_credential_set_id_fk": {
+          "name": "webhook_credential_set_id_credential_set_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "credential_set",
+          "columnsFrom": ["credential_set_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow": {
+      "name": "workflow",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#3972F6'"
+        },
+        "last_synced": {
+          "name": "last_synced",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_deployed": {
+          "name": "is_deployed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deployed_at": {
+          "name": "deployed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public_api": {
+          "name": "is_public_api",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_user_id_idx": {
+          "name": "workflow_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_id_idx": {
+          "name": "workflow_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_user_workspace_idx": {
+          "name": "workflow_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_folder_name_active_unique": {
+          "name": "workflow_workspace_folder_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"folder_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_sort_idx": {
+          "name": "workflow_folder_sort_idx",
+          "columns": [
+            {
+              "expression": "folder_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_archived_at_idx": {
+          "name": "workflow_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_user_id_user_id_fk": {
+          "name": "workflow_user_id_user_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_workspace_id_workspace_id_fk": {
+          "name": "workflow_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_id_workflow_folder_id_fk": {
+          "name": "workflow_folder_id_workflow_folder_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workflow_folder",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_blocks": {
+      "name": "workflow_blocks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_x": {
+          "name": "position_x",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_y": {
+          "name": "position_y",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "horizontal_handles": {
+          "name": "horizontal_handles",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "is_wide": {
+          "name": "is_wide",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "advanced_mode": {
+          "name": "advanced_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "trigger_mode": {
+          "name": "trigger_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "height": {
+          "name": "height",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "sub_blocks": {
+          "name": "sub_blocks",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "outputs": {
+          "name": "outputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_blocks_workflow_id_idx": {
+          "name": "workflow_blocks_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_blocks_type_idx": {
+          "name": "workflow_blocks_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_blocks_workflow_id_workflow_id_fk": {
+          "name": "workflow_blocks_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_blocks",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_checkpoints": {
+      "name": "workflow_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message_id": {
+          "name": "message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_state": {
+          "name": "workflow_state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_checkpoints_user_id_idx": {
+          "name": "workflow_checkpoints_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_id_idx": {
+          "name": "workflow_checkpoints_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_id_idx": {
+          "name": "workflow_checkpoints_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_message_id_idx": {
+          "name": "workflow_checkpoints_message_id_idx",
+          "columns": [
+            {
+              "expression": "message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_user_workflow_idx": {
+          "name": "workflow_checkpoints_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_chat_idx": {
+          "name": "workflow_checkpoints_workflow_chat_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_created_at_idx": {
+          "name": "workflow_checkpoints_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_created_at_idx": {
+          "name": "workflow_checkpoints_chat_created_at_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_checkpoints_user_id_user_id_fk": {
+          "name": "workflow_checkpoints_user_id_user_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_workflow_id_workflow_id_fk": {
+          "name": "workflow_checkpoints_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_chat_id_copilot_chats_id_fk": {
+          "name": "workflow_checkpoints_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_deployment_version": {
+      "name": "workflow_deployment_version",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_deployment_version_workflow_version_unique": {
+          "name": "workflow_deployment_version_workflow_version_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_workflow_active_idx": {
+          "name": "workflow_deployment_version_workflow_active_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_created_at_idx": {
+          "name": "workflow_deployment_version_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_deployment_version_workflow_id_workflow_id_fk": {
+          "name": "workflow_deployment_version_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_deployment_version",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_edges": {
+      "name": "workflow_edges",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_block_id": {
+          "name": "source_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_block_id": {
+          "name": "target_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_handle": {
+          "name": "source_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "target_handle": {
+          "name": "target_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_edges_workflow_id_idx": {
+          "name": "workflow_edges_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_source_idx": {
+          "name": "workflow_edges_workflow_source_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "source_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_target_idx": {
+          "name": "workflow_edges_workflow_target_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_edges_workflow_id_workflow_id_fk": {
+          "name": "workflow_edges_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_source_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_source_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["source_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_target_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_target_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["target_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_logs": {
+      "name": "workflow_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_snapshot_id": {
+          "name": "state_snapshot_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "files": {
+          "name": "files",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_execution_logs_workflow_id_idx": {
+          "name": "workflow_execution_logs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_state_snapshot_id_idx": {
+          "name": "workflow_execution_logs_state_snapshot_id_idx",
+          "columns": [
+            {
+              "expression": "state_snapshot_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_deployment_version_id_idx": {
+          "name": "workflow_execution_logs_deployment_version_id_idx",
+          "columns": [
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_trigger_idx": {
+          "name": "workflow_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_level_idx": {
+          "name": "workflow_execution_logs_level_idx",
+          "columns": [
+            {
+              "expression": "level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_started_at_idx": {
+          "name": "workflow_execution_logs_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_execution_id_unique": {
+          "name": "workflow_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workflow_started_at_idx": {
+          "name": "workflow_execution_logs_workflow_started_at_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_started_at_idx": {
+          "name": "workflow_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_running_started_at_idx": {
+          "name": "workflow_execution_logs_running_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "status = 'running'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_logs_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_logs_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "workflow_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk": {
+          "name": "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_execution_snapshots",
+          "columnsFrom": ["state_snapshot_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_snapshots": {
+      "name": "workflow_execution_snapshots",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state_hash": {
+          "name": "state_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_data": {
+          "name": "state_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_snapshots_workflow_id_idx": {
+          "name": "workflow_snapshots_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_hash_idx": {
+          "name": "workflow_snapshots_hash_idx",
+          "columns": [
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_workflow_hash_idx": {
+          "name": "workflow_snapshots_workflow_hash_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_created_at_idx": {
+          "name": "workflow_snapshots_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_snapshots_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_snapshots_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_snapshots",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_folder": {
+      "name": "workflow_folder",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'#6B7280'"
+        },
+        "is_expanded": {
+          "name": "is_expanded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_folder_user_idx": {
+          "name": "workflow_folder_user_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_parent_idx": {
+          "name": "workflow_folder_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_parent_sort_idx": {
+          "name": "workflow_folder_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_archived_at_idx": {
+          "name": "workflow_folder_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_folder_user_id_user_id_fk": {
+          "name": "workflow_folder_user_id_user_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_workspace_id_workspace_id_fk": {
+          "name": "workflow_folder_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_server": {
+      "name": "workflow_mcp_server",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public": {
+          "name": "is_public",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_server_workspace_id_idx": {
+          "name": "workflow_mcp_server_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_created_by_idx": {
+          "name": "workflow_mcp_server_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_deleted_at_idx": {
+          "name": "workflow_mcp_server_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_server_workspace_id_workspace_id_fk": {
+          "name": "workflow_mcp_server_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_server_created_by_user_id_fk": {
+          "name": "workflow_mcp_server_created_by_user_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_tool": {
+      "name": "workflow_mcp_tool",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "server_id": {
+          "name": "server_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_description": {
+          "name": "tool_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parameter_schema": {
+          "name": "parameter_schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_tool_server_id_idx": {
+          "name": "workflow_mcp_tool_server_id_idx",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_workflow_id_idx": {
+          "name": "workflow_mcp_tool_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_server_workflow_unique": {
+          "name": "workflow_mcp_tool_server_workflow_unique",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_mcp_tool\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_archived_at_idx": {
+          "name": "workflow_mcp_tool_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk": {
+          "name": "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow_mcp_server",
+          "columnsFrom": ["server_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_tool_workflow_id_workflow_id_fk": {
+          "name": "workflow_mcp_tool_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_schedule": {
+      "name": "workflow_schedule",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cron_expression": {
+          "name": "cron_expression",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_ran_at": {
+          "name": "last_ran_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_queued_at": {
+          "name": "last_queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "timezone": {
+          "name": "timezone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'UTC'"
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_type": {
+          "name": "source_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'workflow'"
+        },
+        "job_title": {
+          "name": "job_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "prompt": {
+          "name": "prompt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lifecycle": {
+          "name": "lifecycle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'persistent'"
+        },
+        "success_condition": {
+          "name": "success_condition",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_runs": {
+          "name": "max_runs",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "source_chat_id": {
+          "name": "source_chat_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_task_name": {
+          "name": "source_task_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_user_id": {
+          "name": "source_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_workspace_id": {
+          "name": "source_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_history": {
+          "name": "job_history",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_schedule_workflow_block_deployment_unique": {
+          "name": "workflow_schedule_workflow_block_deployment_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_workflow_deployment_idx": {
+          "name": "workflow_schedule_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_archived_at_idx": {
+          "name": "workflow_schedule_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_schedule_workflow_id_workflow_id_fk": {
+          "name": "workflow_schedule_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_user_id_user_id_fk": {
+          "name": "workflow_schedule_source_user_id_user_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "user",
+          "columnsFrom": ["source_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_workspace_id_workspace_id_fk": {
+          "name": "workflow_schedule_source_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workspace",
+          "columnsFrom": ["source_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_subflows": {
+      "name": "workflow_subflows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_subflows_workflow_id_idx": {
+          "name": "workflow_subflows_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_subflows_workflow_type_idx": {
+          "name": "workflow_subflows_workflow_type_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_subflows_workflow_id_workflow_id_fk": {
+          "name": "workflow_subflows_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_subflows",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace": {
+      "name": "workspace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#33C482'"
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "billed_account_user_id": {
+          "name": "billed_account_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "allow_personal_api_keys": {
+          "name": "allow_personal_api_keys",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "inbox_enabled": {
+          "name": "inbox_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "inbox_address": {
+          "name": "inbox_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "inbox_provider_id": {
+          "name": "inbox_provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workspace_owner_id_user_id_fk": {
+          "name": "workspace_owner_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["owner_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_billed_account_user_id_user_id_fk": {
+          "name": "workspace_billed_account_user_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["billed_account_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_byok_keys": {
+      "name": "workspace_byok_keys",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_byok_provider_unique": {
+          "name": "workspace_byok_provider_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_byok_workspace_idx": {
+          "name": "workspace_byok_workspace_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_byok_keys_workspace_id_workspace_id_fk": {
+          "name": "workspace_byok_keys_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_byok_keys_created_by_user_id_fk": {
+          "name": "workspace_byok_keys_created_by_user_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_environment": {
+      "name": "workspace_environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_environment_workspace_unique": {
+          "name": "workspace_environment_workspace_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_environment_workspace_id_workspace_id_fk": {
+          "name": "workspace_environment_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_environment",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_file": {
+      "name": "workspace_file",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_by": {
+          "name": "uploaded_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_file_workspace_id_idx": {
+          "name": "workspace_file_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_key_idx": {
+          "name": "workspace_file_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_deleted_at_idx": {
+          "name": "workspace_file_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_file_workspace_id_workspace_id_fk": {
+          "name": "workspace_file_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_uploaded_by_user_id_fk": {
+          "name": "workspace_file_uploaded_by_user_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "user",
+          "columnsFrom": ["uploaded_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_file_key_unique": {
+          "name": "workspace_file_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_files": {
+      "name": "workspace_files",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_name": {
+          "name": "original_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_files_key_active_unique": {
+          "name": "workspace_files_key_active_unique",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_name_active_unique": {
+          "name": "workspace_files_workspace_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "original_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL AND \"workspace_files\".\"context\" = 'workspace' AND \"workspace_files\".\"workspace_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_key_idx": {
+          "name": "workspace_files_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_user_id_idx": {
+          "name": "workspace_files_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_id_idx": {
+          "name": "workspace_files_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_context_idx": {
+          "name": "workspace_files_context_idx",
+          "columns": [
+            {
+              "expression": "context",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_chat_id_idx": {
+          "name": "workspace_files_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_deleted_at_idx": {
+          "name": "workspace_files_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_files_user_id_user_id_fk": {
+          "name": "workspace_files_user_id_user_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_workspace_id_workspace_id_fk": {
+          "name": "workspace_files_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_chat_id_copilot_chats_id_fk": {
+          "name": "workspace_files_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_invitation": {
+      "name": "workspace_invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "status": {
+          "name": "status",
+          "type": "workspace_invitation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permissions": {
+          "name": "permissions",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'admin'"
+        },
+        "org_invitation_id": {
+          "name": "org_invitation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workspace_invitation_workspace_id_workspace_id_fk": {
+          "name": "workspace_invitation_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_invitation",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_invitation_inviter_id_user_id_fk": {
+          "name": "workspace_invitation_inviter_id_user_id_fk",
+          "tableFrom": "workspace_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["inviter_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_invitation_token_unique": {
+          "name": "workspace_invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_notification_delivery": {
+      "name": "workspace_notification_delivery",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "subscription_id": {
+          "name": "subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "notification_delivery_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_attempt_at": {
+          "name": "last_attempt_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_attempt_at": {
+          "name": "next_attempt_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_status": {
+          "name": "response_status",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_body": {
+          "name": "response_body",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_notification_delivery_subscription_id_idx": {
+          "name": "workspace_notification_delivery_subscription_id_idx",
+          "columns": [
+            {
+              "expression": "subscription_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_execution_id_idx": {
+          "name": "workspace_notification_delivery_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_status_idx": {
+          "name": "workspace_notification_delivery_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_delivery_next_attempt_idx": {
+          "name": "workspace_notification_delivery_next_attempt_idx",
+          "columns": [
+            {
+              "expression": "next_attempt_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_notification_delivery_subscription_id_workspace_notification_subscription_id_fk": {
+          "name": "workspace_notification_delivery_subscription_id_workspace_notification_subscription_id_fk",
+          "tableFrom": "workspace_notification_delivery",
+          "tableTo": "workspace_notification_subscription",
+          "columnsFrom": ["subscription_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_notification_delivery_workflow_id_workflow_id_fk": {
+          "name": "workspace_notification_delivery_workflow_id_workflow_id_fk",
+          "tableFrom": "workspace_notification_delivery",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_notification_subscription": {
+      "name": "workspace_notification_subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "notification_type": {
+          "name": "notification_type",
+          "type": "notification_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_ids": {
+          "name": "workflow_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "all_workflows": {
+          "name": "all_workflows",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "level_filter": {
+          "name": "level_filter",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY['info', 'error']::text[]"
+        },
+        "trigger_filter": {
+          "name": "trigger_filter",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "ARRAY['api', 'webhook', 'schedule', 'manual', 'chat']::text[]"
+        },
+        "include_final_output": {
+          "name": "include_final_output",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_trace_spans": {
+          "name": "include_trace_spans",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_rate_limits": {
+          "name": "include_rate_limits",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "include_usage_data": {
+          "name": "include_usage_data",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "webhook_config": {
+          "name": "webhook_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_recipients": {
+          "name": "email_recipients",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "slack_config": {
+          "name": "slack_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alert_config": {
+          "name": "alert_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_alert_at": {
+          "name": "last_alert_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "active": {
+          "name": "active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_notification_workspace_id_idx": {
+          "name": "workspace_notification_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_active_idx": {
+          "name": "workspace_notification_active_idx",
+          "columns": [
+            {
+              "expression": "active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_notification_type_idx": {
+          "name": "workspace_notification_type_idx",
+          "columns": [
+            {
+              "expression": "notification_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_notification_subscription_workspace_id_workspace_id_fk": {
+          "name": "workspace_notification_subscription_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_notification_subscription",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_notification_subscription_created_by_user_id_fk": {
+          "name": "workspace_notification_subscription_created_by_user_id_fk",
+          "tableFrom": "workspace_notification_subscription",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.a2a_task_status": {
+      "name": "a2a_task_status",
+      "schema": "public",
+      "values": [
+        "submitted",
+        "working",
+        "input-required",
+        "completed",
+        "failed",
+        "canceled",
+        "rejected",
+        "auth-required",
+        "unknown"
+      ]
+    },
+    "public.academy_cert_status": {
+      "name": "academy_cert_status",
+      "schema": "public",
+      "values": ["active", "revoked", "expired"]
+    },
+    "public.billing_blocked_reason": {
+      "name": "billing_blocked_reason",
+      "schema": "public",
+      "values": ["payment_failed", "dispute"]
+    },
+    "public.chat_type": {
+      "name": "chat_type",
+      "schema": "public",
+      "values": ["mothership", "copilot"]
+    },
+    "public.copilot_async_tool_status": {
+      "name": "copilot_async_tool_status",
+      "schema": "public",
+      "values": ["pending", "running", "completed", "failed", "cancelled", "delivered"]
+    },
+    "public.copilot_run_status": {
+      "name": "copilot_run_status",
+      "schema": "public",
+      "values": ["active", "paused_waiting_for_tool", "resuming", "complete", "error", "cancelled"]
+    },
+    "public.credential_member_role": {
+      "name": "credential_member_role",
+      "schema": "public",
+      "values": ["admin", "member"]
+    },
+    "public.credential_member_status": {
+      "name": "credential_member_status",
+      "schema": "public",
+      "values": ["active", "pending", "revoked"]
+    },
+    "public.credential_set_invitation_status": {
+      "name": "credential_set_invitation_status",
+      "schema": "public",
+      "values": ["pending", "accepted", "expired", "cancelled"]
+    },
+    "public.credential_set_member_status": {
+      "name": "credential_set_member_status",
+      "schema": "public",
+      "values": ["active", "pending", "revoked"]
+    },
+    "public.credential_type": {
+      "name": "credential_type",
+      "schema": "public",
+      "values": ["oauth", "env_workspace", "env_personal", "service_account"]
+    },
+    "public.notification_delivery_status": {
+      "name": "notification_delivery_status",
+      "schema": "public",
+      "values": ["pending", "in_progress", "success", "failed"]
+    },
+    "public.notification_type": {
+      "name": "notification_type",
+      "schema": "public",
+      "values": ["webhook", "email", "slack"]
+    },
+    "public.permission_type": {
+      "name": "permission_type",
+      "schema": "public",
+      "values": ["admin", "write", "read"]
+    },
+    "public.template_creator_type": {
+      "name": "template_creator_type",
+      "schema": "public",
+      "values": ["user", "organization"]
+    },
+    "public.template_status": {
+      "name": "template_status",
+      "schema": "public",
+      "values": ["pending", "approved", "rejected"]
+    },
+    "public.usage_log_category": {
+      "name": "usage_log_category",
+      "schema": "public",
+      "values": ["model", "fixed"]
+    },
+    "public.usage_log_source": {
+      "name": "usage_log_source",
+      "schema": "public",
+      "values": [
+        "workflow",
+        "wand",
+        "copilot",
+        "workspace-chat",
+        "mcp_copilot",
+        "mothership_block",
+        "knowledge-base"
+      ]
+    },
+    "public.workspace_invitation_status": {
+      "name": "workspace_invitation_status",
+      "schema": "public",
+      "values": ["pending", "accepted", "rejected", "cancelled"]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/packages/db/migrations/meta/_journal.json b/packages/db/migrations/meta/_journal.json
index eea0268cd4e..bfa6e8f2cf6 100644
--- a/packages/db/migrations/meta/_journal.json
+++ b/packages/db/migrations/meta/_journal.json
@@ -1296,6 +1296,13 @@
       "when": 1775247973312,
       "tag": "0185_new_gravity",
       "breakpoints": true
+    },
+    {
+      "idx": 186,
+      "version": "7",
+      "when": 1775525922688,
+      "tag": "0186_greedy_jocasta",
+      "breakpoints": true
     }
   ]
 }
diff --git a/packages/db/schema.ts b/packages/db/schema.ts
index 0c0d09c7197..8f2faa21e0a 100644
--- a/packages/db/schema.ts
+++ b/packages/db/schema.ts
@@ -130,6 +130,7 @@ export const workflowFolder = pgTable(
     sortOrder: integer('sort_order').notNull().default(0),
     createdAt: timestamp('created_at').notNull().defaultNow(),
     updatedAt: timestamp('updated_at').notNull().defaultNow(),
+    archivedAt: timestamp('archived_at'),
   },
   (table) => ({
     userIdx: index('workflow_folder_user_idx').on(table.userId),
@@ -138,6 +139,7 @@ export const workflowFolder = pgTable(
       table.parentId
     ),
     parentSortIdx: index('workflow_folder_parent_sort_idx').on(table.parentId, table.sortOrder),
+    archivedAtIdx: index('workflow_folder_archived_at_idx').on(table.archivedAt),
   })
 )
 
diff --git a/packages/testing/src/mocks/audit.mock.ts b/packages/testing/src/mocks/audit.mock.ts
index d44b82df206..0b4a46d9deb 100644
--- a/packages/testing/src/mocks/audit.mock.ts
+++ b/packages/testing/src/mocks/audit.mock.ts
@@ -50,6 +50,7 @@ export const auditMock = {
     FOLDER_CREATED: 'folder.created',
     FOLDER_DELETED: 'folder.deleted',
     FOLDER_DUPLICATED: 'folder.duplicated',
+    FOLDER_RESTORED: 'folder.restored',
     FORM_CREATED: 'form.created',
     FORM_UPDATED: 'form.updated',
     FORM_DELETED: 'form.deleted',
diff --git a/scripts/generate-docs.ts b/scripts/generate-docs.ts
index 13a1c509dfa..49f2dcf8f1b 100755
--- a/scripts/generate-docs.ts
+++ b/scripts/generate-docs.ts
@@ -491,17 +491,35 @@ async function buildTriggerRegistry(): Promise<Map<string, TriggerInfo>> {
     try {
       const content = fs.readFileSync(file, 'utf-8')
 
-      // Each trigger file exports a single TriggerConfig with id, name, description
-      const idMatch = /\bid\s*:\s*['"]([^'"]+)['"]/.exec(content)
-      const nameMatch = /\bname\s*:\s*['"]([^'"]+)['"]/.exec(content)
-      const descMatch = /\bdescription\s*:\s*['"]([^'"]+)['"]/.exec(content)
-
-      if (idMatch && nameMatch) {
-        registry.set(idMatch[1], {
-          id: idMatch[1],
-          name: nameMatch[1],
-          description: descMatch?.[1] ?? '',
-        })
+      // A file may export multiple TriggerConfig objects (e.g. v1 + v2 in
+      // the same file). Extract all exported configs by splitting on the
+      // export boundaries and parsing each one independently.
+      const exportRegex = /export\s+const\s+\w+\s*:\s*TriggerConfig\s*=\s*\{/g
+      let exportMatch
+      const exportStarts: number[] = []
+
+      while ((exportMatch = exportRegex.exec(content)) !== null) {
+        exportStarts.push(exportMatch.index)
+      }
+
+      // If no typed exports found, fall back to simple regex on whole file
+      const segments =
+        exportStarts.length > 0
+          ? exportStarts.map((start, i) => content.substring(start, exportStarts[i + 1]))
+          : [content]
+
+      for (const segment of segments) {
+        const idMatch = /\bid\s*:\s*['"]([^'"]+)['"]/.exec(segment)
+        const nameMatch = /\bname\s*:\s*['"]([^'"]+)['"]/.exec(segment)
+        const descMatch = /\bdescription\s*:\s*['"]([^'"]+)['"]/.exec(segment)
+
+        if (idMatch && nameMatch) {
+          registry.set(idMatch[1], {
+            id: idMatch[1],
+            name: nameMatch[1],
+            description: descMatch?.[1] ?? '',
+          })
+        }
       }
     } catch {
       // skip unreadable files silently
diff --git a/turbo.json b/turbo.json
index 5d00f7846da..386c5c0de3c 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://turbo.build/schema.json",
+  "$schema": "https://v2-9-4.turborepo.dev/schema.json",
   "envMode": "loose",
   "tasks": {
     "transit": {