Merge branch 'staging' into feat/mothership-copilot

2026-04-06 03:00:16 -04:00 · 2026-03-13 18:40:36 -07:00
parent cbe8fe300d 7e740e617b
commit af434a121f
235 changed files with 10238 additions and 1378 deletions
--- a/apps/docs/components/icons.tsx
+++ b/apps/docs/components/icons.tsx
@@ -2007,6 +2007,24 @@ export function ElevenLabsIcon(props: SVGProps<SVGSVGElement>) {
  )
 }

+export function FathomIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1000 1000' fill='none'>
+      <path
+        d='M0,668.7v205.78c0,53.97,34.24,102.88,85.8,119.08,87.48,27.49,167.88-36.99,167.88-120.22v-77.45L0,668.7Z'
+        fill='#007299'
+      />
+      <path
+        d='M873.72,626.07c-19.05,0-38.38-4.3-56.58-13.38L72.78,241.43C11.15,210.69-17.51,136.6,11.18,74.05,41.2,8.59,119.26-18.53,183.23,13.38l744.25,371.21c62.45,31.15,91,109.08,59.79,171.43-22.22,44.38-67.02,70.05-113.55,70.05Z'
+        fill='#00beff'
+      />
+      <path
+        d='M500.09,813.66c-19.05,0-38.38-4.3-56.58-13.38l-370.72-184.9c-61.63-30.74-90.29-104.82-61.61-167.37,30.02-65.46,108.08-92.59,172.06-60.68l370.62,184.85c62.45,31.15,91,109.08,59.79,171.43-22.22,44.38-67.02,70.05-113.55,70.05Z'
+        fill='#00beff'
+      />
+    </svg>
+  )
+}
 export function LinkupIcon(props: SVGProps<SVGSVGElement>) {
  return (
    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 154 107' fill='none'>
@@ -3582,6 +3600,27 @@ export const ResendIcon = (props: SVGProps<SVGSVGElement>) => (
  </svg>
 )

+export const GoogleAdsIcon = (props: SVGProps<SVGSVGElement>) => (
+  <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'>
+    <g transform='matrix(.257748 0 0 .257745 -.361416 2.515516)'>
+      <path
+        d='M85.9 28.6c2.4-6.3 5.7-12.1 10.6-16.8 19.6-19.1 52-14.3 65.3 9.7 10 18.2 20.6 36 30.9 54l51.6 89.8c14.3 25.1-1.2 56.8-29.6 61.1-17.4 2.6-33.7-5.4-42.7-21l-45.4-78.8c-.3-.6-.7-1.1-1.1-1.6-1.6-1.3-2.3-3.2-3.3-4.9L88.8 62.2c-3.9-6.8-5.7-14.2-5.5-22 .3-4 .8-8 2.6-11.6'
+        fill='#3c8bd9'
+      />
+      <path
+        d='M85.9 28.6c-.9 3.6-1.7 7.2-1.9 11-.3 8.4 1.8 16.2 6 23.5l32.9 56.9c1 1.7 1.8 3.4 2.8 5l-18.1 31.1-25.3 43.6c-.4 0-.5-.2-.6-.5-.1-.8.2-1.5.4-2.3 4.1-15 .7-28.3-9.6-39.7-6.3-6.9-14.3-10.8-23.5-12.1-12-1.7-22.6 1.4-32.1 8.9-1.7 1.3-2.8 3.2-4.8 4.2-.4 0-.6-.2-.7-.5l14.3-24.9L85.2 29.7c.2-.4.5-.7.7-1.1'
+        fill='#fabc04'
+      />
+      <path
+        d='M11.8 158l5.7-5.1c24.3-19.2 60.8-5.3 66.1 25.1 1.3 7.3.6 14.3-1.6 21.3-.1.6-.2 1.1-.4 1.7-.9 1.6-1.7 3.3-2.7 4.9-8.9 14.7-22 22-39.2 20.9C20 225.4 4.5 210.6 1.8 191c-1.3-9.5.6-18.4 5.5-26.6 1-1.8 2.2-3.4 3.3-5.2.5-.4.3-1.2 1.2-1.2'
+        fill='#34a852'
+      />
+      <path d='M11.8 158c-.4.4-.4 1.1-1.1 1.2-.1-.7.3-1.1.7-1.6l.4.4' fill='#fabc04' />
+      <path d='M81.6 201c-.4-.7 0-1.2.4-1.7l.4.4-.8 1.3' fill='#e1c025' />
+    </g>
+  </svg>
+)
+
 export const GoogleBigQueryIcon = (props: SVGProps<SVGSVGElement>) => (
  <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'>
    <path
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -43,6 +43,7 @@ import {
  EvernoteIcon,
  ExaAIIcon,
  EyeIcon,
+  FathomIcon,
  FirecrawlIcon,
  FirefliesIcon,
  GammaIcon,
@@ -50,6 +51,7 @@ import {
  GitLabIcon,
  GmailIcon,
  GongIcon,
+  GoogleAdsIcon,
  GoogleBigQueryIcon,
  GoogleBooksIcon,
  GoogleCalendarIcon,
@@ -206,6 +208,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  enrich: EnrichSoIcon,
  evernote: EvernoteIcon,
  exa: ExaAIIcon,
+  fathom: FathomIcon,
  file_v3: DocumentIcon,
  firecrawl: FirecrawlIcon,
  fireflies_v2: FirefliesIcon,
@@ -214,6 +217,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  gitlab: GitLabIcon,
  gmail_v2: GmailIcon,
  gong: GongIcon,
+  google_ads: GoogleAdsIcon,
  google_bigquery: GoogleBigQueryIcon,
  google_books: GoogleBooksIcon,
  google_calendar_v2: GoogleCalendarIcon,
--- a/apps/docs/content/docs/en/tools/ashby.mdx
+++ b/apps/docs/content/docs/en/tools/ashby.mdx
@@ -22,6 +22,8 @@ With Ashby, you can:
 - **List and view jobs**: Browse all open, closed, and archived job postings with location and department info
 - **List applications**: View all applications across your organization with candidate and job details, status tracking, and pagination

+The Ashby block also supports **webhook triggers** that automatically start workflows in response to Ashby events. Available triggers include Application Submitted, Candidate Stage Change, Candidate Hired, Candidate Deleted, Job Created, and Offer Created. Webhooks are fully managed — Sim automatically creates the webhook in Ashby when you save the trigger and deletes it when you remove it, so there's no manual webhook configuration needed. Just provide your Ashby API key (with `apiKeysWrite` permission) and select the event type.
+
 In Sim, the Ashby integration enables your agents to programmatically manage your recruiting pipeline. Agents can search for candidates, create new candidate records, add notes after interviews, and monitor applications across jobs. This allows you to automate recruiting workflows like candidate intake, interview follow-ups, pipeline reporting, and cross-referencing candidates across roles.
 {/* MANUAL-CONTENT-END */}

--- a/apps/docs/content/docs/en/tools/evernote.mdx
+++ b/apps/docs/content/docs/en/tools/evernote.mdx
@@ -10,6 +10,21 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
  color="#E0E0E0"
 />

+{/* MANUAL-CONTENT-START:intro */}
+[Evernote](https://evernote.com/) is a note-taking and organization platform that helps individuals and teams capture ideas, manage projects, and store information across devices. With notebooks, tags, and powerful search, Evernote serves as a central hub for knowledge management.
+
+With the Sim Evernote integration, you can:
+
+- **Create and update notes**: Programmatically create new notes with content and tags, or update existing notes in any notebook.
+- **Search and retrieve notes**: Use Evernote's search grammar to find notes by keyword, tag, notebook, or other criteria, and retrieve full note content.
+- **Organize with notebooks and tags**: Create notebooks and tags, list existing ones, and move or copy notes between notebooks.
+- **Delete and manage notes**: Move notes to trash or copy them to different notebooks as part of automated workflows.
+
+**How it works in Sim:**
+Add an Evernote block to your workflow and select an operation (e.g., create note, search notes, list notebooks). Provide your Evernote developer token and any required parameters. The block calls the Evernote API and returns structured data you can pass to downstream blocks — for example, searching for meeting notes and sending summaries to Slack, or creating notes from AI-generated content.
+{/* MANUAL-CONTENT-END */}
+
+
 ## Usage Instructions

 Integrate with Evernote to manage notes, notebooks, and tags. Create, read, update, copy, search, and delete notes. Create and list notebooks and tags.
--- a/apps/docs/content/docs/en/tools/fathom.mdx
+++ b/apps/docs/content/docs/en/tools/fathom.mdx
@@ -0,0 +1,150 @@
+---
+title: Fathom
+description: Access meeting recordings, transcripts, and summaries
+---
+
+import { BlockInfoCard } from "@/components/ui/block-info-card"
+
+<BlockInfoCard 
+  type="fathom"
+  color="#181C1E"
+/>
+
+{/* MANUAL-CONTENT-START:intro */}
+[Fathom](https://fathom.video/) is an AI meeting assistant that automatically records, transcribes, and summarizes your video calls. It works across platforms like Zoom, Google Meet, and Microsoft Teams, generating highlights and action items so your team can stay focused during meetings and catch up quickly afterward.
+
+With the Sim Fathom integration, you can:
+
+- **List and filter meetings**: Retrieve recent meetings recorded by you or shared with your team, with optional filters by date range, recorder, or team.
+- **Get meeting summaries**: Pull structured, markdown-formatted summaries for any recorded meeting to quickly review key discussion points.
+- **Access full transcripts**: Retrieve complete transcripts with speaker attribution and timestamps for detailed review or downstream processing.
+- **Manage teams and members**: List teams in your Fathom organization and view team member details to coordinate meeting workflows.
+
+**How it works in Sim:**
+Add a Fathom block to your workflow and select an operation. Provide your Fathom API key and any required parameters (such as a recording ID for summaries and transcripts). The block calls the Fathom API and returns structured data you can pass to downstream blocks — for example, sending a summary to Slack or extracting action items with an AI agent.
+{/* MANUAL-CONTENT-END */}
+
+
+## Usage Instructions
+
+Integrate Fathom AI Notetaker into your workflow. List meetings, get transcripts and summaries, and manage team members and teams. Can also trigger workflows when new meeting content is ready.
+
+
+
+## Tools
+
+### `fathom_list_meetings`
+
+List recent meetings recorded by the user or shared to their team.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Fathom API Key |
+| `includeSummary` | string | No | Include meeting summary \(true/false\) |
+| `includeTranscript` | string | No | Include meeting transcript \(true/false\) |
+| `includeActionItems` | string | No | Include action items \(true/false\) |
+| `includeCrmMatches` | string | No | Include linked CRM matches \(true/false\) |
+| `createdAfter` | string | No | Filter meetings created after this ISO 8601 timestamp |
+| `createdBefore` | string | No | Filter meetings created before this ISO 8601 timestamp |
+| `recordedBy` | string | No | Filter by recorder email address |
+| `teams` | string | No | Filter by team name |
+| `cursor` | string | No | Pagination cursor from a previous response |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `meetings` | array | List of meetings |
+|   ↳ `title` | string | Meeting title |
+|   ↳ `recording_id` | number | Unique recording ID |
+|   ↳ `url` | string | URL to view the meeting |
+|   ↳ `share_url` | string | Shareable URL |
+|   ↳ `created_at` | string | Creation timestamp |
+|   ↳ `transcript_language` | string | Transcript language |
+| `next_cursor` | string | Pagination cursor for next page |
+
+### `fathom_get_summary`
+
+Get the call summary for a specific meeting recording.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Fathom API Key |
+| `recordingId` | string | Yes | The recording ID of the meeting |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `template_name` | string | Name of the summary template used |
+| `markdown_formatted` | string | Markdown-formatted summary text |
+
+### `fathom_get_transcript`
+
+Get the full transcript for a specific meeting recording.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Fathom API Key |
+| `recordingId` | string | Yes | The recording ID of the meeting |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `transcript` | array | Array of transcript entries with speaker, text, and timestamp |
+|   ↳ `speaker` | object | Speaker information |
+|     ↳ `display_name` | string | Speaker display name |
+|     ↳ `matched_calendar_invitee_email` | string | Matched calendar invitee email |
+|   ↳ `text` | string | Transcript text |
+|   ↳ `timestamp` | string | Timestamp \(HH:MM:SS\) |
+
+### `fathom_list_team_members`
+
+List team members in your Fathom organization.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Fathom API Key |
+| `teams` | string | No | Team name to filter by |
+| `cursor` | string | No | Pagination cursor from a previous response |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `members` | array | List of team members |
+|   ↳ `name` | string | Team member name |
+|   ↳ `email` | string | Team member email |
+|   ↳ `created_at` | string | Date the member was added |
+| `next_cursor` | string | Pagination cursor for next page |
+
+### `fathom_list_teams`
+
+List teams in your Fathom organization.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Fathom API Key |
+| `cursor` | string | No | Pagination cursor from a previous response |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `teams` | array | List of teams |
+|   ↳ `name` | string | Team name |
+|   ↳ `created_at` | string | Date the team was created |
+| `next_cursor` | string | Pagination cursor for next page |
+
+
--- a/apps/docs/content/docs/en/tools/google_ads.mdx
+++ b/apps/docs/content/docs/en/tools/google_ads.mdx
@@ -0,0 +1,192 @@
+---
+title: Google Ads
+description: Query campaigns, ad groups, and performance metrics
+---
+
+import { BlockInfoCard } from "@/components/ui/block-info-card"
+
+<BlockInfoCard 
+  type="google_ads"
+  color="#E0E0E0"
+/>
+
+{/* MANUAL-CONTENT-START:intro */}
+[Google Ads](https://ads.google.com) is Google's online advertising platform that lets businesses create ads to reach customers across Google Search, YouTube, Gmail, and millions of partner websites. It supports campaign types including Search, Display, Video, Shopping, and Performance Max, with detailed targeting, bidding strategies, and performance analytics.
+
+In Sim, the Google Ads integration enables your agents to query campaign data, monitor ad group performance, and pull detailed metrics using the Google Ads Query Language (GAQL). This supports use cases such as automated performance reporting, budget monitoring, campaign health checks, and data-driven optimization workflows. By connecting Sim with Google Ads, your agents can retrieve real-time advertising data and act on insights without manual dashboard navigation.
+{/* MANUAL-CONTENT-END */}
+
+
+## Usage Instructions
+
+Connect to Google Ads to list accessible accounts, list campaigns, view ad group details, get performance metrics, and run custom GAQL queries.
+
+
+
+## Tools
+
+### `google_ads_list_customers`
+
+List all Google Ads customer accounts accessible by the authenticated user
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `developerToken` | string | Yes | Google Ads API developer token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `customerIds` | array | List of accessible customer IDs |
+| `totalCount` | number | Total number of accessible customer accounts |
+
+### `google_ads_search`
+
+Run a custom Google Ads Query Language (GAQL) query
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `customerId` | string | Yes | Google Ads customer ID \(numeric, no dashes\) |
+| `developerToken` | string | Yes | Google Ads API developer token |
+| `managerCustomerId` | string | No | Manager account customer ID \(if accessing via manager account\) |
+| `query` | string | Yes | GAQL query to execute |
+| `pageToken` | string | No | Page token for pagination |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `results` | json | Array of result objects from the GAQL query |
+| `totalResultsCount` | number | Total number of matching results |
+| `nextPageToken` | string | Token for the next page of results |
+
+### `google_ads_list_campaigns`
+
+List campaigns in a Google Ads account with optional status filtering
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `customerId` | string | Yes | Google Ads customer ID \(numeric, no dashes\) |
+| `developerToken` | string | Yes | Google Ads API developer token |
+| `managerCustomerId` | string | No | Manager account customer ID \(if accessing via manager account\) |
+| `status` | string | No | Filter by campaign status \(ENABLED, PAUSED, REMOVED\) |
+| `limit` | number | No | Maximum number of campaigns to return |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `campaigns` | array | List of campaigns in the account |
+|   ↳ `id` | string | Campaign ID |
+|   ↳ `name` | string | Campaign name |
+|   ↳ `status` | string | Campaign status \(ENABLED, PAUSED, REMOVED\) |
+|   ↳ `channelType` | string | Advertising channel type \(SEARCH, DISPLAY, SHOPPING, VIDEO, PERFORMANCE_MAX\) |
+|   ↳ `startDate` | string | Campaign start date \(YYYY-MM-DD\) |
+|   ↳ `endDate` | string | Campaign end date \(YYYY-MM-DD\) |
+|   ↳ `budgetAmountMicros` | string | Daily budget in micros \(divide by 1,000,000 for currency value\) |
+| `totalCount` | number | Total number of campaigns returned |
+
+### `google_ads_campaign_performance`
+
+Get performance metrics for Google Ads campaigns over a date range
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `customerId` | string | Yes | Google Ads customer ID \(numeric, no dashes\) |
+| `developerToken` | string | Yes | Google Ads API developer token |
+| `managerCustomerId` | string | No | Manager account customer ID \(if accessing via manager account\) |
+| `campaignId` | string | No | Filter by specific campaign ID |
+| `dateRange` | string | No | Predefined date range \(LAST_7_DAYS, LAST_30_DAYS, THIS_MONTH, LAST_MONTH, TODAY, YESTERDAY\) |
+| `startDate` | string | No | Custom start date in YYYY-MM-DD format |
+| `endDate` | string | No | Custom end date in YYYY-MM-DD format |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `campaigns` | array | Campaign performance data broken down by date |
+|   ↳ `id` | string | Campaign ID |
+|   ↳ `name` | string | Campaign name |
+|   ↳ `status` | string | Campaign status |
+|   ↳ `impressions` | string | Number of impressions |
+|   ↳ `clicks` | string | Number of clicks |
+|   ↳ `costMicros` | string | Cost in micros \(divide by 1,000,000 for currency value\) |
+|   ↳ `ctr` | number | Click-through rate \(0.0 to 1.0\) |
+|   ↳ `conversions` | number | Number of conversions |
+|   ↳ `date` | string | Date for this row \(YYYY-MM-DD\) |
+| `totalCount` | number | Total number of result rows |
+
+### `google_ads_list_ad_groups`
+
+List ad groups in a Google Ads campaign
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `customerId` | string | Yes | Google Ads customer ID \(numeric, no dashes\) |
+| `developerToken` | string | Yes | Google Ads API developer token |
+| `managerCustomerId` | string | No | Manager account customer ID \(if accessing via manager account\) |
+| `campaignId` | string | Yes | Campaign ID to list ad groups for |
+| `status` | string | No | Filter by ad group status \(ENABLED, PAUSED, REMOVED\) |
+| `limit` | number | No | Maximum number of ad groups to return |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `adGroups` | array | List of ad groups in the campaign |
+|   ↳ `id` | string | Ad group ID |
+|   ↳ `name` | string | Ad group name |
+|   ↳ `status` | string | Ad group status \(ENABLED, PAUSED, REMOVED\) |
+|   ↳ `type` | string | Ad group type \(SEARCH_STANDARD, DISPLAY_STANDARD, SHOPPING_PRODUCT_ADS\) |
+|   ↳ `campaignId` | string | Parent campaign ID |
+|   ↳ `campaignName` | string | Parent campaign name |
+| `totalCount` | number | Total number of ad groups returned |
+
+### `google_ads_ad_performance`
+
+Get performance metrics for individual ads over a date range
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `customerId` | string | Yes | Google Ads customer ID \(numeric, no dashes\) |
+| `developerToken` | string | Yes | Google Ads API developer token |
+| `managerCustomerId` | string | No | Manager account customer ID \(if accessing via manager account\) |
+| `campaignId` | string | No | Filter by campaign ID |
+| `adGroupId` | string | No | Filter by ad group ID |
+| `dateRange` | string | No | Predefined date range \(LAST_7_DAYS, LAST_30_DAYS, THIS_MONTH, LAST_MONTH, TODAY, YESTERDAY\) |
+| `startDate` | string | No | Custom start date in YYYY-MM-DD format |
+| `endDate` | string | No | Custom end date in YYYY-MM-DD format |
+| `limit` | number | No | Maximum number of results to return |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `ads` | array | Ad performance data broken down by date |
+|   ↳ `adId` | string | Ad ID |
+|   ↳ `adGroupId` | string | Parent ad group ID |
+|   ↳ `adGroupName` | string | Parent ad group name |
+|   ↳ `campaignId` | string | Parent campaign ID |
+|   ↳ `campaignName` | string | Parent campaign name |
+|   ↳ `adType` | string | Ad type \(RESPONSIVE_SEARCH_AD, EXPANDED_TEXT_AD, etc.\) |
+|   ↳ `impressions` | string | Number of impressions |
+|   ↳ `clicks` | string | Number of clicks |
+|   ↳ `costMicros` | string | Cost in micros \(divide by 1,000,000 for currency value\) |
+|   ↳ `ctr` | number | Click-through rate \(0.0 to 1.0\) |
+|   ↳ `conversions` | number | Number of conversions |
+|   ↳ `date` | string | Date for this row \(YYYY-MM-DD\) |
+| `totalCount` | number | Total number of result rows |
+
+
--- a/apps/docs/content/docs/en/tools/meta.json
+++ b/apps/docs/content/docs/en/tools/meta.json
@@ -37,6 +37,7 @@
    "enrich",
    "evernote",
    "exa",
+    "fathom",
    "file",
    "firecrawl",
    "fireflies",
@@ -45,6 +46,7 @@
    "gitlab",
    "gmail",
    "gong",
+    "google_ads",
    "google_bigquery",
    "google_books",
    "google_calendar",
--- a/apps/docs/content/docs/en/tools/obsidian.mdx
+++ b/apps/docs/content/docs/en/tools/obsidian.mdx
@@ -10,6 +10,22 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
  color="#0F0F0F"
 />

+{/* MANUAL-CONTENT-START:intro */}
+[Obsidian](https://obsidian.md/) is a powerful knowledge base and note-taking application that works on top of a local folder of plain-text Markdown files. With features like bidirectional linking, graph views, and a rich plugin ecosystem, Obsidian is widely used for personal knowledge management, research, and documentation.
+
+With the Sim Obsidian integration, you can:
+
+- **Read and create notes**: Retrieve note content from your vault or create new notes programmatically as part of automated workflows.
+- **Update and patch notes**: Modify existing notes in full or patch content at specific locations within a note.
+- **Search your vault**: Find notes by keyword or content across your entire Obsidian vault.
+- **Manage periodic notes**: Access and create daily or other periodic notes for journaling and task tracking.
+- **Execute commands**: Trigger Obsidian commands remotely to automate vault operations.
+
+**How it works in Sim:**
+Add an Obsidian block to your workflow and select an operation. This integration requires the [Obsidian Local REST API](https://github.com/coddingtonbear/obsidian-local-rest-api) plugin to be installed and running in your vault. Provide your API key and vault URL, along with any required parameters. The block communicates with your local Obsidian instance and returns structured data you can pass to downstream blocks — for example, searching your vault for research notes and feeding them into an AI agent for summarization.
+{/* MANUAL-CONTENT-END */}
+
+
 ## Usage Instructions

 Read, create, update, search, and delete notes in your Obsidian vault. Manage periodic notes, execute commands, and patch content at specific locations. Requires the Obsidian Local REST API plugin.
--- a/apps/docs/content/docs/en/tools/parallel_ai.mdx
+++ b/apps/docs/content/docs/en/tools/parallel_ai.mdx
@@ -44,20 +44,24 @@ Search the web using Parallel AI. Provides comprehensive search results with int
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `objective` | string | Yes | The search objective or question to answer |
-| `search_queries` | string | No | Optional comma-separated list of search queries to execute |
-| `processor` | string | No | Processing method: base or pro \(default: base\) |
-| `max_results` | number | No | Maximum number of results to return \(default: 5\) |
-| `max_chars_per_result` | number | No | Maximum characters per result \(default: 1500\) |
+| `search_queries` | string | No | Comma-separated list of search queries to execute |
+| `mode` | string | No | Search mode: one-shot, agentic, or fast \(default: one-shot\) |
+| `max_results` | number | No | Maximum number of results to return \(default: 10\) |
+| `max_chars_per_result` | number | No | Maximum characters per result excerpt \(minimum: 1000\) |
+| `include_domains` | string | No | Comma-separated list of domains to restrict search results to |
+| `exclude_domains` | string | No | Comma-separated list of domains to exclude from search results |
 | `apiKey` | string | Yes | Parallel AI API Key |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
+| `search_id` | string | Unique identifier for this search request |
 | `results` | array | Search results with excerpts from relevant pages |
 |   ↳ `url` | string | The URL of the search result |
 |   ↳ `title` | string | The title of the search result |
-|   ↳ `excerpts` | array | Text excerpts from the page |
+|   ↳ `publish_date` | string | Publication date of the page \(YYYY-MM-DD\) |
+|   ↳ `excerpts` | array | LLM-optimized excerpts from the page |

 ### `parallel_extract`

@@ -68,31 +72,33 @@ Extract targeted information from specific URLs using Parallel AI. Processes pro
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `urls` | string | Yes | Comma-separated list of URLs to extract information from |
-| `objective` | string | Yes | What information to extract from the provided URLs |
-| `excerpts` | boolean | Yes | Include relevant excerpts from the content |
-| `full_content` | boolean | Yes | Include full page content |
+| `objective` | string | No | What information to extract from the provided URLs |
+| `excerpts` | boolean | No | Include relevant excerpts from the content \(default: true\) |
+| `full_content` | boolean | No | Include full page content as markdown \(default: false\) |
 | `apiKey` | string | Yes | Parallel AI API Key |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
+| `extract_id` | string | Unique identifier for this extraction request |
 | `results` | array | Extracted information from the provided URLs |
 |   ↳ `url` | string | The source URL |
 |   ↳ `title` | string | The title of the page |
-|   ↳ `content` | string | Extracted content |
-|   ↳ `excerpts` | array | Relevant text excerpts |
+|   ↳ `publish_date` | string | Publication date \(YYYY-MM-DD\) |
+|   ↳ `excerpts` | array | Relevant text excerpts in markdown |
+|   ↳ `full_content` | string | Full page content as markdown |

 ### `parallel_deep_research`

-Conduct comprehensive deep research across the web using Parallel AI. Synthesizes information from multiple sources with citations. Can take up to 15 minutes to complete.
+Conduct comprehensive deep research across the web using Parallel AI. Synthesizes information from multiple sources with citations. Can take up to 45 minutes to complete.

 #### Input

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `input` | string | Yes | Research query or question \(up to 15,000 characters\) |
-| `processor` | string | No | Compute level: base, lite, pro, ultra, ultra2x, ultra4x, ultra8x \(default: base\) |
+| `processor` | string | No | Processing tier: pro, ultra, pro-fast, ultra-fast \(default: pro\) |
 | `include_domains` | string | No | Comma-separated list of domains to restrict research to \(source policy\) |
 | `exclude_domains` | string | No | Comma-separated list of domains to exclude from research \(source policy\) |
 | `apiKey` | string | Yes | Parallel AI API Key |
@@ -101,17 +107,17 @@ Conduct comprehensive deep research across the web using Parallel AI. Synthesize

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `status` | string | Task status \(completed, failed\) |
+| `status` | string | Task status \(completed, failed, running\) |
 | `run_id` | string | Unique ID for this research task |
 | `message` | string | Status message |
 | `content` | object | Research results \(structured based on output_schema\) |
 | `basis` | array | Citations and sources with reasoning and confidence levels |
-|   ↳ `field` | string | Output field name |
+|   ↳ `field` | string | Output field dot-notation path |
 |   ↳ `reasoning` | string | Explanation for the result |
 |   ↳ `citations` | array | Array of sources |
 |     ↳ `url` | string | Source URL |
 |     ↳ `title` | string | Source title |
 |     ↳ `excerpts` | array | Relevant excerpts from the source |
-|   ↳ `confidence` | string | Confidence level indicator |
+|   ↳ `confidence` | string | Confidence level \(high, medium\) |


--- a/apps/docs/content/docs/en/tools/slack.mdx
+++ b/apps/docs/content/docs/en/tools/slack.mdx
@@ -590,6 +590,7 @@ List all users in a Slack workspace. Returns user profiles with names and avatar
 |   ↳ `name` | string | Username \(handle\) |
 |   ↳ `real_name` | string | Full real name |
 |   ↳ `display_name` | string | Display name shown in Slack |
+|   ↳ `email` | string | Email address \(requires users:read.email scope\) |
 |   ↳ `is_bot` | boolean | Whether the user is a bot |
 |   ↳ `is_admin` | boolean | Whether the user is a workspace admin |
 |   ↳ `is_owner` | boolean | Whether the user is the workspace owner |
@@ -629,6 +630,7 @@ Get detailed information about a specific Slack user by their user ID.
 |   ↳ `title` | string | Job title |
 |   ↳ `phone` | string | Phone number |
 |   ↳ `skype` | string | Skype handle |
+|   ↳ `email` | string | Email address \(requires users:read.email scope\) |
 |   ↳ `is_bot` | boolean | Whether the user is a bot |
 |   ↳ `is_admin` | boolean | Whether the user is a workspace admin |
 |   ↳ `is_owner` | boolean | Whether the user is the workspace owner |
--- a/apps/sim/app/api/a2a/serve/[agentId]/route.ts
+++ b/apps/sim/app/api/a2a/serve/[agentId]/route.ts
@@ -13,13 +13,12 @@ import {
  isTerminalState,
  parseWorkflowSSEChunk,
 } from '@/lib/a2a/utils'
-import { type AuthResult, checkHybridAuth } from '@/lib/auth/hybrid'
+import { type AuthResult, AuthType, checkHybridAuth } from '@/lib/auth/hybrid'
 import { acquireLock, getRedisClient, releaseLock } from '@/lib/core/config/redis'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
 import { SSE_HEADERS } from '@/lib/core/utils/sse'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { markExecutionCancelled } from '@/lib/execution/cancellation'
-import { decrementSSEConnections, incrementSSEConnections } from '@/lib/monitoring/sse-connections'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
 import { getWorkspaceBilledAccountUserId } from '@/lib/workspaces/utils'
 import {
@@ -271,9 +270,9 @@ export async function POST(request: NextRequest, { params }: { params: Promise<R

    const { id, method, params: rpcParams } = body
    const requestApiKey = request.headers.get('X-API-Key')
-    const apiKey = authenticatedAuthType === 'api_key' ? requestApiKey : null
+    const apiKey = authenticatedAuthType === AuthType.API_KEY ? requestApiKey : null
    const isPersonalApiKeyCaller =
-      authenticatedAuthType === 'api_key' && authenticatedApiKeyType === 'personal'
+      authenticatedAuthType === AuthType.API_KEY && authenticatedApiKeyType === 'personal'
    const callerFingerprint = getCallerFingerprint(request, authenticatedUserId)
    const billedUserId = await getWorkspaceBilledAccountUserId(agent.workspaceId)
    if (!billedUserId) {
@@ -720,11 +719,9 @@ async function handleMessageStream(
  }

  const encoder = new TextEncoder()
-  let messageStreamDecremented = false

  const stream = new ReadableStream({
    async start(controller) {
-      incrementSSEConnections('a2a-message')
      const sendEvent = (event: string, data: unknown) => {
        try {
          const jsonRpcResponse = {
@@ -1029,19 +1026,10 @@ async function handleMessageStream(
        })
      } finally {
        await releaseLock(lockKey, lockValue)
-        if (!messageStreamDecremented) {
-          messageStreamDecremented = true
-          decrementSSEConnections('a2a-message')
-        }
        controller.close()
      }
    },
-    cancel() {
-      if (!messageStreamDecremented) {
-        messageStreamDecremented = true
-        decrementSSEConnections('a2a-message')
-      }
-    },
+    cancel() {},
  })

  return new NextResponse(stream, {
@@ -1229,22 +1217,16 @@ async function handleTaskResubscribe(
    { once: true }
  )

-  let sseDecremented = false
  const cleanup = () => {
    isCancelled = true
    if (pollTimeoutId) {
      clearTimeout(pollTimeoutId)
      pollTimeoutId = null
    }
-    if (!sseDecremented) {
-      sseDecremented = true
-      decrementSSEConnections('a2a-resubscribe')
-    }
  }

  const stream = new ReadableStream({
    async start(controller) {
-      incrementSSEConnections('a2a-resubscribe')
      const sendEvent = (event: string, data: unknown): boolean => {
        if (isCancelled || abortSignal.aborted) return false
        try {
--- a/apps/sim/app/api/auth/oauth/credentials/route.test.ts
+++ b/apps/sim/app/api/auth/oauth/credentials/route.test.ts
@@ -24,6 +24,7 @@ const { mockCheckSessionOrInternalAuth, mockLogger } = vi.hoisted(() => {
 })

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
 }))

--- a/apps/sim/app/api/auth/oauth/token/route.test.ts
+++ b/apps/sim/app/api/auth/oauth/token/route.test.ts
@@ -51,6 +51,7 @@ vi.mock('@/lib/auth/credential-access', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkHybridAuth: vi.fn(),
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
  checkInternalAuth: vi.fn(),
--- a/apps/sim/app/api/auth/oauth/token/route.ts
+++ b/apps/sim/app/api/auth/oauth/token/route.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { AuthType, checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getCredential, getOAuthToken, refreshTokenIfNeeded } from '@/app/api/auth/oauth/utils'

@@ -72,7 +72,7 @@ export async function POST(request: NextRequest) {
      })

      const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
-      if (!auth.success || auth.authType !== 'session' || !auth.userId) {
+      if (!auth.success || auth.authType !== AuthType.SESSION || !auth.userId) {
        logger.warn(`[${requestId}] Unauthorized request for credentialAccountUserId path`, {
          success: auth.success,
          authType: auth.authType,
@@ -202,7 +202,7 @@ export async function GET(request: NextRequest) {
      credentialId,
      requireWorkflowIdForInternal: false,
    })
-    if (!authz.ok || authz.authType !== 'session' || !authz.credentialOwnerUserId) {
+    if (!authz.ok || authz.authType !== AuthType.SESSION || !authz.credentialOwnerUserId) {
      return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
    }

--- a/apps/sim/app/api/copilot/chat/delete/route.test.ts
+++ b/apps/sim/app/api/copilot/chat/delete/route.test.ts
@@ -32,6 +32,7 @@ vi.mock('@sim/db/schema', () => ({
 }))

 vi.mock('drizzle-orm', () => ({
+  and: vi.fn((...conditions: unknown[]) => ({ conditions, type: 'and' })),
  eq: vi.fn((field: unknown, value: unknown) => ({ field, value, type: 'eq' })),
 }))

--- a/apps/sim/app/api/copilot/chats/route.test.ts
+++ b/apps/sim/app/api/copilot/chats/route.test.ts
@@ -6,30 +6,28 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'

 const {
-  mockSelect,
+  mockSelectDistinctOn,
  mockFrom,
+  mockLeftJoin,
  mockWhere,
  mockOrderBy,
  mockAuthenticate,
  mockCreateUnauthorizedResponse,
  mockCreateInternalServerErrorResponse,
-  mockGetActiveWorkflowRecord,
-  mockCheckWorkspaceAccess,
 } = vi.hoisted(() => ({
-  mockSelect: vi.fn(),
+  mockSelectDistinctOn: vi.fn(),
  mockFrom: vi.fn(),
+  mockLeftJoin: vi.fn(),
  mockWhere: vi.fn(),
  mockOrderBy: vi.fn(),
  mockAuthenticate: vi.fn(),
  mockCreateUnauthorizedResponse: vi.fn(),
  mockCreateInternalServerErrorResponse: vi.fn(),
-  mockGetActiveWorkflowRecord: vi.fn(),
-  mockCheckWorkspaceAccess: vi.fn(),
 }))

 vi.mock('@sim/db', () => ({
  db: {
-    select: mockSelect,
+    selectDistinctOn: mockSelectDistinctOn,
  },
 }))

@@ -38,15 +36,34 @@ vi.mock('@sim/db/schema', () => ({
    id: 'id',
    title: 'title',
    workflowId: 'workflowId',
+    workspaceId: 'workspaceId',
    userId: 'userId',
    updatedAt: 'updatedAt',
  },
+  workflow: {
+    id: 'id',
+    workspaceId: 'workspaceId',
+    archivedAt: 'archivedAt',
+  },
+  workspace: {
+    id: 'id',
+    archivedAt: 'archivedAt',
+  },
+  permissions: {
+    id: 'id',
+    entityType: 'entityType',
+    entityId: 'entityId',
+    userId: 'userId',
+  },
 }))

 vi.mock('drizzle-orm', () => ({
  and: vi.fn((...conditions: unknown[]) => ({ conditions, type: 'and' })),
  eq: vi.fn((field: unknown, value: unknown) => ({ field, value, type: 'eq' })),
+  or: vi.fn((...conditions: unknown[]) => ({ conditions, type: 'or' })),
+  isNull: vi.fn((field: unknown) => ({ field, type: 'isNull' })),
  desc: vi.fn((field: unknown) => ({ field, type: 'desc' })),
+  sql: vi.fn(),
 }))

 vi.mock('@/lib/copilot/request-helpers', () => ({
@@ -55,22 +72,15 @@ vi.mock('@/lib/copilot/request-helpers', () => ({
  createInternalServerErrorResponse: mockCreateInternalServerErrorResponse,
 }))

-vi.mock('@/lib/workflows/active-context', () => ({
-  getActiveWorkflowRecord: mockGetActiveWorkflowRecord,
-}))
-
-vi.mock('@/lib/workspaces/permissions/utils', () => ({
-  checkWorkspaceAccess: mockCheckWorkspaceAccess,
-}))
-
 import { GET } from '@/app/api/copilot/chats/route'

 describe('Copilot Chats List API Route', () => {
  beforeEach(() => {
    vi.clearAllMocks()

-    mockSelect.mockReturnValue({ from: mockFrom })
-    mockFrom.mockReturnValue({ where: mockWhere })
+    mockSelectDistinctOn.mockReturnValue({ from: mockFrom })
+    mockFrom.mockReturnValue({ leftJoin: mockLeftJoin })
+    mockLeftJoin.mockReturnValue({ leftJoin: mockLeftJoin, where: mockWhere })
    mockWhere.mockReturnValue({ orderBy: mockOrderBy })
    mockOrderBy.mockResolvedValue([])

@@ -80,8 +90,6 @@ describe('Copilot Chats List API Route', () => {
    mockCreateInternalServerErrorResponse.mockImplementation(
      (message: string) => new Response(JSON.stringify({ error: message }), { status: 500 })
    )
-    mockGetActiveWorkflowRecord.mockResolvedValue({ id: 'workflow-1' })
-    mockCheckWorkspaceAccess.mockResolvedValue({ exists: true, hasAccess: true })
  })

  afterEach(() => {
@@ -252,7 +260,7 @@ describe('Copilot Chats List API Route', () => {
      const request = new Request('http://localhost:3000/api/copilot/chats')
      await GET(request as any)

-      expect(mockSelect).toHaveBeenCalled()
+      expect(mockSelectDistinctOn).toHaveBeenCalled()
      expect(mockWhere).toHaveBeenCalled()
    })

--- a/apps/sim/app/api/files/delete/route.test.ts
+++ b/apps/sim/app/api/files/delete/route.test.ts
@@ -91,6 +91,7 @@ vi.mock('@/lib/auth', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkHybridAuth: mocks.mockCheckHybridAuth,
  checkSessionOrInternalAuth: mocks.mockCheckSessionOrInternalAuth,
  checkInternalAuth: mocks.mockCheckInternalAuth,
--- a/apps/sim/app/api/files/parse/route.test.ts
+++ b/apps/sim/app/api/files/parse/route.test.ts
@@ -106,6 +106,7 @@ vi.mock('@/lib/auth', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkInternalAuth: mockCheckInternalAuth,
  checkHybridAuth: mockCheckHybridAuth,
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
--- a/apps/sim/app/api/files/serve/[...path]/route.test.ts
+++ b/apps/sim/app/api/files/serve/[...path]/route.test.ts
@@ -49,6 +49,7 @@ vi.mock('fs/promises', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
 }))

--- a/apps/sim/app/api/files/upload/route.test.ts
+++ b/apps/sim/app/api/files/upload/route.test.ts
@@ -100,6 +100,7 @@ vi.mock('@/lib/auth', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkHybridAuth: mocks.mockCheckHybridAuth,
  checkSessionOrInternalAuth: mocks.mockCheckSessionOrInternalAuth,
  checkInternalAuth: mocks.mockCheckInternalAuth,
--- a/apps/sim/app/api/function/execute/route.test.ts
+++ b/apps/sim/app/api/function/execute/route.test.ts
@@ -18,6 +18,7 @@ vi.mock('@/lib/execution/isolated-vm', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkInternalAuth: mockCheckInternalAuth,
 }))

--- a/apps/sim/app/api/health/route.test.ts
+++ b/apps/sim/app/api/health/route.test.ts
@@ -0,0 +1,17 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { GET } from '@/app/api/health/route'
+
+describe('GET /api/health', () => {
+  it('returns an ok status payload', async () => {
+    const response = await GET()
+
+    expect(response.status).toBe(200)
+    await expect(response.json()).resolves.toEqual({
+      status: 'ok',
+      timestamp: expect.any(String),
+    })
+  })
+})
--- a/apps/sim/app/api/health/route.ts
+++ b/apps/sim/app/api/health/route.ts
@@ -0,0 +1,12 @@
+/**
+ * Health check endpoint for deployment platforms and container probes.
+ */
+export async function GET(): Promise<Response> {
+  return Response.json(
+    {
+      status: 'ok',
+      timestamp: new Date().toISOString(),
+    },
+    { status: 200 }
+  )
+}
--- a/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { AuthType, checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/constants'
 import { createTagDefinition, getTagDefinitions } from '@/lib/knowledge/tags/service'
 import { checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
@@ -25,7 +25,7 @@ export async function GET(req: NextRequest, { params }: { params: Promise<{ id:
    }

    // For session auth, verify KB access. Internal JWT is trusted.
-    if (auth.authType === 'session' && auth.userId) {
+    if (auth.authType === AuthType.SESSION && auth.userId) {
      const accessCheck = await checkKnowledgeBaseWriteAccess(knowledgeBaseId, auth.userId)
      if (!accessCheck.hasAccess) {
        return NextResponse.json(
@@ -65,7 +65,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
    }

    // For session auth, verify KB access. Internal JWT is trusted.
-    if (auth.authType === 'session' && auth.userId) {
+    if (auth.authType === AuthType.SESSION && auth.userId) {
      const accessCheck = await checkKnowledgeBaseWriteAccess(knowledgeBaseId, auth.userId)
      if (!accessCheck.hasAccess) {
        return NextResponse.json(
--- a/apps/sim/app/api/knowledge/search/route.test.ts
+++ b/apps/sim/app/api/knowledge/search/route.test.ts
@@ -68,6 +68,7 @@ vi.mock('@sim/db', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
 }))

--- a/apps/sim/app/api/mcp/events/route.test.ts
+++ b/apps/sim/app/api/mcp/events/route.test.ts
@@ -19,6 +19,37 @@ vi.mock('@/lib/workspaces/permissions/utils', () => ({
  getUserEntityPermissions: mockGetUserEntityPermissions,
 }))

+vi.mock('@/lib/events/sse-endpoint', () => ({
+  createWorkspaceSSE: (_config: any) => {
+    return async (request: any) => {
+      const session = await mockGetSession()
+      if (!session?.user?.id) {
+        return new Response('Unauthorized', { status: 401 })
+      }
+      const url = new URL(request.url)
+      const workspaceId = url.searchParams.get('workspaceId')
+      if (!workspaceId) {
+        return new Response('Missing workspaceId query parameter', { status: 400 })
+      }
+      const permissions = await mockGetUserEntityPermissions(
+        session.user.id,
+        'workspace',
+        workspaceId
+      )
+      if (!permissions) {
+        return new Response('Access denied to workspace', { status: 403 })
+      }
+      return new Response(new ReadableStream({ start() {} }), {
+        headers: {
+          'Content-Type': 'text/event-stream',
+          'Cache-Control': 'no-cache',
+          Connection: 'keep-alive',
+        },
+      })
+    }
+  },
+}))
+
 vi.mock('@/lib/mcp/connection-manager', () => ({
  mcpConnectionManager: null,
 }))
--- a/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
+++ b/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
@@ -69,6 +69,7 @@ vi.mock('@sim/db/schema', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkHybridAuth: mockCheckHybridAuth,
  checkSessionOrInternalAuth: vi.fn(),
  checkInternalAuth: vi.fn(),
--- a/apps/sim/app/api/mcp/serve/[serverId]/route.ts
+++ b/apps/sim/app/api/mcp/serve/[serverId]/route.ts
@@ -19,7 +19,7 @@ import { workflow, workflowMcpServer, workflowMcpTool, workspace } from '@sim/db
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { type AuthResult, checkHybridAuth } from '@/lib/auth/hybrid'
+import { type AuthResult, AuthType, checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateInternalToken } from '@/lib/auth/internal'
 import { getMaxExecutionTimeout } from '@/lib/core/execution-limits'
 import { getInternalApiBaseUrl } from '@/lib/core/utils/urls'
@@ -152,7 +152,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<R
      executeAuthContext = {
        authType: auth.authType,
        userId: auth.userId,
-        apiKey: auth.authType === 'api_key' ? request.headers.get('X-API-Key') : null,
+        apiKey: auth.authType === AuthType.API_KEY ? request.headers.get('X-API-Key') : null,
      }
    }

@@ -316,7 +316,7 @@ async function handleToolsCall(
      const internalToken = await generateInternalToken(publicServerOwnerId)
      headers.Authorization = `Bearer ${internalToken}`
    } else if (executeAuthContext) {
-      if (executeAuthContext.authType === 'api_key' && executeAuthContext.apiKey) {
+      if (executeAuthContext.authType === AuthType.API_KEY && executeAuthContext.apiKey) {
        headers['X-API-Key'] = executeAuthContext.apiKey
      } else {
        const internalToken = await generateInternalToken(executeAuthContext.userId)
--- a/apps/sim/app/api/mcp/servers/[id]/refresh/route.ts
+++ b/apps/sim/app/api/mcp/servers/[id]/refresh/route.ts
@@ -192,7 +192,8 @@ export const POST = withMcpAuth<{ id: string }>('read')(
        )
      } catch (error) {
        connectionStatus = 'error'
-        lastError = error instanceof Error ? error.message : 'Connection test failed'
+        lastError =
+          error instanceof Error ? error.message.split('\n')[0].slice(0, 200) : 'Connection failed'
        logger.warn(`[${requestId}] Failed to connect to server ${serverId}:`, error)
      }

--- a/apps/sim/app/api/mcp/servers/test-connection/route.ts
+++ b/apps/sim/app/api/mcp/servers/test-connection/route.ts
@@ -41,6 +41,20 @@ interface TestConnectionResult {
  warnings?: string[]
 }

+/**
+ * Extracts a user-friendly error message from connection errors.
+ * Keeps diagnostic info (timeout, DNS, HTTP status) but strips
+ * verbose internals (Zod details, full response bodies, stack traces).
+ */
+function sanitizeConnectionError(error: unknown): string {
+  if (!(error instanceof Error)) {
+    return 'Unknown connection error'
+  }
+
+  const firstLine = error.message.split('\n')[0]
+  return firstLine.length > 200 ? `${firstLine.slice(0, 200)}...` : firstLine
+}
+
 /**
 * POST - Test connection to an MCP server before registering it
 */
@@ -137,8 +151,7 @@ export const POST = withMcpAuth('write')(
        } catch (toolError) {
          logger.warn(`[${requestId}] Connection established but could not list tools:`, toolError)
          result.success = false
-          const errorMessage = toolError instanceof Error ? toolError.message : 'Unknown error'
-          result.error = `Connection established but could not list tools: ${errorMessage}`
+          result.error = 'Connection established but could not list tools'
          result.warnings = result.warnings || []
          result.warnings.push(
            'Server connected but tool listing failed - connection may be incomplete'
@@ -163,11 +176,7 @@ export const POST = withMcpAuth('write')(
        logger.warn(`[${requestId}] MCP server test failed:`, error)

        result.success = false
-        if (error instanceof Error) {
-          result.error = error.message
-        } else {
-          result.error = 'Unknown connection error'
-        }
+        result.error = sanitizeConnectionError(error)
      } finally {
        if (client) {
          try {
--- a/apps/sim/app/api/mcp/tools/execute/route.ts
+++ b/apps/sim/app/api/mcp/tools/execute/route.ts
@@ -89,11 +89,12 @@ export const POST = withMcpAuth('read')(
          tool = tools.find((t) => t.name === toolName) ?? null

          if (!tool) {
+            logger.warn(`[${requestId}] Tool ${toolName} not found on server ${serverId}`, {
+              availableTools: tools.map((t) => t.name),
+            })
            return createMcpErrorResponse(
-              new Error(
-                `Tool ${toolName} not found on server ${serverId}. Available tools: ${tools.map((t) => t.name).join(', ')}`
-              ),
-              'Tool not found',
+              new Error('Tool not found'),
+              'Tool not found on the specified server',
              404
            )
          }
--- a/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
+++ b/apps/sim/app/api/resume/[workflowId]/[executionId]/[contextId]/route.ts
@@ -1,6 +1,7 @@
 import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
+import { AuthType } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
@@ -39,7 +40,7 @@ export async function POST(

  const resumeInput = payload?.input ?? payload ?? {}
  const isPersonalApiKeyCaller =
-    access.auth?.authType === 'api_key' && access.auth?.apiKeyType === 'personal'
+    access.auth?.authType === AuthType.API_KEY && access.auth?.apiKeyType === 'personal'

  let userId: string
  if (isPersonalApiKeyCaller && access.auth?.userId) {
--- a/apps/sim/app/api/schedules/execute/route.test.ts
+++ b/apps/sim/app/api/schedules/execute/route.test.ts
@@ -109,7 +109,11 @@ vi.mock('@sim/db', () => ({
  },
 }))

-import { GET } from '@/app/api/schedules/execute/route'
+vi.mock('uuid', () => ({
+  v4: vi.fn().mockReturnValue('schedule-execution-1'),
+}))
+
+import { GET } from './route'

 const SINGLE_SCHEDULE = [
  {
@@ -206,4 +210,44 @@ describe('Scheduled Workflow Execution API Route', () => {
    const data = await response.json()
    expect(data).toHaveProperty('executedCount', 2)
  })
+
+  it('should enqueue preassigned correlation metadata for schedules', async () => {
+    mockDbReturning.mockReturnValue(SINGLE_SCHEDULE)
+
+    const response = await GET(createMockRequest())
+
+    expect(response.status).toBe(200)
+    expect(mockEnqueue).toHaveBeenCalledWith(
+      'schedule-execution',
+      expect.objectContaining({
+        scheduleId: 'schedule-1',
+        workflowId: 'workflow-1',
+        executionId: 'schedule-execution-1',
+        requestId: 'test-request-id',
+        correlation: {
+          executionId: 'schedule-execution-1',
+          requestId: 'test-request-id',
+          source: 'schedule',
+          workflowId: 'workflow-1',
+          scheduleId: 'schedule-1',
+          triggerType: 'schedule',
+          scheduledFor: '2025-01-01T00:00:00.000Z',
+        },
+      }),
+      {
+        metadata: {
+          workflowId: 'workflow-1',
+          correlation: {
+            executionId: 'schedule-execution-1',
+            requestId: 'test-request-id',
+            source: 'schedule',
+            workflowId: 'workflow-1',
+            scheduleId: 'schedule-1',
+            triggerType: 'schedule',
+            scheduledFor: '2025-01-01T00:00:00.000Z',
+          },
+        },
+      }
+    )
+  })
 })
--- a/apps/sim/app/api/schedules/execute/route.ts
+++ b/apps/sim/app/api/schedules/execute/route.ts
@@ -2,6 +2,7 @@ import { db, workflowDeploymentVersion, workflowSchedule } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, lt, lte, ne, not, or, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
+import { v4 as uuidv4 } from 'uuid'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { getJobQueue, shouldExecuteInline } from '@/lib/core/async-jobs'
 import { generateRequestId } from '@/lib/core/utils/request'
@@ -84,10 +85,23 @@ export async function GET(request: NextRequest) {

    const schedulePromises = dueSchedules.map(async (schedule) => {
      const queueTime = schedule.lastQueuedAt ?? queuedAt
+      const executionId = uuidv4()
+      const correlation = {
+        executionId,
+        requestId,
+        source: 'schedule' as const,
+        workflowId: schedule.workflowId,
+        scheduleId: schedule.id,
+        triggerType: 'schedule',
+        scheduledFor: schedule.nextRunAt?.toISOString(),
+      }

      const payload = {
        scheduleId: schedule.id,
        workflowId: schedule.workflowId!,
+        executionId,
+        requestId,
+        correlation,
        blockId: schedule.blockId || undefined,
        cronExpression: schedule.cronExpression || undefined,
        lastRanAt: schedule.lastRanAt?.toISOString(),
@@ -98,7 +112,7 @@ export async function GET(request: NextRequest) {

      try {
        const jobId = await jobQueue.enqueue('schedule-execution', payload, {
-          metadata: { workflowId: schedule.workflowId ?? undefined },
+          metadata: { workflowId: schedule.workflowId ?? undefined, correlation },
        })
        logger.info(
          `[${requestId}] Queued schedule execution task ${jobId} for workflow ${schedule.workflowId}`
--- a/apps/sim/app/api/tools/a2a/cancel-task/route.ts
+++ b/apps/sim/app/api/tools/a2a/cancel-task/route.ts
@@ -76,7 +76,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Failed to cancel task',
+        error: 'Failed to cancel task',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/a2a/delete-push-notification/route.ts
+++ b/apps/sim/app/api/tools/a2a/delete-push-notification/route.ts
@@ -86,7 +86,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Failed to delete push notification',
+        error: 'Failed to delete push notification',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/a2a/get-agent-card/route.ts
+++ b/apps/sim/app/api/tools/a2a/get-agent-card/route.ts
@@ -84,7 +84,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Failed to fetch Agent Card',
+        error: 'Failed to fetch Agent Card',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/a2a/get-push-notification/route.ts
+++ b/apps/sim/app/api/tools/a2a/get-push-notification/route.ts
@@ -107,7 +107,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Failed to get push notification',
+        error: 'Failed to get push notification',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/a2a/get-task/route.ts
+++ b/apps/sim/app/api/tools/a2a/get-task/route.ts
@@ -87,7 +87,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Failed to get task',
+        error: 'Failed to get task',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/a2a/resubscribe/route.ts
+++ b/apps/sim/app/api/tools/a2a/resubscribe/route.ts
@@ -111,7 +111,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Failed to resubscribe',
+        error: 'Failed to resubscribe',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/a2a/send-message/route.ts
+++ b/apps/sim/app/api/tools/a2a/send-message/route.ts
@@ -70,7 +70,7 @@ export async function POST(request: NextRequest) {
      return NextResponse.json(
        {
          success: false,
-          error: `Failed to connect to agent: ${clientError instanceof Error ? clientError.message : 'Unknown error'}`,
+          error: 'Failed to connect to agent',
        },
        { status: 502 }
      )
@@ -158,7 +158,7 @@ export async function POST(request: NextRequest) {
      return NextResponse.json(
        {
          success: false,
-          error: `Failed to send message: ${sendError instanceof Error ? sendError.message : 'Unknown error'}`,
+          error: 'Failed to send message to agent',
        },
        { status: 502 }
      )
@@ -218,7 +218,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Internal server error',
+        error: 'Internal server error',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/a2a/set-push-notification/route.ts
+++ b/apps/sim/app/api/tools/a2a/set-push-notification/route.ts
@@ -98,7 +98,7 @@ export async function POST(request: NextRequest) {
    return NextResponse.json(
      {
        success: false,
-        error: error instanceof Error ? error.message : 'Failed to set push notification',
+        error: 'Failed to set push notification',
      },
      { status: 500 }
    )
--- a/apps/sim/app/api/tools/custom/route.test.ts
+++ b/apps/sim/app/api/tools/custom/route.test.ts
@@ -182,6 +182,7 @@ vi.mock('@/lib/auth', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkSessionOrInternalAuth: (...args: unknown[]) => mockCheckSessionOrInternalAuth(...args),
 }))

--- a/apps/sim/app/api/tools/mongodb/utils.ts
+++ b/apps/sim/app/api/tools/mongodb/utils.ts
@@ -1,7 +1,13 @@
 import { MongoClient } from 'mongodb'
+import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'
 import type { MongoDBCollectionInfo, MongoDBConnectionConfig } from '@/tools/mongodb/types'

 export async function createMongoDBConnection(config: MongoDBConnectionConfig) {
+  const hostValidation = await validateDatabaseHost(config.host, 'host')
+  if (!hostValidation.isValid) {
+    throw new Error(hostValidation.error)
+  }
+
  const credentials =
    config.username && config.password
      ? `${encodeURIComponent(config.username)}:${encodeURIComponent(config.password)}@`
--- a/apps/sim/app/api/tools/mysql/utils.ts
+++ b/apps/sim/app/api/tools/mysql/utils.ts
@@ -1,4 +1,5 @@
 import mysql from 'mysql2/promise'
+import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'

 export interface MySQLConnectionConfig {
  host: string
@@ -10,6 +11,11 @@ export interface MySQLConnectionConfig {
 }

 export async function createMySQLConnection(config: MySQLConnectionConfig) {
+  const hostValidation = await validateDatabaseHost(config.host, 'host')
+  if (!hostValidation.isValid) {
+    throw new Error(hostValidation.error)
+  }
+
  const connectionConfig: mysql.ConnectionOptions = {
    host: config.host,
    port: config.port,
--- a/apps/sim/app/api/tools/neo4j/utils.ts
+++ b/apps/sim/app/api/tools/neo4j/utils.ts
@@ -1,7 +1,13 @@
 import neo4j from 'neo4j-driver'
+import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'
 import type { Neo4jConnectionConfig } from '@/tools/neo4j/types'

 export async function createNeo4jDriver(config: Neo4jConnectionConfig) {
+  const hostValidation = await validateDatabaseHost(config.host, 'host')
+  if (!hostValidation.isValid) {
+    throw new Error(hostValidation.error)
+  }
+
  const isAuraHost =
    config.host === 'databases.neo4j.io' || config.host.endsWith('.databases.neo4j.io')

--- a/apps/sim/app/api/tools/postgresql/delete/route.ts
+++ b/apps/sim/app/api/tools/postgresql/delete/route.ts
@@ -35,7 +35,7 @@ export async function POST(request: NextRequest) {
      `[${requestId}] Deleting data from ${params.table} on ${params.host}:${params.port}/${params.database}`
    )

-    const sql = createPostgresConnection({
+    const sql = await createPostgresConnection({
      host: params.host,
      port: params.port,
      database: params.database,
--- a/apps/sim/app/api/tools/postgresql/execute/route.ts
+++ b/apps/sim/app/api/tools/postgresql/execute/route.ts
@@ -47,7 +47,7 @@ export async function POST(request: NextRequest) {
      )
    }

-    const sql = createPostgresConnection({
+    const sql = await createPostgresConnection({
      host: params.host,
      port: params.port,
      database: params.database,
--- a/apps/sim/app/api/tools/postgresql/insert/route.ts
+++ b/apps/sim/app/api/tools/postgresql/insert/route.ts
@@ -57,7 +57,7 @@ export async function POST(request: NextRequest) {
      `[${requestId}] Inserting data into ${params.table} on ${params.host}:${params.port}/${params.database}`
    )

-    const sql = createPostgresConnection({
+    const sql = await createPostgresConnection({
      host: params.host,
      port: params.port,
      database: params.database,
--- a/apps/sim/app/api/tools/postgresql/introspect/route.ts
+++ b/apps/sim/app/api/tools/postgresql/introspect/route.ts
@@ -34,7 +34,7 @@ export async function POST(request: NextRequest) {
      `[${requestId}] Introspecting PostgreSQL schema on ${params.host}:${params.port}/${params.database}`
    )

-    const sql = createPostgresConnection({
+    const sql = await createPostgresConnection({
      host: params.host,
      port: params.port,
      database: params.database,
--- a/apps/sim/app/api/tools/postgresql/query/route.ts
+++ b/apps/sim/app/api/tools/postgresql/query/route.ts
@@ -34,7 +34,7 @@ export async function POST(request: NextRequest) {
      `[${requestId}] Executing PostgreSQL query on ${params.host}:${params.port}/${params.database}`
    )

-    const sql = createPostgresConnection({
+    const sql = await createPostgresConnection({
      host: params.host,
      port: params.port,
      database: params.database,
--- a/apps/sim/app/api/tools/postgresql/update/route.ts
+++ b/apps/sim/app/api/tools/postgresql/update/route.ts
@@ -54,7 +54,7 @@ export async function POST(request: NextRequest) {
      `[${requestId}] Updating data in ${params.table} on ${params.host}:${params.port}/${params.database}`
    )

-    const sql = createPostgresConnection({
+    const sql = await createPostgresConnection({
      host: params.host,
      port: params.port,
      database: params.database,
--- a/apps/sim/app/api/tools/postgresql/utils.ts
+++ b/apps/sim/app/api/tools/postgresql/utils.ts
@@ -1,7 +1,13 @@
 import postgres from 'postgres'
+import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'
 import type { PostgresConnectionConfig } from '@/tools/postgresql/types'

-export function createPostgresConnection(config: PostgresConnectionConfig) {
+export async function createPostgresConnection(config: PostgresConnectionConfig) {
+  const hostValidation = await validateDatabaseHost(config.host, 'host')
+  if (!hostValidation.isValid) {
+    throw new Error(hostValidation.error)
+  }
+
  const sslConfig =
    config.ssl === 'disabled'
      ? false
--- a/apps/sim/app/api/tools/redis/execute/route.ts
+++ b/apps/sim/app/api/tools/redis/execute/route.ts
@@ -3,6 +3,7 @@ import Redis from 'ioredis'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { validateDatabaseHost } from '@/lib/core/security/input-validation.server'

 const logger = createLogger('RedisAPI')

@@ -24,6 +25,16 @@ export async function POST(request: NextRequest) {
    const body = await request.json()
    const { url, command, args } = RequestSchema.parse(body)

+    const parsedUrl = new URL(url)
+    const hostname =
+      parsedUrl.hostname.startsWith('[') && parsedUrl.hostname.endsWith(']')
+        ? parsedUrl.hostname.slice(1, -1)
+        : parsedUrl.hostname
+    const hostValidation = await validateDatabaseHost(hostname, 'host')
+    if (!hostValidation.isValid) {
+      return NextResponse.json({ error: hostValidation.error }, { status: 400 })
+    }
+
    client = new Redis(url, {
      connectTimeout: 10000,
      commandTimeout: 10000,
--- a/apps/sim/app/api/users/me/usage-limits/route.ts
+++ b/apps/sim/app/api/users/me/usage-limits/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 { AuthType, checkHybridAuth } from '@/lib/auth/hybrid'
 import { checkServerSideUsageLimits } from '@/lib/billing'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { getEffectiveCurrentPeriodCost } from '@/lib/billing/core/usage'
@@ -20,7 +20,7 @@ export async function GET(request: NextRequest) {

    const userSubscription = await getHighestPrioritySubscription(authenticatedUserId)
    const rateLimiter = new RateLimiter()
-    const triggerType = auth.authType === 'api_key' ? 'api' : 'manual'
+    const triggerType = auth.authType === AuthType.API_KEY ? 'api' : 'manual'
    const [syncStatus, asyncStatus] = await Promise.all([
      rateLimiter.getRateLimitStatusWithSubscription(
        authenticatedUserId,
--- a/apps/sim/app/api/wand/route.ts
+++ b/apps/sim/app/api/wand/route.ts
@@ -10,7 +10,6 @@ import { checkAndBillOverageThreshold } from '@/lib/billing/threshold-billing'
 import { env } from '@/lib/core/config/env'
 import { getCostMultiplier, isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { generateRequestId } from '@/lib/core/utils/request'
-import { decrementSSEConnections, incrementSSEConnections } from '@/lib/monitoring/sse-connections'
 import { enrichTableSchema } from '@/lib/table/llm/wand'
 import { verifyWorkspaceMembership } from '@/app/api/workflows/utils'
 import { extractResponseText, parseResponsesUsage } from '@/providers/openai/utils'
@@ -331,14 +330,10 @@ export async function POST(req: NextRequest) {
        const encoder = new TextEncoder()
        const decoder = new TextDecoder()

-        let wandStreamClosed = false
        const readable = new ReadableStream({
          async start(controller) {
-            incrementSSEConnections('wand')
            const reader = response.body?.getReader()
            if (!reader) {
-              wandStreamClosed = true
-              decrementSSEConnections('wand')
              controller.close()
              return
            }
@@ -483,18 +478,9 @@ export async function POST(req: NextRequest) {
              controller.close()
            } finally {
              reader.releaseLock()
-              if (!wandStreamClosed) {
-                wandStreamClosed = true
-                decrementSSEConnections('wand')
-              }
-            }
-          },
-          cancel() {
-            if (!wandStreamClosed) {
-              wandStreamClosed = true
-              decrementSSEConnections('wand')
            }
          },
+          cancel() {},
        })

        return new Response(readable, {
--- a/apps/sim/app/api/webhooks/route.ts
+++ b/apps/sim/app/api/webhooks/route.ts
@@ -401,9 +401,7 @@ export async function POST(request: NextRequest) {
            )
          }

-          // Configure each new webhook (for providers that need configuration)
-          const pollingProviders = ['gmail', 'outlook']
-          const needsConfiguration = pollingProviders.includes(provider)
+          const needsConfiguration = provider === 'gmail' || provider === 'outlook'

          if (needsConfiguration) {
            const configureFunc =
--- a/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
+++ b/apps/sim/app/api/webhooks/trigger/[path]/route.test.ts
@@ -101,6 +101,7 @@ const {
  processWebhookMock,
  executeMock,
  getWorkspaceBilledAccountUserIdMock,
+  queueWebhookExecutionMock,
 } = vi.hoisted(() => ({
  generateRequestHashMock: vi.fn().mockResolvedValue('test-hash-123'),
  validateSlackSignatureMock: vi.fn().mockResolvedValue(true),
@@ -125,6 +126,10 @@ const {
    .mockImplementation(async (workspaceId: string | null | undefined) =>
      workspaceId ? 'test-user-id' : null
    ),
+  queueWebhookExecutionMock: vi.fn().mockImplementation(async () => {
+    const { NextResponse } = await import('next/server')
+    return NextResponse.json({ message: 'Webhook processed' })
+  }),
 }))

 vi.mock('@trigger.dev/sdk', () => ({
@@ -268,6 +273,32 @@ vi.mock('@/lib/webhooks/processor', () => ({
    }
  }),
  handleProviderChallenges: vi.fn().mockResolvedValue(null),
+  handlePreLookupWebhookVerification: vi
+    .fn()
+    .mockImplementation(
+      async (
+        method: string,
+        body: Record<string, unknown> | undefined,
+        _requestId: string,
+        path: string
+      ) => {
+        if (path !== 'pending-verification-path') {
+          return null
+        }
+
+        const isVerificationProbe =
+          method === 'GET' ||
+          method === 'HEAD' ||
+          (method === 'POST' && (!body || Object.keys(body).length === 0 || !body.type))
+
+        if (!isVerificationProbe) {
+          return null
+        }
+
+        const { NextResponse } = require('next/server')
+        return NextResponse.json({ status: 'ok', message: 'Webhook endpoint verified' })
+      }
+    ),
  handleProviderReachabilityTest: vi.fn().mockReturnValue(null),
  verifyProviderAuth: vi
    .fn()
@@ -324,19 +355,28 @@ vi.mock('@/lib/webhooks/processor', () => ({
        return null
      }
    ),
-  checkWebhookPreprocessing: vi.fn().mockResolvedValue(null),
+  checkWebhookPreprocessing: vi.fn().mockResolvedValue({
+    error: null,
+    actorUserId: 'test-user-id',
+    executionId: 'preprocess-execution-id',
+    correlation: {
+      executionId: 'preprocess-execution-id',
+      requestId: 'mock-request-id',
+      source: 'webhook',
+      workflowId: 'test-workflow-id',
+      webhookId: 'generic-webhook-id',
+      path: 'test-path',
+      provider: 'generic',
+      triggerType: 'webhook',
+    },
+  }),
  formatProviderErrorResponse: vi.fn().mockImplementation((_webhook, error, status) => {
    const { NextResponse } = require('next/server')
    return NextResponse.json({ error }, { status })
  }),
  shouldSkipWebhookEvent: vi.fn().mockReturnValue(false),
  handlePreDeploymentVerification: vi.fn().mockReturnValue(null),
-  queueWebhookExecution: vi.fn().mockImplementation(async () => {
-    // Call processWebhookMock so tests can verify it was called
-    processWebhookMock()
-    const { NextResponse } = await import('next/server')
-    return NextResponse.json({ message: 'Webhook processed' })
-  }),
+  queueWebhookExecution: queueWebhookExecutionMock,
 }))

 vi.mock('drizzle-orm/postgres-js', () => ({
@@ -351,7 +391,7 @@ vi.mock('@/lib/core/utils/request', () => requestUtilsMock)

 process.env.DATABASE_URL = 'postgresql://test:test@localhost:5432/test'

-import { POST } from '@/app/api/webhooks/trigger/[path]/route'
+import { GET, POST } from '@/app/api/webhooks/trigger/[path]/route'

 describe('Webhook Trigger API Route', () => {
  beforeEach(() => {
@@ -387,11 +427,77 @@ describe('Webhook Trigger API Route', () => {
  })

  it('should handle 404 for non-existent webhooks', async () => {
+    const req = createMockRequest('POST', { type: 'event.test' })
+
+    const params = Promise.resolve({ path: 'non-existent-path' })
+
+    const response = await POST(req as any, { params })
+
+    expect(response.status).toBe(404)
+
+    const text = await response.text()
+    expect(text).toMatch(/not found/i)
+  })
+
+  it('should return 405 for GET requests on unknown webhook paths', async () => {
+    const req = createMockRequest(
+      'GET',
+      undefined,
+      {},
+      'http://localhost:3000/api/webhooks/trigger/non-existent-path'
+    )
+
+    const params = Promise.resolve({ path: 'non-existent-path' })
+
+    const response = await GET(req as any, { params })
+
+    expect(response.status).toBe(405)
+  })
+
+  it('should return 200 for GET verification probes on registered pending paths', async () => {
+    const req = createMockRequest(
+      'GET',
+      undefined,
+      {},
+      'http://localhost:3000/api/webhooks/trigger/pending-verification-path'
+    )
+
+    const params = Promise.resolve({ path: 'pending-verification-path' })
+
+    const response = await GET(req as any, { params })
+
+    expect(response.status).toBe(200)
+    await expect(response.json()).resolves.toMatchObject({
+      status: 'ok',
+      message: 'Webhook endpoint verified',
+    })
+  })
+
+  it('should return 200 for empty POST verification probes on registered pending paths', async () => {
+    const req = createMockRequest(
+      'POST',
+      undefined,
+      {},
+      'http://localhost:3000/api/webhooks/trigger/pending-verification-path'
+    )
+
+    const params = Promise.resolve({ path: 'pending-verification-path' })
+
+    const response = await POST(req as any, { params })
+
+    expect(response.status).toBe(200)
+    await expect(response.json()).resolves.toMatchObject({
+      status: 'ok',
+      message: 'Webhook endpoint verified',
+    })
+  })
+
+  it('should return 404 for POST requests without type on unknown webhook paths', async () => {
    const req = createMockRequest('POST', { event: 'test' })

    const params = Promise.resolve({ path: 'non-existent-path' })

-    const response = await POST(req, { params })
+    const response = await POST(req as any, { params })

    expect(response.status).toBe(404)

@@ -400,6 +506,47 @@ describe('Webhook Trigger API Route', () => {
  })

  describe('Generic Webhook Authentication', () => {
+    it('passes correlation-bearing request context into webhook queueing', async () => {
+      testData.webhooks.push({
+        id: 'generic-webhook-id',
+        provider: 'generic',
+        path: 'test-path',
+        isActive: true,
+        providerConfig: { requireAuth: false },
+        workflowId: 'test-workflow-id',
+      })
+
+      const req = createMockRequest('POST', { event: 'test', id: 'test-123' })
+      const params = Promise.resolve({ path: 'test-path' })
+
+      const response = await POST(req as any, { params })
+
+      expect(response.status).toBe(200)
+      expect(queueWebhookExecutionMock).toHaveBeenCalledOnce()
+      const call = queueWebhookExecutionMock.mock.calls[0]
+      expect(call[0]).toEqual(expect.objectContaining({ id: 'generic-webhook-id' }))
+      expect(call[1]).toEqual(expect.objectContaining({ id: 'test-workflow-id' }))
+      expect(call[2]).toEqual(expect.objectContaining({ event: 'test', id: 'test-123' }))
+      expect(call[4]).toEqual(
+        expect.objectContaining({
+          requestId: 'mock-request-id',
+          path: 'test-path',
+          actorUserId: 'test-user-id',
+          executionId: 'preprocess-execution-id',
+          correlation: {
+            executionId: 'preprocess-execution-id',
+            requestId: 'mock-request-id',
+            source: 'webhook',
+            workflowId: 'test-workflow-id',
+            webhookId: 'generic-webhook-id',
+            path: 'test-path',
+            provider: 'generic',
+            triggerType: 'webhook',
+          },
+        })
+      )
+    })
+
    it('should process generic webhook without authentication', async () => {
      testData.webhooks.push({
        id: 'generic-webhook-id',
@@ -420,7 +567,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'test', id: 'test-123' })
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(200)

@@ -450,7 +597,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'bearer.test' }, headers)
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(200)
    })
@@ -481,7 +628,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'custom.header.test' }, headers)
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(200)
    })
@@ -516,7 +663,7 @@ describe('Webhook Trigger API Route', () => {
        const req = createMockRequest('POST', { event: 'case.test' }, headers)
        const params = Promise.resolve({ path: 'test-path' })

-        const response = await POST(req, { params })
+        const response = await POST(req as any, { params })

        expect(response.status).toBe(200)
      }
@@ -551,7 +698,7 @@ describe('Webhook Trigger API Route', () => {
        const req = createMockRequest('POST', { event: 'custom.case.test' }, headers)
        const params = Promise.resolve({ path: 'test-path' })

-        const response = await POST(req, { params })
+        const response = await POST(req as any, { params })

        expect(response.status).toBe(200)
      }
@@ -574,7 +721,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'wrong.token.test' }, headers)
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(401)
      expect(await response.text()).toContain('Unauthorized - Invalid authentication token')
@@ -602,7 +749,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'wrong.custom.test' }, headers)
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(401)
      expect(await response.text()).toContain('Unauthorized - Invalid authentication token')
@@ -622,7 +769,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'no.auth.test' })
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(401)
      expect(await response.text()).toContain('Unauthorized - Invalid authentication token')
@@ -650,7 +797,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'exclusivity.test' }, headers)
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(401)
      expect(await response.text()).toContain('Unauthorized - Invalid authentication token')
@@ -678,7 +825,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'wrong.header.name.test' }, headers)
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(401)
      expect(await response.text()).toContain('Unauthorized - Invalid authentication token')
@@ -703,7 +850,7 @@ describe('Webhook Trigger API Route', () => {
      const req = createMockRequest('POST', { event: 'no.token.config.test' }, headers)
      const params = Promise.resolve({ path: 'test-path' })

-      const response = await POST(req, { params })
+      const response = await POST(req as any, { params })

      expect(response.status).toBe(401)
      expect(await response.text()).toContain(
--- a/apps/sim/app/api/webhooks/trigger/[path]/route.ts
+++ b/apps/sim/app/api/webhooks/trigger/[path]/route.ts
@@ -4,8 +4,8 @@ import { generateRequestId } from '@/lib/core/utils/request'
 import {
  checkWebhookPreprocessing,
  findAllWebhooksForPath,
-  formatProviderErrorResponse,
  handlePreDeploymentVerification,
+  handlePreLookupWebhookVerification,
  handleProviderChallenges,
  handleProviderReachabilityTest,
  parseWebhookBody,
@@ -31,7 +31,10 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
    return challengeResponse
  }

-  return new NextResponse('Method not allowed', { status: 405 })
+  return (
+    (await handlePreLookupWebhookVerification(request.method, undefined, requestId, path)) ||
+    new NextResponse('Method not allowed', { status: 405 })
+  )
 }

 export async function POST(
@@ -65,6 +68,16 @@ export async function POST(
  const webhooksForPath = await findAllWebhooksForPath({ requestId, path })

  if (webhooksForPath.length === 0) {
+    const verificationResponse = await handlePreLookupWebhookVerification(
+      request.method,
+      body,
+      requestId,
+      path
+    )
+    if (verificationResponse) {
+      return verificationResponse
+    }
+
    logger.warn(`[${requestId}] Webhook or workflow not found for path: ${path}`)
    return new NextResponse('Not Found', { status: 404 })
  }
@@ -82,7 +95,6 @@ export async function POST(
      requestId
    )
    if (authError) {
-      // For multi-webhook, log and continue to next webhook
      if (webhooksForPath.length > 1) {
        logger.warn(`[${requestId}] Auth failed for webhook ${foundWebhook.id}, continuing to next`)
        continue
@@ -92,39 +104,18 @@ export async function POST(

    const reachabilityResponse = handleProviderReachabilityTest(foundWebhook, body, requestId)
    if (reachabilityResponse) {
-      // Reachability test should return immediately for the first webhook
      return reachabilityResponse
    }

-    let preprocessError: NextResponse | null = null
-    try {
-      preprocessError = await checkWebhookPreprocessing(foundWorkflow, foundWebhook, requestId)
-      if (preprocessError) {
-        if (webhooksForPath.length > 1) {
-          logger.warn(
-            `[${requestId}] Preprocessing failed for webhook ${foundWebhook.id}, continuing to next`
-          )
-          continue
-        }
-        return preprocessError
-      }
-    } catch (error) {
-      logger.error(`[${requestId}] Unexpected error during webhook preprocessing`, {
-        error: error instanceof Error ? error.message : String(error),
-        stack: error instanceof Error ? error.stack : undefined,
-        webhookId: foundWebhook.id,
-        workflowId: foundWorkflow.id,
-      })
-
+    const preprocessResult = await checkWebhookPreprocessing(foundWorkflow, foundWebhook, requestId)
+    if (preprocessResult.error) {
      if (webhooksForPath.length > 1) {
+        logger.warn(
+          `[${requestId}] Preprocessing failed for webhook ${foundWebhook.id}, continuing to next`
+        )
        continue
      }
-
-      return formatProviderErrorResponse(
-        foundWebhook,
-        'An unexpected error occurred during preprocessing',
-        500
-      )
+      return preprocessResult.error
    }

    if (foundWebhook.blockId) {
@@ -152,6 +143,9 @@ export async function POST(
    const response = await queueWebhookExecution(foundWebhook, foundWorkflow, body, request, {
      requestId,
      path,
+      actorUserId: preprocessResult.actorUserId,
+      executionId: preprocessResult.executionId,
+      correlation: preprocessResult.correlation,
    })
    responses.push(response)
  }
--- a/apps/sim/app/api/workflows/[id]/chat/status/route.test.ts
+++ b/apps/sim/app/api/workflows/[id]/chat/status/route.test.ts
@@ -52,6 +52,7 @@ vi.mock('@sim/db/schema', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
 }))

--- a/apps/sim/app/api/workflows/[id]/execute/response-block.test.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/response-block.test.ts
@@ -0,0 +1,115 @@
+/**
+ * Tests that internal JWT callers receive the standard response format
+ * even when the child workflow has a Response block.
+ *
+ * @vitest-environment node
+ */
+
+import { beforeEach, describe, expect, it } from 'vitest'
+import { AuthType } from '@/lib/auth/hybrid'
+import type { ExecutionResult } from '@/lib/workflows/types'
+import { createHttpResponseFromBlock, workflowHasResponseBlock } from '@/lib/workflows/utils'
+
+function buildExecutionResult(overrides: Partial<ExecutionResult> = {}): ExecutionResult {
+  return {
+    success: true,
+    output: { data: { issues: [] }, status: 200, headers: {} },
+    logs: [
+      {
+        blockId: 'response-1',
+        blockType: 'response',
+        blockName: 'Response',
+        success: true,
+        output: { data: { issues: [] }, status: 200, headers: {} },
+        startedAt: '2026-01-01T00:00:00Z',
+        endedAt: '2026-01-01T00:00:01Z',
+      },
+    ],
+    metadata: {
+      duration: 500,
+      startTime: '2026-01-01T00:00:00Z',
+      endTime: '2026-01-01T00:00:01Z',
+    },
+    ...overrides,
+  }
+}
+
+describe('Response block gating by auth type', () => {
+  let resultWithResponseBlock: ExecutionResult
+
+  beforeEach(() => {
+    resultWithResponseBlock = buildExecutionResult()
+  })
+
+  it('should detect a Response block in execution result', () => {
+    expect(workflowHasResponseBlock(resultWithResponseBlock)).toBe(true)
+  })
+
+  it('should not detect a Response block when none exists', () => {
+    const resultWithoutResponseBlock = buildExecutionResult({
+      output: { result: 'hello' },
+      logs: [
+        {
+          blockId: 'agent-1',
+          blockType: 'agent',
+          blockName: 'Agent',
+          success: true,
+          output: { result: 'hello' },
+          startedAt: '2026-01-01T00:00:00Z',
+          endedAt: '2026-01-01T00:00:01Z',
+        },
+      ],
+    })
+    expect(workflowHasResponseBlock(resultWithoutResponseBlock)).toBe(false)
+  })
+
+  it('should skip Response block formatting for internal JWT callers', () => {
+    const authType = AuthType.INTERNAL_JWT
+    const hasResponseBlock = workflowHasResponseBlock(resultWithResponseBlock)
+
+    expect(hasResponseBlock).toBe(true)
+
+    // This mirrors the route.ts condition:
+    // if (auth.authType !== AuthType.INTERNAL_JWT && workflowHasResponseBlock(...))
+    const shouldFormatAsResponseBlock = authType !== AuthType.INTERNAL_JWT && hasResponseBlock
+    expect(shouldFormatAsResponseBlock).toBe(false)
+  })
+
+  it('should apply Response block formatting for API key callers', () => {
+    const authType = AuthType.API_KEY
+    const hasResponseBlock = workflowHasResponseBlock(resultWithResponseBlock)
+
+    const shouldFormatAsResponseBlock = authType !== AuthType.INTERNAL_JWT && hasResponseBlock
+    expect(shouldFormatAsResponseBlock).toBe(true)
+
+    const response = createHttpResponseFromBlock(resultWithResponseBlock)
+    expect(response.status).toBe(200)
+  })
+
+  it('should apply Response block formatting for session callers', () => {
+    const authType = AuthType.SESSION
+    const hasResponseBlock = workflowHasResponseBlock(resultWithResponseBlock)
+
+    const shouldFormatAsResponseBlock = authType !== AuthType.INTERNAL_JWT && hasResponseBlock
+    expect(shouldFormatAsResponseBlock).toBe(true)
+  })
+
+  it('should return raw user data via createHttpResponseFromBlock', async () => {
+    const response = createHttpResponseFromBlock(resultWithResponseBlock)
+    const body = await response.json()
+
+    // Response block returns the user-defined data directly (no success/executionId wrapper)
+    expect(body).toEqual({ issues: [] })
+    expect(body.success).toBeUndefined()
+    expect(body.executionId).toBeUndefined()
+  })
+
+  it('should respect custom status codes from Response block', () => {
+    const result = buildExecutionResult({
+      output: { data: { error: 'Not found' }, status: 404, headers: {} },
+    })
+
+    const response = createHttpResponseFromBlock(result)
+    expect(response.status).toBe(404)
+  })
+})
--- a/apps/sim/app/api/workflows/[id]/execute/route.async.test.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.async.test.ts
@@ -0,0 +1,165 @@
+/**
+ * @vitest-environment node
+ */
+
+import { createMockRequest } from '@sim/testing'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const {
+  mockCheckHybridAuth,
+  mockAuthorizeWorkflowByWorkspacePermission,
+  mockPreprocessExecution,
+  mockEnqueue,
+} = vi.hoisted(() => ({
+  mockCheckHybridAuth: vi.fn(),
+  mockAuthorizeWorkflowByWorkspacePermission: vi.fn(),
+  mockPreprocessExecution: vi.fn(),
+  mockEnqueue: vi.fn().mockResolvedValue('job-123'),
+}))
+
+vi.mock('@/lib/auth/hybrid', () => ({
+  checkHybridAuth: mockCheckHybridAuth,
+  AuthType: {
+    SESSION: 'session',
+    API_KEY: 'api_key',
+    INTERNAL_JWT: 'internal_jwt',
+  },
+}))
+
+vi.mock('@/lib/workflows/utils', () => ({
+  authorizeWorkflowByWorkspacePermission: mockAuthorizeWorkflowByWorkspacePermission,
+  createHttpResponseFromBlock: vi.fn(),
+  workflowHasResponseBlock: vi.fn().mockReturnValue(false),
+}))
+
+vi.mock('@/lib/execution/preprocessing', () => ({
+  preprocessExecution: mockPreprocessExecution,
+}))
+
+vi.mock('@/lib/core/async-jobs', () => ({
+  getJobQueue: vi.fn().mockResolvedValue({
+    enqueue: mockEnqueue,
+    startJob: vi.fn(),
+    completeJob: vi.fn(),
+    markJobFailed: vi.fn(),
+  }),
+  shouldExecuteInline: vi.fn().mockReturnValue(false),
+}))
+
+vi.mock('@/lib/core/utils/request', () => ({
+  generateRequestId: vi.fn().mockReturnValue('req-12345678'),
+}))
+
+vi.mock('@/lib/core/utils/urls', () => ({
+  getBaseUrl: vi.fn().mockReturnValue('http://localhost:3000'),
+}))
+
+vi.mock('@/lib/execution/call-chain', () => ({
+  SIM_VIA_HEADER: 'x-sim-via',
+  parseCallChain: vi.fn().mockReturnValue([]),
+  validateCallChain: vi.fn().mockReturnValue(null),
+  buildNextCallChain: vi.fn().mockReturnValue(['workflow-1']),
+}))
+
+vi.mock('@/lib/logs/execution/logging-session', () => ({
+  LoggingSession: vi.fn().mockImplementation(() => ({})),
+}))
+
+vi.mock('@/background/workflow-execution', () => ({
+  executeWorkflowJob: vi.fn(),
+}))
+
+vi.mock('@sim/logger', () => ({
+  createLogger: vi.fn().mockReturnValue({
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+  }),
+}))
+
+vi.mock('uuid', () => ({
+  validate: vi.fn().mockReturnValue(true),
+  v4: vi.fn().mockReturnValue('execution-123'),
+}))
+
+import { POST } from './route'
+
+describe('workflow execute async route', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    mockCheckHybridAuth.mockResolvedValue({
+      success: true,
+      userId: 'session-user-1',
+      authType: 'session',
+    })
+
+    mockAuthorizeWorkflowByWorkspacePermission.mockResolvedValue({
+      allowed: true,
+      workflow: {
+        id: 'workflow-1',
+        userId: 'owner-1',
+        workspaceId: 'workspace-1',
+      },
+    })
+
+    mockPreprocessExecution.mockResolvedValue({
+      success: true,
+      actorUserId: 'actor-1',
+      workflowRecord: {
+        id: 'workflow-1',
+        userId: 'owner-1',
+        workspaceId: 'workspace-1',
+      },
+    })
+  })
+
+  it('queues async execution with matching correlation metadata', async () => {
+    const req = createMockRequest(
+      'POST',
+      { input: { hello: 'world' } },
+      {
+        'Content-Type': 'application/json',
+        'X-Execution-Mode': 'async',
+      }
+    )
+    const params = Promise.resolve({ id: 'workflow-1' })
+
+    const response = await POST(req as any, { params })
+    const body = await response.json()
+
+    expect(response.status).toBe(202)
+    expect(body.executionId).toBe('execution-123')
+    expect(body.jobId).toBe('job-123')
+    expect(mockEnqueue).toHaveBeenCalledWith(
+      'workflow-execution',
+      expect.objectContaining({
+        workflowId: 'workflow-1',
+        userId: 'actor-1',
+        executionId: 'execution-123',
+        requestId: 'req-12345678',
+        correlation: {
+          executionId: 'execution-123',
+          requestId: 'req-12345678',
+          source: 'workflow',
+          workflowId: 'workflow-1',
+          triggerType: 'manual',
+        },
+      }),
+      {
+        metadata: {
+          workflowId: 'workflow-1',
+          userId: 'actor-1',
+          correlation: {
+            executionId: 'execution-123',
+            requestId: 'req-12345678',
+            source: 'workflow',
+            workflowId: 'workflow-1',
+            triggerType: 'manual',
+          },
+        },
+      }
+    )
+  })
+})
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { validate as uuidValidate, v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
-import { checkHybridAuth } from '@/lib/auth/hybrid'
+import { AuthType, checkHybridAuth } from '@/lib/auth/hybrid'
 import { getJobQueue, shouldExecuteInline } from '@/lib/core/async-jobs'
 import {
  createTimeoutAbortController,
@@ -22,7 +22,6 @@ import { createExecutionEventWriter, setExecutionMeta } from '@/lib/execution/ev
 import { processInputFileFields } from '@/lib/execution/files'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
-import { decrementSSEConnections, incrementSSEConnections } from '@/lib/monitoring/sse-connections'
 import {
  cleanupExecutionBase64Cache,
  hydrateUserFilesWithBase64,
@@ -167,19 +166,29 @@ type AsyncExecutionParams = {
 async function handleAsyncExecution(params: AsyncExecutionParams): Promise<NextResponse> {
  const { requestId, workflowId, userId, input, triggerType, executionId, callChain } = params

+  const correlation = {
+    executionId,
+    requestId,
+    source: 'workflow' as const,
+    workflowId,
+    triggerType,
+  }
+
  const payload: WorkflowExecutionPayload = {
    workflowId,
    userId,
    input,
    triggerType,
    executionId,
+    requestId,
+    correlation,
    callChain,
  }

  try {
    const jobQueue = await getJobQueue()
    const jobId = await jobQueue.enqueue('workflow-execution', payload, {
-      metadata: { workflowId, userId },
+      metadata: { workflowId, userId, correlation },
    })

    logger.info(`[${requestId}] Queued async workflow execution`, {
@@ -323,7 +332,8 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
      )
    }

-    const defaultTriggerType = isPublicApiAccess || auth.authType === 'api_key' ? 'api' : 'manual'
+    const defaultTriggerType =
+      isPublicApiAccess || auth.authType === AuthType.API_KEY ? 'api' : 'manual'

    const {
      selectedOutputs,
@@ -426,7 +436,9 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
    // For API key and internal JWT auth, the entire body is the input (except for our control fields)
    // For session auth, the input is explicitly provided in the input field
    const input =
-      isPublicApiAccess || auth.authType === 'api_key' || auth.authType === 'internal_jwt'
+      isPublicApiAccess ||
+      auth.authType === AuthType.API_KEY ||
+      auth.authType === AuthType.INTERNAL_JWT
        ? (() => {
            const {
              selectedOutputs,
@@ -452,7 +464,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
    // Public API callers always execute the deployed state, never the draft.
    const shouldUseDraftState = isPublicApiAccess
      ? false
-      : (useDraftState ?? auth.authType === 'session')
+      : (useDraftState ?? auth.authType === AuthType.SESSION)
    const streamHeader = req.headers.get('X-Stream-Response') === 'true'
    const enableSSE = streamHeader || streamParam === true
    const executionModeHeader = req.headers.get('X-Execution-Mode')
@@ -463,13 +475,13 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:

    if (
      isAsyncMode &&
-      (useDraftState !== undefined ||
-        workflowStateOverride !== undefined ||
-        rawRunFromBlock !== undefined ||
-        stopAfterBlockId !== undefined ||
-        selectedOutputs?.length ||
-        includeFileBase64 !== undefined ||
-        base64MaxBytes !== undefined)
+      (body.useDraftState !== undefined ||
+        body.workflowStateOverride !== undefined ||
+        body.runFromBlock !== undefined ||
+        body.stopAfterBlockId !== undefined ||
+        body.selectedOutputs?.length ||
+        body.includeFileBase64 !== undefined ||
+        body.base64MaxBytes !== undefined)
    ) {
      return NextResponse.json(
        { error: 'Async execution does not support draft or override execution controls' },
@@ -504,7 +516,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
    // Client-side sessions and personal API keys bill/permission-check the
    // authenticated user, not the workspace billed account.
    const useAuthenticatedUserAsActor =
-      isClientSession || (auth.authType === 'api_key' && auth.apiKeyType === 'personal')
+      isClientSession || (auth.authType === AuthType.API_KEY && auth.apiKeyType === 'personal')

    // Authorization fetches the full workflow record and checks workspace permissions.
    // Run it first so we can pass the record to preprocessing (eliminates a duplicate DB query).
@@ -741,8 +753,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:

        const resultWithBase64 = { ...result, output: outputWithBase64 }

-        const hasResponseBlock = workflowHasResponseBlock(resultWithBase64)
-        if (hasResponseBlock) {
+        if (auth.authType !== AuthType.INTERNAL_JWT && workflowHasResponseBlock(resultWithBase64)) {
          return createHttpResponseFromBlock(resultWithBase64)
        }

@@ -834,7 +845,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
    const encoder = new TextEncoder()
    const timeoutController = createTimeoutAbortController(preprocessResult.executionTimeout?.sync)
    let isStreamClosed = false
-    let sseDecremented = false

    const eventWriter = createExecutionEventWriter(executionId)
    setExecutionMeta(executionId, {
@@ -845,7 +855,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:

    const stream = new ReadableStream<Uint8Array>({
      async start(controller) {
-        incrementSSEConnections('workflow-execute')
        let finalMetaStatus: 'complete' | 'error' | 'cancelled' | null = null

        const sendEvent = (event: ExecutionEvent) => {
@@ -1229,10 +1238,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
          if (executionId) {
            await cleanupExecutionBase64Cache(executionId)
          }
-          if (!sseDecremented) {
-            sseDecremented = true
-            decrementSSEConnections('workflow-execute')
-          }
          if (!isStreamClosed) {
            try {
              controller.enqueue(encoder.encode('data: [DONE]\n\n'))
@@ -1244,10 +1249,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
      cancel() {
        isStreamClosed = true
        logger.info(`[${requestId}] Client disconnected from SSE stream`)
-        if (!sseDecremented) {
-          sseDecremented = true
-          decrementSSEConnections('workflow-execute')
-        }
      },
    })

--- a/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts
+++ b/apps/sim/app/api/workflows/[id]/executions/[executionId]/stream/route.ts
@@ -7,7 +7,6 @@ import {
  getExecutionMeta,
  readExecutionEvents,
 } from '@/lib/execution/event-buffer'
-import { decrementSSEConnections, incrementSSEConnections } from '@/lib/monitoring/sse-connections'
 import { formatSSEEvent } from '@/lib/workflows/executor/execution-events'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'

@@ -84,10 +83,8 @@ export async function GET(

    let closed = false

-    let sseDecremented = false
    const stream = new ReadableStream<Uint8Array>({
      async start(controller) {
-        incrementSSEConnections('execution-stream-reconnect')
        let lastEventId = fromEventId
        const pollDeadline = Date.now() + MAX_POLL_DURATION_MS

@@ -155,20 +152,11 @@ export async function GET(
              controller.close()
            } catch {}
          }
-        } finally {
-          if (!sseDecremented) {
-            sseDecremented = true
-            decrementSSEConnections('execution-stream-reconnect')
-          }
        }
      },
      cancel() {
        closed = true
        logger.info('Client disconnected from reconnection stream', { executionId })
-        if (!sseDecremented) {
-          sseDecremented = true
-          decrementSSEConnections('execution-stream-reconnect')
-        }
      },
    })

--- a/apps/sim/app/api/workflows/[id]/form/status/route.test.ts
+++ b/apps/sim/app/api/workflows/[id]/form/status/route.test.ts
@@ -44,6 +44,7 @@ vi.mock('@sim/db/schema', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
 }))

--- a/apps/sim/app/api/workflows/[id]/route.test.ts
+++ b/apps/sim/app/api/workflows/[id]/route.test.ts
@@ -43,6 +43,7 @@ vi.mock('@/lib/auth', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkHybridAuth: (...args: unknown[]) => mockCheckHybridAuth(...args),
  checkSessionOrInternalAuth: (...args: unknown[]) => mockCheckSessionOrInternalAuth(...args),
 }))
--- a/apps/sim/app/api/workflows/[id]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/route.ts
@@ -5,7 +5,7 @@ import { and, eq, isNull, ne } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
-import { checkHybridAuth, checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { AuthType, checkHybridAuth, checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { archiveWorkflow } from '@/lib/workflows/lifecycle'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils'
@@ -38,7 +38,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
    }

-    const isInternalCall = auth.authType === 'internal_jwt'
+    const isInternalCall = auth.authType === AuthType.INTERNAL_JWT
    const userId = auth.userId || null

    let workflowData = await getWorkflowById(workflowId)
--- a/apps/sim/app/api/workflows/[id]/state/route.ts
+++ b/apps/sim/app/api/workflows/[id]/state/route.ts
@@ -14,6 +14,7 @@ import {
 } from '@/lib/workflows/persistence/utils'
 import { sanitizeAgentToolsInBlocks } from '@/lib/workflows/sanitization/validation'
 import { authorizeWorkflowByWorkspacePermission } from '@/lib/workflows/utils'
+import { validateEdges } from '@/stores/workflows/workflow/edge-validation'
 import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types'
 import { generateLoopBlocks, generateParallelBlocks } from '@/stores/workflows/workflow/utils'

@@ -226,12 +227,16 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
    )

    const typedBlocks = filteredBlocks as Record<string, BlockState>
+    const validatedEdges = validateEdges(state.edges as WorkflowState['edges'], typedBlocks)
+    const validationWarnings = validatedEdges.dropped.map(
+      ({ edge, reason }) => `Dropped edge "${edge.id}": ${reason}`
+    )
    const canonicalLoops = generateLoopBlocks(typedBlocks)
    const canonicalParallels = generateParallelBlocks(typedBlocks)

    const workflowState = {
      blocks: filteredBlocks,
-      edges: state.edges,
+      edges: validatedEdges.valid,
      loops: canonicalLoops,
      parallels: canonicalParallels,
      lastSaved: state.lastSaved || Date.now(),
@@ -322,7 +327,10 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
      )
    }

-    return NextResponse.json({ success: true, warnings }, { status: 200 })
+    return NextResponse.json(
+      { success: true, warnings: [...warnings, ...validationWarnings] },
+      { status: 200 }
+    )
  } catch (error: any) {
    const elapsed = Date.now() - startTime
    logger.error(
--- a/apps/sim/app/api/workflows/[id]/variables/route.test.ts
+++ b/apps/sim/app/api/workflows/[id]/variables/route.test.ts
@@ -18,6 +18,7 @@ const { mockCheckSessionOrInternalAuth, mockAuthorizeWorkflowByWorkspacePermissi
 vi.mock('@/lib/audit/log', () => auditMock)

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
 }))

--- a/apps/sim/app/api/workflows/route.test.ts
+++ b/apps/sim/app/api/workflows/route.test.ts
@@ -66,6 +66,7 @@ vi.mock('@/lib/audit/log', () => ({
 }))

 vi.mock('@/lib/auth/hybrid', () => ({
+  AuthType: { SESSION: 'session', API_KEY: 'api_key', INTERNAL_JWT: 'internal_jwt' },
  checkHybridAuth: vi.fn(),
  checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
  checkInternalAuth: vi.fn(),
--- a/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/test/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/notifications/[notificationId]/test/route.ts
@@ -12,6 +12,7 @@ import {
 } from '@/components/emails'
 import { getSession } from '@/lib/auth'
 import { decryptSecret } from '@/lib/core/security/encryption'
+import { secureFetchWithValidation } from '@/lib/core/security/input-validation.server'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
@@ -135,18 +136,18 @@ async function testWebhook(subscription: typeof workspaceNotificationSubscriptio
    headers['sim-signature'] = `t=${timestamp},v1=${signature}`
  }

-  const controller = new AbortController()
-  const timeoutId = setTimeout(() => controller.abort(), 10000)
-
  try {
-    const response = await fetch(webhookConfig.url, {
-      method: 'POST',
-      headers,
-      body,
-      signal: controller.signal,
-    })
-
-    clearTimeout(timeoutId)
+    const response = await secureFetchWithValidation(
+      webhookConfig.url,
+      {
+        method: 'POST',
+        headers,
+        body,
+        timeout: 10000,
+        allowHttp: true,
+      },
+      'webhookUrl'
+    )
    const responseBody = await response.text().catch(() => '')

    return {
@@ -157,12 +158,10 @@ async function testWebhook(subscription: typeof workspaceNotificationSubscriptio
      timestamp: new Date().toISOString(),
    }
  } catch (error: unknown) {
-    clearTimeout(timeoutId)
-    const err = error as Error & { name?: string }
-    if (err.name === 'AbortError') {
-      return { success: false, error: 'Request timeout after 10 seconds' }
-    }
-    return { success: false, error: err.message }
+    logger.warn('Webhook test failed', {
+      error: error instanceof Error ? error.message : String(error),
+    })
+    return { success: false, error: 'Failed to deliver webhook' }
  }
 }

@@ -268,13 +267,15 @@ async function testSlack(

    return {
      success: result.ok,
-      error: result.error,
+      error: result.ok ? undefined : `Slack error: ${result.error || 'unknown'}`,
      channel: result.channel,
      timestamp: new Date().toISOString(),
    }
  } catch (error: unknown) {
-    const err = error as Error
-    return { success: false, error: err.message }
+    logger.warn('Slack test notification failed', {
+      error: error instanceof Error ? error.message : String(error),
+    })
+    return { success: false, error: 'Failed to send Slack notification' }
  }
 }

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
@@ -4,7 +4,6 @@ import { createLogger } from '@sim/logger'
 import { ChevronDown, ChevronsUpDown, ChevronUp, Plus } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import Editor from 'react-simple-code-editor'
-import { useUpdateNodeInternals } from 'reactflow'
 import {
  Button,
  Code,
@@ -173,7 +172,6 @@ export function ConditionInput({
  const [visualLineHeights, setVisualLineHeights] = useState<{
    [key: string]: number[]
  }>({})
-  const updateNodeInternals = useUpdateNodeInternals()
  const batchRemoveEdges = useWorkflowStore((state) => state.batchRemoveEdges)
  const edges = useWorkflowStore((state) => state.edges)

@@ -352,17 +350,8 @@ export function ConditionInput({
    if (newValue !== prevStoreValueRef.current) {
      prevStoreValueRef.current = newValue
      setStoreValue(newValue)
-      updateNodeInternals(blockId)
    }
-  }, [
-    conditionalBlocks,
-    blockId,
-    subBlockId,
-    setStoreValue,
-    updateNodeInternals,
-    isReady,
-    isPreview,
-  ])
+  }, [conditionalBlocks, blockId, subBlockId, setStoreValue, isReady, isPreview])

  // Cleanup when component unmounts
  useEffect(() => {
@@ -708,8 +697,6 @@ export function ConditionInput({

    shouldPersistRef.current = true
    setConditionalBlocks((blocks) => updateBlockTitles(blocks.filter((block) => block.id !== id)))
-
-    setTimeout(() => updateNodeInternals(blockId), 0)
  }

  const moveBlock = (id: string, direction: 'up' | 'down') => {
@@ -737,8 +724,6 @@ export function ConditionInput({
    ]
    shouldPersistRef.current = true
    setConditionalBlocks(updateBlockTitles(newBlocks))
-
-    setTimeout(() => updateNodeInternals(blockId), 0)
  }

  // Add useEffect to handle keyboard events for both dropdowns
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node.tsx
@@ -198,14 +198,14 @@ export const SubflowNodeComponent = memo(({ data, id, selected }: NodeProps<Subf
        </div>

        {/*
-         * Click-catching background — selects this subflow when the body area is clicked.
-         * No event bubbling concern: ReactFlow renders child nodes as viewport-level siblings,
-         * not as DOM children of this component, so child clicks never reach this div.
+         * Subflow body background. Uses pointer-events: none so that edges rendered
+         * inside the subflow remain clickable. The subflow node wrapper also has
+         * pointer-events: none (set in workflow.tsx), so body-area clicks pass
+         * through to the pane. Subflow selection is done via the header above.
         */}
        <div
          className='absolute inset-0 top-[44px] rounded-b-[8px]'
-          style={{ pointerEvents: isPreview ? 'none' : 'auto' }}
-          onClick={() => setCurrentBlockId(id)}
+          style={{ pointerEvents: 'none' }}
        />

        {!isPreview && (
--- 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
@@ -11,6 +11,7 @@ import { createMcpToolId } from '@/lib/mcp/shared'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
 import type { FilterRule, SortRule } from '@/lib/table/types'
 import { BLOCK_DIMENSIONS, HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
+import { getConditionRows, getRouterRows } from '@/lib/workflows/dynamic-handle-topology'
 import {
  buildCanonicalIndex,
  evaluateSubBlockCondition,
@@ -1051,6 +1052,9 @@ export const WorkflowBlock = memo(function WorkflowBlock({

  const subBlockRows = subBlockRowsData.rows
  const subBlockState = subBlockRowsData.stateToUse
+  const topologySubBlocks = data.isPreview
+    ? (data.blockState?.subBlocks ?? {})
+    : (currentStoreBlock?.subBlocks ?? {})
  const effectiveAdvanced = useMemo(() => {
    const rawValues = Object.entries(subBlockState).reduce<Record<string, unknown>>(
      (acc, [key, entry]) => {
@@ -1110,34 +1114,8 @@ export const WorkflowBlock = memo(function WorkflowBlock({
   */
  const conditionRows = useMemo(() => {
    if (type !== 'condition') return [] as { id: string; title: string; value: string }[]
-
-    const conditionsValue = subBlockState.conditions?.value
-    const raw = typeof conditionsValue === 'string' ? conditionsValue : undefined
-
-    try {
-      if (raw) {
-        const parsed = JSON.parse(raw) as unknown
-        if (Array.isArray(parsed)) {
-          return parsed.map((item: unknown, index: number) => {
-            const conditionItem = item as { id?: string; value?: unknown }
-            const title = index === 0 ? 'if' : index === parsed.length - 1 ? 'else' : 'else if'
-            return {
-              id: conditionItem?.id ?? `${id}-cond-${index}`,
-              title,
-              value: typeof conditionItem?.value === 'string' ? conditionItem.value : '',
-            }
-          })
-        }
-      }
-    } catch (error) {
-      logger.warn('Failed to parse condition subblock value', { error, blockId: id })
-    }
-
-    return [
-      { id: `${id}-if`, title: 'if', value: '' },
-      { id: `${id}-else`, title: 'else', value: '' },
-    ]
-  }, [type, subBlockState, id])
+    return getConditionRows(id, topologySubBlocks.conditions?.value)
+  }, [type, topologySubBlocks, id])

  /**
   * Compute per-route rows (id/value) for router_v2 blocks so we can render
@@ -1146,31 +1124,8 @@ export const WorkflowBlock = memo(function WorkflowBlock({
   */
  const routerRows = useMemo(() => {
    if (type !== 'router_v2') return [] as { id: string; value: string }[]
-
-    const routesValue = subBlockState.routes?.value
-    const raw = typeof routesValue === 'string' ? routesValue : undefined
-
-    try {
-      if (raw) {
-        const parsed = JSON.parse(raw) as unknown
-        if (Array.isArray(parsed)) {
-          return parsed.map((item: unknown, index: number) => {
-            const routeItem = item as { id?: string; value?: string }
-            return {
-              // Use stable ID format that matches ConditionInput's generateStableId
-              id: routeItem?.id ?? `${id}-route${index + 1}`,
-              value: routeItem?.value ?? '',
-            }
-          })
-        }
-      }
-    } catch (error) {
-      logger.warn('Failed to parse router routes value', { error, blockId: id })
-    }
-
-    // Fallback must match ConditionInput's default: generateStableId(blockId, 'route1') = `${blockId}-route1`
-    return [{ id: `${id}-route1`, value: '' }]
-  }, [type, subBlockState, id])
+    return getRouterRows(id, topologySubBlocks.routes?.value)
+  }, [type, topologySubBlocks, id])

  /**
   * Compute and publish deterministic layout metrics for workflow blocks.
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/index.ts
@@ -6,6 +6,7 @@ export { useBlockOutputFields } from './use-block-output-fields'
 export { useBlockVisual } from './use-block-visual'
 export { useCanvasContextMenu } from './use-canvas-context-menu'
 export { type CurrentWorkflow, useCurrentWorkflow } from './use-current-workflow'
+export { useDynamicHandleRefresh } from './use-dynamic-handle-refresh'
 export { useNodeUtilities } from './use-node-utilities'
 export { usePreventZoom } from './use-prevent-zoom'
 export { useScrollManagement } from './use-scroll-management'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-dynamic-handle-refresh.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-dynamic-handle-refresh.ts
@@ -0,0 +1,33 @@
+import { useEffect, useMemo, useRef } from 'react'
+import { useUpdateNodeInternals } from 'reactflow'
+import {
+  collectDynamicHandleTopologySignatures,
+  getChangedDynamicHandleBlockIds,
+} from '@/lib/workflows/dynamic-handle-topology'
+import { useWorkflowStore } from '@/stores/workflows/workflow/store'
+
+export function useDynamicHandleRefresh() {
+  const updateNodeInternals = useUpdateNodeInternals()
+  const blocks = useWorkflowStore((state) => state.blocks)
+  const previousSignaturesRef = useRef<Map<string, string>>(new Map())
+
+  const signatures = useMemo(() => collectDynamicHandleTopologySignatures(blocks), [blocks])
+
+  useEffect(() => {
+    const changedBlockIds = getChangedDynamicHandleBlockIds(
+      previousSignaturesRef.current,
+      signatures
+    )
+    previousSignaturesRef.current = signatures
+
+    if (changedBlockIds.length === 0) {
+      return
+    }
+
+    const frameId = requestAnimationFrame(() => {
+      changedBlockIds.forEach((blockId) => updateNodeInternals(blockId))
+    })
+
+    return () => cancelAnimationFrame(frameId)
+  }, [signatures, updateNodeInternals])
+}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-shift-selection-lock.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-shift-selection-lock.ts
@@ -12,7 +12,7 @@ interface UseShiftSelectionLockResult {
  /** Computed ReactFlow props based on current selection state */
  selectionProps: {
    selectionOnDrag: boolean
-    panOnDrag: [number, number] | false
+    panOnDrag: number[]
    selectionKeyCode: string | null
  }
 }
@@ -55,7 +55,7 @@ export function useShiftSelectionLock({

  const selectionProps = {
    selectionOnDrag: !isHandMode || isShiftSelecting,
-    panOnDrag: (isHandMode && !isShiftSelecting ? [0, 1] : false) as [number, number] | false,
+    panOnDrag: isHandMode && !isShiftSelecting ? [0, 1] : [1],
    selectionKeyCode: isShiftSelecting ? null : 'Shift',
  }

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/auto-layout-utils.ts
@@ -116,7 +116,7 @@ export async function applyAutoLayoutAndUpdateStore(
      lastSaved: Date.now(),
    }

-    useWorkflowStore.setState(newWorkflowState)
+    useWorkflowStore.getState().replaceWorkflowState(newWorkflowState)

    logger.info('Successfully updated workflow store with auto layout', { workflowId })

@@ -168,9 +168,9 @@ export async function applyAutoLayoutAndUpdateStore(
      })

      // Revert the store changes since database save failed
-      useWorkflowStore.setState({
+      useWorkflowStore.getState().replaceWorkflowState({
        ...workflowStore.getWorkflowState(),
-        blocks: blocks,
+        blocks,
        lastSaved: workflowStore.lastSaved,
      })

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts
@@ -1,6 +1,7 @@
 export * from './auto-layout-utils'
 export * from './block-protection-utils'
 export * from './block-ring-utils'
+export * from './node-derivation'
 export * from './node-position-utils'
 export * from './workflow-canvas-helpers'
 export * from './workflow-execution-utils'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-derivation.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-derivation.ts
@@ -0,0 +1,32 @@
+import type { BlockState } from '@/stores/workflows/workflow/types'
+
+export const Z_INDEX = {
+  ROOT_BLOCK: 10,
+  CHILD_BLOCK: 1000,
+} as const
+
+export function computeContainerZIndex(
+  block: Pick<BlockState, 'data'>,
+  allBlocks: Record<string, Pick<BlockState, 'data'>>
+): number {
+  let depth = 0
+  let parentId = block.data?.parentId
+
+  while (parentId && depth < 100) {
+    depth++
+    parentId = allBlocks[parentId]?.data?.parentId
+  }
+
+  return depth
+}
+
+export function computeBlockZIndex(
+  block: Pick<BlockState, 'type' | 'data'>,
+  allBlocks: Record<string, Pick<BlockState, 'type' | 'data'>>
+): number {
+  if (block.type === 'loop' || block.type === 'parallel') {
+    return computeContainerZIndex(block, allBlocks)
+  }
+
+  return block.data?.parentId ? Z_INDEX.CHILD_BLOCK : Z_INDEX.ROOT_BLOCK
+}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -45,6 +45,7 @@ import {
  useAutoLayout,
  useCanvasContextMenu,
  useCurrentWorkflow,
+  useDynamicHandleRefresh,
  useNodeUtilities,
  useShiftSelectionLock,
  useWorkflowExecution,
@@ -259,6 +260,7 @@ const WorkflowContent = React.memo(
    const { screenToFlowPosition, getNodes, setNodes, getIntersectingNodes } = reactFlowInstance
    const { fitViewToBounds, getViewportCenter } = useCanvasViewport(reactFlowInstance)
    const { emitCursorUpdate } = useSocket()
+    useDynamicHandleRefresh()

    const workspaceId = propWorkspaceId || (params.workspaceId as string)
    const workflowIdParam = propWorkflowId || (params.workflowId as string)
--- a/apps/sim/background/async-execution-correlation.test.ts
+++ b/apps/sim/background/async-execution-correlation.test.ts
@@ -0,0 +1,71 @@
+/**
+ * @vitest-environment node
+ */
+
+import { describe, expect, it } from 'vitest'
+import { buildScheduleCorrelation } from './schedule-execution'
+import { buildWebhookCorrelation } from './webhook-execution'
+import { buildWorkflowCorrelation } from './workflow-execution'
+
+describe('async execution correlation fallbacks', () => {
+  it('falls back for legacy workflow payloads missing correlation fields', () => {
+    const correlation = buildWorkflowCorrelation({
+      workflowId: 'workflow-1',
+      userId: 'user-1',
+      triggerType: 'api',
+      executionId: 'execution-legacy',
+    })
+
+    expect(correlation).toEqual({
+      executionId: 'execution-legacy',
+      requestId: 'executio',
+      source: 'workflow',
+      workflowId: 'workflow-1',
+      triggerType: 'api',
+    })
+  })
+
+  it('falls back for legacy schedule payloads missing preassigned request id', () => {
+    const correlation = buildScheduleCorrelation({
+      scheduleId: 'schedule-1',
+      workflowId: 'workflow-1',
+      executionId: 'schedule-exec-1',
+      now: '2025-01-01T00:00:00.000Z',
+      scheduledFor: '2025-01-01T00:00:00.000Z',
+    })
+
+    expect(correlation).toEqual({
+      executionId: 'schedule-exec-1',
+      requestId: 'schedule',
+      source: 'schedule',
+      workflowId: 'workflow-1',
+      scheduleId: 'schedule-1',
+      triggerType: 'schedule',
+      scheduledFor: '2025-01-01T00:00:00.000Z',
+    })
+  })
+
+  it('falls back for legacy webhook payloads missing preassigned fields', () => {
+    const correlation = buildWebhookCorrelation({
+      webhookId: 'webhook-1',
+      workflowId: 'workflow-1',
+      userId: 'user-1',
+      executionId: 'webhook-exec-1',
+      provider: 'slack',
+      body: {},
+      headers: {},
+      path: 'incoming/slack',
+    })
+
+    expect(correlation).toEqual({
+      executionId: 'webhook-exec-1',
+      requestId: 'webhook-',
+      source: 'webhook',
+      workflowId: 'workflow-1',
+      webhookId: 'webhook-1',
+      path: 'incoming/slack',
+      provider: 'slack',
+      triggerType: 'webhook',
+    })
+  })
+})
--- a/apps/sim/background/async-preprocessing-correlation.test.ts
+++ b/apps/sim/background/async-preprocessing-correlation.test.ts
@@ -0,0 +1,296 @@
+/**
+ * @vitest-environment node
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const {
+  mockPreprocessExecution,
+  mockTask,
+  mockDbUpdate,
+  mockDbSelect,
+  mockExecuteWorkflowCore,
+  mockLoggingSession,
+  mockBlockExistsInDeployment,
+  mockLoadDeployedWorkflowState,
+  mockGetScheduleTimeValues,
+  mockGetSubBlockValue,
+} = vi.hoisted(() => ({
+  mockPreprocessExecution: vi.fn(),
+  mockTask: vi.fn((config) => config),
+  mockDbUpdate: vi.fn(() => ({
+    set: vi.fn(() => ({
+      where: vi.fn().mockResolvedValue(undefined),
+    })),
+  })),
+  mockDbSelect: vi.fn(),
+  mockExecuteWorkflowCore: vi.fn(),
+  mockLoggingSession: vi.fn(),
+  mockBlockExistsInDeployment: vi.fn(),
+  mockLoadDeployedWorkflowState: vi.fn(),
+  mockGetScheduleTimeValues: vi.fn(),
+  mockGetSubBlockValue: vi.fn(),
+}))
+
+vi.mock('@trigger.dev/sdk', () => ({ task: mockTask }))
+
+vi.mock('@sim/db', () => ({
+  db: {
+    update: mockDbUpdate,
+    select: mockDbSelect,
+  },
+  workflow: {},
+  workflowSchedule: {},
+}))
+
+vi.mock('drizzle-orm', () => ({
+  eq: vi.fn(),
+  and: vi.fn(),
+  isNull: vi.fn(),
+  sql: Object.assign(vi.fn(), { raw: vi.fn() }),
+}))
+
+vi.mock('@/lib/execution/preprocessing', () => ({
+  preprocessExecution: mockPreprocessExecution,
+}))
+
+vi.mock('@/lib/logs/execution/logging-session', () => ({
+  LoggingSession: vi.fn().mockImplementation(() => {
+    const instance = {
+      safeStart: vi.fn().mockResolvedValue(true),
+      safeCompleteWithError: vi.fn().mockResolvedValue(undefined),
+      markAsFailed: vi.fn().mockResolvedValue(undefined),
+      waitForPostExecution: vi.fn().mockResolvedValue(undefined),
+    }
+    mockLoggingSession(instance)
+    return instance
+  }),
+}))
+
+vi.mock('@/lib/core/execution-limits', () => ({
+  createTimeoutAbortController: vi.fn(() => ({
+    signal: undefined,
+    cleanup: vi.fn(),
+    isTimedOut: vi.fn().mockReturnValue(false),
+    timeoutMs: undefined,
+  })),
+  getTimeoutErrorMessage: vi.fn(),
+}))
+
+vi.mock('@/lib/logs/execution/trace-spans/trace-spans', () => ({
+  buildTraceSpans: vi.fn(() => ({ traceSpans: [] })),
+}))
+
+vi.mock('@/lib/workflows/executor/execution-core', () => ({
+  executeWorkflowCore: mockExecuteWorkflowCore,
+  wasExecutionFinalizedByCore: vi.fn().mockReturnValue(false),
+}))
+
+vi.mock('@/lib/workflows/executor/human-in-the-loop-manager', () => ({
+  PauseResumeManager: {
+    persistPauseResult: vi.fn(),
+    processQueuedResumes: vi.fn(),
+  },
+}))
+
+vi.mock('@/lib/workflows/persistence/utils', () => ({
+  blockExistsInDeployment: mockBlockExistsInDeployment,
+  loadDeployedWorkflowState: mockLoadDeployedWorkflowState,
+}))
+
+vi.mock('@/lib/workflows/schedules/utils', () => ({
+  calculateNextRunTime: vi.fn(),
+  getScheduleTimeValues: mockGetScheduleTimeValues,
+  getSubBlockValue: mockGetSubBlockValue,
+}))
+
+vi.mock('@/executor/execution/snapshot', () => ({
+  ExecutionSnapshot: vi.fn(),
+}))
+
+vi.mock('@/executor/utils/errors', () => ({
+  hasExecutionResult: vi.fn().mockReturnValue(false),
+}))
+
+vi.mock('@sim/logger', () => ({
+  createLogger: vi.fn().mockReturnValue({
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+    debug: vi.fn(),
+  }),
+}))
+
+import { executeScheduleJob } from './schedule-execution'
+import { executeWorkflowJob } from './workflow-execution'
+
+describe('async preprocessing correlation threading', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockDbSelect.mockReturnValue({
+      from: vi.fn().mockReturnValue({
+        where: vi.fn().mockReturnValue({
+          limit: vi.fn().mockResolvedValue([
+            {
+              id: 'schedule-1',
+              workflowId: 'workflow-1',
+              status: 'active',
+              archivedAt: null,
+            },
+          ]),
+        }),
+      }),
+    })
+    mockLoadDeployedWorkflowState.mockResolvedValue({
+      blocks: {
+        'schedule-block': {
+          type: 'schedule',
+        },
+      },
+      edges: [],
+      loops: {},
+      parallels: {},
+      deploymentVersionId: 'deployment-1',
+    })
+    mockGetSubBlockValue.mockReturnValue('daily')
+    mockGetScheduleTimeValues.mockReturnValue({ timezone: 'UTC' })
+  })
+
+  it('does not pre-start workflow logging before core execution', async () => {
+    mockPreprocessExecution.mockResolvedValueOnce({
+      success: true,
+      actorUserId: 'actor-1',
+      workflowRecord: {
+        id: 'workflow-1',
+        userId: 'owner-1',
+        workspaceId: 'workspace-1',
+        variables: {},
+      },
+      executionTimeout: {},
+    })
+    mockExecuteWorkflowCore.mockResolvedValueOnce({
+      success: true,
+      status: 'success',
+      output: { ok: true },
+      metadata: { duration: 10, userId: 'actor-1' },
+    })
+
+    await executeWorkflowJob({
+      workflowId: 'workflow-1',
+      userId: 'user-1',
+      triggerType: 'api',
+      executionId: 'execution-1',
+      requestId: 'request-1',
+    })
+
+    const loggingSession = mockLoggingSession.mock.calls[0]?.[0]
+    expect(loggingSession).toBeDefined()
+    expect(loggingSession.safeStart).not.toHaveBeenCalled()
+    expect(mockExecuteWorkflowCore).toHaveBeenCalledWith(
+      expect.objectContaining({
+        loggingSession,
+      })
+    )
+  })
+
+  it('does not pre-start schedule logging before core execution', async () => {
+    mockPreprocessExecution.mockResolvedValueOnce({
+      success: true,
+      actorUserId: 'actor-2',
+      workflowRecord: {
+        id: 'workflow-1',
+        userId: 'owner-1',
+        workspaceId: 'workspace-1',
+        variables: {},
+      },
+      executionTimeout: {},
+    })
+    mockExecuteWorkflowCore.mockResolvedValueOnce({
+      success: true,
+      status: 'success',
+      output: { ok: true },
+      metadata: { duration: 12, userId: 'actor-2' },
+    })
+
+    await executeScheduleJob({
+      scheduleId: 'schedule-1',
+      workflowId: 'workflow-1',
+      executionId: 'execution-2',
+      requestId: 'request-2',
+      now: '2025-01-01T00:00:00.000Z',
+      scheduledFor: '2025-01-01T00:00:00.000Z',
+    })
+
+    const loggingSession = mockLoggingSession.mock.calls[0]?.[0]
+    expect(loggingSession).toBeDefined()
+    expect(loggingSession.safeStart).not.toHaveBeenCalled()
+    expect(mockExecuteWorkflowCore).toHaveBeenCalledWith(
+      expect.objectContaining({
+        loggingSession,
+      })
+    )
+  })
+
+  it('passes workflow correlation into preprocessing', async () => {
+    mockPreprocessExecution.mockResolvedValueOnce({
+      success: false,
+      error: { message: 'preprocessing failed', statusCode: 500, logCreated: true },
+    })
+
+    await expect(
+      executeWorkflowJob({
+        workflowId: 'workflow-1',
+        userId: 'user-1',
+        triggerType: 'api',
+        executionId: 'execution-1',
+        requestId: 'request-1',
+      })
+    ).rejects.toThrow('preprocessing failed')
+
+    expect(mockPreprocessExecution).toHaveBeenCalledWith(
+      expect.objectContaining({
+        triggerData: {
+          correlation: {
+            executionId: 'execution-1',
+            requestId: 'request-1',
+            source: 'workflow',
+            workflowId: 'workflow-1',
+            triggerType: 'api',
+          },
+        },
+      })
+    )
+  })
+
+  it('passes schedule correlation into preprocessing', async () => {
+    mockPreprocessExecution.mockResolvedValueOnce({
+      success: false,
+      error: { message: 'auth failed', statusCode: 401, logCreated: true },
+    })
+
+    await executeScheduleJob({
+      scheduleId: 'schedule-1',
+      workflowId: 'workflow-1',
+      executionId: 'execution-2',
+      requestId: 'request-2',
+      now: '2025-01-01T00:00:00.000Z',
+      scheduledFor: '2025-01-01T00:00:00.000Z',
+    })
+
+    expect(mockPreprocessExecution).toHaveBeenCalledWith(
+      expect.objectContaining({
+        triggerData: {
+          correlation: {
+            executionId: 'execution-2',
+            requestId: 'request-2',
+            source: 'schedule',
+            workflowId: 'workflow-1',
+            scheduleId: 'schedule-1',
+            triggerType: 'schedule',
+            scheduledFor: '2025-01-01T00:00:00.000Z',
+          },
+        },
+      })
+    )
+  })
+})
--- a/apps/sim/background/schedule-execution.ts
+++ b/apps/sim/background/schedule-execution.ts
@@ -4,11 +4,15 @@ import { task } from '@trigger.dev/sdk'
 import { Cron } from 'croner'
 import { and, eq, isNull } from 'drizzle-orm'
 import { v4 as uuidv4 } from 'uuid'
+import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
 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 { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
+import {
+  executeWorkflowCore,
+  wasExecutionFinalizedByCore,
+} from '@/lib/workflows/executor/execution-core'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 import {
  blockExistsInDeployment,
@@ -39,6 +43,23 @@ type RunWorkflowResult =
  | { status: 'success'; blocks: Record<string, BlockState>; executionResult: ExecutionCoreResult }
  | { status: 'failure'; blocks: Record<string, BlockState>; executionResult: ExecutionCoreResult }

+export function buildScheduleCorrelation(
+  payload: ScheduleExecutionPayload
+): AsyncExecutionCorrelation {
+  const executionId = payload.executionId || uuidv4()
+  const requestId = payload.requestId || payload.correlation?.requestId || executionId.slice(0, 8)
+
+  return {
+    executionId,
+    requestId,
+    source: 'schedule',
+    workflowId: payload.workflowId,
+    scheduleId: payload.scheduleId,
+    triggerType: payload.correlation?.triggerType || 'schedule',
+    scheduledFor: payload.scheduledFor || payload.correlation?.scheduledFor,
+  }
+}
+
 async function applyScheduleUpdate(
  scheduleId: string,
  updates: WorkflowScheduleUpdate,
@@ -117,6 +138,7 @@ async function determineNextRunAfterError(

 async function runWorkflowExecution({
  payload,
+  correlation,
  workflowRecord,
  actorUserId,
  loggingSession,
@@ -125,6 +147,7 @@ async function runWorkflowExecution({
  asyncTimeout,
 }: {
  payload: ScheduleExecutionPayload
+  correlation: AsyncExecutionCorrelation
  workflowRecord: WorkflowRecord
  actorUserId: string
  loggingSession: LoggingSession
@@ -177,6 +200,7 @@ async function runWorkflowExecution({
      useDraftState: false,
      startTime: new Date().toISOString(),
      isClientSession: false,
+      correlation,
    }

    const snapshot = new ExecutionSnapshot(
@@ -257,6 +281,10 @@ async function runWorkflowExecution({
  } catch (error: unknown) {
    logger.error(`[${requestId}] Early failure in scheduled workflow ${payload.workflowId}`, error)

+    if (wasExecutionFinalizedByCore(error, executionId)) {
+      throw error
+    }
+
    const executionResult = hasExecutionResult(error) ? error.executionResult : undefined
    const { traceSpans } = executionResult ? buildTraceSpans(executionResult) : { traceSpans: [] }

@@ -275,6 +303,9 @@ async function runWorkflowExecution({
 export type ScheduleExecutionPayload = {
  scheduleId: string
  workflowId: string
+  executionId?: string
+  requestId?: string
+  correlation?: AsyncExecutionCorrelation
  blockId?: string
  cronExpression?: string
  lastRanAt?: string
@@ -309,8 +340,9 @@ function calculateNextRunTime(
 }

 export async function executeScheduleJob(payload: ScheduleExecutionPayload) {
-  const executionId = uuidv4()
-  const requestId = executionId.slice(0, 8)
+  const correlation = buildScheduleCorrelation(payload)
+  const executionId = correlation.executionId
+  const requestId = correlation.requestId
  const now = new Date(payload.now)
  const scheduledFor = payload.scheduledFor ? new Date(payload.scheduledFor) : null

@@ -368,6 +400,7 @@ export async function executeScheduleJob(payload: ScheduleExecutionPayload) {
      checkRateLimit: true,
      checkDeployment: true,
      loggingSession,
+      triggerData: { correlation },
    })

    if (!preprocessResult.success) {
@@ -503,11 +536,16 @@ export async function executeScheduleJob(payload: ScheduleExecutionPayload) {
      return
    }

+    if (!workflowRecord.workspaceId) {
+      throw new Error(`Workflow ${payload.workflowId} has no associated workspace`)
+    }
+
    logger.info(`[${requestId}] Executing scheduled workflow ${payload.workflowId}`)

    try {
      const executionResult = await runWorkflowExecution({
        payload,
+        correlation,
        workflowRecord,
        actorUserId,
        loggingSession,
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -1,26 +1,25 @@
 import { db } from '@sim/db'
-import { webhook, workflow as workflowTable } from '@sim/db/schema'
+import { account, webhook } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { eq } from 'drizzle-orm'
 import { v4 as uuidv4 } from 'uuid'
-import { getHighestPrioritySubscription } from '@/lib/billing'
-import {
-  createTimeoutAbortController,
-  getExecutionTimeout,
-  getTimeoutErrorMessage,
-} from '@/lib/core/execution-limits'
+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 type { SubscriptionPlan } from '@/lib/core/rate-limiter/types'
 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 { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
+import {
+  executeWorkflowCore,
+  wasExecutionFinalizedByCore,
+} from '@/lib/workflows/executor/execution-core'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
-import { getWorkflowById } from '@/lib/workflows/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'
@@ -30,6 +29,24 @@ import { getTrigger, isTriggerValid } from '@/triggers'

 const logger = createLogger('TriggerWebhookExecution')

+export function buildWebhookCorrelation(
+  payload: WebhookExecutionPayload
+): AsyncExecutionCorrelation {
+  const executionId = payload.executionId || uuidv4()
+  const requestId = payload.requestId || payload.correlation?.requestId || executionId.slice(0, 8)
+
+  return {
+    executionId,
+    requestId,
+    source: 'webhook',
+    workflowId: payload.workflowId,
+    webhookId: payload.webhookId,
+    path: payload.path,
+    provider: payload.provider,
+    triggerType: payload.correlation?.triggerType || 'webhook',
+  }
+}
+
 /**
 * Process trigger outputs based on their schema definitions
 * Finds outputs marked as 'file' or 'file[]' and uploads them to execution storage
@@ -104,18 +121,22 @@ export type WebhookExecutionPayload = {
  webhookId: string
  workflowId: string
  userId: string
+  executionId?: string
+  requestId?: string
+  correlation?: AsyncExecutionCorrelation
  provider: string
  body: any
  headers: Record<string, string>
  path: string
  blockId?: string
+  workspaceId?: string
  credentialId?: string
-  credentialAccountUserId?: string
 }

 export async function executeWebhookJob(payload: WebhookExecutionPayload) {
-  const executionId = uuidv4()
-  const requestId = executionId.slice(0, 8)
+  const correlation = buildWebhookCorrelation(payload)
+  const executionId = correlation.executionId
+  const requestId = correlation.requestId

  logger.info(`[${requestId}] Starting webhook execution`, {
    webhookId: payload.webhookId,
@@ -133,7 +154,7 @@ export async function executeWebhookJob(payload: WebhookExecutionPayload) {
  )

  const runOperation = async () => {
-    return await executeWebhookJobInternal(payload, executionId, requestId)
+    return await executeWebhookJobInternal(payload, correlation)
  }

  return await webhookIdempotency.executeWithIdempotency(
@@ -143,11 +164,27 @@ 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) {
+    return undefined
+  }
+  const [credentialRecord] = await db
+    .select({ userId: account.userId })
+    .from(account)
+    .where(eq(account.id, resolved.accountId))
+    .limit(1)
+  return credentialRecord?.userId
+}
+
 async function executeWebhookJobInternal(
  payload: WebhookExecutionPayload,
-  executionId: string,
-  requestId: string
+  correlation: AsyncExecutionCorrelation
 ) {
+  const { executionId, requestId } = correlation
  const loggingSession = new LoggingSession(
    payload.workflowId,
    executionId,
@@ -155,17 +192,57 @@ async function executeWebhookJobInternal(
    requestId
  )

-  const userSubscription = await getHighestPrioritySubscription(payload.userId)
-  const asyncTimeout = getExecutionTimeout(
-    userSubscription?.plan as SubscriptionPlan | undefined,
-    'async'
-  )
+  // Resolve workflow record, billing actor, subscription, and timeout
+  const preprocessResult = await preprocessExecution({
+    workflowId: payload.workflowId,
+    userId: payload.userId,
+    triggerType: 'webhook',
+    executionId,
+    requestId,
+    triggerData: { correlation },
+    checkRateLimit: false,
+    checkDeployment: false,
+    skipUsageLimits: true,
+    workspaceId: payload.workspaceId,
+    loggingSession,
+  })
+
+  if (!preprocessResult.success) {
+    throw new Error(preprocessResult.error?.message || 'Preprocessing failed in background job')
+  }
+
+  const { workflowRecord, executionTimeout } = preprocessResult
+  if (!workflowRecord) {
+    throw new Error(`Workflow ${payload.workflowId} not found during preprocessing`)
+  }
+
+  const workspaceId = workflowRecord.workspaceId
+  if (!workspaceId) {
+    throw new Error(`Workflow ${payload.workflowId} has no associated workspace`)
+  }
+
+  const workflowVariables = (workflowRecord.variables as Record<string, any>) || {}
+  const asyncTimeout = executionTimeout?.async ?? 120_000
  const timeoutController = createTimeoutAbortController(asyncTimeout)

  let deploymentVersionId: string | undefined

  try {
-    const workflowData = await loadDeployedWorkflowState(payload.workflowId)
+    // 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),
+      payload.credentialId
+        ? resolveCredentialAccountUserId(payload.credentialId)
+        : Promise.resolve(undefined),
+    ])
+    const credentialAccountUserId = resolvedCredentialUserId
+    if (payload.credentialId && !credentialAccountUserId) {
+      logger.warn(
+        `[${requestId}] Failed to resolve credential account for credential ${payload.credentialId}`
+      )
+    }
+
    if (!workflowData) {
      throw new Error(
        'Workflow state not found. The workflow may not be deployed or the deployment data may be corrupted.'
@@ -178,28 +255,11 @@ async function executeWebhookJobInternal(
        ? (workflowData.deploymentVersionId as string)
        : undefined

-    const wfRows = await db
-      .select({ workspaceId: workflowTable.workspaceId, variables: workflowTable.variables })
-      .from(workflowTable)
-      .where(eq(workflowTable.id, payload.workflowId))
-      .limit(1)
-    const workspaceId = wfRows[0]?.workspaceId
-    if (!workspaceId) {
-      throw new Error(`Workflow ${payload.workflowId} has no associated workspace`)
-    }
-    const workflowVariables = (wfRows[0]?.variables as Record<string, any>) || {}
-
    // Handle special Airtable case
    if (payload.provider === 'airtable') {
      logger.info(`[${requestId}] Processing Airtable webhook via fetchAndProcessAirtablePayloads`)

-      // Load the actual webhook record from database to get providerConfig
-      const [webhookRecord] = await db
-        .select()
-        .from(webhook)
-        .where(eq(webhook.id, payload.webhookId))
-        .limit(1)
-
+      const webhookRecord = webhookRows[0]
      if (!webhookRecord) {
        throw new Error(`Webhook record not found: ${payload.webhookId}`)
      }
@@ -210,29 +270,20 @@ async function executeWebhookJobInternal(
        providerConfig: webhookRecord.providerConfig,
      }

-      // Create a mock workflow object for Airtable processing
      const mockWorkflow = {
        id: payload.workflowId,
        userId: payload.userId,
      }

-      // Get the processed Airtable input
      const airtableInput = await fetchAndProcessAirtablePayloads(
        webhookData,
        mockWorkflow,
        requestId
      )

-      // If we got input (changes), execute the workflow like other providers
      if (airtableInput) {
        logger.info(`[${requestId}] Executing workflow with Airtable changes`)

-        // Get workflow for core execution
-        const workflow = await getWorkflowById(payload.workflowId)
-        if (!workflow) {
-          throw new Error(`Workflow ${payload.workflowId} not found`)
-        }
-
        const metadata: ExecutionMetadata = {
          requestId,
          executionId,
@@ -240,13 +291,14 @@ async function executeWebhookJobInternal(
          workspaceId,
          userId: payload.userId,
          sessionUserId: undefined,
-          workflowUserId: workflow.userId,
+          workflowUserId: workflowRecord.userId,
          triggerType: payload.provider || 'webhook',
          triggerBlockId: payload.blockId,
          useDraftState: false,
          startTime: new Date().toISOString(),
          isClientSession: false,
-          credentialAccountUserId: payload.credentialAccountUserId,
+          credentialAccountUserId,
+          correlation,
          workflowStateOverride: {
            blocks,
            edges,
@@ -258,7 +310,7 @@ async function executeWebhookJobInternal(

        const snapshot = new ExecutionSnapshot(
          metadata,
-          workflow,
+          workflowRecord,
          airtableInput,
          workflowVariables,
          []
@@ -331,13 +383,13 @@ async function executeWebhookJobInternal(
      // No changes to process
      logger.info(`[${requestId}] No Airtable changes to process`)

-      // Start logging session so the complete call has a log entry to update
      await loggingSession.safeStart({
        userId: payload.userId,
        workspaceId,
        variables: {},
        triggerData: {
          isTest: false,
+          correlation,
        },
        deploymentVersionId,
      })
@@ -359,13 +411,6 @@ async function executeWebhookJobInternal(
    }

    // Format input for standard webhooks
-    // Load the actual webhook to get providerConfig (needed for Teams credentialId)
-    const webhookRows = await db
-      .select()
-      .from(webhook)
-      .where(eq(webhook.id, payload.webhookId))
-      .limit(1)
-
    const actualWebhook =
      webhookRows.length > 0
        ? webhookRows[0]
@@ -388,13 +433,13 @@ async function executeWebhookJobInternal(
    if (!input && payload.provider === 'whatsapp') {
      logger.info(`[${requestId}] No messages in WhatsApp payload, skipping execution`)

-      // Start logging session so the complete call has a log entry to update
      await loggingSession.safeStart({
        userId: payload.userId,
        workspaceId,
        variables: {},
        triggerData: {
          isTest: false,
+          correlation,
        },
        deploymentVersionId,
      })
@@ -454,7 +499,6 @@ async function executeWebhookJobInternal(
        }
      } catch (error) {
        logger.error(`[${requestId}] Error processing trigger file outputs:`, error)
-        // Continue without processing attachments rather than failing execution
      }
    }

@@ -501,18 +545,11 @@ async function executeWebhookJobInternal(
        }
      } catch (error) {
        logger.error(`[${requestId}] Error processing generic webhook files:`, error)
-        // Continue without processing files rather than failing execution
      }
    }

    logger.info(`[${requestId}] Executing workflow for ${payload.provider} webhook`)

-    // Get workflow for core execution
-    const workflow = await getWorkflowById(payload.workflowId)
-    if (!workflow) {
-      throw new Error(`Workflow ${payload.workflowId} not found`)
-    }
-
    const metadata: ExecutionMetadata = {
      requestId,
      executionId,
@@ -520,13 +557,14 @@ async function executeWebhookJobInternal(
      workspaceId,
      userId: payload.userId,
      sessionUserId: undefined,
-      workflowUserId: workflow.userId,
+      workflowUserId: workflowRecord.userId,
      triggerType: payload.provider || 'webhook',
      triggerBlockId: payload.blockId,
      useDraftState: false,
      startTime: new Date().toISOString(),
      isClientSession: false,
-      credentialAccountUserId: payload.credentialAccountUserId,
+      credentialAccountUserId,
+      correlation,
      workflowStateOverride: {
        blocks,
        edges,
@@ -538,7 +576,13 @@ async function executeWebhookJobInternal(

    const triggerInput = input || {}

-    const snapshot = new ExecutionSnapshot(metadata, workflow, triggerInput, workflowVariables, [])
+    const snapshot = new ExecutionSnapshot(
+      metadata,
+      workflowRecord,
+      triggerInput,
+      workflowVariables,
+      []
+    )

    const executionResult = await executeWorkflowCore({
      snapshot,
@@ -614,27 +658,18 @@ async function executeWebhookJobInternal(
      provider: payload.provider,
    })

+    if (wasExecutionFinalizedByCore(error, executionId)) {
+      throw error
+    }
+
    try {
-      const wfRow = await db
-        .select({ workspaceId: workflowTable.workspaceId })
-        .from(workflowTable)
-        .where(eq(workflowTable.id, payload.workflowId))
-        .limit(1)
-      const errorWorkspaceId = wfRow[0]?.workspaceId
-
-      if (!errorWorkspaceId) {
-        logger.warn(
-          `[${requestId}] Cannot log error: workflow ${payload.workflowId} has no workspace`
-        )
-        throw error
-      }
-
      await loggingSession.safeStart({
        userId: payload.userId,
-        workspaceId: errorWorkspaceId,
+        workspaceId,
        variables: {},
        triggerData: {
          isTest: false,
+          correlation,
        },
        deploymentVersionId,
      })
--- a/apps/sim/background/workflow-execution.ts
+++ b/apps/sim/background/workflow-execution.ts
@@ -1,11 +1,15 @@
 import { createLogger } from '@sim/logger'
 import { task } from '@trigger.dev/sdk'
 import { v4 as uuidv4 } from 'uuid'
+import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import { createTimeoutAbortController, getTimeoutErrorMessage } from '@/lib/core/execution-limits'
 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 { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
+import {
+  executeWorkflowCore,
+  wasExecutionFinalizedByCore,
+} from '@/lib/workflows/executor/execution-core'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata } from '@/executor/execution/types'
@@ -14,12 +18,29 @@ import type { CoreTriggerType } from '@/stores/logs/filters/types'

 const logger = createLogger('TriggerWorkflowExecution')

+export function buildWorkflowCorrelation(
+  payload: WorkflowExecutionPayload
+): AsyncExecutionCorrelation {
+  const executionId = payload.executionId || uuidv4()
+  const requestId = payload.requestId || payload.correlation?.requestId || executionId.slice(0, 8)
+
+  return {
+    executionId,
+    requestId,
+    source: 'workflow',
+    workflowId: payload.workflowId,
+    triggerType: payload.triggerType || payload.correlation?.triggerType || 'api',
+  }
+}
+
 export type WorkflowExecutionPayload = {
  workflowId: string
  userId: string
  input?: any
  triggerType?: CoreTriggerType
  executionId?: string
+  requestId?: string
+  correlation?: AsyncExecutionCorrelation
  metadata?: Record<string, any>
  callChain?: string[]
 }
@@ -31,8 +52,9 @@ export type WorkflowExecutionPayload = {
 */
 export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
  const workflowId = payload.workflowId
-  const executionId = payload.executionId || uuidv4()
-  const requestId = executionId.slice(0, 8)
+  const correlation = buildWorkflowCorrelation(payload)
+  const executionId = correlation.executionId
+  const requestId = correlation.requestId

  logger.info(`[${requestId}] Starting workflow execution job: ${workflowId}`, {
    userId: payload.userId,
@@ -40,7 +62,7 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
    executionId,
  })

-  const triggerType = payload.triggerType || 'api'
+  const triggerType = (correlation.triggerType || 'api') as CoreTriggerType
  const loggingSession = new LoggingSession(workflowId, executionId, triggerType, requestId)

  try {
@@ -53,6 +75,7 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
      checkRateLimit: true,
      checkDeployment: true,
      loggingSession: loggingSession,
+      triggerData: { correlation },
    })

    if (!preprocessResult.success) {
@@ -72,12 +95,6 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {

    logger.info(`[${requestId}] Preprocessing passed. Using actor: ${actorUserId}`)

-    await loggingSession.safeStart({
-      userId: actorUserId,
-      workspaceId,
-      variables: {},
-    })
-
    const workflow = preprocessResult.workflowRecord!

    const metadata: ExecutionMetadata = {
@@ -93,6 +110,7 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
      startTime: new Date().toISOString(),
      isClientSession: false,
      callChain: payload.callChain,
+      correlation,
    }

    const snapshot = new ExecutionSnapshot(
@@ -180,6 +198,10 @@ export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
      executionId,
    })

+    if (wasExecutionFinalizedByCore(error, executionId)) {
+      throw error
+    }
+
    const executionResult = hasExecutionResult(error) ? error.executionResult : undefined
    const { traceSpans } = executionResult ? buildTraceSpans(executionResult) : { traceSpans: [] }

--- a/apps/sim/background/workspace-notification-delivery.ts
+++ b/apps/sim/background/workspace-notification-delivery.ts
@@ -19,6 +19,7 @@ import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { dollarsToCredits } from '@/lib/billing/credits/conversion'
 import { RateLimiter } from '@/lib/core/rate-limiter'
 import { decryptSecret } from '@/lib/core/security/encryption'
+import { secureFetchWithValidation } from '@/lib/core/security/input-validation.server'
 import { formatDuration } from '@/lib/core/utils/formatting'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import type { TraceSpan, WorkflowExecutionLog } from '@/lib/logs/types'
@@ -205,18 +206,18 @@ async function deliverWebhook(
    headers['sim-signature'] = `t=${payload.timestamp},v1=${signature}`
  }

-  const controller = new AbortController()
-  const timeoutId = setTimeout(() => controller.abort(), 30000)
-
  try {
-    const response = await fetch(webhookConfig.url, {
-      method: 'POST',
-      headers,
-      body,
-      signal: controller.signal,
-    })
-
-    clearTimeout(timeoutId)
+    const response = await secureFetchWithValidation(
+      webhookConfig.url,
+      {
+        method: 'POST',
+        headers,
+        body,
+        timeout: 30000,
+        allowHttp: true,
+      },
+      'webhookUrl'
+    )

    return {
      success: response.ok,
@@ -224,11 +225,13 @@ async function deliverWebhook(
      error: response.ok ? undefined : `HTTP ${response.status}`,
    }
  } catch (error: unknown) {
-    clearTimeout(timeoutId)
-    const err = error as Error & { name?: string }
+    logger.warn('Webhook delivery failed', {
+      error: error instanceof Error ? error.message : String(error),
+      webhookUrl: webhookConfig.url,
+    })
    return {
      success: false,
-      error: err.name === 'AbortError' ? 'Request timeout' : err.message,
+      error: 'Failed to deliver webhook',
    }
  }
 }
--- a/apps/sim/blocks/blocks/ashby.ts
+++ b/apps/sim/blocks/blocks/ashby.ts
@@ -1,5 +1,6 @@
 import { AshbyIcon } from '@/components/icons'
 import { AuthMode, type BlockConfig } from '@/blocks/types'
+import { getTrigger } from '@/triggers'

 export const AshbyBlock: BlockConfig = {
  type: 'ashby',
@@ -13,6 +14,18 @@ export const AshbyBlock: BlockConfig = {
  icon: AshbyIcon,
  authMode: AuthMode.ApiKey,

+  triggers: {
+    enabled: true,
+    available: [
+      'ashby_application_submit',
+      'ashby_candidate_stage_change',
+      'ashby_candidate_hire',
+      'ashby_candidate_delete',
+      'ashby_job_create',
+      'ashby_offer_create',
+    ],
+  },
+
  subBlocks: [
    {
      id: 'operation',
@@ -366,6 +379,14 @@ Output only the ISO 8601 timestamp string, nothing else.`,
      },
      mode: 'advanced',
    },
+
+    // Trigger subBlocks
+    ...getTrigger('ashby_application_submit').subBlocks,
+    ...getTrigger('ashby_candidate_stage_change').subBlocks,
+    ...getTrigger('ashby_candidate_hire').subBlocks,
+    ...getTrigger('ashby_candidate_delete').subBlocks,
+    ...getTrigger('ashby_job_create').subBlocks,
+    ...getTrigger('ashby_offer_create').subBlocks,
  ],

  tools: {
--- a/apps/sim/blocks/blocks/fathom.ts
+++ b/apps/sim/blocks/blocks/fathom.ts
@@ -0,0 +1,211 @@
+import { FathomIcon } from '@/components/icons'
+import { AuthMode, type BlockConfig } from '@/blocks/types'
+import type { FathomResponse } from '@/tools/fathom/types'
+import { getTrigger } from '@/triggers'
+import { fathomTriggerOptions } from '@/triggers/fathom/utils'
+
+export const FathomBlock: BlockConfig<FathomResponse> = {
+  type: 'fathom',
+  name: 'Fathom',
+  description: 'Access meeting recordings, transcripts, and summaries',
+  authMode: AuthMode.ApiKey,
+  triggerAllowed: true,
+  longDescription:
+    'Integrate Fathom AI Notetaker into your workflow. List meetings, get transcripts and summaries, and manage team members and teams. Can also trigger workflows when new meeting content is ready.',
+  docsLink: 'https://docs.sim.ai/tools/fathom',
+  category: 'tools',
+  bgColor: '#181C1E',
+  icon: FathomIcon,
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'List Meetings', id: 'fathom_list_meetings' },
+        { label: 'Get Summary', id: 'fathom_get_summary' },
+        { label: 'Get Transcript', id: 'fathom_get_transcript' },
+        { label: 'List Team Members', id: 'fathom_list_team_members' },
+        { label: 'List Teams', id: 'fathom_list_teams' },
+      ],
+      value: () => 'fathom_list_meetings',
+    },
+    {
+      id: 'recordingId',
+      title: 'Recording ID',
+      type: 'short-input',
+      required: { field: 'operation', value: ['fathom_get_summary', 'fathom_get_transcript'] },
+      placeholder: 'Enter the recording ID',
+      condition: { field: 'operation', value: ['fathom_get_summary', 'fathom_get_transcript'] },
+    },
+    {
+      id: 'includeSummary',
+      title: 'Include Summary',
+      type: 'dropdown',
+      options: [
+        { label: 'No', id: 'false' },
+        { label: 'Yes', id: 'true' },
+      ],
+      value: () => 'false',
+      condition: { field: 'operation', value: 'fathom_list_meetings' },
+    },
+    {
+      id: 'includeTranscript',
+      title: 'Include Transcript',
+      type: 'dropdown',
+      options: [
+        { label: 'No', id: 'false' },
+        { label: 'Yes', id: 'true' },
+      ],
+      value: () => 'false',
+      condition: { field: 'operation', value: 'fathom_list_meetings' },
+    },
+    {
+      id: 'includeActionItems',
+      title: 'Include Action Items',
+      type: 'dropdown',
+      options: [
+        { label: 'No', id: 'false' },
+        { label: 'Yes', id: 'true' },
+      ],
+      value: () => 'false',
+      condition: { field: 'operation', value: 'fathom_list_meetings' },
+    },
+    {
+      id: 'includeCrmMatches',
+      title: 'Include CRM Matches',
+      type: 'dropdown',
+      options: [
+        { label: 'No', id: 'false' },
+        { label: 'Yes', id: 'true' },
+      ],
+      value: () => 'false',
+      condition: { field: 'operation', value: 'fathom_list_meetings' },
+    },
+    {
+      id: 'createdAfter',
+      title: 'Created After',
+      type: 'short-input',
+      placeholder: 'ISO 8601 timestamp (e.g., 2025-01-01T00:00:00Z)',
+      condition: { field: 'operation', value: 'fathom_list_meetings' },
+      mode: 'advanced',
+      wandConfig: {
+        enabled: true,
+        prompt: 'Generate an ISO 8601 timestamp. Return ONLY the timestamp string.',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'createdBefore',
+      title: 'Created Before',
+      type: 'short-input',
+      placeholder: 'ISO 8601 timestamp (e.g., 2025-12-31T23:59:59Z)',
+      condition: { field: 'operation', value: 'fathom_list_meetings' },
+      mode: 'advanced',
+      wandConfig: {
+        enabled: true,
+        prompt: 'Generate an ISO 8601 timestamp. Return ONLY the timestamp string.',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'recordedBy',
+      title: 'Recorded By',
+      type: 'short-input',
+      placeholder: 'Filter by recorder email',
+      condition: { field: 'operation', value: 'fathom_list_meetings' },
+      mode: 'advanced',
+    },
+    {
+      id: 'teams',
+      title: 'Team',
+      type: 'short-input',
+      placeholder: 'Filter by team name',
+      condition: {
+        field: 'operation',
+        value: ['fathom_list_meetings', 'fathom_list_team_members'],
+      },
+      mode: 'advanced',
+    },
+    {
+      id: 'cursor',
+      title: 'Pagination Cursor',
+      type: 'short-input',
+      placeholder: 'Cursor from a previous response',
+      condition: {
+        field: 'operation',
+        value: ['fathom_list_meetings', 'fathom_list_team_members', 'fathom_list_teams'],
+      },
+      mode: 'advanced',
+    },
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input',
+      required: true,
+      placeholder: 'Enter your Fathom API key',
+      password: true,
+    },
+    {
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: fathomTriggerOptions,
+      value: () => 'fathom_new_meeting',
+      required: true,
+    },
+    ...getTrigger('fathom_new_meeting').subBlocks,
+    ...getTrigger('fathom_webhook').subBlocks,
+  ],
+  tools: {
+    access: [
+      'fathom_list_meetings',
+      'fathom_get_summary',
+      'fathom_get_transcript',
+      'fathom_list_team_members',
+      'fathom_list_teams',
+    ],
+    config: {
+      tool: (params) => {
+        return params.operation || 'fathom_list_meetings'
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Operation to perform' },
+    apiKey: { type: 'string', description: 'Fathom API key' },
+    recordingId: { type: 'string', description: 'Recording ID for summary or transcript' },
+    includeSummary: { type: 'string', description: 'Include summary in meetings response' },
+    includeTranscript: { type: 'string', description: 'Include transcript in meetings response' },
+    includeActionItems: {
+      type: 'string',
+      description: 'Include action items in meetings response',
+    },
+    includeCrmMatches: {
+      type: 'string',
+      description: 'Include linked CRM matches in meetings response',
+    },
+    createdAfter: { type: 'string', description: 'Filter meetings created after this timestamp' },
+    createdBefore: {
+      type: 'string',
+      description: 'Filter meetings created before this timestamp',
+    },
+    recordedBy: { type: 'string', description: 'Filter by recorder email' },
+    teams: { type: 'string', description: 'Filter by team name' },
+    cursor: { type: 'string', description: 'Pagination cursor for next page' },
+  },
+  outputs: {
+    meetings: { type: 'json', description: 'List of meetings' },
+    template_name: { type: 'string', description: 'Summary template name' },
+    markdown_formatted: { type: 'string', description: 'Markdown-formatted summary' },
+    transcript: { type: 'json', description: 'Meeting transcript entries' },
+    members: { type: 'json', description: 'List of team members' },
+    teams: { type: 'json', description: 'List of teams' },
+    next_cursor: { type: 'string', description: 'Pagination cursor' },
+  },
+  triggers: {
+    enabled: true,
+    available: ['fathom_new_meeting', 'fathom_webhook'],
+  },
+}
--- a/apps/sim/blocks/blocks/generic_webhook.ts
+++ b/apps/sim/blocks/blocks/generic_webhook.ts
@@ -18,6 +18,7 @@ export const GenericWebhookBlock: BlockConfig = {
  bestPractices: `
  - You can test the webhook by sending a request to the webhook URL. E.g. depending on authorization:  curl -X POST http://localhost:3000/api/webhooks/trigger/d8abcf0d-1ee5-4b77-bb07-b1e8142ea4e9 -H "Content-Type: application/json" -H "X-Sim-Secret: 1234" -d '{"message": "Test webhook trigger", "data": {"key": "v"}}'
  - Continuing example above, the body can be accessed in downstream block using dot notation. E.g. <webhook1.message> and <webhook1.data.key>
+  - To deduplicate incoming events, set the Deduplication Field to a dot-notation path of a unique field in the payload (e.g. "event.id"). Duplicate values within 7 days will be skipped.
  - Only use when there's no existing integration for the service with triggerAllowed flag set to true.
  `,
  subBlocks: [...getTrigger('generic_webhook').subBlocks],
--- a/apps/sim/blocks/blocks/google_ads.ts
+++ b/apps/sim/blocks/blocks/google_ads.ts
@@ -0,0 +1,294 @@
+import { GoogleAdsIcon } from '@/components/icons'
+import { getScopesForService } from '@/lib/oauth/utils'
+import type { BlockConfig } from '@/blocks/types'
+import { AuthMode } from '@/blocks/types'
+
+export const GoogleAdsBlock: BlockConfig = {
+  type: 'google_ads',
+  name: 'Google Ads',
+  description: 'Query campaigns, ad groups, and performance metrics',
+  longDescription:
+    'Connect to Google Ads to list accessible accounts, list campaigns, view ad group details, get performance metrics, and run custom GAQL queries.',
+  docsLink: 'https://docs.sim.ai/tools/google_ads',
+  category: 'tools',
+  bgColor: '#E0E0E0',
+  icon: GoogleAdsIcon,
+  authMode: AuthMode.OAuth,
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'List Customers', id: 'list_customers' },
+        { label: 'List Campaigns', id: 'list_campaigns' },
+        { label: 'Campaign Performance', id: 'campaign_performance' },
+        { label: 'List Ad Groups', id: 'list_ad_groups' },
+        { label: 'Ad Performance', id: 'ad_performance' },
+        { label: 'Custom Query (GAQL)', id: 'search' },
+      ],
+      value: () => 'list_campaigns',
+    },
+
+    {
+      id: 'credential',
+      title: 'Google Ads Account',
+      type: 'oauth-input',
+      canonicalParamId: 'oauthCredential',
+      mode: 'basic',
+      required: true,
+      serviceId: 'google-ads',
+      requiredScopes: getScopesForService('google-ads'),
+      placeholder: 'Select Google Ads account',
+    },
+    {
+      id: 'manualCredential',
+      title: 'Google Ads Account',
+      type: 'short-input',
+      canonicalParamId: 'oauthCredential',
+      mode: 'advanced',
+      placeholder: 'Enter credential ID',
+      required: true,
+    },
+
+    {
+      id: 'developerToken',
+      title: 'Developer Token',
+      type: 'short-input',
+      placeholder: 'Enter your Google Ads API developer token',
+      required: true,
+      password: true,
+    },
+
+    {
+      id: 'customerId',
+      title: 'Customer ID',
+      type: 'short-input',
+      placeholder: 'Google Ads customer ID (no dashes)',
+      condition: {
+        field: 'operation',
+        value: 'list_customers',
+        not: true,
+      },
+      required: {
+        field: 'operation',
+        value: 'list_customers',
+        not: true,
+      },
+    },
+
+    {
+      id: 'managerCustomerId',
+      title: 'Manager Customer ID',
+      type: 'short-input',
+      placeholder: 'Manager account ID (optional)',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: 'list_customers',
+        not: true,
+      },
+    },
+
+    {
+      id: 'query',
+      title: 'GAQL Query',
+      type: 'long-input',
+      placeholder:
+        "SELECT campaign.id, campaign.name, metrics.impressions FROM campaign WHERE campaign.status = 'ENABLED'",
+      condition: { field: 'operation', value: 'search' },
+      required: { field: 'operation', value: 'search' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a Google Ads Query Language (GAQL) query based on the user's description.
+The query should:
+- Use valid GAQL syntax
+- Include relevant metrics when asking about performance
+- Include segments.date with a date range when using metrics
+- Be efficient and well-formatted
+
+Common resources: campaign, ad_group, ad_group_ad, keyword_view, search_term_view
+Common metrics: metrics.impressions, metrics.clicks, metrics.cost_micros, metrics.ctr, metrics.conversions
+Date ranges: LAST_7_DAYS, LAST_30_DAYS, THIS_MONTH, YESTERDAY
+
+Examples:
+- "active campaigns" -> SELECT campaign.id, campaign.name, campaign.status FROM campaign WHERE campaign.status = 'ENABLED'
+- "campaign spend last week" -> SELECT campaign.name, metrics.cost_micros, segments.date FROM campaign WHERE segments.date DURING LAST_7_DAYS AND campaign.status != 'REMOVED'
+
+Return ONLY the GAQL query - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the query you want to run...',
+      },
+    },
+
+    {
+      id: 'campaignId',
+      title: 'Campaign ID',
+      type: 'short-input',
+      placeholder: 'Campaign ID to filter by',
+      condition: {
+        field: 'operation',
+        value: ['campaign_performance', 'list_ad_groups', 'ad_performance'],
+      },
+      required: { field: 'operation', value: 'list_ad_groups' },
+    },
+
+    {
+      id: 'adGroupId',
+      title: 'Ad Group ID',
+      type: 'short-input',
+      placeholder: 'Ad group ID to filter by',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'ad_performance' },
+    },
+
+    {
+      id: 'status',
+      title: 'Status Filter',
+      type: 'dropdown',
+      options: [
+        { label: 'All (except removed)', id: '' },
+        { label: 'Enabled', id: 'ENABLED' },
+        { label: 'Paused', id: 'PAUSED' },
+      ],
+      mode: 'advanced',
+      condition: { field: 'operation', value: ['list_campaigns', 'list_ad_groups'] },
+    },
+
+    {
+      id: 'dateRange',
+      title: 'Date Range',
+      type: 'dropdown',
+      options: [
+        { label: 'Last 30 Days', id: 'LAST_30_DAYS' },
+        { label: 'Last 7 Days', id: 'LAST_7_DAYS' },
+        { label: 'Today', id: 'TODAY' },
+        { label: 'Yesterday', id: 'YESTERDAY' },
+        { label: 'This Month', id: 'THIS_MONTH' },
+        { label: 'Last Month', id: 'LAST_MONTH' },
+        { label: 'Custom', id: 'CUSTOM' },
+      ],
+      condition: { field: 'operation', value: ['campaign_performance', 'ad_performance'] },
+      value: () => 'LAST_30_DAYS',
+    },
+
+    {
+      id: 'startDate',
+      title: 'Start Date',
+      type: 'short-input',
+      placeholder: 'YYYY-MM-DD',
+      condition: { field: 'dateRange', value: 'CUSTOM' },
+      required: { field: 'dateRange', value: 'CUSTOM' },
+    },
+
+    {
+      id: 'endDate',
+      title: 'End Date',
+      type: 'short-input',
+      placeholder: 'YYYY-MM-DD',
+      condition: { field: 'dateRange', value: 'CUSTOM' },
+      required: { field: 'dateRange', value: 'CUSTOM' },
+    },
+
+    {
+      id: 'pageToken',
+      title: 'Page Token',
+      type: 'short-input',
+      placeholder: 'Pagination token',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'search' },
+    },
+
+    {
+      id: 'limit',
+      title: 'Limit',
+      type: 'short-input',
+      placeholder: 'Maximum results to return',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: ['list_campaigns', 'list_ad_groups', 'ad_performance'],
+      },
+    },
+  ],
+  tools: {
+    access: [
+      'google_ads_list_customers',
+      'google_ads_search',
+      'google_ads_list_campaigns',
+      'google_ads_campaign_performance',
+      'google_ads_list_ad_groups',
+      'google_ads_ad_performance',
+    ],
+    config: {
+      tool: (params) => `google_ads_${params.operation}`,
+      params: (params) => {
+        const { oauthCredential, dateRange, limit, ...rest } = params
+
+        const result: Record<string, unknown> = {
+          ...rest,
+          oauthCredential,
+        }
+
+        if (dateRange && dateRange !== 'CUSTOM') {
+          result.dateRange = dateRange
+        }
+
+        if (limit !== undefined && limit !== '') {
+          result.limit = Number(limit)
+        }
+
+        return result
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Operation to perform' },
+    oauthCredential: { type: 'string', description: 'Google Ads OAuth credential' },
+    developerToken: { type: 'string', description: 'Google Ads API developer token' },
+    customerId: { type: 'string', description: 'Google Ads customer ID (numeric, no dashes)' },
+    managerCustomerId: { type: 'string', description: 'Manager account customer ID' },
+    query: { type: 'string', description: 'GAQL query to execute' },
+    campaignId: { type: 'string', description: 'Campaign ID to filter by' },
+    adGroupId: { type: 'string', description: 'Ad group ID to filter by' },
+    status: { type: 'string', description: 'Status filter (ENABLED, PAUSED)' },
+    dateRange: { type: 'string', description: 'Date range for performance queries' },
+    startDate: { type: 'string', description: 'Custom start date (YYYY-MM-DD)' },
+    endDate: { type: 'string', description: 'Custom end date (YYYY-MM-DD)' },
+    pageToken: { type: 'string', description: 'Pagination token' },
+    limit: { type: 'number', description: 'Maximum results to return' },
+  },
+  outputs: {
+    customerIds: {
+      type: 'json',
+      description: 'List of accessible customer IDs (list_customers)',
+    },
+    results: {
+      type: 'json',
+      description: 'Query results (search)',
+    },
+    campaigns: {
+      type: 'json',
+      description: 'Campaign data (list_campaigns, campaign_performance)',
+    },
+    adGroups: {
+      type: 'json',
+      description: 'Ad group data (list_ad_groups)',
+    },
+    ads: {
+      type: 'json',
+      description: 'Ad performance data (ad_performance)',
+    },
+    totalCount: {
+      type: 'number',
+      description: 'Total number of results',
+    },
+    totalResultsCount: {
+      type: 'number',
+      description: 'Total results count (search)',
+    },
+    nextPageToken: {
+      type: 'string',
+      description: 'Token for next page of results',
+    },
+  },
+}
--- a/apps/sim/blocks/blocks/grain.ts
+++ b/apps/sim/blocks/blocks/grain.ts
@@ -25,6 +25,7 @@ export const GrainBlock: BlockConfig = {
        { label: 'List Recordings', id: 'grain_list_recordings' },
        { label: 'Get Recording', id: 'grain_get_recording' },
        { label: 'Get Transcript', id: 'grain_get_transcript' },
+        { label: 'List Views', id: 'grain_list_views' },
        { label: 'List Teams', id: 'grain_list_teams' },
        { label: 'List Meeting Types', id: 'grain_list_meeting_types' },
        { label: 'Create Webhook', id: 'grain_create_hook' },
@@ -72,7 +73,7 @@ export const GrainBlock: BlockConfig = {
      placeholder: 'ISO8601 timestamp (e.g., 2024-01-01T00:00:00Z)',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_create_hook'],
+        value: ['grain_list_recordings'],
      },
      wandConfig: {
        enabled: true,
@@ -96,7 +97,7 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
      placeholder: 'ISO8601 timestamp (e.g., 2024-01-01T00:00:00Z)',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_create_hook'],
+        value: ['grain_list_recordings'],
      },
      wandConfig: {
        enabled: true,
@@ -125,7 +126,7 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
      value: () => '',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_create_hook'],
+        value: ['grain_list_recordings'],
      },
    },
    // Title search
@@ -162,7 +163,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
      placeholder: 'Filter by team UUID (optional)',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_create_hook'],
+        value: ['grain_list_recordings'],
      },
    },
    // Meeting type ID filter
@@ -173,7 +174,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
      placeholder: 'Filter by meeting type UUID (optional)',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_create_hook'],
+        value: ['grain_list_recordings'],
      },
    },
    // Include highlights
@@ -183,7 +184,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
      type: 'switch',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_get_recording', 'grain_create_hook'],
+        value: ['grain_list_recordings', 'grain_get_recording'],
      },
    },
    // Include participants
@@ -193,7 +194,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
      type: 'switch',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_get_recording', 'grain_create_hook'],
+        value: ['grain_list_recordings', 'grain_get_recording'],
      },
    },
    // Include AI summary
@@ -203,7 +204,18 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
      type: 'switch',
      condition: {
        field: 'operation',
-        value: ['grain_list_recordings', 'grain_get_recording', 'grain_create_hook'],
+        value: ['grain_list_recordings', 'grain_get_recording'],
+      },
+    },
+    {
+      id: 'viewId',
+      title: 'View ID',
+      type: 'short-input',
+      placeholder: 'Enter Grain view UUID',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['grain_create_hook'],
      },
    },
    // Include calendar event (get_recording only)
@@ -271,6 +283,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
      'grain_list_recordings',
      'grain_get_recording',
      'grain_get_transcript',
+      'grain_list_views',
      'grain_list_teams',
      'grain_list_meeting_types',
      'grain_create_hook',
@@ -327,6 +340,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,

          case 'grain_list_teams':
          case 'grain_list_meeting_types':
+          case 'grain_list_views':
          case 'grain_list_hooks':
            return baseParams

@@ -334,17 +348,13 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
            if (!params.hookUrl?.trim()) {
              throw new Error('Webhook URL is required.')
            }
+            if (!params.viewId?.trim()) {
+              throw new Error('View ID is required.')
+            }
            return {
              ...baseParams,
              hookUrl: params.hookUrl.trim(),
-              filterBeforeDatetime: params.beforeDatetime || undefined,
-              filterAfterDatetime: params.afterDatetime || undefined,
-              filterParticipantScope: params.participantScope || undefined,
-              filterTeamId: params.teamId || undefined,
-              filterMeetingTypeId: params.meetingTypeId || undefined,
-              includeHighlights: params.includeHighlights || false,
-              includeParticipants: params.includeParticipants || false,
-              includeAiSummary: params.includeAiSummary || false,
+              viewId: params.viewId.trim(),
            }

          case 'grain_delete_hook':
@@ -367,6 +377,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
    apiKey: { type: 'string', description: 'Grain API key (Personal Access Token)' },
    recordingId: { type: 'string', description: 'Recording UUID' },
    cursor: { type: 'string', description: 'Pagination cursor' },
+    viewId: { type: 'string', description: 'Grain view UUID for webhook subscriptions' },
    beforeDatetime: {
      type: 'string',
      description: 'Filter recordings before this ISO8601 timestamp',
@@ -416,6 +427,7 @@ Return ONLY the search term - no explanations, no quotes, no extra text.`,
    teamsList: { type: 'json', description: 'Array of team objects' },
    // Meeting type outputs
    meetingTypes: { type: 'json', description: 'Array of meeting type objects' },
+    views: { type: 'json', description: 'Array of Grain views' },
    // Hook outputs
    hooks: { type: 'json', description: 'Array of webhook objects' },
    hook: { type: 'json', description: 'Created webhook data' },
--- a/apps/sim/blocks/blocks/jira.ts
+++ b/apps/sim/blocks/blocks/jira.ts
@@ -165,7 +165,7 @@ export const JiraBlock: BlockConfig<JiraResponse> = {
      type: 'short-input',
      canonicalParamId: 'issueKey',
      placeholder: 'Enter Jira issue key',
-      dependsOn: ['credential', 'domain', 'projectId', 'manualProjectId'],
+      dependsOn: ['credential', 'domain'],
      condition: {
        field: 'operation',
        value: [
--- a/apps/sim/blocks/blocks/parallel.ts
+++ b/apps/sim/blocks/blocks/parallel.ts
@@ -9,7 +9,7 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
  authMode: AuthMode.ApiKey,
  longDescription:
    'Integrate Parallel AI into the workflow. Can search the web, extract information from URLs, and conduct deep research.',
-  docsLink: 'https://docs.parallel.ai/',
+  docsLink: 'https://docs.sim.ai/tools/parallel-ai',
  category: 'tools',
  bgColor: '#E0E0E0',
  icon: ParallelIcon,
@@ -56,7 +56,7 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
      title: 'Extract Objective',
      type: 'long-input',
      placeholder: 'What information to extract from the URLs?',
-      required: true,
+      required: false,
      condition: { field: 'operation', value: 'extract' },
    },
    {
@@ -89,6 +89,37 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
      required: true,
      condition: { field: 'operation', value: 'deep_research' },
    },
+    {
+      id: 'search_mode',
+      title: 'Search Mode',
+      type: 'dropdown',
+      options: [
+        { label: 'One-Shot', id: 'one-shot' },
+        { label: 'Agentic', id: 'agentic' },
+        { label: 'Fast', id: 'fast' },
+      ],
+      value: () => 'one-shot',
+      condition: { field: 'operation', value: 'search' },
+      mode: 'advanced',
+    },
+    {
+      id: 'search_include_domains',
+      title: 'Include Domains',
+      type: 'short-input',
+      placeholder: 'Comma-separated domains to include (e.g., .edu, example.com)',
+      required: false,
+      condition: { field: 'operation', value: 'search' },
+      mode: 'advanced',
+    },
+    {
+      id: 'search_exclude_domains',
+      title: 'Exclude Domains',
+      type: 'short-input',
+      placeholder: 'Comma-separated domains to exclude',
+      required: false,
+      condition: { field: 'operation', value: 'search' },
+      mode: 'advanced',
+    },
    {
      id: 'include_domains',
      title: 'Include Domains',
@@ -96,6 +127,7 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
      placeholder: 'Comma-separated domains to include',
      required: false,
      condition: { field: 'operation', value: 'deep_research' },
+      mode: 'advanced',
    },
    {
      id: 'exclude_domains',
@@ -104,37 +136,37 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
      placeholder: 'Comma-separated domains to exclude',
      required: false,
      condition: { field: 'operation', value: 'deep_research' },
+      mode: 'advanced',
    },
    {
      id: 'processor',
-      title: 'Processor',
+      title: 'Research Processor',
      type: 'dropdown',
      options: [
-        { label: 'Lite', id: 'lite' },
-        { label: 'Base', id: 'base' },
-        { label: 'Core', id: 'core' },
-        { label: 'Core 2x', id: 'core2x' },
        { label: 'Pro', id: 'pro' },
        { label: 'Ultra', id: 'ultra' },
-        { label: 'Ultra 2x', id: 'ultra2x' },
-        { label: 'Ultra 4x', id: 'ultra4x' },
+        { label: 'Pro Fast', id: 'pro-fast' },
+        { label: 'Ultra Fast', id: 'ultra-fast' },
      ],
-      value: () => 'base',
-      condition: { field: 'operation', value: ['search', 'deep_research'] },
+      value: () => 'pro',
+      condition: { field: 'operation', value: 'deep_research' },
+      mode: 'advanced',
    },
    {
      id: 'max_results',
      title: 'Max Results',
      type: 'short-input',
-      placeholder: '5',
+      placeholder: '10',
      condition: { field: 'operation', value: 'search' },
+      mode: 'advanced',
    },
    {
      id: 'max_chars_per_result',
-      title: 'Max Chars',
+      title: 'Max Chars Per Result',
      type: 'short-input',
      placeholder: '1500',
      condition: { field: 'operation', value: 'search' },
+      mode: 'advanced',
    },
    {
      id: 'apiKey',
@@ -150,8 +182,6 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
    access: ['parallel_search', 'parallel_extract', 'parallel_deep_research'],
    config: {
      tool: (params) => {
-        if (params.extract_objective) params.objective = params.extract_objective
-        if (params.research_input) params.input = params.research_input
        switch (params.operation) {
          case 'search':
            return 'parallel_search'
@@ -175,21 +205,30 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
              .filter((query: string) => query.length > 0)
            if (queries.length > 0) {
              result.search_queries = queries
-            } else {
-              result.search_queries = undefined
            }
          }
+          if (params.search_mode && params.search_mode !== 'one-shot') {
+            result.mode = params.search_mode
+          }
          if (params.max_results) result.max_results = Number(params.max_results)
          if (params.max_chars_per_result) {
            result.max_chars_per_result = Number(params.max_chars_per_result)
          }
+          result.include_domains = params.search_include_domains || undefined
+          result.exclude_domains = params.search_exclude_domains || undefined
        }

        if (operation === 'extract') {
+          if (params.extract_objective) result.objective = params.extract_objective
          result.excerpts = !(params.excerpts === 'false' || params.excerpts === false)
          result.full_content = params.full_content === 'true' || params.full_content === true
        }

+        if (operation === 'deep_research') {
+          if (params.research_input) result.input = params.research_input
+          if (params.processor) result.processor = params.processor
+        }
+
        return result
      },
    },
@@ -203,29 +242,34 @@ export const ParallelBlock: BlockConfig<ToolResponse> = {
    excerpts: { type: 'boolean', description: 'Include excerpts' },
    full_content: { type: 'boolean', description: 'Include full content' },
    research_input: { type: 'string', description: 'Deep research query' },
-    include_domains: { type: 'string', description: 'Domains to include' },
-    exclude_domains: { type: 'string', description: 'Domains to exclude' },
-    processor: { type: 'string', description: 'Processing method' },
+    include_domains: { type: 'string', description: 'Domains to include (deep research)' },
+    exclude_domains: { type: 'string', description: 'Domains to exclude (deep research)' },
+    search_include_domains: { type: 'string', description: 'Domains to include (search)' },
+    search_exclude_domains: { type: 'string', description: 'Domains to exclude (search)' },
+    search_mode: { type: 'string', description: 'Search mode (one-shot, agentic, fast)' },
+    processor: { type: 'string', description: 'Research processing tier' },
    max_results: { type: 'number', description: 'Maximum number of results' },
    max_chars_per_result: { type: 'number', description: 'Maximum characters per result' },
    apiKey: { type: 'string', description: 'Parallel AI API key' },
  },
  outputs: {
-    results: { type: 'string', description: 'Search or extract results (JSON stringified)' },
+    results: {
+      type: 'json',
+      description: 'Search or extract results (array of url, title, excerpts)',
+    },
+    search_id: { type: 'string', description: 'Search request ID (for search)' },
+    extract_id: { type: 'string', description: 'Extract request ID (for extract)' },
    status: { type: 'string', description: 'Task status (for deep research)' },
    run_id: { type: 'string', description: 'Task run ID (for deep research)' },
    message: { type: 'string', description: 'Status message (for deep research)' },
    content: {
-      type: 'string',
-      description: 'Research content (for deep research, JSON stringified)',
+      type: 'json',
+      description: 'Research content (for deep research, structured based on output_schema)',
    },
    basis: {
-      type: 'string',
-      description: 'Citations and sources (for deep research, JSON stringified)',
-    },
-    metadata: {
-      type: 'string',
-      description: 'Task metadata (for deep research, JSON stringified)',
+      type: 'json',
+      description:
+        'Citations and sources with field, reasoning, citations, confidence (for deep research)',
    },
  },
 }
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -40,6 +40,7 @@ import { EnrichBlock } from '@/blocks/blocks/enrich'
 import { EvaluatorBlock } from '@/blocks/blocks/evaluator'
 import { EvernoteBlock } from '@/blocks/blocks/evernote'
 import { ExaBlock } from '@/blocks/blocks/exa'
+import { FathomBlock } from '@/blocks/blocks/fathom'
 import { FileBlock, FileV2Block, FileV3Block } from '@/blocks/blocks/file'
 import { FirecrawlBlock } from '@/blocks/blocks/firecrawl'
 import { FirefliesBlock, FirefliesV2Block } from '@/blocks/blocks/fireflies'
@@ -51,6 +52,7 @@ import { GitLabBlock } from '@/blocks/blocks/gitlab'
 import { GmailBlock, GmailV2Block } from '@/blocks/blocks/gmail'
 import { GongBlock } from '@/blocks/blocks/gong'
 import { GoogleSearchBlock } from '@/blocks/blocks/google'
+import { GoogleAdsBlock } from '@/blocks/blocks/google_ads'
 import { GoogleBigQueryBlock } from '@/blocks/blocks/google_bigquery'
 import { GoogleBooksBlock } from '@/blocks/blocks/google_books'
 import { GoogleCalendarBlock, GoogleCalendarV2Block } from '@/blocks/blocks/google_calendar'
@@ -237,6 +239,7 @@ export const registry: Record<string, BlockConfig> = {
  dynamodb: DynamoDBBlock,
  elasticsearch: ElasticsearchBlock,
  elevenlabs: ElevenLabsBlock,
+  fathom: FathomBlock,
  enrich: EnrichBlock,
  evernote: EvernoteBlock,
  evaluator: EvaluatorBlock,
@@ -257,6 +260,7 @@ export const registry: Record<string, BlockConfig> = {
  gmail_v2: GmailV2Block,
  google_calendar: GoogleCalendarBlock,
  google_calendar_v2: GoogleCalendarV2Block,
+  google_ads: GoogleAdsBlock,
  google_books: GoogleBooksBlock,
  google_contacts: GoogleContactsBlock,
  google_docs: GoogleDocsBlock,
--- a/apps/sim/components/icons.tsx
+++ b/apps/sim/components/icons.tsx
@@ -2007,6 +2007,24 @@ export function ElevenLabsIcon(props: SVGProps<SVGSVGElement>) {
  )
 }

+export function FathomIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1000 1000' fill='none'>
+      <path
+        d='M0,668.7v205.78c0,53.97,34.24,102.88,85.8,119.08,87.48,27.49,167.88-36.99,167.88-120.22v-77.45L0,668.7Z'
+        fill='#007299'
+      />
+      <path
+        d='M873.72,626.07c-19.05,0-38.38-4.3-56.58-13.38L72.78,241.43C11.15,210.69-17.51,136.6,11.18,74.05,41.2,8.59,119.26-18.53,183.23,13.38l744.25,371.21c62.45,31.15,91,109.08,59.79,171.43-22.22,44.38-67.02,70.05-113.55,70.05Z'
+        fill='#00beff'
+      />
+      <path
+        d='M500.09,813.66c-19.05,0-38.38-4.3-56.58-13.38l-370.72-184.9c-61.63-30.74-90.29-104.82-61.61-167.37,30.02-65.46,108.08-92.59,172.06-60.68l370.62,184.85c62.45,31.15,91,109.08,59.79,171.43-22.22,44.38-67.02,70.05-113.55,70.05Z'
+        fill='#00beff'
+      />
+    </svg>
+  )
+}
 export function LinkupIcon(props: SVGProps<SVGSVGElement>) {
  return (
    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 154 107' fill='none'>
@@ -3582,6 +3600,27 @@ export const ResendIcon = (props: SVGProps<SVGSVGElement>) => (
  </svg>
 )

+export const GoogleAdsIcon = (props: SVGProps<SVGSVGElement>) => (
+  <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'>
+    <g transform='matrix(.257748 0 0 .257745 -.361416 2.515516)'>
+      <path
+        d='M85.9 28.6c2.4-6.3 5.7-12.1 10.6-16.8 19.6-19.1 52-14.3 65.3 9.7 10 18.2 20.6 36 30.9 54l51.6 89.8c14.3 25.1-1.2 56.8-29.6 61.1-17.4 2.6-33.7-5.4-42.7-21l-45.4-78.8c-.3-.6-.7-1.1-1.1-1.6-1.6-1.3-2.3-3.2-3.3-4.9L88.8 62.2c-3.9-6.8-5.7-14.2-5.5-22 .3-4 .8-8 2.6-11.6'
+        fill='#3c8bd9'
+      />
+      <path
+        d='M85.9 28.6c-.9 3.6-1.7 7.2-1.9 11-.3 8.4 1.8 16.2 6 23.5l32.9 56.9c1 1.7 1.8 3.4 2.8 5l-18.1 31.1-25.3 43.6c-.4 0-.5-.2-.6-.5-.1-.8.2-1.5.4-2.3 4.1-15 .7-28.3-9.6-39.7-6.3-6.9-14.3-10.8-23.5-12.1-12-1.7-22.6 1.4-32.1 8.9-1.7 1.3-2.8 3.2-4.8 4.2-.4 0-.6-.2-.7-.5l14.3-24.9L85.2 29.7c.2-.4.5-.7.7-1.1'
+        fill='#fabc04'
+      />
+      <path
+        d='M11.8 158l5.7-5.1c24.3-19.2 60.8-5.3 66.1 25.1 1.3 7.3.6 14.3-1.6 21.3-.1.6-.2 1.1-.4 1.7-.9 1.6-1.7 3.3-2.7 4.9-8.9 14.7-22 22-39.2 20.9C20 225.4 4.5 210.6 1.8 191c-1.3-9.5.6-18.4 5.5-26.6 1-1.8 2.2-3.4 3.3-5.2.5-.4.3-1.2 1.2-1.2'
+        fill='#34a852'
+      />
+      <path d='M11.8 158c-.4.4-.4 1.1-1.1 1.2-.1-.7.3-1.1.7-1.6l.4.4' fill='#fabc04' />
+      <path d='M81.6 201c-.4-.7 0-1.2.4-1.7l.4.4-.8 1.3' fill='#e1c025' />
+    </g>
+  </svg>
+)
+
 export const GoogleBigQueryIcon = (props: SVGProps<SVGSVGElement>) => (
  <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'>
    <path
--- a/apps/sim/executor/execution/types.ts
+++ b/apps/sim/executor/execution/types.ts
@@ -1,4 +1,5 @@
 import type { Edge } from 'reactflow'
+import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
 import type { NodeMetadata } from '@/executor/dag/types'
 import type {
  BlockLog,
@@ -34,6 +35,7 @@ export interface ExecutionMetadata {
    deploymentVersionId?: string
  }
  callChain?: string[]
+  correlation?: AsyncExecutionCorrelation
 }

 export interface SerializableExecutionState {
--- a/apps/sim/executor/handlers/condition/condition-handler.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.ts
@@ -166,7 +166,8 @@ export class ConditionBlockHandler implements BlockHandler {
    if (!output || typeof output !== 'object') {
      return output
    }
-    const { _pauseMetadata, error, ...rest } = output
+    const { _pauseMetadata, error, providerTiming, tokens, toolCalls, model, cost, ...rest } =
+      output
    return rest
  }

--- a/apps/sim/executor/handlers/trigger/trigger-handler.ts
+++ b/apps/sim/executor/handlers/trigger/trigger-handler.ts
@@ -22,7 +22,7 @@ export class TriggerBlockHandler implements BlockHandler {
    }

    const existingState = ctx.blockStates.get(block.id)
-    if (existingState?.output && Object.keys(existingState.output).length > 0) {
+    if (existingState?.output) {
      return existingState.output
    }

--- a/apps/sim/hooks/use-collaborative-workflow.ts
+++ b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -475,6 +475,7 @@ export function useCollaborativeWorkflow() {

      try {
        useSubBlockStore.getState().setValue(blockId, subblockId, value)
+        useWorkflowStore.getState().syncDynamicHandleSubblockValue(blockId, subblockId, value)
        const blockType = useWorkflowStore.getState().blocks?.[blockId]?.type
        if (activeWorkflowId && blockType === 'function' && subblockId === 'code') {
          useCodeUndoRedoStore.getState().clear(activeWorkflowId, blockId, subblockId)
@@ -555,7 +556,7 @@ export function useCollaborativeWorkflow() {
              isApplyingRemoteChange.current = true
              try {
                // Update the main workflow state using the API response
-                useWorkflowStore.setState({
+                useWorkflowStore.getState().replaceWorkflowState({
                  blocks: workflowData.state.blocks || {},
                  edges: workflowData.state.edges || [],
                  loops: workflowData.state.loops || {},
@@ -1230,6 +1231,7 @@ export function useCollaborativeWorkflow() {

      // ALWAYS update local store first for immediate UI feedback
      useSubBlockStore.getState().setValue(blockId, subblockId, value)
+      useWorkflowStore.getState().syncDynamicHandleSubblockValue(blockId, subblockId, value)

      if (activeWorkflowId) {
        const operationId = crypto.randomUUID()
--- a/Show More
+++ b/Show More