From 6382eb54bc109340208ea574203c35a553842e1c Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Tue, 14 Jul 2026 13:15:53 -0700
Subject: [PATCH 1/6] improvement(webhooks): external subscription management

---
 .../content/docs/en/integrations/airtable.mdx |     3 +
 apps/sim/app/api/chat/manage/[id]/route.ts    |     1 -
 .../app/api/cron/renew-subscriptions/route.ts |     3 +-
 .../api/mcp/serve/[serverId]/route.test.ts    |    11 +-
 .../sim/app/api/mcp/serve/[serverId]/route.ts |    22 +-
 apps/sim/app/api/schedules/execute/route.ts   |     2 +
 .../app/api/tools/deployments/deploy/route.ts |     6 +-
 .../api/tools/deployments/promote/route.ts    |     6 +-
 apps/sim/app/api/v1/admin/types.ts            |    12 -
 .../v1/admin/workflows/[id]/deploy/route.ts   |    23 +-
 .../versions/[versionId]/activate/route.ts    |     8 +-
 .../v1/workflows/[id]/deploy/route.test.ts    |    29 +-
 .../app/api/v1/workflows/[id]/deploy/route.ts |    16 +-
 .../v1/workflows/[id]/rollback/route.test.ts  |    18 +
 .../api/v1/workflows/[id]/rollback/route.ts   |    14 +-
 .../app/api/workflows/[id]/deploy/route.ts    |    47 +-
 .../[id]/deployments/[version]/route.ts       |    25 +-
 .../app/api/workflows/[id]/execute/route.ts   |    17 +-
 .../general/components/versions.tsx           |    36 +-
 .../components/deploy-modal/deploy-modal.tsx  |   140 +-
 .../condition-input/condition-input.tsx       |    24 +-
 apps/sim/background/schedule-execution.ts     |    23 +-
 apps/sim/background/webhook-execution.test.ts |    68 +-
 apps/sim/background/webhook-execution.ts      |    19 +-
 apps/sim/blocks/blocks/airtable.test.ts       |   109 +
 apps/sim/blocks/blocks/airtable.ts            |    12 +-
 .../lib/promote/reactivate-in-tx.ts           |    75 +-
 .../workspace-forking/lib/promote/rollback.ts |     2 +-
 apps/sim/executor/constants.ts                |     5 -
 .../condition/condition-handler.test.ts       |    35 +
 .../handlers/condition/condition-handler.ts   |    19 +-
 apps/sim/hooks/queries/deployments.ts         |    63 +-
 apps/sim/lib/api/contracts/deployments.ts     |    52 +-
 .../lib/api/contracts/v1/admin/workflows.ts   |    16 +-
 apps/sim/lib/api/contracts/v1/workflows.ts    |    22 +-
 apps/sim/lib/api/contracts/workflows.ts       |     2 +
 .../tools/handlers/deployment/deploy.ts       |    17 +-
 .../tools/handlers/deployment/manage.ts       |    20 +-
 .../workflow/edit-workflow/builders.test.ts   |    13 +-
 .../server/workflow/edit-workflow/builders.ts |     4 +-
 apps/sim/lib/core/outbox/service.test.ts      |    24 +
 apps/sim/lib/core/outbox/service.ts           |    13 +
 .../lib/webhooks/delivery-predicate.test.ts   |    55 +
 apps/sim/lib/webhooks/delivery-predicate.ts   |    21 +
 apps/sim/lib/webhooks/deploy.ts               |   509 +-
 apps/sim/lib/webhooks/path-claims.test.ts     |   109 +
 apps/sim/lib/webhooks/path-claims.ts          |   117 +
 apps/sim/lib/webhooks/polling/utils.ts        |     4 +-
 apps/sim/lib/webhooks/processor.test.ts       |    38 +-
 apps/sim/lib/webhooks/processor.ts            |    65 +-
 .../webhooks/provider-subscriptions.test.ts   |    46 +-
 .../lib/webhooks/provider-subscriptions.ts    |    50 +-
 apps/sim/lib/webhooks/providers/gmail.ts      |    47 +-
 apps/sim/lib/webhooks/providers/imap.ts       |    42 +-
 apps/sim/lib/webhooks/providers/outlook.ts    |    59 +-
 apps/sim/lib/webhooks/providers/rss.ts        |    32 +-
 .../lib/webhooks/providers/tiktok-targets.ts  |     4 +-
 apps/sim/lib/webhooks/providers/types.ts      |     6 +-
 .../webhooks/registration-identity.test.ts    |   132 +
 .../sim/lib/webhooks/registration-identity.ts |    99 +
 .../registration-reconciliation.test.ts       |   158 +
 .../webhooks/registration-reconciliation.ts   |   110 +
 .../lib/webhooks/registration-service.test.ts |   277 +
 apps/sim/lib/webhooks/registration-service.ts |   366 +
 .../lib/webhooks/registration-store.test.ts   |   290 +
 apps/sim/lib/webhooks/registration-store.ts   |   552 +
 apps/sim/lib/webhooks/utils.server.test.ts    |   109 +
 apps/sim/lib/webhooks/utils.server.ts         |    36 +-
 apps/sim/lib/workflows/conditions.test.ts     |    23 +
 apps/sim/lib/workflows/conditions.ts          |     9 +
 .../workflows/deployment-lifecycle.test.ts    |    52 +
 .../sim/lib/workflows/deployment-lifecycle.ts |   189 +
 .../lib/workflows/deployment-outbox.test.ts   |   505 +
 apps/sim/lib/workflows/deployment-outbox.ts   |   761 +-
 .../executor/execution-state.test.ts          |   173 +
 .../lib/workflows/executor/execution-state.ts |    92 +-
 apps/sim/lib/workflows/lifecycle.test.ts      |    11 +-
 apps/sim/lib/workflows/lifecycle.ts           |     5 +
 .../workflows/orchestration/chat-deploy.ts    |     8 +
 .../workflows/orchestration/deploy.test.ts    |   442 +-
 .../sim/lib/workflows/orchestration/deploy.ts |   562 +-
 apps/sim/lib/workflows/orchestration/index.ts |     1 +
 .../lib/workflows/orchestration/types.test.ts |    17 +
 apps/sim/lib/workflows/orchestration/types.ts |     1 +
 .../persistence/deployment-operations.test.ts |   436 +
 .../persistence/deployment-operations.ts      |   865 +
 .../lib/workflows/persistence/utils.test.ts   |    85 +-
 apps/sim/lib/workflows/persistence/utils.ts   |   580 +-
 .../lib/workflows/schedules/deploy.test.ts    |     4 +-
 apps/sim/lib/workflows/schedules/deploy.ts    |    37 +-
 apps/sim/lib/workspace-events/no-activity.ts  |     4 +-
 .../sim/lib/workspace-events/subscriptions.ts |     4 +-
 .../stores/workflows/registry/store.test.ts   |    37 +
 apps/sim/stores/workflows/registry/store.ts   |     7 +
 apps/sim/tools/airtable/airtable.test.ts      |    92 +
 apps/sim/tools/airtable/create_records.ts     |    11 +-
 apps/sim/tools/airtable/types.ts              |    34 +-
 .../tools/airtable/update_multiple_records.ts |    11 +-
 apps/sim/tools/airtable/update_record.ts      |    11 +-
 .../migrations/0261_tranquil_donald_blake.sql |    87 +
 .../db/migrations/meta/0261_snapshot.json     | 17352 ++++++++++++++++
 packages/db/migrations/meta/_journal.json     |     7 +
 packages/db/schema.ts                         |   125 +
 packages/testing/src/mocks/schema.mock.ts     |    32 +
 104 files changed, 25682 insertions(+), 1399 deletions(-)
 create mode 100644 apps/sim/blocks/blocks/airtable.test.ts
 create mode 100644 apps/sim/lib/webhooks/delivery-predicate.test.ts
 create mode 100644 apps/sim/lib/webhooks/delivery-predicate.ts
 create mode 100644 apps/sim/lib/webhooks/path-claims.test.ts
 create mode 100644 apps/sim/lib/webhooks/path-claims.ts
 create mode 100644 apps/sim/lib/webhooks/registration-identity.test.ts
 create mode 100644 apps/sim/lib/webhooks/registration-identity.ts
 create mode 100644 apps/sim/lib/webhooks/registration-reconciliation.test.ts
 create mode 100644 apps/sim/lib/webhooks/registration-reconciliation.ts
 create mode 100644 apps/sim/lib/webhooks/registration-service.test.ts
 create mode 100644 apps/sim/lib/webhooks/registration-service.ts
 create mode 100644 apps/sim/lib/webhooks/registration-store.test.ts
 create mode 100644 apps/sim/lib/webhooks/registration-store.ts
 create mode 100644 apps/sim/lib/webhooks/utils.server.test.ts
 create mode 100644 apps/sim/lib/workflows/conditions.test.ts
 create mode 100644 apps/sim/lib/workflows/conditions.ts
 create mode 100644 apps/sim/lib/workflows/deployment-lifecycle.test.ts
 create mode 100644 apps/sim/lib/workflows/deployment-lifecycle.ts
 create mode 100644 apps/sim/lib/workflows/deployment-outbox.test.ts
 create mode 100644 apps/sim/lib/workflows/executor/execution-state.test.ts
 create mode 100644 apps/sim/lib/workflows/orchestration/types.test.ts
 create mode 100644 apps/sim/lib/workflows/persistence/deployment-operations.test.ts
 create mode 100644 apps/sim/lib/workflows/persistence/deployment-operations.ts
 create mode 100644 apps/sim/tools/airtable/airtable.test.ts
 create mode 100644 packages/db/migrations/0261_tranquil_donald_blake.sql
 create mode 100644 packages/db/migrations/meta/0261_snapshot.json

diff --git a/apps/docs/content/docs/en/integrations/airtable.mdx b/apps/docs/content/docs/en/integrations/airtable.mdx
index 63314699c05..ee76053d391 100644
--- a/apps/docs/content/docs/en/integrations/airtable.mdx
+++ b/apps/docs/content/docs/en/integrations/airtable.mdx
@@ -142,6 +142,7 @@ Write new records to an Airtable table
 | `baseId` | string | Yes | Airtable base ID \(starts with "app", e.g., "appXXXXXXXXXXXXXX"\) |
 | `tableId` | string | Yes | Table ID \(starts with "tbl"\) or table name |
 | `records` | json | Yes | Array of records to create, each with a `fields` object |
+| `typecast` | boolean | No | When true, Airtable automatically converts string values to the field type |
 
 #### Output
 
@@ -166,6 +167,7 @@ Update an existing record in an Airtable table by ID
 | `tableId` | string | Yes | Table ID \(starts with "tbl"\) or table name |
 | `recordId` | string | Yes | Record ID to update \(starts with "rec", e.g., "recXXXXXXXXXXXXXX"\) |
 | `fields` | json | Yes | An object containing the field names and their new values |
+| `typecast` | boolean | No | When true, Airtable automatically converts string values to the field type |
 
 #### Output
 
@@ -190,6 +192,7 @@ Update multiple existing records in an Airtable table
 | `baseId` | string | Yes | Airtable base ID \(starts with "app", e.g., "appXXXXXXXXXXXXXX"\) |
 | `tableId` | string | Yes | Table ID \(starts with "tbl"\) or table name |
 | `records` | json | Yes | Array of records to update, each with an `id` and a `fields` object |
+| `typecast` | boolean | No | When true, Airtable automatically converts string values to the field type |
 
 #### Output
 
diff --git a/apps/sim/app/api/chat/manage/[id]/route.ts b/apps/sim/app/api/chat/manage/[id]/route.ts
index 707051d7e9f..3dffe9ccb37 100644
--- a/apps/sim/app/api/chat/manage/[id]/route.ts
+++ b/apps/sim/app/api/chat/manage/[id]/route.ts
@@ -140,7 +140,6 @@ export const PATCH = withRouteHandler(
       const deployResult = await performFullDeploy({
         workflowId: existingChat[0].workflowId,
         userId: session.user.id,
-        request,
       })
 
       if (!deployResult.success) {
diff --git a/apps/sim/app/api/cron/renew-subscriptions/route.ts b/apps/sim/app/api/cron/renew-subscriptions/route.ts
index 4728f0fd666..97f00a26ff2 100644
--- a/apps/sim/app/api/cron/renew-subscriptions/route.ts
+++ b/apps/sim/app/api/cron/renew-subscriptions/route.ts
@@ -8,6 +8,7 @@ import { verifyCronAuth } from '@/lib/auth/internal'
 import { acquireLock, releaseLock } from '@/lib/core/config/redis'
 import { runDetached } from '@/lib/core/utils/background'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
+import { deliverableWebhookPredicate } from '@/lib/webhooks/delivery-predicate'
 import { getCredentialOwner, getNotificationUrl } from '@/lib/webhooks/provider-subscription-utils'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 
@@ -96,7 +97,7 @@ async function renewExpiringSubscriptions(): Promise<{
     .from(webhookTable)
     .where(
       and(
-        eq(webhookTable.isActive, true),
+        deliverableWebhookPredicate(webhookTable, 'active_only'),
         or(
           eq(webhookTable.provider, 'microsoft-teams'),
           eq(webhookTable.provider, 'microsoftteams')
diff --git a/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts b/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
index f0af2021175..9ea057e4e6c 100644
--- a/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
+++ b/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
@@ -278,7 +278,9 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([
+        { isDeployed: true, workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' },
+      ])
 
     hybridAuthMockFns.mockCheckHybridAuth.mockResolvedValueOnce({
       success: true,
@@ -683,7 +685,9 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([
+        { isDeployed: true, workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' },
+      ])
     fetchMock.mockResolvedValueOnce(
       new Response(
         JSON.stringify({
@@ -716,6 +720,9 @@ describe('MCP Serve Route', () => {
     const fetchOptions = fetchMock.mock.calls[0][1] as RequestInit
     const headers = fetchOptions.headers as Record<string, string>
     expect(headers['X-Sim-MCP-Tool-Call']).toBe('true')
+    expect(JSON.parse(fetchOptions.body as string)).toMatchObject({
+      deploymentVersionId: 'deployment-1',
+    })
   })
 
   it('preserves downstream attributed usage admission rejections', async () => {
diff --git a/apps/sim/app/api/mcp/serve/[serverId]/route.ts b/apps/sim/app/api/mcp/serve/[serverId]/route.ts
index 5186d6c3410..f593e44db68 100644
--- a/apps/sim/app/api/mcp/serve/[serverId]/route.ts
+++ b/apps/sim/app/api/mcp/serve/[serverId]/route.ts
@@ -18,7 +18,13 @@ import {
   type Tool,
 } from '@modelcontextprotocol/sdk/types.js'
 import { db } from '@sim/db'
-import { workflow, workflowMcpServer, workflowMcpTool, workspace } from '@sim/db/schema'
+import {
+  workflow,
+  workflowDeploymentVersion,
+  workflowMcpServer,
+  workflowMcpTool,
+  workspace,
+} from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, asc, eq, gt, isNull, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
@@ -764,8 +770,19 @@ async function handleToolsCall(
     }
 
     const [wf] = await db
-      .select({ isDeployed: workflow.isDeployed, workspaceId: workflow.workspaceId })
+      .select({
+        isDeployed: workflow.isDeployed,
+        workspaceId: workflow.workspaceId,
+        deploymentVersionId: workflowDeploymentVersion.id,
+      })
       .from(workflow)
+      .leftJoin(
+        workflowDeploymentVersion,
+        and(
+          eq(workflowDeploymentVersion.workflowId, workflow.id),
+          eq(workflowDeploymentVersion.isActive, true)
+        )
+      )
       .where(and(eq(workflow.id, tool.workflowId), isNull(workflow.archivedAt)))
       .limit(1)
     const abortedAfterWorkflowLookup = callerAbortedJsonRpcResponse(id, abortSignal)
@@ -826,6 +843,7 @@ async function handleToolsCall(
       input: params.arguments || {},
       triggerType: 'mcp',
       includeFileBase64: false,
+      ...(wf.deploymentVersionId ? { deploymentVersionId: wf.deploymentVersionId } : {}),
     })
     assertKnownSizeWithinLimit(
       Buffer.byteLength(workflowRequestBody, 'utf-8'),
diff --git a/apps/sim/app/api/schedules/execute/route.ts b/apps/sim/app/api/schedules/execute/route.ts
index 63a9258211d..13f87274810 100644
--- a/apps/sim/app/api/schedules/execute/route.ts
+++ b/apps/sim/app/api/schedules/execute/route.ts
@@ -165,6 +165,7 @@ async function claimWorkflowSchedules(queuedAt: Date, limit: number) {
         lastQueuedAt: workflowSchedule.lastQueuedAt,
         timezone: workflowSchedule.timezone,
         deploymentVersionId: workflowSchedule.deploymentVersionId,
+        deploymentOperationId: workflowSchedule.deploymentOperationId,
         sourceType: workflowSchedule.sourceType,
       })
 
@@ -864,6 +865,7 @@ async function processScheduleItem(
     workspaceId,
     billingAttribution,
     deploymentVersionId: schedule.deploymentVersionId || undefined,
+    deploymentOperationId: schedule.deploymentOperationId || undefined,
     cronExpression: schedule.cronExpression || undefined,
     timezone: schedule.timezone || undefined,
     lastRanAt: schedule.lastRanAt?.toISOString(),
diff --git a/apps/sim/app/api/tools/deployments/deploy/route.ts b/apps/sim/app/api/tools/deployments/deploy/route.ts
index bf0ea376a84..5f35c91da86 100644
--- a/apps/sim/app/api/tools/deployments/deploy/route.ts
+++ b/apps/sim/app/api/tools/deployments/deploy/route.ts
@@ -51,11 +51,9 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
     const result = await performFullDeploy({
       workflowId,
       userId: auth.userId,
-      workflowName: access.workflow.name || undefined,
       versionName: name,
       versionDescription: description ?? undefined,
       requestId,
-      request,
     })
 
     if (!result.success) {
@@ -69,9 +67,11 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       success: true,
       output: {
         workflowId,
-        isDeployed: true,
+        isDeployed: Boolean(result.activeDeployment),
         deployedAt: result.deployedAt?.toISOString() ?? null,
         version: result.version,
+        activeDeployment: result.activeDeployment,
+        latestDeploymentAttempt: result.latestDeploymentAttempt,
         warnings: result.warnings ?? [],
       },
     })
diff --git a/apps/sim/app/api/tools/deployments/promote/route.ts b/apps/sim/app/api/tools/deployments/promote/route.ts
index 406b08b0b9d..a126c3dbd57 100644
--- a/apps/sim/app/api/tools/deployments/promote/route.ts
+++ b/apps/sim/app/api/tools/deployments/promote/route.ts
@@ -53,9 +53,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       workflowId,
       version,
       userId: auth.userId,
-      workflow: access.workflow as Record<string, unknown>,
       requestId,
-      request,
     })
 
     if (!result.success) {
@@ -69,9 +67,11 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       success: true,
       output: {
         workflowId,
-        isDeployed: true,
+        isDeployed: Boolean(result.activeDeployment),
         deployedAt: result.deployedAt?.toISOString() ?? null,
         version,
+        activeDeployment: result.activeDeployment,
+        latestDeploymentAttempt: result.latestDeploymentAttempt,
         warnings: result.warnings ?? [],
       },
     })
diff --git a/apps/sim/app/api/v1/admin/types.ts b/apps/sim/app/api/v1/admin/types.ts
index 04f61a8a964..4754de31054 100644
--- a/apps/sim/app/api/v1/admin/types.ts
+++ b/apps/sim/app/api/v1/admin/types.ts
@@ -629,18 +629,6 @@ export interface AdminDeploymentVersion {
   deployedByName: string | null
 }
 
-export interface AdminDeployResult {
-  isDeployed: boolean
-  version: number
-  deployedAt: string
-  warnings?: string[]
-}
-
-export interface AdminUndeployResult {
-  isDeployed: boolean
-  warnings?: string[]
-}
-
 // =============================================================================
 // Audit Log Types
 // =============================================================================
diff --git a/apps/sim/app/api/v1/admin/workflows/[id]/deploy/route.ts b/apps/sim/app/api/v1/admin/workflows/[id]/deploy/route.ts
index 62fe6405bfd..5e844a00188 100644
--- a/apps/sim/app/api/v1/admin/workflows/[id]/deploy/route.ts
+++ b/apps/sim/app/api/v1/admin/workflows/[id]/deploy/route.ts
@@ -1,6 +1,8 @@
 import { createLogger } from '@sim/logger'
 import { getActiveWorkflowRecord } from '@sim/platform-authz/workflow'
 import {
+  type AdminV1DeployResult,
+  type AdminV1UndeployResult,
   adminV1DeployWorkflowContract,
   adminV1UndeployWorkflowContract,
 } from '@/lib/api/contracts/v1/admin'
@@ -15,7 +17,6 @@ import {
   notFoundResponse,
   singleResponse,
 } from '@/app/api/v1/admin/responses'
-import type { AdminDeployResult, AdminUndeployResult } from '@/app/api/v1/admin/types'
 
 const logger = createLogger('AdminWorkflowDeployAPI')
 export const maxDuration = 120
@@ -51,9 +52,7 @@ export const POST = withRouteHandler(
       const result = await performFullDeploy({
         workflowId,
         userId: workflowRecord.userId,
-        workflowName: workflowRecord.name,
         requestId,
-        request,
         actorId: 'admin-api',
       })
 
@@ -63,13 +62,19 @@ export const POST = withRouteHandler(
         return internalErrorResponse(result.error || 'Failed to deploy workflow')
       }
 
-      logger.info(`[${requestId}] Admin API: Deployed workflow ${workflowId} as v${result.version}`)
+      const isDeployed = Boolean(result.activeDeployment)
+      const attemptActivated = result.latestDeploymentAttempt?.status === 'active'
+      logger.info(
+        `[${requestId}] Admin API: Deployment ${attemptActivated ? 'activated' : 'accepted'} for workflow ${workflowId}`
+      )
 
-      const response: AdminDeployResult = {
-        isDeployed: true,
-        version: result.version!,
-        deployedAt: result.deployedAt!.toISOString(),
+      const response: AdminV1DeployResult = {
+        isDeployed,
+        version: result.version ?? null,
+        deployedAt: result.deployedAt?.toISOString() ?? null,
         warnings: result.warnings,
+        activeDeployment: result.activeDeployment,
+        latestDeploymentAttempt: result.latestDeploymentAttempt,
       }
 
       return singleResponse(response)
@@ -108,7 +113,7 @@ export const DELETE = withRouteHandler(
 
       logger.info(`Admin API: Undeployed workflow ${workflowId}`)
 
-      const response: AdminUndeployResult = {
+      const response: AdminV1UndeployResult = {
         isDeployed: false,
         warnings: result.warnings,
       }
diff --git a/apps/sim/app/api/v1/admin/workflows/[id]/versions/[versionId]/activate/route.ts b/apps/sim/app/api/v1/admin/workflows/[id]/versions/[versionId]/activate/route.ts
index 360a817c5b6..4f5922c3745 100644
--- a/apps/sim/app/api/v1/admin/workflows/[id]/versions/[versionId]/activate/route.ts
+++ b/apps/sim/app/api/v1/admin/workflows/[id]/versions/[versionId]/activate/route.ts
@@ -40,9 +40,7 @@ export const POST = withRouteHandler(
         workflowId,
         version: versionNum,
         userId: workflowRecord.userId,
-        workflow: workflowRecord as Record<string, unknown>,
         requestId,
-        request,
         actorId: 'admin-api',
       })
 
@@ -53,14 +51,16 @@ export const POST = withRouteHandler(
       }
 
       logger.info(
-        `[${requestId}] Admin API: Activated version ${versionNum} for workflow ${workflowId}`
+        `[${requestId}] Admin API: ${result.latestDeploymentAttempt?.status === 'active' ? 'Activated' : 'Accepted activation for'} version ${versionNum} on workflow ${workflowId}`
       )
 
       return singleResponse({
         success: true,
         version: versionNum,
-        deployedAt: result.deployedAt!.toISOString(),
+        deployedAt: result.deployedAt?.toISOString() ?? null,
         warnings: result.warnings,
+        activeDeployment: result.activeDeployment,
+        latestDeploymentAttempt: result.latestDeploymentAttempt,
       })
     } catch (error) {
       logger.error(
diff --git a/apps/sim/app/api/v1/workflows/[id]/deploy/route.test.ts b/apps/sim/app/api/v1/workflows/[id]/deploy/route.test.ts
index dd78899e2ac..42e977bdfe2 100644
--- a/apps/sim/app/api/v1/workflows/[id]/deploy/route.test.ts
+++ b/apps/sim/app/api/v1/workflows/[id]/deploy/route.test.ts
@@ -82,6 +82,22 @@ describe('POST /api/v1/workflows/[id]/deploy', () => {
       deployedAt: new Date('2026-06-12T00:00:00Z'),
       version: 4,
       warnings: undefined,
+      activeDeployment: {
+        deploymentVersionId: 'dv-4',
+        version: 4,
+        deployedAt: '2026-06-12T00:00:00.000Z',
+      },
+      latestDeploymentAttempt: {
+        id: 'op-1',
+        deploymentVersionId: 'dv-4',
+        version: 4,
+        action: 'deploy',
+        status: 'active',
+        readiness: { webhooks: 'ready', schedules: 'ready', mcp: 'ready' },
+        requestedAt: '2026-06-12T00:00:00.000Z',
+        activatedAt: '2026-06-12T00:00:00.000Z',
+        error: null,
+      },
     })
   })
 
@@ -163,6 +179,8 @@ describe('POST /api/v1/workflows/[id]/deploy', () => {
       deployedAt: '2026-06-12T00:00:00.000Z',
       version: 4,
       warnings: [],
+      activeDeployment: expect.objectContaining({ deploymentVersionId: 'dv-4', version: 4 }),
+      latestDeploymentAttempt: expect.objectContaining({ id: 'op-1', status: 'active' }),
     })
   })
 
@@ -179,12 +197,11 @@ describe('POST /api/v1/workflows/[id]/deploy', () => {
         versionDescription: 'Fixes the agent prompt',
       })
     )
-    expect(mockCaptureServerEvent).toHaveBeenCalledWith(
-      'user-1',
-      'workflow_deployed',
-      expect.objectContaining({ workflow_id: WORKFLOW_ID }),
-      expect.anything()
-    )
+    /**
+     * The workflow_deployed analytics event is emitted by the activation
+     * side effects in the deployment outbox, not by this route.
+     */
+    expect(mockCaptureServerEvent).not.toHaveBeenCalled()
   })
 
   it('maps validation failures from the orchestration to 400', async () => {
diff --git a/apps/sim/app/api/v1/workflows/[id]/deploy/route.ts b/apps/sim/app/api/v1/workflows/[id]/deploy/route.ts
index 008a45a9820..822e00ab2ca 100644
--- a/apps/sim/app/api/v1/workflows/[id]/deploy/route.ts
+++ b/apps/sim/app/api/v1/workflows/[id]/deploy/route.ts
@@ -60,11 +60,9 @@ export const POST = withRouteHandler(
       const result = await performFullDeploy({
         workflowId: id,
         userId,
-        workflowName: workflow.name || undefined,
         versionName: body.data.name,
         versionDescription: body.data.description ?? undefined,
         requestId,
-        request,
       })
 
       if (!result.success) {
@@ -74,25 +72,19 @@ export const POST = withRouteHandler(
         )
       }
 
-      captureServerEvent(
-        userId,
-        'workflow_deployed',
-        { workflow_id: id, workspace_id: workspaceId },
-        {
-          groups: { workspace: workspaceId },
-          setOnce: { first_workflow_deployed_at: new Date().toISOString() },
-        }
-      )
+      const isDeployed = Boolean(result.activeDeployment)
 
       const limits = await getUserLimits(userId)
       const apiResponse = createApiResponse(
         {
           data: {
             id,
-            isDeployed: true,
+            isDeployed,
             deployedAt: result.deployedAt?.toISOString() ?? null,
             version: result.version,
             warnings: result.warnings ?? [],
+            activeDeployment: result.activeDeployment ?? null,
+            latestDeploymentAttempt: result.latestDeploymentAttempt ?? null,
           },
         },
         limits,
diff --git a/apps/sim/app/api/v1/workflows/[id]/rollback/route.test.ts b/apps/sim/app/api/v1/workflows/[id]/rollback/route.test.ts
index cdebe9e35af..8ee6ec2940b 100644
--- a/apps/sim/app/api/v1/workflows/[id]/rollback/route.test.ts
+++ b/apps/sim/app/api/v1/workflows/[id]/rollback/route.test.ts
@@ -81,6 +81,22 @@ describe('POST /api/v1/workflows/[id]/rollback', () => {
     mockPerformActivateVersion.mockResolvedValue({
       success: true,
       deployedAt: new Date('2026-06-12T00:00:00Z'),
+      activeDeployment: {
+        deploymentVersionId: 'dv-4',
+        version: 4,
+        deployedAt: '2026-06-12T00:00:00.000Z',
+      },
+      latestDeploymentAttempt: {
+        id: 'op-1',
+        deploymentVersionId: 'dv-4',
+        version: 4,
+        action: 'activate',
+        status: 'active',
+        readiness: { webhooks: 'ready', schedules: 'ready', mcp: 'ready' },
+        requestedAt: '2026-06-12T00:00:00.000Z',
+        activatedAt: '2026-06-12T00:00:00.000Z',
+        error: null,
+      },
     })
   })
 
@@ -128,6 +144,8 @@ describe('POST /api/v1/workflows/[id]/rollback', () => {
       deployedAt: '2026-06-12T00:00:00.000Z',
       version: 4,
       warnings: [],
+      activeDeployment: expect.objectContaining({ deploymentVersionId: 'dv-4', version: 4 }),
+      latestDeploymentAttempt: expect.objectContaining({ id: 'op-1', status: 'active' }),
     })
   })
 
diff --git a/apps/sim/app/api/v1/workflows/[id]/rollback/route.ts b/apps/sim/app/api/v1/workflows/[id]/rollback/route.ts
index 534e7fd89de..63ca166cdf1 100644
--- a/apps/sim/app/api/v1/workflows/[id]/rollback/route.ts
+++ b/apps/sim/app/api/v1/workflows/[id]/rollback/route.ts
@@ -9,7 +9,6 @@ import {
 import { parseOptionalJsonBody, parseRequest, validationErrorResponse } from '@/lib/api/server'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { captureServerEvent } from '@/lib/posthog/server'
 import { performActivateVersion } from '@/lib/workflows/orchestration'
 import { statusForOrchestrationError } from '@/lib/workflows/orchestration/types'
 import { findPreviousDeploymentVersion } from '@/lib/workflows/persistence/utils'
@@ -81,9 +80,7 @@ export const POST = withRouteHandler(
         workflowId: id,
         version: targetVersion,
         userId,
-        workflow: workflow as Record<string, unknown>,
         requestId,
-        request,
       })
 
       if (!result.success) {
@@ -93,22 +90,17 @@ export const POST = withRouteHandler(
         )
       }
 
-      captureServerEvent(
-        userId,
-        'deployment_version_activated',
-        { workflow_id: id, workspace_id: workspaceId, version: targetVersion },
-        { groups: { workspace: workspaceId } }
-      )
-
       const limits = await getUserLimits(userId)
       const apiResponse = createApiResponse(
         {
           data: {
             id,
-            isDeployed: true,
+            isDeployed: Boolean(result.activeDeployment),
             deployedAt: result.deployedAt?.toISOString() ?? null,
             version: targetVersion,
             warnings: result.warnings ?? [],
+            activeDeployment: result.activeDeployment ?? null,
+            latestDeploymentAttempt: result.latestDeploymentAttempt ?? null,
           },
         },
         limits,
diff --git a/apps/sim/app/api/workflows/[id]/deploy/route.ts b/apps/sim/app/api/workflows/[id]/deploy/route.ts
index 440636186e1..517fe693cfe 100644
--- a/apps/sim/app/api/workflows/[id]/deploy/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deploy/route.ts
@@ -10,7 +10,11 @@ import { parseRequest } from '@/lib/api/server'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { captureServerEvent } from '@/lib/posthog/server'
-import { performFullDeploy, performFullUndeploy } from '@/lib/workflows/orchestration'
+import {
+  getWorkflowDeploymentSummary,
+  performFullDeploy,
+  performFullUndeploy,
+} from '@/lib/workflows/orchestration'
 import { statusForOrchestrationError } from '@/lib/workflows/orchestration/types'
 import { validateWorkflowPermissions } from '@/lib/workflows/utils'
 import {
@@ -44,7 +48,10 @@ export const GET = withRouteHandler(
         return createErrorResponse(error.message, error.status)
       }
 
-      if (!workflowData.isDeployed) {
+      const deploymentSummary = await getWorkflowDeploymentSummary(id)
+      const isDeployed = deploymentSummary.activeDeployment !== null || workflowData.isDeployed
+
+      if (!isDeployed) {
         logger.info(`[${requestId}] Workflow is not deployed: ${id}`)
         return createSuccessResponse({
           isDeployed: false,
@@ -52,10 +59,17 @@ export const GET = withRouteHandler(
           apiKey: null,
           needsRedeployment: false,
           isPublicApi: workflowData.isPublicApi ?? false,
+          activeDeployment: deploymentSummary.activeDeployment,
+          latestDeploymentAttempt: deploymentSummary.latestDeploymentAttempt,
+          warnings: deploymentSummary.warnings,
         })
       }
 
-      const needsRedeployment = await checkNeedsRedeployment(id)
+      const attemptStatus = deploymentSummary.latestDeploymentAttempt?.status
+      const needsRedeployment =
+        attemptStatus === 'preparing' || attemptStatus === 'activating'
+          ? false
+          : await checkNeedsRedeployment(id)
 
       logger.info(`[${requestId}] Successfully retrieved deployment info: ${id}`)
 
@@ -65,10 +79,13 @@ export const GET = withRouteHandler(
 
       return createSuccessResponse({
         apiKey: responseApiKeyInfo,
-        isDeployed: workflowData.isDeployed,
-        deployedAt: workflowData.deployedAt,
+        isDeployed,
+        deployedAt: deploymentSummary.activeDeployment?.deployedAt ?? workflowData.deployedAt,
         needsRedeployment,
         isPublicApi: workflowData.isPublicApi ?? false,
+        activeDeployment: deploymentSummary.activeDeployment,
+        latestDeploymentAttempt: deploymentSummary.latestDeploymentAttempt,
+        warnings: deploymentSummary.warnings,
       })
     } catch (error: any) {
       logger.error(`[${requestId}] Error fetching deployment info: ${id}`, error)
@@ -102,9 +119,7 @@ export const POST = withRouteHandler(
       const result = await performFullDeploy({
         workflowId: id,
         userId: actorUserId,
-        workflowName: workflowData!.name || undefined,
         requestId,
-        request,
       })
 
       if (!result.success) {
@@ -114,16 +129,10 @@ export const POST = withRouteHandler(
         )
       }
 
-      logger.info(`[${requestId}] Workflow deployed successfully: ${id}`)
-
-      captureServerEvent(
-        actorUserId,
-        'workflow_deployed',
-        { workflow_id: id, workspace_id: workflowData!.workspaceId ?? '' },
-        {
-          groups: workflowData!.workspaceId ? { workspace: workflowData!.workspaceId } : undefined,
-          setOnce: { first_workflow_deployed_at: new Date().toISOString() },
-        }
+      const isDeployed = Boolean(result.activeDeployment)
+      const attemptActivated = result.latestDeploymentAttempt?.status === 'active'
+      logger.info(
+        `[${requestId}] Workflow deployment ${attemptActivated ? 'activated' : 'accepted for preparation'}: ${id}`
       )
 
       const responseApiKeyInfo = workflowData!.workspaceId
@@ -132,9 +141,11 @@ export const POST = withRouteHandler(
 
       return createSuccessResponse({
         apiKey: responseApiKeyInfo,
-        isDeployed: true,
+        isDeployed,
         deployedAt: result.deployedAt,
         warnings: result.warnings,
+        activeDeployment: result.activeDeployment,
+        latestDeploymentAttempt: result.latestDeploymentAttempt,
       })
     } catch (error: unknown) {
       if (error instanceof WorkflowLockedError) {
diff --git a/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts b/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts
index 751171b0b3b..d3c3337e62f 100644
--- a/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts
@@ -6,7 +6,6 @@ import { updateDeploymentVersionMetadataContract } from '@/lib/api/contracts/dep
 import { getValidationErrorMessage, parseRequest } from '@/lib/api/server'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { captureServerEvent } from '@/lib/posthog/server'
 import { performActivateVersion } from '@/lib/workflows/orchestration'
 import { statusForOrchestrationError } from '@/lib/workflows/orchestration/types'
 import {
@@ -73,11 +72,11 @@ export const PATCH = withRouteHandler(
 
       // Activation requires admin permission, other updates require write
       const requiredPermission = isActive ? 'admin' : 'write'
-      const {
-        error,
-        session,
-        workflow: workflowData,
-      } = await validateWorkflowPermissions(id, requestId, requiredPermission)
+      const { error, session } = await validateWorkflowPermissions(
+        id,
+        requestId,
+        requiredPermission
+      )
       if (error) {
         return createErrorResponse(error.message, error.status)
       }
@@ -98,9 +97,7 @@ export const PATCH = withRouteHandler(
           workflowId: id,
           version: versionNum,
           userId: actorUserId,
-          workflow: workflowData as Record<string, unknown>,
           requestId,
-          request,
         })
 
         if (!activateResult.success) {
@@ -145,18 +142,12 @@ export const PATCH = withRouteHandler(
           }
         }
 
-        const wsId = (workflowData as { workspaceId?: string } | null)?.workspaceId
-        captureServerEvent(
-          actorUserId,
-          'deployment_version_activated',
-          { workflow_id: id, workspace_id: wsId ?? '', version: versionNum },
-          wsId ? { groups: { workspace: wsId } } : undefined
-        )
-
         return createSuccessResponse({
           success: true,
-          deployedAt: activateResult.deployedAt,
+          deployedAt: activateResult.deployedAt ?? null,
           warnings: activateResult.warnings,
+          activeDeployment: activateResult.activeDeployment ?? null,
+          latestDeploymentAttempt: activateResult.latestDeploymentAttempt ?? null,
           ...(updatedName !== undefined && { name: updatedName }),
           ...(updatedDescription !== undefined && { description: updatedDescription }),
         })
diff --git a/apps/sim/app/api/workflows/[id]/execute/route.ts b/apps/sim/app/api/workflows/[id]/execute/route.ts
index a0ca81c0464..ceda6082aa1 100644
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -85,6 +85,7 @@ import {
 import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
 import {
   loadDeployedWorkflowState,
+  loadWorkflowDeploymentVersionState,
   loadWorkflowFromNormalizedTables,
 } from '@/lib/workflows/persistence/utils'
 import { createStreamingResponse } from '@/lib/workflows/streaming/streaming'
@@ -691,6 +692,7 @@ async function handleExecutePost(
       includeFileBase64,
       base64MaxBytes,
       workflowStateOverride,
+      deploymentVersionId: admittedDeploymentVersionId,
       executionId: rawBodyExecutionId,
       triggerBlockId: parsedTriggerBlockId,
       startBlockId,
@@ -699,6 +701,12 @@ async function handleExecutePost(
       parentWorkspaceId,
     } = validation.data
     const triggerBlockId = parsedTriggerBlockId ?? startBlockId
+    if (admittedDeploymentVersionId && !isMcpBridgeRequest) {
+      return NextResponse.json(
+        { error: 'deploymentVersionId is reserved for internal MCP execution' },
+        { status: 400 }
+      )
+    }
     const headerExecutionId = headerValidation.data[WORKFLOW_EXECUTION_ID_HEADER]
     let legacyBodyExecutionId: string | undefined
     if (!headerExecutionId && rawBodyExecutionId !== undefined) {
@@ -829,6 +837,7 @@ async function handleExecutePost(
               includeFileBase64,
               base64MaxBytes,
               workflowStateOverride,
+              deploymentVersionId: _deploymentVersionId,
               triggerBlockId: _triggerBlockId,
               stopAfterBlockId: _stopAfterBlockId,
               runFromBlock: _runFromBlock,
@@ -1100,7 +1109,13 @@ async function handleExecutePost(
       }
       const workflowData = shouldUseDraftState
         ? await loadWorkflowFromNormalizedTables(workflowId)
-        : await loadDeployedWorkflowState(workflowId, workspaceId)
+        : admittedDeploymentVersionId
+          ? await loadWorkflowDeploymentVersionState(
+              workflowId,
+              admittedDeploymentVersionId,
+              workspaceId
+            )
+          : await loadDeployedWorkflowState(workflowId, workspaceId)
 
       if (req.signal.aborted) {
         await releaseExecutionSlot(executionId)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx
index 14781118029..8d6c7306ab8 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx
@@ -207,6 +207,10 @@ export function Versions({
       <div className='bg-[var(--surface-2)]'>
         {versions.map((v) => {
           const isSelected = selectedVersion === v.version
+          const operationStatus =
+            !v.isActive && v.latestOperationStatus !== 'active' ? v.latestOperationStatus : null
+          const isOperationPending =
+            operationStatus === 'preparing' || operationStatus === 'activating'
 
           return (
             <div
@@ -233,9 +237,23 @@ export function Versions({
                   <div
                     className={cn(
                       'size-[6px] shrink-0 rounded-xs',
-                      v.isActive ? 'bg-[var(--indicator-active)]' : 'bg-[var(--indicator-inactive)]'
+                      v.isActive
+                        ? 'bg-[var(--indicator-active)]'
+                        : isOperationPending
+                          ? 'bg-amber-400'
+                          : operationStatus === 'failed'
+                            ? 'bg-red-400'
+                            : 'bg-[var(--indicator-inactive)]'
                     )}
-                    title={v.isActive ? 'Live' : 'Inactive'}
+                    title={
+                      v.isActive
+                        ? 'Live'
+                        : isOperationPending
+                          ? 'Pending'
+                          : operationStatus === 'failed'
+                            ? 'Failed'
+                            : 'Inactive'
+                    }
                   />
                   {editingVersion === v.version ? (
                     <Input
@@ -272,6 +290,20 @@ export function Versions({
                       {v.isActive && (
                         <span className='shrink-0 text-[var(--text-tertiary)]'>(live)</span>
                       )}
+                      {operationStatus && (
+                        <span
+                          className={cn(
+                            'shrink-0',
+                            isOperationPending
+                              ? 'text-amber-600 dark:text-amber-400'
+                              : operationStatus === 'failed'
+                                ? 'text-red-600 dark:text-red-400'
+                                : 'text-[var(--text-tertiary)]'
+                          )}
+                        >
+                          ({operationStatus})
+                        </span>
+                      )}
                       {isSelected && (
                         <span className='shrink-0 text-[var(--text-tertiary)]'>(selected)</span>
                       )}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
index 8d6d4f46ea2..06aa02bd7ab 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
@@ -22,6 +22,7 @@ import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { useQueryClient } from '@tanstack/react-query'
 import { useParams } from 'next/navigation'
+import type { DeploymentOperationSummary } from '@/lib/api/contracts/deployments'
 import { isBillingEnabled } from '@/lib/core/config/env-flags'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { getInputFormatExample as getInputFormatExampleUtil } from '@/lib/workflows/operations/deployment-utils'
@@ -180,7 +181,7 @@ export function DeployModal({
     data: deploymentInfoData,
     isLoading: isLoadingDeploymentInfo,
     refetch: refetchDeploymentInfo,
-  } = useDeploymentInfo(workflowId, { enabled: open && isDeployed })
+  } = useDeploymentInfo(workflowId, { enabled: open })
 
   const { data: versionsData, isLoading: versionsLoading } = useDeploymentVersions(workflowId, {
     enabled: open,
@@ -201,6 +202,21 @@ export function DeployModal({
   const activateVersionMutation = useActivateDeploymentVersion()
 
   const versions = versionsData?.versions ?? []
+  const deploymentAttemptStatus = deploymentInfoData?.latestDeploymentAttempt?.status
+  const hasTerminalDeploymentAttempt =
+    deploymentAttemptStatus === 'active' ||
+    deploymentAttemptStatus === 'failed' ||
+    deploymentAttemptStatus === 'superseded'
+  const isAttemptFailed = deploymentAttemptStatus === 'failed'
+  const attemptErrorMessage = isAttemptFailed
+    ? (deploymentInfoData?.latestDeploymentAttempt?.error?.message ??
+      'Deployment preparation failed')
+    : null
+  const displayedDeployWarnings = isAttemptFailed
+    ? []
+    : hasTerminalDeploymentAttempt || deployWarnings.length === 0
+      ? (deploymentInfoData?.warnings ?? [])
+      : deployWarnings
 
   const isWorkflowStillActive = (targetWorkflowId: string) => {
     return useWorkflowRegistry.getState().activeWorkflowId === targetWorkflowId
@@ -340,7 +356,8 @@ export function DeployModal({
 
       try {
         const result = await deployMutation.mutateAsync({ workflowId })
-        const syncWarning = await syncDraftAfterDeploy()
+        const syncWarning =
+          result.latestDeploymentAttempt?.status === 'active' ? await syncDraftAfterDeploy() : null
         if (!isWorkflowStillActive(workflowId) || deployActionIdRef.current !== actionId) return
         setDeployWarnings([...(result.warnings || []), ...(syncWarning ? [syncWarning] : [])])
       } finally {
@@ -545,14 +562,37 @@ export function DeployModal({
                 Configure and manage workflow deployment settings including API, MCP, and chat
                 options.
               </ModalDescription>
-              {(deployError || deployWarnings.length > 0) && (
-                <div className='mb-3 flex flex-col gap-2'>
+              {(deployError || attemptErrorMessage || displayedDeployWarnings.length > 0) && (
+                <div className='mb-3 flex flex-col gap-2' aria-live='polite'>
                   {deployError && (
-                    <Badge variant='red' size='lg' dot className='max-w-full truncate'>
+                    <Badge variant='red' size='lg' dot className='max-w-full truncate' role='alert'>
                       {deployError}
                     </Badge>
                   )}
-                  {deployWarnings.map((warning) => (
+                  {!deployError && attemptErrorMessage && (
+                    <Tooltip.Root>
+                      <Tooltip.Trigger asChild>
+                        <Badge
+                          variant='red'
+                          size='lg'
+                          dot
+                          className='max-w-full cursor-default truncate'
+                          role='alert'
+                        >
+                          {attemptErrorMessage}
+                        </Badge>
+                      </Tooltip.Trigger>
+                      <Tooltip.Content side='bottom' className='max-w-[360px]'>
+                        <p className='text-caption'>{attemptErrorMessage}</p>
+                        <p className='text-caption'>
+                          {isDeployed
+                            ? 'The previously deployed version is still live.'
+                            : 'The workflow remains undeployed.'}
+                        </p>
+                      </Tooltip.Content>
+                    </Tooltip.Root>
+                  )}
+                  {displayedDeployWarnings.map((warning) => (
                     <Badge
                       key={warning}
                       variant='amber'
@@ -639,6 +679,8 @@ export function DeployModal({
               isUndeploying={isUndeploying}
               deployReadiness={deployReadiness}
               isDeploymentSettling={isDeploymentSettling}
+              attemptStatus={deploymentAttemptStatus}
+              attemptErrorMessage={attemptErrorMessage}
               onDeploy={onDeploy}
               onRedeploy={handleRedeploy}
               onUndeploy={() => {
@@ -781,15 +823,68 @@ export function DeployModal({
   )
 }
 
+type DeploymentAttemptStatus = DeploymentOperationSummary['status']
+
 interface StatusBadgeProps {
-  isWarning: boolean
+  isDeployed: boolean
+  needsRedeployment: boolean
+  attemptStatus?: DeploymentAttemptStatus
+  attemptErrorMessage?: string | null
 }
 
-function StatusBadge({ isWarning }: StatusBadgeProps) {
-  const label = isWarning ? 'Update deployment' : 'Live'
+/**
+ * Lifecycle-aware deployment status badge. Pending attempts render amber,
+ * failed attempts render red with the failure reason in a tooltip, and a
+ * settled live deployment falls back to the Live/Update states.
+ */
+function StatusBadge({
+  isDeployed,
+  needsRedeployment,
+  attemptStatus,
+  attemptErrorMessage,
+}: StatusBadgeProps) {
+  if (attemptStatus === 'preparing' || attemptStatus === 'activating') {
+    return (
+      <Tooltip.Root>
+        <Tooltip.Trigger asChild>
+          <Badge variant='amber' size='lg' dot className='cursor-default'>
+            Pending
+          </Badge>
+        </Tooltip.Trigger>
+        <Tooltip.Content side='top' className='max-w-[320px]'>
+          {isDeployed
+            ? 'A new version is being prepared. The current version stays live until cutover completes.'
+            : 'Triggers and schedules are being registered. The workflow goes live once activation completes.'}
+        </Tooltip.Content>
+      </Tooltip.Root>
+    )
+  }
+
+  if (attemptStatus === 'failed') {
+    return (
+      <Tooltip.Root>
+        <Tooltip.Trigger asChild>
+          <Badge variant='red' size='lg' dot className='cursor-default'>
+            Failed
+          </Badge>
+        </Tooltip.Trigger>
+        <Tooltip.Content side='top' className='max-w-[320px]'>
+          <p className='text-caption'>{attemptErrorMessage || 'Deployment preparation failed.'}</p>
+          <p className='text-caption'>
+            {isDeployed
+              ? 'The previously deployed version is still live.'
+              : 'The workflow remains undeployed.'}
+          </p>
+        </Tooltip.Content>
+      </Tooltip.Root>
+    )
+  }
+
+  if (!isDeployed) return null
+
   return (
-    <Badge variant={isWarning ? 'amber' : 'green'} size='lg' dot>
-      {label}
+    <Badge variant={needsRedeployment ? 'amber' : 'green'} size='lg' dot>
+      {needsRedeployment ? 'Update deployment' : 'Live'}
     </Badge>
   )
 }
@@ -801,6 +896,8 @@ interface GeneralFooterProps {
   isUndeploying: boolean
   deployReadiness: DeployReadiness
   isDeploymentSettling: boolean
+  attemptStatus?: DeploymentAttemptStatus
+  attemptErrorMessage?: string | null
   onDeploy: () => Promise<void>
   onRedeploy: () => Promise<void>
   onUndeploy: () => void
@@ -813,6 +910,8 @@ function GeneralFooter({
   isUndeploying,
   deployReadiness,
   isDeploymentSettling,
+  attemptStatus,
+  attemptErrorMessage,
   onDeploy,
   onRedeploy,
   onUndeploy,
@@ -828,7 +927,17 @@ function GeneralFooter({
   if (!isDeployed) {
     return (
       <ModalFooter className='items-center justify-between'>
-        <div className='max-w-[260px] text-[var(--text-muted)] text-xs'>{blockedMessage}</div>
+        <div className='flex min-w-0 flex-col gap-1'>
+          <StatusBadge
+            isDeployed={false}
+            needsRedeployment={needsRedeployment}
+            attemptStatus={attemptStatus}
+            attemptErrorMessage={attemptErrorMessage}
+          />
+          {blockedMessage && (
+            <div className='max-w-[260px] text-[var(--text-muted)] text-xs'>{blockedMessage}</div>
+          )}
+        </div>
         <div className='flex items-center gap-2'>
           <Button variant='tertiary' onClick={onDeploy} disabled={isDeployBlocked}>
             {deployActionLoading && <Loader className='mr-1.5 size-3.5' animate />}
@@ -842,7 +951,12 @@ function GeneralFooter({
   return (
     <ModalFooter className='items-center justify-between'>
       <div className='flex min-w-0 flex-col gap-1'>
-        <StatusBadge isWarning={needsRedeployment} />
+        <StatusBadge
+          isDeployed
+          needsRedeployment={needsRedeployment}
+          attemptStatus={attemptStatus}
+          attemptErrorMessage={attemptErrorMessage}
+        />
         {blockedMessage && (
           <div className='max-w-[300px] text-[var(--text-muted)] text-xs'>{blockedMessage}</div>
         )}
diff --git 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
index 3b52f3a96b6..1099461437e 100644
--- 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
@@ -16,6 +16,7 @@ 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 { isElseConditionTitle } from '@/lib/workflows/conditions'
 import {
   isLikelyReferenceSegment,
   SYSTEM_REFERENCE_PREFIXES,
@@ -736,7 +737,7 @@ export function ConditionInput({
     if (isPreview || disabled) return
 
     const blockIndex = conditionalBlocks.findIndex((block) => block.id === afterId)
-    if (!isRouterMode && conditionalBlocks[blockIndex]?.title === 'else') return
+    if (!isRouterMode && isElseConditionTitle(conditionalBlocks[blockIndex]?.title)) return
 
     const newBlockId = isRouterMode
       ? generateStableId(blockId, `route-${Date.now()}`)
@@ -793,7 +794,7 @@ export function ConditionInput({
     const blockIndex = conditionalBlocks.findIndex((block) => block.id === id)
     if (blockIndex === -1) return
 
-    if (conditionalBlocks[blockIndex]?.title === 'else') return
+    if (isElseConditionTitle(conditionalBlocks[blockIndex]?.title)) return
 
     if (
       (direction === 'up' && blockIndex === 0) ||
@@ -804,7 +805,7 @@ export function ConditionInput({
     const newBlocks = [...conditionalBlocks]
     const targetIndex = direction === 'up' ? blockIndex - 1 : blockIndex + 1
 
-    if (direction === 'down' && newBlocks[targetIndex]?.title === 'else') return
+    if (direction === 'down' && isElseConditionTitle(newBlocks[targetIndex]?.title)) return
 
     ;[newBlocks[blockIndex], newBlocks[targetIndex]] = [
       newBlocks[targetIndex],
@@ -950,7 +951,7 @@ export function ConditionInput({
                 'flex items-center justify-between overflow-hidden bg-transparent px-2.5 py-[5px]',
                 isRouterMode
                   ? 'rounded-t-[4px] border-[var(--border-1)] border-b'
-                  : block.title === 'else'
+                  : isElseConditionTitle(block.title)
                     ? 'rounded-sm border-0'
                     : 'rounded-t-[4px] border-[var(--border-1)] border-b'
               )}
@@ -964,7 +965,11 @@ export function ConditionInput({
                     <Button
                       variant='ghost'
                       onClick={() => addBlock(block.id)}
-                      disabled={isPreview || disabled || (!isRouterMode && block.title === 'else')}
+                      disabled={
+                        isPreview ||
+                        disabled ||
+                        (!isRouterMode && isElseConditionTitle(block.title))
+                      }
                       className='h-auto p-0'
                     >
                       <Plus className='size-[14px]' />
@@ -983,7 +988,7 @@ export function ConditionInput({
                         isPreview ||
                         index === 0 ||
                         disabled ||
-                        (!isRouterMode && block.title === 'else')
+                        (!isRouterMode && isElseConditionTitle(block.title))
                       }
                       className='h-auto p-0'
                     >
@@ -1003,8 +1008,9 @@ export function ConditionInput({
                         isPreview ||
                         disabled ||
                         index === conditionalBlocks.length - 1 ||
-                        (!isRouterMode && conditionalBlocks[index + 1]?.title === 'else') ||
-                        (!isRouterMode && block.title === 'else')
+                        (!isRouterMode &&
+                          isElseConditionTitle(conditionalBlocks[index + 1]?.title)) ||
+                        (!isRouterMode && isElseConditionTitle(block.title))
                       }
                       className='h-auto p-0'
                     >
@@ -1205,7 +1211,7 @@ export function ConditionInput({
 
             {/* Condition mode: show code editor */}
             {!isRouterMode &&
-              block.title !== 'else' &&
+              !isElseConditionTitle(block.title) &&
               (() => {
                 const blockLineCount = block.value.split('\n').length
                 const blockGutterWidth = calculateGutterWidth(blockLineCount)
diff --git a/apps/sim/background/schedule-execution.ts b/apps/sim/background/schedule-execution.ts
index 68192bf2a04..da02f0ebfaa 100644
--- a/apps/sim/background/schedule-execution.ts
+++ b/apps/sim/background/schedule-execution.ts
@@ -319,17 +319,23 @@ async function isScheduleDeploymentVersionActive(
 
 async function isScheduleClaimCurrent(
   scheduleId: string,
-  claimedAt: Date | null
+  claimedAt: Date | null,
+  deploymentOperationId?: string
 ): Promise<boolean> {
-  if (!claimedAt) return true
+  if (!claimedAt && !deploymentOperationId) return true
 
   const [scheduleRecord] = await db
-    .select({ lastQueuedAt: workflowSchedule.lastQueuedAt })
+    .select({
+      lastQueuedAt: workflowSchedule.lastQueuedAt,
+      deploymentOperationId: workflowSchedule.deploymentOperationId,
+    })
     .from(workflowSchedule)
     .where(and(eq(workflowSchedule.id, scheduleId), isNull(workflowSchedule.archivedAt)))
     .limit(1)
 
-  return scheduleRecord?.lastQueuedAt?.getTime() === claimedAt.getTime()
+  if (!scheduleRecord) return false
+  if (claimedAt && scheduleRecord.lastQueuedAt?.getTime() !== claimedAt.getTime()) return false
+  return scheduleRecord.deploymentOperationId === (deploymentOperationId ?? null)
 }
 
 async function runWorkflowExecution({
@@ -455,7 +461,13 @@ async function runWorkflowExecution({
       }
 
       const claimedAt = getScheduleClaimedAt(payload)
-      if (!(await isScheduleClaimCurrent(payload.scheduleId, claimedAt))) {
+      if (
+        !(await isScheduleClaimCurrent(
+          payload.scheduleId,
+          claimedAt,
+          payload.deploymentOperationId
+        ))
+      ) {
         logger.info(
           `[${requestId}] Schedule claim changed before workflow core started, skipping`,
           {
@@ -569,6 +581,7 @@ export type ScheduleExecutionPayload = {
   correlation?: AsyncExecutionCorrelation
   blockId?: string
   deploymentVersionId?: string
+  deploymentOperationId?: string
   cronExpression?: string
   timezone?: string
   lastRanAt?: string
diff --git a/apps/sim/background/webhook-execution.test.ts b/apps/sim/background/webhook-execution.test.ts
index b307d978f0e..29997641303 100644
--- a/apps/sim/background/webhook-execution.test.ts
+++ b/apps/sim/background/webhook-execution.test.ts
@@ -20,6 +20,7 @@ const {
   mockGetActiveSpan,
   mockExecuteWithIdempotency,
   mockReleaseExecutionSlot,
+  mockLoadDeploymentVersionState,
 } = vi.hoisted(() => ({
   mockResolveWebhookRecordProviderConfig: vi.fn(),
   mockExecuteWorkflowCore: vi.fn(),
@@ -28,6 +29,15 @@ const {
   mockGetActiveSpan: vi.fn(),
   mockExecuteWithIdempotency: vi.fn(),
   mockReleaseExecutionSlot: vi.fn(),
+  mockLoadDeploymentVersionState: vi.fn(
+    async (_workflowId: string, deploymentVersionId: string) => ({
+      blocks: {},
+      edges: [],
+      loops: {},
+      parallels: {},
+      deploymentVersionId,
+    })
+  ),
 }))
 
 vi.mock('@opentelemetry/api', () => ({
@@ -66,6 +76,7 @@ vi.mock('@/lib/workflows/persistence/utils', () => ({
     parallels: {},
     deploymentVersionId: 'deployment-1',
   })),
+  loadWorkflowDeploymentVersionState: mockLoadDeploymentVersionState,
 }))
 
 vi.mock('@/lib/webhooks/providers', () => ({
@@ -206,7 +217,13 @@ describe('executeWebhookJob fault vs error handling', () => {
       success: true,
       actorUserId: 'user-1',
       billingAttribution,
-      workflowRecord: { workspaceId: 'workspace-1', userId: 'user-1', variables: {} },
+      workflowRecord: {
+        workspaceId: 'workspace-1',
+        userId: 'user-1',
+        variables: {},
+        isDeployed: true,
+        archivedAt: null,
+      },
       executionTimeout: { async: 120_000 },
     })
     mockResolveWebhookRecordProviderConfig.mockImplementation(async (record) => record)
@@ -248,6 +265,55 @@ describe('executeWebhookJob fault vs error handling', () => {
     expect(loggingSessionMockFns.mockSafeCompleteWithError).toHaveBeenCalled()
   })
 
+  it('executes against the deployment version admitted by webhook ingress', async () => {
+    mockExecuteWorkflowCore.mockResolvedValue({
+      success: true,
+      status: 'completed',
+      output: {},
+      logs: [],
+      executionState: {
+        blockStates: {},
+        executedBlocks: [],
+        blockLogs: [],
+        decisions: {},
+        completedLoops: [],
+        activeExecutionPath: [],
+      },
+    })
+
+    await executeWebhookJob({
+      ...payload,
+      deploymentVersionId: 'deployment-admitted',
+    })
+
+    expect(mockLoadDeploymentVersionState).toHaveBeenCalledWith(
+      'workflow-1',
+      'deployment-admitted',
+      'workspace-1'
+    )
+  })
+
+  it('does not start queued webhook work after the workflow is undeployed', async () => {
+    executionPreprocessingMockFns.mockPreprocessExecution.mockResolvedValueOnce({
+      success: true,
+      actorUserId: 'user-1',
+      billingAttribution,
+      workflowRecord: {
+        workspaceId: 'workspace-1',
+        userId: 'user-1',
+        variables: {},
+        isDeployed: false,
+        archivedAt: null,
+      },
+      executionTimeout: { async: 120_000 },
+    })
+
+    await expect(executeWebhookJob(payload)).rejects.toThrow(
+      'Workflow workflow-1 is no longer deployed'
+    )
+    expect(mockExecuteWorkflowCore).not.toHaveBeenCalled()
+  })
+
   it('releases the reservation when idempotency returns a cached result', async () => {
     const cachedResult = {
       success: true,
diff --git a/apps/sim/background/webhook-execution.ts b/apps/sim/background/webhook-execution.ts
index 98e5c6ac7b4..11e06c38e6c 100644
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -29,7 +29,10 @@ import {
   wasExecutionFinalizedByCore,
 } from '@/lib/workflows/executor/execution-core'
 import { handlePostExecutionPauseState } from '@/lib/workflows/executor/pause-persistence'
-import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
+import {
+  loadDeployedWorkflowState,
+  loadWorkflowDeploymentVersionState,
+} from '@/lib/workflows/persistence/utils'
 import { resolveOAuthAccountId } from '@/app/api/auth/oauth/utils'
 import { WEBHOOK_EXECUTION_CONCURRENCY_LIMIT } from '@/background/concurrency-limits'
 import { getBlock } from '@/blocks'
@@ -241,6 +244,8 @@ export type WebhookExecutionPayload = {
   headers: Record<string, string>
   path: string
   blockId?: string
+  /** Immutable deployment admitted by webhook ingress; absent on legacy queued jobs. */
+  deploymentVersionId?: string
   workspaceId: string
   credentialId?: string
   /** Epoch ms when the webhook HTTP request was first received (for dispatch-latency metrics). */
@@ -407,6 +412,9 @@ async function executeWebhookJobInternal(
   if (!workflowRecord) {
     throw new Error(`Workflow ${payload.workflowId} not found during preprocessing`)
   }
+  if (!workflowRecord.isDeployed || workflowRecord.archivedAt) {
+    throw new Error(`Workflow ${payload.workflowId} is no longer deployed`)
+  }
 
   const workspaceId = workflowRecord.workspaceId
   if (!workspaceId) {
@@ -420,8 +428,15 @@ async function executeWebhookJobInternal(
   let deploymentVersionId: string | undefined
 
   try {
+    const workflowStatePromise = payload.deploymentVersionId
+      ? loadWorkflowDeploymentVersionState(
+          payload.workflowId,
+          payload.deploymentVersionId,
+          workspaceId
+        )
+      : loadDeployedWorkflowState(payload.workflowId, workspaceId)
     const [workflowData, webhookRows, resolvedCredentialUserId] = await Promise.all([
-      loadDeployedWorkflowState(payload.workflowId, workspaceId),
+      workflowStatePromise,
       db.select().from(webhook).where(eq(webhook.id, payload.webhookId)).limit(1),
       payload.credentialId
         ? resolveCredentialAccountUserId(payload.credentialId)
diff --git a/apps/sim/blocks/blocks/airtable.test.ts b/apps/sim/blocks/blocks/airtable.test.ts
new file mode 100644
index 00000000000..c89876a67c3
--- /dev/null
+++ b/apps/sim/blocks/blocks/airtable.test.ts
@@ -0,0 +1,109 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('@/triggers', () => ({
+  getTrigger: () => ({ subBlocks: [] }),
+}))
+
+import { AirtableBlock } from '@/blocks/blocks/airtable'
+
+const nestedFields = {
+  StringBoolean: 'false',
+  StringNumber: '42',
+  Boolean: true,
+  Number: 42,
+  Nested: {
+    values: ['true', false, '001'],
+  },
+}
+
+const records = [{ fields: nestedFields }]
+const updateRecords = [{ id: 'rec123', fields: nestedFields }]
+const baseParams = {
+  oauthCredential: 'credential',
+  baseId: 'app123',
+  tableId: 'tbl123',
+}
+
+const operationCases = [
+  {
+    operation: 'create',
+    params: { records: JSON.stringify(records) },
+    payload: { records },
+  },
+  {
+    operation: 'update',
+    params: { recordId: 'rec123', fields: JSON.stringify(nestedFields) },
+    payload: { fields: nestedFields },
+  },
+  {
+    operation: 'updateMultiple',
+    params: { records: JSON.stringify(updateRecords) },
+    payload: { records: updateRecords },
+  },
+  {
+    operation: 'upsert',
+    params: {
+      records: JSON.stringify(records),
+      fieldsToMergeOn: JSON.stringify(['External ID']),
+    },
+    payload: { records, fieldsToMergeOn: ['External ID'] },
+  },
+] as const
+
+describe('AirtableBlock typecast', () => {
+  const buildParams = AirtableBlock.tools.config.params!
+
+  it('exposes typecast as an advanced switch for all write operations', () => {
+    expect(AirtableBlock.subBlocks.find(({ id }) => id === 'typecast')).toMatchObject({
+      type: 'switch',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: ['create', 'update', 'updateMultiple', 'upsert'],
+      },
+    })
+  })
+
+  describe.each(operationCases)('$operation params', ({ operation, params, payload }) => {
+    it('omits typecast when unset and preserves nested values', () => {
+      expect(buildParams({ ...baseParams, operation, ...params })).toMatchObject(payload)
+      expect(buildParams({ ...baseParams, operation, ...params })).not.toHaveProperty('typecast')
+    })
+
+    it.each([
+      { supplied: true, expected: true },
+      { supplied: false, expected: false },
+      { supplied: 'true', expected: true },
+      { supplied: 'false', expected: false },
+    ])('coerces only typecast $supplied to $expected', ({ supplied, expected }) => {
+      expect(
+        buildParams({
+          ...baseParams,
+          operation,
+          ...params,
+          typecast: supplied,
+        })
+      ).toMatchObject({
+        ...payload,
+        typecast: expected,
+      })
+    })
+  })
+
+  it('does not pass typecast to read or delete operations', () => {
+    expect(buildParams({ ...baseParams, operation: 'list', typecast: 'true' })).not.toHaveProperty(
+      'typecast'
+    )
+    expect(
+      buildParams({
+        ...baseParams,
+        operation: 'delete',
+        recordIds: JSON.stringify(['rec123']),
+        typecast: 'true',
+      })
+    ).not.toHaveProperty('typecast')
+  })
+})
diff --git a/apps/sim/blocks/blocks/airtable.ts b/apps/sim/blocks/blocks/airtable.ts
index faedd66e8c5..7ca201bb9ac 100644
--- a/apps/sim/blocks/blocks/airtable.ts
+++ b/apps/sim/blocks/blocks/airtable.ts
@@ -268,7 +268,7 @@ Return ONLY the valid JSON array of field name strings - no explanations, no mar
       id: 'typecast',
       title: 'Typecast',
       type: 'switch',
-      condition: { field: 'operation', value: 'upsert' },
+      condition: { field: 'operation', value: ['create', 'update', 'updateMultiple', 'upsert'] },
       mode: 'advanced',
     },
     {
@@ -369,22 +369,24 @@ Return ONLY the valid JSON array of record ID strings - no explanations, no mark
           credential: oauthCredential,
           ...rest,
         }
+        const typecastParams =
+          typecast != null ? { typecast: typecast === true || typecast === 'true' } : {}
 
         switch (params.operation) {
           case 'create':
           case 'updateMultiple':
-            return { ...baseParams, records: parsedRecords }
+            return { ...baseParams, records: parsedRecords, ...typecastParams }
           case 'upsert':
             return {
               ...baseParams,
               records: parsedRecords,
               fieldsToMergeOn: parsedFieldsToMergeOn,
-              ...(typecast != null ? { typecast: typecast === true || typecast === 'true' } : {}),
+              ...typecastParams,
             }
           case 'delete':
             return { ...baseParams, recordIds: parsedRecordIds }
           case 'update':
-            return { ...baseParams, fields: parsedFields }
+            return { ...baseParams, fields: parsedFields, ...typecastParams }
           default:
             return baseParams // No JSON parsing needed for list/get
         }
@@ -403,7 +405,7 @@ Return ONLY the valid JSON array of record ID strings - no explanations, no mark
     records: { type: 'json', description: 'Record data array' }, // Required for create/updateMultiple/upsert
     fields: { type: 'json', description: 'Field data object' }, // Required for update single
     fieldsToMergeOn: { type: 'json', description: 'Field names to match records on' }, // Required for upsert
-    typecast: { type: 'boolean', description: 'Auto-convert string values to field types' }, // Optional for upsert
+    typecast: { type: 'boolean', description: 'Auto-convert string values to field types' },
     recordIds: { type: 'json', description: 'Record IDs to delete' }, // Required for delete
   },
   // Output structure depends on the operation, covered by AirtableResponse union type
diff --git a/apps/sim/ee/workspace-forking/lib/promote/reactivate-in-tx.ts b/apps/sim/ee/workspace-forking/lib/promote/reactivate-in-tx.ts
index f5b129401d1..9449e93278a 100644
--- a/apps/sim/ee/workspace-forking/lib/promote/reactivate-in-tx.ts
+++ b/apps/sim/ee/workspace-forking/lib/promote/reactivate-in-tx.ts
@@ -1,7 +1,12 @@
 import { workflow, workflowDeploymentVersion } from '@sim/db/schema'
+import { sha256Hex } from '@sim/security/hash'
 import { and, eq } from 'drizzle-orm'
 import type { DbOrTx } from '@/lib/db/types'
-import { enqueueWorkflowDeploymentSideEffects } from '@/lib/workflows/deployment-outbox'
+import {
+  DEPLOYMENT_READINESS_COMPONENTS,
+  enqueueWorkflowDeploymentPreparation,
+} from '@/lib/workflows/deployment-outbox'
+import { prepareWorkflowVersionActivation } from '@/lib/workflows/persistence/deployment-operations'
 import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
@@ -16,24 +21,20 @@ interface ReactivateDeployedVersionParams {
 export interface ReactivateDeployedVersionResult {
   deploymentVersionId: string
   /**
-   * Outbox event id enqueued inside the transaction. Process it AFTER the tx commits
-   * (or rely on the outbox cron/reaper if the process dies first).
+   * Newly enqueued event. Reused idempotent operations already own a durable event.
    */
-  outboxEventId: string
+  outboxEventId?: string
 }
 
 /**
- * Reactivate a prior deployment version AND restore the workflow's draft to it using
- * ONLY DB writes against the provided transaction, enqueuing the deployment
- * side-effect (webhook / schedule / MCP re-subscription) to the outbox for processing
- * AFTER the tx commits. This composes the DB halves of {@link activateWorkflowVersion}
- * and `performRevertToVersion` so a fork rollback can run atomically under its fork
- * advisory lock - the heavy side-effects never run inside the locked tx.
+ * Prepare a prior deployment version for v2 activation and restore the workflow's
+ * draft to it using only DB writes against the provided transaction.
  *
  * Deliberately does NOT call `assertWorkflowMutable`: a rollback is an admin force-undo
  * and must not be blocked by a workflow/folder lock (that check is also not tx-safe).
- * Idempotent: deactivate-all + activate-target + overwrite-draft yield the same state
- * on retry.
+ * Idempotent: preparing the activation and overwriting the draft yield the same
+ * prepared operation and draft on retry; the cutover itself happens asynchronously
+ * through the deployment outbox.
  *
  * Returns null when the target version row no longer exists, so the caller can mark the
  * workflow skipped rather than failing the whole rollback.
@@ -80,25 +81,6 @@ export async function reactivateDeployedVersionInTx(
     )
   }
 
-  // Activate the target version (deactivate every other), mark the workflow deployed.
-  await tx
-    .update(workflowDeploymentVersion)
-    .set({ isActive: false })
-    .where(eq(workflowDeploymentVersion.workflowId, workflowId))
-  await tx
-    .update(workflowDeploymentVersion)
-    .set({ isActive: true })
-    .where(
-      and(
-        eq(workflowDeploymentVersion.workflowId, workflowId),
-        eq(workflowDeploymentVersion.version, version)
-      )
-    )
-  await tx
-    .update(workflow)
-    .set({ isDeployed: true, deployedAt: now })
-    .where(eq(workflow.id, workflowId))
-
   // Restore the draft to the deployed version's state.
   const hasVariables = Object.hasOwn(deployedState, 'variables')
   const restoredState: WorkflowState = {
@@ -126,13 +108,34 @@ export async function reactivateDeployedVersionInTx(
     })
     .where(eq(workflow.id, workflowId))
 
-  const outboxEventId = await enqueueWorkflowDeploymentSideEffects(tx, {
+  let outboxEventId: string | undefined
+  const prepared = await prepareWorkflowVersionActivation({
     workflowId,
     deploymentVersionId: versionRow.id,
-    userId,
-    requestId,
-    forceRecreateSubscriptions: true,
+    actorId: userId,
+    requestHash: sha256Hex(JSON.stringify({ action: 'activate', workflowId, version, userId })),
+    idempotencyKey: `${requestId}:${workflowId}:reactivate:${version}`,
+    readinessComponents: DEPLOYMENT_READINESS_COMPONENTS,
+    tx,
+    onPrepareTransaction: async (innerTx, operation) => {
+      if (!operation.deploymentVersionId || operation.version === null) {
+        throw new Error('Prepared rollback activation is missing its target version')
+      }
+      outboxEventId = await enqueueWorkflowDeploymentPreparation(innerTx, {
+        protocolVersion: operation.protocolVersion,
+        operationId: operation.id,
+        generation: operation.generation,
+        workflowId: operation.workflowId,
+        deploymentVersionId: operation.deploymentVersionId,
+        version: operation.version,
+        userId,
+        requestId,
+        checkpoints: {},
+      })
+    },
   })
-
+  if (!prepared.success) {
+    throw new Error(prepared.error)
+  }
   return { deploymentVersionId: versionRow.id, outboxEventId }
 }
diff --git a/apps/sim/ee/workspace-forking/lib/promote/rollback.ts b/apps/sim/ee/workspace-forking/lib/promote/rollback.ts
index 42c8eac4b0d..8d1ed317c33 100644
--- a/apps/sim/ee/workspace-forking/lib/promote/rollback.ts
+++ b/apps/sim/ee/workspace-forking/lib/promote/rollback.ts
@@ -171,7 +171,7 @@ export async function rollbackFork(params: RollbackForkParams): Promise<Rollback
           skipped.add(op.workflowId)
           continue
         }
-        outboxEventIds.push(result.outboxEventId)
+        if (result.outboxEventId) outboxEventIds.push(result.outboxEventId)
         continue
       }
 
diff --git a/apps/sim/executor/constants.ts b/apps/sim/executor/constants.ts
index affd77355c8..97194928e0b 100644
--- a/apps/sim/executor/constants.ts
+++ b/apps/sim/executor/constants.ts
@@ -247,11 +247,6 @@ export const EVALUATOR = {
   JSON_INDENT: 2,
 } as const
 
-export const CONDITION = {
-  ELSE_LABEL: 'else',
-  ELSE_TITLE: 'else',
-} as const
-
 export const PAUSE_RESUME = {
   OPERATION: {
     HUMAN: 'human',
diff --git a/apps/sim/executor/handlers/condition/condition-handler.test.ts b/apps/sim/executor/handlers/condition/condition-handler.test.ts
index ec446cec2be..f892dff84e3 100644
--- a/apps/sim/executor/handlers/condition/condition-handler.test.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.test.ts
@@ -211,6 +211,41 @@ describe('ConditionBlockHandler', () => {
     expect(mockContext.decisions.condition.get(mockBlock.id)).toBe('else1')
   })
 
+  it('recognizes legacy-capitalized else branches without evaluating them', async () => {
+    const conditions = [{ id: 'else1', title: 'Else', value: '' }]
+    const inputs = { conditions: JSON.stringify(conditions) }
+
+    const result = await handler.execute(mockContext, mockBlock, inputs)
+
+    expect(mockExecuteTool).not.toHaveBeenCalled()
+    expect((result as any).selectedOption).toBe('else1')
+    expect((result as any).selectedPath?.blockId).toBe(mockTargetBlock2.id)
+  })
+
+  it('finds whitespace and mixed-case else branches during fallback', async () => {
+    mockExecuteTool.mockResolvedValueOnce({ success: true, output: { result: false } })
+
+    const conditions = [
+      { id: 'cond1', title: 'if', value: 'false' },
+      { id: 'else1', title: ' \t eLsE \n', value: '' },
+    ]
+    const inputs = { conditions: JSON.stringify(conditions) }
+    mockContext.workflow!.connections = [
+      { source: mockSourceBlock.id, target: mockBlock.id },
+      {
+        source: mockBlock.id,
+        target: mockTargetBlock1.id,
+        sourceHandle: 'condition-cond1',
+      },
+    ]
+
+    const result = await handler.execute(mockContext, mockBlock, inputs)
+
+    expect(mockExecuteTool).toHaveBeenCalledOnce()
+    expect((result as any).selectedOption).toBe('else1')
+    expect((result as any).selectedPath).toBeNull()
+  })
+
   it('should handle invalid conditions JSON format', async () => {
     const inputs = { conditions: '{ "invalid json ' }
 
diff --git a/apps/sim/executor/handlers/condition/condition-handler.ts b/apps/sim/executor/handlers/condition/condition-handler.ts
index 20ce8660dd1..d329ee4a2c2 100644
--- a/apps/sim/executor/handlers/condition/condition-handler.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.ts
@@ -1,7 +1,8 @@
 import { createLogger } from '@sim/logger'
 import { normalizeStringRecord, normalizeWorkflowVariables } from '@/lib/core/utils/records'
+import { isElseConditionTitle } from '@/lib/workflows/conditions'
 import type { BlockOutput } from '@/blocks/types'
-import { BlockType, CONDITION, DEFAULTS, EDGE } from '@/executor/constants'
+import { BlockType, DEFAULTS, EDGE } from '@/executor/constants'
 import type { BlockHandler, ExecutionContext } from '@/executor/types'
 import { collectBlockData } from '@/executor/utils/block-data'
 import {
@@ -211,12 +212,9 @@ export class ConditionBlockHandler implements BlockHandler {
     selectedCondition: { id: string; title: string; value: string } | null
   }> {
     for (const condition of conditions) {
-      if (condition.title === CONDITION.ELSE_TITLE) {
+      if (isElseConditionTitle(condition.title)) {
         const connection = this.findConnectionForCondition(outgoingConnections, condition.id)
-        if (connection) {
-          return { selectedConnection: connection, selectedCondition: condition }
-        }
-        continue
+        return { selectedConnection: connection ?? null, selectedCondition: condition }
       }
 
       const conditionValueString = String(condition.value || '')
@@ -241,15 +239,6 @@ export class ConditionBlockHandler implements BlockHandler {
       }
     }
 
-    const elseCondition = conditions.find((c) => c.title === CONDITION.ELSE_TITLE)
-    if (elseCondition) {
-      const elseConnection = this.findConnectionForCondition(outgoingConnections, elseCondition.id)
-      if (elseConnection) {
-        return { selectedConnection: elseConnection, selectedCondition: elseCondition }
-      }
-      return { selectedConnection: null, selectedCondition: elseCondition }
-    }
-
     return { selectedConnection: null, selectedCondition: null }
   }
 
diff --git a/apps/sim/hooks/queries/deployments.ts b/apps/sim/hooks/queries/deployments.ts
index fdc6c22b4fe..0ad74ab581e 100644
--- a/apps/sim/hooks/queries/deployments.ts
+++ b/apps/sim/hooks/queries/deployments.ts
@@ -32,6 +32,7 @@ const logger = createLogger('DeploymentQueries')
 export type { ChatDetail, DeploymentVersionsResponse }
 
 export const DEPLOYMENT_INFO_STALE_TIME = 30 * 1000
+export const DEPLOYMENT_STATUS_REFETCH_INTERVAL = 2 * 1000
 export const DEPLOYED_WORKFLOW_STATE_STALE_TIME = 30 * 1000
 export const DEPLOYMENT_VERSIONS_STALE_TIME = 30 * 1000
 export const CHAT_DEPLOYMENT_STATUS_STALE_TIME = 30 * 1000
@@ -102,6 +103,9 @@ async function fetchDeploymentInfo(
     apiKey: data.apiKey ?? null,
     needsRedeployment: data.needsRedeployment ?? false,
     isPublicApi: data.isPublicApi ?? false,
+    warnings: data.warnings,
+    activeDeployment: data.activeDeployment ?? null,
+    latestDeploymentAttempt: data.latestDeploymentAttempt ?? null,
   }
 }
 
@@ -109,16 +113,21 @@ async function fetchDeploymentInfo(
  * Hook to fetch deployment info for a workflow.
  * Provides isDeployed status, deployedAt timestamp, apiKey info, and needsRedeployment flag.
  */
-export function useDeploymentInfo(
-  workflowId: string | null,
-  options?: { enabled?: boolean; refetchOnMount?: boolean | 'always' }
-) {
+export function useDeploymentInfo(workflowId: string | null, options?: { enabled?: boolean }) {
   return useQuery({
     queryKey: deploymentKeys.info(workflowId),
     queryFn: ({ signal }) => fetchDeploymentInfo(workflowId!, signal),
     enabled: Boolean(workflowId) && (options?.enabled ?? true),
     staleTime: DEPLOYMENT_INFO_STALE_TIME,
-    ...(options?.refetchOnMount !== undefined && { refetchOnMount: options.refetchOnMount }),
+    refetchInterval: (query) => {
+      const status = query.state.data?.latestDeploymentAttempt?.status
+      return status === 'preparing' || status === 'activating'
+        ? DEPLOYMENT_STATUS_REFETCH_INTERVAL
+        : false
+    },
+    refetchOnMount: 'always',
+    refetchOnWindowFocus: true,
+    refetchOnReconnect: true,
   })
 }
 
@@ -170,7 +179,9 @@ async function fetchDeploymentVersions(
 
 /**
  * Hook to fetch deployment versions for a workflow.
- * Returns a list of all deployment versions with their metadata.
+ * Returns a list of all deployment versions with their metadata. Polls while
+ * any version has an in-flight deployment attempt so preparing/activating
+ * labels resolve to their terminal state without a manual refresh.
  */
 export function useDeploymentVersions(workflowId: string | null, options?: { enabled?: boolean }) {
   return useQuery({
@@ -178,6 +189,14 @@ export function useDeploymentVersions(workflowId: string | null, options?: { ena
     queryFn: ({ signal }) => fetchDeploymentVersions(workflowId!, signal),
     enabled: Boolean(workflowId) && (options?.enabled ?? true),
     staleTime: DEPLOYMENT_VERSIONS_STALE_TIME,
+    refetchInterval: (query) => {
+      const hasInFlightVersion = query.state.data?.versions.some(
+        (version) =>
+          version.latestOperationStatus === 'preparing' ||
+          version.latestOperationStatus === 'activating'
+      )
+      return hasInFlightVersion ? DEPLOYMENT_STATUS_REFETCH_INTERVAL : false
+    },
   })
 }
 
@@ -304,6 +323,8 @@ export function useDeployWorkflow() {
         deployedAt: data.deployedAt ?? undefined,
         apiKey: data.apiKey ?? undefined,
         warnings: data.warnings,
+        activeDeployment: data.activeDeployment,
+        latestDeploymentAttempt: data.latestDeploymentAttempt,
       }
     },
     onSettled: (_data, error, variables) => {
@@ -539,40 +560,14 @@ export function useActivateDeploymentVersion() {
         body: { isActive: true },
       })
     },
-    onMutate: async ({ workflowId, version }) => {
-      await queryClient.cancelQueries({ queryKey: deploymentKeys.versions(workflowId) })
-
-      const previousVersions = queryClient.getQueryData<DeploymentVersionsResponse>(
-        deploymentKeys.versions(workflowId)
-      )
-
-      if (previousVersions) {
-        queryClient.setQueryData<DeploymentVersionsResponse>(deploymentKeys.versions(workflowId), {
-          versions: previousVersions.versions.map((v) => ({
-            ...v,
-            isActive: v.version === version,
-          })),
-        })
-      }
-
-      return { previousVersions }
-    },
-    onError: (_, variables, context) => {
-      logger.error('Failed to activate deployment version')
-
-      if (context?.previousVersions) {
-        queryClient.setQueryData(
-          deploymentKeys.versions(variables.workflowId),
-          context.previousVersions
-        )
-      }
-    },
     onSettled: (_data, error, variables) => {
       if (!error) {
         logger.info('Deployment version activated', {
           workflowId: variables.workflowId,
           version: variables.version,
         })
+      } else {
+        logger.error('Failed to activate deployment version', { error })
       }
       return invalidateDeploymentQueries(queryClient, variables.workflowId)
     },
diff --git a/apps/sim/lib/api/contracts/deployments.ts b/apps/sim/lib/api/contracts/deployments.ts
index 1b9cd57db72..a7daf83b739 100644
--- a/apps/sim/lib/api/contracts/deployments.ts
+++ b/apps/sim/lib/api/contracts/deployments.ts
@@ -1,6 +1,11 @@
 import { z } from 'zod'
 import { defineRouteContract } from '@/lib/api/contracts/types'
 import { workflowIdParamsSchema } from '@/lib/api/contracts/workflows'
+import {
+  DEPLOYMENT_COMPONENT_STATUSES,
+  DEPLOYMENT_OPERATION_ACTIONS,
+  DEPLOYMENT_OPERATION_STATUSES,
+} from '@/lib/workflows/deployment-lifecycle'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
 const deployedWorkflowStateSchema = z.custom<WorkflowState>(
@@ -56,6 +61,46 @@ export const activateDeploymentVersionBodySchema = z.object({
 
 export type ActivateDeploymentVersionBody = z.input<typeof activateDeploymentVersionBodySchema>
 
+export const deploymentOperationStatusSchema = z.enum(DEPLOYMENT_OPERATION_STATUSES)
+
+export const deploymentComponentReadinessSchema = z.enum([
+  ...DEPLOYMENT_COMPONENT_STATUSES,
+  'not_applicable',
+])
+
+export const deploymentReadinessSchema = z.object({
+  webhooks: deploymentComponentReadinessSchema,
+  schedules: deploymentComponentReadinessSchema,
+  mcp: deploymentComponentReadinessSchema,
+})
+
+export const deploymentOperationSummarySchema = z.object({
+  id: z.string(),
+  deploymentVersionId: z.string(),
+  version: z.number().int().positive(),
+  action: z.enum(DEPLOYMENT_OPERATION_ACTIONS),
+  status: deploymentOperationStatusSchema,
+  readiness: deploymentReadinessSchema,
+  requestedAt: z.string(),
+  activatedAt: z.string().nullable().optional(),
+  error: z
+    .object({
+      code: z.string(),
+      message: z.string(),
+      retryable: z.boolean(),
+    })
+    .nullable()
+    .optional(),
+})
+
+export type DeploymentOperationSummary = z.output<typeof deploymentOperationSummarySchema>
+
+export const activeDeploymentSummarySchema = z.object({
+  deploymentVersionId: z.string(),
+  version: z.number().int().positive(),
+  deployedAt: z.string(),
+})
+
 export const deploymentVersionPatchBodySchema = deploymentVersionMetadataFieldsSchema
   .extend({
     isActive: z.literal(true).optional(),
@@ -74,6 +119,8 @@ export const deploymentInfoResponseSchema = z.object({
   needsRedeployment: z.boolean().optional(),
   isPublicApi: z.boolean().optional(),
   warnings: z.array(z.string()).optional(),
+  activeDeployment: activeDeploymentSummarySchema.nullable().optional(),
+  latestDeploymentAttempt: deploymentOperationSummarySchema.nullable().optional(),
 })
 
 export type DeploymentInfoResponse = z.output<typeof deploymentInfoResponseSchema>
@@ -89,6 +136,7 @@ export const deploymentVersionSchema = z.object({
   createdAt: z.string(),
   createdBy: z.string().nullable().optional(),
   deployedBy: z.string().nullable().optional(),
+  latestOperationStatus: deploymentOperationStatusSchema.nullable().optional(),
 })
 
 export type DeploymentVersion = z.output<typeof deploymentVersionSchema>
@@ -168,10 +216,12 @@ export type UpdateDeploymentVersionMetadataResponse = z.output<
 
 export const activateDeploymentVersionResponseSchema = z.object({
   success: z.literal(true),
-  deployedAt: z.string(),
+  deployedAt: z.string().nullable().optional(),
   warnings: z.array(z.string()).optional(),
   name: z.string().nullable().optional(),
   description: z.string().nullable().optional(),
+  activeDeployment: activeDeploymentSummarySchema.nullable().optional(),
+  latestDeploymentAttempt: deploymentOperationSummarySchema.nullable().optional(),
 })
 
 export type ActivateDeploymentVersionResponse = z.output<
diff --git a/apps/sim/lib/api/contracts/v1/admin/workflows.ts b/apps/sim/lib/api/contracts/v1/admin/workflows.ts
index ca279afd942..8ef61531579 100644
--- a/apps/sim/lib/api/contracts/v1/admin/workflows.ts
+++ b/apps/sim/lib/api/contracts/v1/admin/workflows.ts
@@ -1,4 +1,8 @@
 import { z } from 'zod'
+import {
+  activeDeploymentSummarySchema,
+  deploymentOperationSummarySchema,
+} from '@/lib/api/contracts/deployments'
 import { type ContractJsonResponse, defineRouteContract } from '@/lib/api/contracts/types'
 import {
   adminV1ExportFormatQuerySchema,
@@ -130,10 +134,12 @@ export const adminV1DeploymentVersionSchema = z.object({
 })
 
 export const adminV1DeployResultSchema = z.object({
-  isDeployed: z.literal(true),
-  version: z.number(),
-  deployedAt: z.string(),
+  isDeployed: z.boolean(),
+  version: z.number().nullable(),
+  deployedAt: z.string().nullable(),
   warnings: z.array(z.string()).optional(),
+  activeDeployment: activeDeploymentSummarySchema.nullable().optional(),
+  latestDeploymentAttempt: deploymentOperationSummarySchema.nullable().optional(),
 })
 
 export const adminV1UndeployResultSchema = z.object({
@@ -171,8 +177,10 @@ const adminV1WorkflowVersionsResultSchema = z.object({
 const adminV1ActivateWorkflowVersionResultSchema = z.object({
   success: z.literal(true),
   version: z.number(),
-  deployedAt: z.string(),
+  deployedAt: z.string().nullable(),
   warnings: z.array(z.string()).optional(),
+  activeDeployment: activeDeploymentSummarySchema.nullable().optional(),
+  latestDeploymentAttempt: deploymentOperationSummarySchema.nullable().optional(),
 })
 
 export const adminV1ListWorkflowsContract = defineRouteContract({
diff --git a/apps/sim/lib/api/contracts/v1/workflows.ts b/apps/sim/lib/api/contracts/v1/workflows.ts
index 5d46dcae135..d0c1469e189 100644
--- a/apps/sim/lib/api/contracts/v1/workflows.ts
+++ b/apps/sim/lib/api/contracts/v1/workflows.ts
@@ -1,5 +1,9 @@
 import { z } from 'zod'
-import { deploymentVersionMetadataFieldsSchema } from '@/lib/api/contracts/deployments'
+import {
+  activeDeploymentSummarySchema,
+  deploymentOperationSummarySchema,
+  deploymentVersionMetadataFieldsSchema,
+} from '@/lib/api/contracts/deployments'
 import { booleanQueryFlagSchema } from '@/lib/api/contracts/primitives'
 import { defineRouteContract } from '@/lib/api/contracts/types'
 import { workflowIdParamsSchema } from '@/lib/api/contracts/workflows'
@@ -93,13 +97,25 @@ const v1DeploymentStateSchema = z.object({
   warnings: z.array(z.string()),
 })
 
-export const v1DeployWorkflowDataSchema = v1DeploymentStateSchema.extend({
+/**
+ * Deploy/rollback admit asynchronously: HTTP success means the attempt was
+ * accepted, while `isDeployed` reflects whether a version is actually live.
+ * `latestDeploymentAttempt` carries the lifecycle status
+ * (preparing/activating/active/failed/superseded) so API consumers can poll
+ * to a terminal state instead of guessing from `isDeployed` alone.
+ */
+const v1DeploymentLifecycleSchema = v1DeploymentStateSchema.extend({
+  activeDeployment: activeDeploymentSummarySchema.nullable(),
+  latestDeploymentAttempt: deploymentOperationSummarySchema.nullable(),
+})
+
+export const v1DeployWorkflowDataSchema = v1DeploymentLifecycleSchema.extend({
   version: z.number().optional(),
 })
 
 export type V1DeployWorkflowData = z.output<typeof v1DeployWorkflowDataSchema>
 
-export const v1RollbackWorkflowDataSchema = v1DeploymentStateSchema.extend({
+export const v1RollbackWorkflowDataSchema = v1DeploymentLifecycleSchema.extend({
   version: z.number(),
 })
 
diff --git a/apps/sim/lib/api/contracts/workflows.ts b/apps/sim/lib/api/contracts/workflows.ts
index 016b0b94d9c..04e5215b525 100644
--- a/apps/sim/lib/api/contracts/workflows.ts
+++ b/apps/sim/lib/api/contracts/workflows.ts
@@ -345,6 +345,8 @@ export const executeWorkflowBodySchema = z.object({
   includeFileBase64: z.boolean().optional().default(true),
   base64MaxBytes: z.number().int().positive().optional(),
   workflowStateOverride: workflowStateSchema.optional(),
+  /** Internal MCP bridge pin for calls admitted before a deployment cutover. */
+  deploymentVersionId: z.string().min(1).optional(),
   executionId: z.unknown().optional(),
   triggerBlockId: z.string().optional(),
   startBlockId: z.string().optional(),
diff --git a/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts b/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts
index b47614c19c0..1ca4554aa2e 100644
--- a/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts
+++ b/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts
@@ -185,7 +185,6 @@ export async function executeDeployApi(
     const result = await performFullDeploy({
       workflowId,
       userId: context.userId,
-      workflowName: workflowRecord.name || undefined,
       versionDescription,
       versionName,
     })
@@ -197,19 +196,23 @@ export async function executeDeployApi(
     const apiEndpoint = buildWorkflowApiEndpoint(baseUrl, workflowId)
     const apiConfig = buildWorkflowApiConfig(baseUrl, apiEndpoint)
     const apiExamples = buildWorkflowApiExamples(baseUrl, apiEndpoint)
+    const isDeployed = Boolean(result.activeDeployment)
     return {
       success: true,
       output: {
         workflowId,
-        isDeployed: true,
+        isDeployed,
         deployedAt: result.deployedAt,
         version: result.version,
+        lifecycleStatus: result.latestDeploymentAttempt?.status ?? null,
+        readiness: result.latestDeploymentAttempt?.readiness ?? null,
+        warnings: result.warnings ?? [],
         apiEndpoint,
         baseUrl,
         deploymentType: 'api',
         deploymentStatus: {
           api: {
-            isDeployed: true,
+            isDeployed,
             endpoint: apiEndpoint,
             deployedAt: result.deployedAt,
             version: result.version,
@@ -802,19 +805,23 @@ export async function executeRedeploy(
     const apiEndpoint = buildWorkflowApiEndpoint(baseUrl, workflowId)
     const apiConfig = buildWorkflowApiConfig(baseUrl, apiEndpoint)
     const apiExamples = buildWorkflowApiExamples(baseUrl, apiEndpoint)
+    const isDeployed = Boolean(result.activeDeployment)
     return {
       success: true,
       output: {
         workflowId,
-        isDeployed: true,
+        isDeployed,
         deployedAt: result.deployedAt || null,
         version: result.version,
+        lifecycleStatus: result.latestDeploymentAttempt?.status ?? null,
+        readiness: result.latestDeploymentAttempt?.readiness ?? null,
+        warnings: result.warnings ?? [],
         apiEndpoint,
         baseUrl,
         deploymentType: 'api',
         deploymentStatus: {
           api: {
-            isDeployed: true,
+            isDeployed,
             endpoint: apiEndpoint,
             deployedAt: result.deployedAt || null,
             version: result.version,
diff --git a/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts b/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
index d3c1c3df7db..07beecd8e10 100644
--- a/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
+++ b/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
@@ -9,7 +9,11 @@ import {
   performUpdateWorkflowMcpServer,
 } from '@/lib/mcp/orchestration'
 import { generateWorkflowDiffSummary } from '@/lib/workflows/comparison'
-import { performActivateVersion, performRevertToVersion } from '@/lib/workflows/orchestration'
+import {
+  getWorkflowDeploymentSummary,
+  performActivateVersion,
+  performRevertToVersion,
+} from '@/lib/workflows/orchestration'
 import {
   listWorkflowVersions,
   updateDeploymentVersionMetadata,
@@ -42,7 +46,7 @@ export async function executeCheckDeploymentStatus(
     const { workflow: workflowRecord } = await ensureWorkflowAccess(workflowId, context.userId)
     const workspaceId = workflowRecord.workspaceId
 
-    const [apiDeploy, chatDeploy] = await Promise.all([
+    const [apiDeploy, chatDeploy, deploymentSummary] = await Promise.all([
       db
         .select({ isDeployed: workflow.isDeployed, deployedAt: workflow.deployedAt })
         .from(workflow)
@@ -63,6 +67,7 @@ export async function executeCheckDeploymentStatus(
         .from(chat)
         .where(and(eq(chat.workflowId, workflowId), isNull(chat.archivedAt)))
         .limit(1),
+      getWorkflowDeploymentSummary(workflowId),
     ])
 
     const isApiDeployed = apiDeploy[0]?.isDeployed || false
@@ -73,6 +78,9 @@ export async function executeCheckDeploymentStatus(
       endpoint: isApiDeployed ? `/api/workflows/${workflowId}/execute` : null,
       apiKey: workflowRecord.workspaceId ? 'Workspace API keys' : 'Personal API keys',
       needsRedeployment,
+      activeDeployment: deploymentSummary.activeDeployment,
+      latestDeploymentAttempt: deploymentSummary.latestDeploymentAttempt,
+      warnings: deploymentSummary.warnings ?? [],
     }
 
     const isChatDeployed = !!chatDeploy[0]
@@ -539,20 +547,24 @@ export async function executePromoteToLive(
       workflowId,
       version,
       userId: context.userId,
-      workflow: workflowRecord as Record<string, unknown>,
     })
 
     if (!result.success) {
       return { success: false, error: result.error || 'Failed to promote version' }
     }
 
+    const isActive = result.latestDeploymentAttempt?.status === 'active'
     return {
       success: true,
       output: {
         workflowId,
         version,
-        message: `Promoted version ${version} to live`,
+        message: isActive
+          ? `Promoted version ${version} to live`
+          : `Started preparing version ${version} for promotion`,
         deployedAt: result.deployedAt ? new Date(result.deployedAt).toISOString() : undefined,
+        lifecycleStatus: result.latestDeploymentAttempt?.status ?? null,
+        readiness: result.latestDeploymentAttempt?.readiness ?? null,
         warnings: result.warnings,
       },
     }
diff --git a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.test.ts b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.test.ts
index b17b7ca32b4..346ec925d90 100644
--- a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.test.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.test.ts
@@ -2,7 +2,7 @@
  * @vitest-environment node
  */
 import { describe, expect, it, vi } from 'vitest'
-import { createBlockFromParams } from './builders'
+import { createBlockFromParams } from '@/lib/copilot/tools/server/workflow/edit-workflow/builders'
 
 const agentBlockConfig = {
   type: 'agent',
@@ -69,4 +69,15 @@ describe('createBlockFromParams', () => {
     expect(parsed[0].id).toBe('condition-1-if')
     expect(parsed[1].id).toBe('condition-1-else')
   })
+
+  it('uses lowercase titles for default condition branches', () => {
+    const block = createBlockFromParams('condition-1', {
+      type: 'condition',
+      name: 'Condition 1',
+      triggerMode: false,
+    })
+
+    const conditions = JSON.parse(block.subBlocks.conditions.value)
+    expect(conditions.map(({ title }: { title: string }) => title)).toEqual(['if', 'else'])
+  })
 })
diff --git a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts
index f27adb77b4e..e3ca1ced888 100644
--- a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow/builders.ts
@@ -161,8 +161,8 @@ export function createBlockFromParams(
       id: 'conditions',
       type: 'condition-input',
       value: JSON.stringify([
-        { id: generateId(), title: 'If', value: '' },
-        { id: generateId(), title: 'Else', value: '' },
+        { id: generateId(), title: 'if', value: '' },
+        { id: generateId(), title: 'else', value: '' },
       ]),
     }
   } else if (params.type === 'router_v2' && !blockState.subBlocks.routes?.value) {
diff --git a/apps/sim/lib/core/outbox/service.test.ts b/apps/sim/lib/core/outbox/service.test.ts
index 192f6e9deb5..3fd89d21f61 100644
--- a/apps/sim/lib/core/outbox/service.test.ts
+++ b/apps/sim/lib/core/outbox/service.test.ts
@@ -395,6 +395,30 @@ describe('processOutboxEvents — handler timeout', () => {
     expect(timeoutUpdate?.set.attempts).toBe(1)
     expect(timeoutUpdate?.set.lastError).toMatch(/timed out/)
   })
+
+  it('aborts the handler signal when its execution window expires', async () => {
+    let handlerSignal: AbortSignal | undefined
+    const handler = vi.fn(
+      async (
+        _payload: unknown,
+        context: { maxAttempts: number; signal: AbortSignal }
+      ): Promise<void> => {
+        handlerSignal = context.signal
+        expect(context.maxAttempts).toBe(10)
+        await new Promise<void>((resolve) => {
+          context.signal.addEventListener('abort', () => resolve(), { once: true })
+        })
+      }
+    )
+    state.claimedRows = [makePendingRow({ attempts: 0 })]
+
+    const promise = processOutboxEvents({ 'test.event': handler })
+    await vi.advanceTimersByTimeAsync(90 * 1000 + 1)
+    const result = await promise
+
+    expect(handlerSignal?.aborted).toBe(true)
+    expect(result.leaseLost).toBe(1)
+  })
 })
 
 describe('processOutboxEvents — reaper recovery', () => {
diff --git a/apps/sim/lib/core/outbox/service.ts b/apps/sim/lib/core/outbox/service.ts
index 334ef2cbaff..5e628726516 100644
--- a/apps/sim/lib/core/outbox/service.ts
+++ b/apps/sim/lib/core/outbox/service.ts
@@ -37,6 +37,13 @@ export interface OutboxEventContext {
   eventType: string
   /** How many times this event has been attempted (zero on first run). */
   attempts: number
+  /** Maximum attempts before this event is dead-lettered. */
+  maxAttempts: number
+  /**
+   * Aborted when the handler exceeds its lease-bound execution window.
+   * External-operation handlers must stop before performing another side effect.
+   */
+  signal: AbortSignal
   /**
    * Durably shallow-merge fields into this event's JSON payload while the
    * current processing lease is still held. Long-running handlers can
@@ -558,13 +565,18 @@ function runHandlerWithTimeout(
   event: typeof outboxEvent.$inferSelect,
   timeoutMs: number = DEFAULT_HANDLER_TIMEOUT_MS
 ): Promise<void> {
+  const controller = new AbortController()
   const context: OutboxEventContext = {
     eventId: event.id,
     eventType: event.eventType,
     attempts: event.attempts,
+    maxAttempts: event.maxAttempts,
+    signal: controller.signal,
     checkpointPayload: async (patch) => {
+      controller.signal.throwIfAborted()
       const updated = await mergePayloadIfLeaseHeld(event, patch)
       if (!updated) {
+        controller.abort()
         throw new Error(`Outbox lease lost while checkpointing event ${event.id}`)
       }
       event.payload = {
@@ -576,6 +588,7 @@ function runHandlerWithTimeout(
 
   return new Promise((resolve, reject) => {
     const timeout = setTimeout(() => {
+      controller.abort()
       reject(new OutboxHandlerTimeoutError(timeoutMs))
     }, timeoutMs)
 
diff --git a/apps/sim/lib/webhooks/delivery-predicate.test.ts b/apps/sim/lib/webhooks/delivery-predicate.test.ts
new file mode 100644
index 00000000000..44033a21745
--- /dev/null
+++ b/apps/sim/lib/webhooks/delivery-predicate.test.ts
@@ -0,0 +1,55 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockAnd, mockEq, mockIsNull } = vi.hoisted(() => ({
+  mockAnd: vi.fn((...conditions: unknown[]) => ({ kind: 'and', conditions })),
+  mockEq: vi.fn((column: unknown, value: unknown) => ({ kind: 'eq', column, value })),
+  mockIsNull: vi.fn((column: unknown) => ({ kind: 'isNull', column })),
+}))
+
+vi.mock('drizzle-orm', () => ({
+  and: mockAnd,
+  eq: mockEq,
+  isNull: mockIsNull,
+}))
+
+import { deliverableWebhookPredicate } from '@/lib/webhooks/delivery-predicate'
+
+const columns = {
+  isActive: 'webhook.isActive',
+  archivedAt: 'webhook.archivedAt',
+} as unknown as Parameters<typeof deliverableWebhookPredicate>[0]
+
+describe('deliverableWebhookPredicate', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('uses the active, non-archived legacy delivery predicate by default', () => {
+    const predicate = deliverableWebhookPredicate(columns)
+
+    expect(mockEq).toHaveBeenCalledWith('webhook.isActive', true)
+    expect(mockIsNull).toHaveBeenCalledWith('webhook.archivedAt')
+    expect(mockAnd).toHaveBeenCalledWith(
+      { kind: 'eq', column: 'webhook.isActive', value: true },
+      { kind: 'isNull', column: 'webhook.archivedAt' }
+    )
+    expect(predicate).toEqual({
+      kind: 'and',
+      conditions: [
+        { kind: 'eq', column: 'webhook.isActive', value: true },
+        { kind: 'isNull', column: 'webhook.archivedAt' },
+      ],
+    })
+  })
+
+  it('preserves active-only behavior for legacy consumers that included archived rows', () => {
+    const predicate = deliverableWebhookPredicate(columns, 'active_only')
+
+    expect(predicate).toEqual({ kind: 'eq', column: 'webhook.isActive', value: true })
+    expect(mockIsNull).not.toHaveBeenCalled()
+    expect(mockAnd).not.toHaveBeenCalled()
+  })
+})
diff --git a/apps/sim/lib/webhooks/delivery-predicate.ts b/apps/sim/lib/webhooks/delivery-predicate.ts
new file mode 100644
index 00000000000..d652b0c8321
--- /dev/null
+++ b/apps/sim/lib/webhooks/delivery-predicate.ts
@@ -0,0 +1,21 @@
+import type { webhook } from '@sim/db/schema'
+import { and, eq, isNull } from 'drizzle-orm'
+
+type WebhookDeliveryColumns = Pick<typeof webhook, 'archivedAt' | 'isActive'>
+
+export type LegacyWebhookDeliveryPolicy = 'active_unarchived' | 'active_only'
+
+/**
+ * Builds the current webhook-row delivery predicate without assuming future lifecycle columns.
+ *
+ * Most delivery consumers exclude archived rows. The active-only policy exists solely to preserve
+ * legacy consumers that historically scanned archived active rows, such as subscription renewal.
+ */
+export function deliverableWebhookPredicate(
+  columns: WebhookDeliveryColumns,
+  policy: LegacyWebhookDeliveryPolicy = 'active_unarchived'
+) {
+  const activePredicate = eq(columns.isActive, true)
+  if (policy === 'active_only') return activePredicate
+  return and(activePredicate, isNull(columns.archivedAt))
+}
diff --git a/apps/sim/lib/webhooks/deploy.ts b/apps/sim/lib/webhooks/deploy.ts
index 60decead333..c866ee7d9a7 100644
--- a/apps/sim/lib/webhooks/deploy.ts
+++ b/apps/sim/lib/webhooks/deploy.ts
@@ -1,17 +1,24 @@
 import { db } from '@sim/db'
 import { account, credential, webhook, workflowDeploymentVersion } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
+import { getErrorMessage } from '@sim/utils/errors'
 import { generateShortId } from '@sim/utils/id'
 import { and, eq, inArray, isNull, or } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
+import { WebhookPathClaimConflictError } from '@/lib/webhooks/path-claims'
 import { PendingWebhookVerificationTracker } from '@/lib/webhooks/pending-verification'
 import {
   cleanupExternalWebhook,
   createExternalWebhookSubscription,
   hasWebhookConfigChanged,
+  projectDesiredWebhookProviderConfig,
 } from '@/lib/webhooks/provider-subscriptions'
 import { getProviderHandler } from '@/lib/webhooks/providers'
 import { fetchSlackTeamId } from '@/lib/webhooks/providers/slack'
+import {
+  prepareStableWebhookRegistrations,
+  type StableDesiredWebhookRegistration,
+} from '@/lib/webhooks/registration-service'
 import { findConflictingWebhookPathOwner } from '@/lib/webhooks/utils.server'
 import {
   buildCanonicalIndex,
@@ -50,6 +57,17 @@ interface BuiltProviderConfig {
   triggerPath: string
 }
 
+interface ResolvedWebhookConfig {
+  provider: string
+  providerConfig: Record<string, unknown>
+  triggerPath: string | null
+  routingKey: string | null
+}
+
+type ResolveWebhookConfigResult =
+  | { success: true; config: ResolvedWebhookConfig }
+  | { success: false; error: TriggerSaveError }
+
 export async function validateTriggerWebhookConfigForDeploy(
   blocks: Record<string, BlockState>
 ): Promise<TriggerSaveResult> {
@@ -339,6 +357,189 @@ async function resolveTriggerCredentialId(
   return resolvedCredential?.id ?? null
 }
 
+async function resolveWebhookConfigForBlock(input: {
+  block: BlockState
+  workflow: Record<string, unknown>
+  userId: string
+  requestId: string
+}): Promise<ResolveWebhookConfigResult | null> {
+  const triggerId = resolveTriggerId(input.block)
+  if (!triggerId || !isTriggerValid(triggerId)) return null
+
+  const triggerDef = getTrigger(triggerId)
+  const { providerConfig, missingFields, credentialReference, credentialServiceId, triggerPath } =
+    buildProviderConfig(input.block, triggerId, triggerDef)
+
+  if (missingFields.length > 0) {
+    return {
+      success: false,
+      error: {
+        message: `Missing required fields for ${triggerDef.name || triggerId}: ${missingFields.join(', ')}`,
+        status: 400,
+      },
+    }
+  }
+
+  if (providerConfig.requireAuth && !providerConfig.token) {
+    return {
+      success: false,
+      error: {
+        message:
+          'Authentication is enabled but no token is configured. Please set an authentication token or disable authentication.',
+        status: 400,
+      },
+    }
+  }
+
+  let credentialId: string | undefined
+  if (credentialReference && credentialServiceId) {
+    const workflowWorkspaceId =
+      typeof input.workflow.workspaceId === 'string' ? input.workflow.workspaceId : undefined
+    if (!workflowWorkspaceId) {
+      return {
+        success: false,
+        error: {
+          message: `Cannot validate credentials for ${triggerDef.name || triggerId} without a workflow workspace`,
+          status: 400,
+        },
+      }
+    }
+
+    credentialId =
+      (await resolveTriggerCredentialId(
+        credentialReference,
+        workflowWorkspaceId,
+        credentialServiceId
+      )) ?? undefined
+    if (!credentialId) {
+      return {
+        success: false,
+        error: {
+          message: `The selected ${credentialServiceId} credential is not available in this workspace`,
+          status: 400,
+        },
+      }
+    }
+    providerConfig.credentialId = credentialId
+  }
+
+  let effectiveProvider = triggerDef.provider
+  let effectivePath: string | null = triggerPath
+  let routingKey: string | null = null
+  if (triggerId === 'slack_oauth') {
+    const appType = typeof providerConfig.appType === 'string' ? providerConfig.appType : 'custom'
+    if (appType === 'sim') {
+      const eventType =
+        typeof providerConfig.eventType === 'string' ? providerConfig.eventType : null
+      if (eventType && !SIM_SUBSCRIBED_EVENTS.includes(eventType)) {
+        return {
+          success: false,
+          error: {
+            message:
+              'This event is not available on the Sim Slack app. Use a custom app or choose a supported event.',
+            status: 400,
+          },
+        }
+      }
+      if (!credentialId) {
+        return {
+          success: false,
+          error: { message: 'Select a Slack account for the trigger.', status: 400 },
+        }
+      }
+
+      let tokenOwnerUserId = input.userId
+      const resolvedAccount = await resolveOAuthAccountId(credentialId)
+      if (resolvedAccount?.accountId) {
+        const [owner] = await db
+          .select({ userId: account.userId })
+          .from(account)
+          .where(eq(account.id, resolvedAccount.accountId))
+          .limit(1)
+        if (owner?.userId) tokenOwnerUserId = owner.userId
+      }
+      const botToken = await refreshAccessTokenIfNeeded(
+        credentialId,
+        tokenOwnerUserId,
+        input.requestId
+      )
+      if (!botToken) {
+        return {
+          success: false,
+          error: {
+            message: 'Could not access the connected Slack account. Reconnect it and try again.',
+            status: 400,
+          },
+        }
+      }
+      try {
+        const { teamId, userId: botUserId } = await fetchSlackTeamId(botToken)
+        routingKey = teamId
+        if (botUserId) providerConfig.bot_user_id = botUserId
+      } catch (error: unknown) {
+        logger.error(
+          `[${input.requestId}] Slack team_id resolution failed for ${input.block.id}`,
+          error
+        )
+        return {
+          success: false,
+          error: {
+            message: 'Could not verify the connected Slack workspace. Reconnect it and try again.',
+            status: 400,
+          },
+        }
+      }
+      effectiveProvider = 'slack_app'
+      effectivePath = null
+    } else {
+      const botCredentialId =
+        typeof providerConfig.botCredential === 'string' ? providerConfig.botCredential : undefined
+      if (!botCredentialId) {
+        return {
+          success: false,
+          error: { message: 'Select a Slack bot credential for the trigger.', status: 400 },
+        }
+      }
+      const botCredential = await getSlackBotCredential(botCredentialId)
+      if (!botCredential) {
+        return {
+          success: false,
+          error: {
+            message: 'The selected Slack bot credential is missing or invalid. Reconnect it.',
+            status: 400,
+          },
+        }
+      }
+      const workflowWorkspace =
+        typeof input.workflow.workspaceId === 'string' ? input.workflow.workspaceId : undefined
+      if (!workflowWorkspace || botCredential.workspaceId !== workflowWorkspace) {
+        return {
+          success: false,
+          error: {
+            message: 'The selected Slack bot credential is not available in this workspace.',
+            status: 400,
+          },
+        }
+      }
+      effectiveProvider = 'slack'
+      effectivePath = null
+      routingKey = botCredentialId
+      providerConfig.credentialId = botCredentialId
+      if (botCredential.botUserId) providerConfig.bot_user_id = botCredential.botUserId
+    }
+  }
+
+  return {
+    success: true,
+    config: {
+      provider: effectiveProvider,
+      providerConfig,
+      triggerPath: effectivePath,
+      routingKey,
+    },
+  }
+}
+
 async function configurePollingIfNeeded(
   provider: string,
   savedWebhook: Record<string, unknown>,
@@ -361,6 +562,95 @@ async function configurePollingIfNeeded(
   return null
 }
 
+export interface PrepareStableTriggerWebhooksInput {
+  request: NextRequest
+  workflowId: string
+  workflow: Record<string, unknown>
+  userId: string
+  blocks: Record<string, BlockState>
+  requestId: string
+  deploymentVersionId: string
+  operationId: string
+  generation: number
+  signal?: AbortSignal
+}
+
+/**
+ * Prepares stable webhook registrations for the v2 deployment operation protocol.
+ *
+ * The legacy save path remains available below and retains its existing execution behavior.
+ */
+export async function prepareStableTriggerWebhooksForDeploy({
+  request,
+  workflowId,
+  workflow,
+  userId,
+  blocks,
+  requestId,
+  deploymentVersionId,
+  operationId,
+  generation,
+  signal,
+}: PrepareStableTriggerWebhooksInput): Promise<TriggerSaveResult> {
+  const validationResult = await validateTriggerWebhookConfigForDeploy(blocks)
+  if (!validationResult.success) return validationResult
+
+  const desired: StableDesiredWebhookRegistration[] = []
+  const triggerBlocks = Object.values(blocks || {}).filter(
+    (block) => block && block.enabled !== false
+  )
+  for (const block of triggerBlocks) {
+    signal?.throwIfAborted()
+    const resolved = await resolveWebhookConfigForBlock({
+      block,
+      workflow,
+      userId,
+      requestId,
+    })
+    if (!resolved) continue
+    if (!resolved.success) return resolved
+
+    desired.push({
+      blockId: block.id,
+      provider: resolved.config.provider,
+      path: resolved.config.triggerPath,
+      routingKey: resolved.config.routingKey,
+      providerConfig: resolved.config.providerConfig,
+      desiredConfig: projectDesiredWebhookProviderConfig(resolved.config.providerConfig),
+    })
+  }
+
+  try {
+    await prepareStableWebhookRegistrations({
+      request,
+      fence: { workflowId, deploymentVersionId, operationId, generation },
+      workflow,
+      userId,
+      requestId,
+      desired,
+      signal,
+    })
+    return { success: true }
+  } catch (error) {
+    if (error instanceof WebhookPathClaimConflictError) {
+      return {
+        success: false,
+        error: {
+          message: `Webhook path "${error.path}" is already in use. Choose a different path.`,
+          status: 409,
+        },
+      }
+    }
+    return {
+      success: false,
+      error: {
+        message: getErrorMessage(error, 'Failed to prepare webhook registrations'),
+        status: 500,
+      },
+    }
+  }
+}
+
 /**
  * Saves trigger webhook configurations as part of workflow deployment.
  * Uses delete + create approach for changed/deleted webhooks.
@@ -411,227 +701,42 @@ export async function saveTriggerWebhooksForDeploy({
     existingWebhookBlockIds: Array.from(webhooksByBlockId.keys()),
   })
 
-  type WebhookConfig = {
-    provider: string
-    providerConfig: Record<string, unknown>
-    triggerPath: string | null
-    routingKey: string | null
-    triggerDef: ReturnType<typeof getTrigger>
-  }
-  const webhookConfigs = new Map<string, WebhookConfig>()
+  const webhookConfigs = new Map<string, ResolvedWebhookConfig>()
 
   const webhooksToDelete: typeof existingWebhooks = []
   const blocksNeedingWebhook: BlockState[] = []
 
   for (const block of triggerBlocks) {
-    const triggerId = resolveTriggerId(block)
-    if (!triggerId || !isTriggerValid(triggerId)) continue
-
-    const triggerDef = getTrigger(triggerId)
-    const provider = triggerDef.provider
-    const { providerConfig, missingFields, credentialReference, credentialServiceId, triggerPath } =
-      buildProviderConfig(block, triggerId, triggerDef)
-
-    if (missingFields.length > 0) {
-      return {
-        success: false,
-        error: {
-          message: `Missing required fields for ${triggerDef.name || triggerId}: ${missingFields.join(', ')}`,
-          status: 400,
-        },
-      }
-    }
-
-    if (providerConfig.requireAuth && !providerConfig.token) {
-      return {
-        success: false,
-        error: {
-          message:
-            'Authentication is enabled but no token is configured. Please set an authentication token or disable authentication.',
-          status: 400,
-        },
-      }
-    }
-
-    let credentialId: string | undefined
-    if (credentialReference && credentialServiceId) {
-      const workflowWorkspaceId =
-        typeof workflow.workspaceId === 'string' ? workflow.workspaceId : undefined
-      if (!workflowWorkspaceId) {
-        return {
-          success: false,
-          error: {
-            message: `Cannot validate credentials for ${triggerDef.name || triggerId} without a workflow workspace`,
-            status: 400,
-          },
-        }
-      }
-
-      credentialId =
-        (await resolveTriggerCredentialId(
-          credentialReference,
-          workflowWorkspaceId,
-          credentialServiceId
-        )) ?? undefined
-      if (!credentialId) {
-        return {
-          success: false,
-          error: {
-            message: `The selected ${credentialServiceId} credential is not available in this workspace`,
-            status: 400,
-          },
-        }
-      }
-      providerConfig.credentialId = credentialId
-    }
-
-    /**
-     * The unified Slack trigger (`slack_oauth`) resolves to one of two backends
-     * by App Type: `sim` routes inbound events on the official Sim app by Slack
-     * `team_id` (routingKey, no path); `custom` routes by the reusable bot
-     * credential id. The team_id is derived here from the connected account via
-     * `auth.test` — never from user input.
-     */
-    let effectiveProvider = provider
-    let effectivePath: string | null = triggerPath
-    let routingKey: string | null = null
-    if (triggerId === 'slack_oauth') {
-      // Absent appType means custom: it's the only mode this ship exposes (the
-      // hidden selector seeds/persists 'custom'), and defaulting to sim would
-      // send credential-less configs down the OAuth/team-id branch.
-      const appType = typeof providerConfig.appType === 'string' ? providerConfig.appType : 'custom'
-      if (appType === 'sim') {
-        const eventType =
-          typeof providerConfig.eventType === 'string' ? providerConfig.eventType : null
-        if (eventType && !SIM_SUBSCRIBED_EVENTS.includes(eventType)) {
-          return {
-            success: false,
-            error: {
-              message:
-                'This event is not available on the Sim Slack app. Use a custom app or choose a supported event.',
-              status: 400,
-            },
-          }
-        }
-        if (!credentialId) {
-          return {
-            success: false,
-            error: { message: 'Select a Slack account for the trigger.', status: 400 },
-          }
-        }
-        // Resolve the credential OWNER's token (not the deploying actor's) —
-        // in a shared workspace a teammate can deploy a trigger wired to
-        // someone else's Slack credential. Mirrors the runtime formatInput path.
-        let tokenOwnerUserId = userId
-        const resolvedAccount = await resolveOAuthAccountId(credentialId)
-        if (resolvedAccount?.accountId) {
-          const [owner] = await db
-            .select({ userId: account.userId })
-            .from(account)
-            .where(eq(account.id, resolvedAccount.accountId))
-            .limit(1)
-          if (owner?.userId) tokenOwnerUserId = owner.userId
-        }
-        const botToken = await refreshAccessTokenIfNeeded(credentialId, tokenOwnerUserId, requestId)
-        if (!botToken) {
-          return {
-            success: false,
-            error: {
-              message: 'Could not access the connected Slack account. Reconnect it and try again.',
-              status: 400,
-            },
-          }
-        }
-        try {
-          const { teamId, userId: botUserId } = await fetchSlackTeamId(botToken)
-          routingKey = teamId
-          if (botUserId) providerConfig.bot_user_id = botUserId
-        } catch (error: unknown) {
-          logger.error(`[${requestId}] Slack team_id resolution failed for ${block.id}`, error)
-          return {
-            success: false,
-            error: {
-              message:
-                'Could not verify the connected Slack workspace. Reconnect it and try again.',
-              status: 400,
-            },
-          }
-        }
-        effectiveProvider = 'slack_app'
-        effectivePath = null
-      } else {
-        // Custom: a reusable bring-your-own bot credential. Route by the
-        // credential id (one shared ingest URL per bot) instead of a per-workflow
-        // path, so multiple triggers on the same bot share one Request URL.
-        const botCredentialId =
-          typeof providerConfig.botCredential === 'string'
-            ? providerConfig.botCredential
-            : undefined
-        if (!botCredentialId) {
-          return {
-            success: false,
-            error: { message: 'Select a Slack bot credential for the trigger.', status: 400 },
-          }
-        }
-        const botCredential = await getSlackBotCredential(botCredentialId)
-        if (!botCredential) {
-          return {
-            success: false,
-            error: {
-              message: 'The selected Slack bot credential is missing or invalid. Reconnect it.',
-              status: 400,
-            },
-          }
-        }
-        // The credential must belong to the workflow's workspace: bot credential
-        // ids are semi-public (they're embedded in Slack Request URLs), so a
-        // pasted foreign id must never bind another tenant's bot to this
-        // workflow.
-        const workflowWorkspace =
-          typeof workflow.workspaceId === 'string' ? workflow.workspaceId : undefined
-        if (!workflowWorkspace || botCredential.workspaceId !== workflowWorkspace) {
-          return {
-            success: false,
-            error: {
-              message: 'The selected Slack bot credential is not available in this workspace.',
-              status: 400,
-            },
-          }
-        }
-        effectiveProvider = 'slack'
-        effectivePath = null
-        routingKey = botCredentialId
-        providerConfig.credentialId = botCredentialId
-        if (botCredential.botUserId) providerConfig.bot_user_id = botCredential.botUserId
-      }
-    }
+    const resolved = await resolveWebhookConfigForBlock({
+      block,
+      workflow,
+      userId,
+      requestId,
+    })
+    if (!resolved) continue
+    if (!resolved.success) return resolved
+    const { provider, providerConfig, triggerPath, routingKey } = resolved.config
 
-    if (effectivePath) {
+    if (triggerPath) {
       const pathConflict = await findConflictingWebhookPathOwner({
-        path: effectivePath,
+        path: triggerPath,
         workflowId,
       })
       if (pathConflict) {
         logger.warn(
-          `[${requestId}] Webhook path conflict for "${effectivePath}": already owned by workflow ${pathConflict}`
+          `[${requestId}] Webhook path conflict for "${triggerPath}": already owned by workflow ${pathConflict}`
         )
         return {
           success: false,
           error: {
-            message: `Webhook path "${effectivePath}" is already in use. Choose a different path.`,
+            message: `Webhook path "${triggerPath}" is already in use. Choose a different path.`,
             status: 409,
           },
         }
       }
     }
 
-    webhookConfigs.set(block.id, {
-      provider: effectiveProvider,
-      providerConfig,
-      triggerPath: effectivePath,
-      routingKey,
-      triggerDef,
-    })
+    webhookConfigs.set(block.id, resolved.config)
 
     const existingForBlock = webhooksByBlockId.get(block.id) ?? []
     if (existingForBlock.length === 0) {
@@ -650,11 +755,11 @@ export async function saveTriggerWebhooksForDeploy({
       const existingConfig = (existingWh.providerConfig as Record<string, unknown>) || {}
       const needsRecreation =
         forceRecreateSubscriptions ||
-        existingWh.provider !== effectiveProvider ||
+        existingWh.provider !== provider ||
         // Routing transitions (path-based <-> routing-key, or a changed key)
         // must recreate the row even when the provider config compares equal —
         // otherwise a stale delivery surface stays active on the old route.
-        (existingWh.path ?? null) !== effectivePath ||
+        (existingWh.path ?? null) !== triggerPath ||
         ((existingWh.routingKey as string | null) ?? null) !== routingKey ||
         hasWebhookConfigChanged(existingConfig, providerConfig)
 
diff --git a/apps/sim/lib/webhooks/path-claims.test.ts b/apps/sim/lib/webhooks/path-claims.test.ts
new file mode 100644
index 00000000000..3ab2a0b1691
--- /dev/null
+++ b/apps/sim/lib/webhooks/path-claims.test.ts
@@ -0,0 +1,109 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it, vi } from 'vitest'
+
+type Condition =
+  | { kind: 'and'; conditions: Condition[] }
+  | { kind: 'eq'; column: string; value: unknown }
+  | { kind: 'lte'; column: string; value: unknown }
+
+vi.mock('drizzle-orm', () => ({
+  and: (...conditions: Condition[]) => ({ kind: 'and', conditions }),
+  eq: (column: string, value: unknown) => ({ kind: 'eq', column, value }),
+  lte: (column: string, value: unknown) => ({ kind: 'lte', column, value }),
+}))
+
+import type { DbOrTx } from '@sim/workflow-persistence/types'
+import {
+  claimWebhookPath,
+  StaleWebhookPathClaimGenerationError,
+  WebhookPathClaimConflictError,
+} from '@/lib/webhooks/path-claims'
+
+interface ClaimRow {
+  path: string
+  workflowId: string
+  generation: number
+}
+
+function conditionValue(condition: Condition, column: string): unknown {
+  if (condition.kind === 'eq' && condition.column === column) return condition.value
+  if (condition.kind !== 'and') return undefined
+  for (const nested of condition.conditions) {
+    const value = conditionValue(nested, column)
+    if (value !== undefined) return value
+  }
+  return undefined
+}
+
+function createClaimTx(claims: Map<string, ClaimRow>): DbOrTx {
+  return {
+    insert: () => ({
+      values: (values: ClaimRow) => ({
+        onConflictDoUpdate: () => ({
+          returning: async () => {
+            const current = claims.get(values.path)
+            if (
+              current &&
+              (current.workflowId !== values.workflowId || current.generation > values.generation)
+            ) {
+              return []
+            }
+            const claimed = { ...values }
+            claims.set(values.path, claimed)
+            return [claimed]
+          },
+        }),
+      }),
+    }),
+    select: () => ({
+      from: () => ({
+        where: (condition: Condition) => ({
+          limit: async () => {
+            const path = conditionValue(condition, 'path') as string
+            const current = claims.get(path)
+            return current ? [current] : []
+          },
+        }),
+      }),
+    }),
+  } as unknown as DbOrTx
+}
+
+describe('webhook path claims', () => {
+  it('atomically gives a normalized path to one workflow under concurrent claims', async () => {
+    const claims = new Map<string, ClaimRow>()
+    const results = await Promise.allSettled([
+      claimWebhookPath(createClaimTx(claims), {
+        path: ' /shared/path/ ',
+        workflowId: 'workflow-a',
+        generation: 1,
+      }),
+      claimWebhookPath(createClaimTx(claims), {
+        path: 'shared/path',
+        workflowId: 'workflow-b',
+        generation: 1,
+      }),
+    ])
+
+    expect(results.filter((result) => result.status === 'fulfilled')).toHaveLength(1)
+    const rejection = results.find((result) => result.status === 'rejected')
+    expect(rejection).toBeDefined()
+    if (rejection?.status !== 'rejected') throw new Error('Expected one rejected claim')
+    expect(rejection.reason).toBeInstanceOf(WebhookPathClaimConflictError)
+    expect(claims.get('shared/path')?.workflowId).toMatch(/^workflow-[ab]$/)
+  })
+
+  it('allows the same workflow to advance but rejects a stale generation', async () => {
+    const claims = new Map<string, ClaimRow>()
+    const tx = createClaimTx(claims)
+    await claimWebhookPath(tx, { path: 'events', workflowId: 'workflow-a', generation: 3 })
+    await claimWebhookPath(tx, { path: '/events/', workflowId: 'workflow-a', generation: 4 })
+
+    await expect(
+      claimWebhookPath(tx, { path: 'events', workflowId: 'workflow-a', generation: 3 })
+    ).rejects.toBeInstanceOf(StaleWebhookPathClaimGenerationError)
+    expect(claims.get('events')?.generation).toBe(4)
+  })
+})
diff --git a/apps/sim/lib/webhooks/path-claims.ts b/apps/sim/lib/webhooks/path-claims.ts
new file mode 100644
index 00000000000..e88fd1b35de
--- /dev/null
+++ b/apps/sim/lib/webhooks/path-claims.ts
@@ -0,0 +1,117 @@
+import { webhookPathClaim } from '@sim/db/schema'
+import type { DbOrTx } from '@sim/workflow-persistence/types'
+import { and, eq, lte } from 'drizzle-orm'
+import { normalizeWebhookRegistrationPath } from '@/lib/webhooks/registration-identity'
+
+export class WebhookPathClaimConflictError extends Error {
+  readonly code = 'webhook_path_conflict'
+
+  constructor(
+    readonly path: string,
+    readonly ownerWorkflowId: string
+  ) {
+    super(`Webhook path "${path}" is already owned by workflow ${ownerWorkflowId}`)
+    this.name = 'WebhookPathClaimConflictError'
+  }
+}
+
+export class StaleWebhookPathClaimGenerationError extends Error {
+  readonly code = 'stale_webhook_path_claim_generation'
+
+  constructor(
+    readonly path: string,
+    readonly attemptedGeneration: number,
+    readonly currentGeneration: number
+  ) {
+    super(
+      `Webhook path "${path}" is already fenced at generation ${currentGeneration}; generation ${attemptedGeneration} is stale`
+    )
+    this.name = 'StaleWebhookPathClaimGenerationError'
+  }
+}
+
+function normalizeClaimPath(path: string): string {
+  const normalizedPath = normalizeWebhookRegistrationPath(path)
+  if (!normalizedPath) {
+    throw new TypeError('Webhook path claim cannot be empty')
+  }
+  return normalizedPath
+}
+
+function assertClaimGeneration(generation: number): void {
+  if (!Number.isSafeInteger(generation) || generation < 0) {
+    throw new TypeError('Webhook path claim generation must be a non-negative safe integer')
+  }
+}
+
+/**
+ * Releases every path claim held by a workflow.
+ *
+ * Claims stay sticky through generation rotations, but once a workflow is
+ * explicitly undeployed or archived it no longer serves traffic, so other
+ * workflows must be able to adopt its paths. Runs inside the caller's
+ * undeploy/archive transaction.
+ */
+export async function releaseWebhookPathClaims(tx: DbOrTx, workflowId: string): Promise<void> {
+  await tx.delete(webhookPathClaim).where(eq(webhookPathClaim.workflowId, workflowId))
+}
+
+/**
+ * Atomically acquires or advances ownership of a normalized webhook path.
+ *
+ * Ownership never transfers between workflows. The conflict update is generation-CAS guarded,
+ * so the primary-key write is the ownership decision rather than a preceding availability check.
+ */
+export async function claimWebhookPath(
+  tx: DbOrTx,
+  input: { path: string; workflowId: string; generation: number }
+): Promise<string> {
+  const path = normalizeClaimPath(input.path)
+  assertClaimGeneration(input.generation)
+  const now = new Date()
+
+  const [claimed] = await tx
+    .insert(webhookPathClaim)
+    .values({
+      path,
+      workflowId: input.workflowId,
+      generation: input.generation,
+      createdAt: now,
+      updatedAt: now,
+    })
+    .onConflictDoUpdate({
+      target: webhookPathClaim.path,
+      set: {
+        generation: input.generation,
+        updatedAt: now,
+      },
+      setWhere: and(
+        eq(webhookPathClaim.workflowId, input.workflowId),
+        lte(webhookPathClaim.generation, input.generation)
+      ),
+    })
+    .returning({
+      path: webhookPathClaim.path,
+      workflowId: webhookPathClaim.workflowId,
+      generation: webhookPathClaim.generation,
+    })
+
+  if (claimed) return claimed.path
+
+  const [current] = await tx
+    .select({
+      workflowId: webhookPathClaim.workflowId,
+      generation: webhookPathClaim.generation,
+    })
+    .from(webhookPathClaim)
+    .where(eq(webhookPathClaim.path, path))
+    .limit(1)
+
+  if (!current) {
+    throw new Error(`Webhook path "${path}" could not be claimed`)
+  }
+  if (current.workflowId !== input.workflowId) {
+    throw new WebhookPathClaimConflictError(path, current.workflowId)
+  }
+  throw new StaleWebhookPathClaimGenerationError(path, input.generation, current.generation)
+}
diff --git a/apps/sim/lib/webhooks/polling/utils.ts b/apps/sim/lib/webhooks/polling/utils.ts
index 91f65015b69..a8daf2d9d27 100644
--- a/apps/sim/lib/webhooks/polling/utils.ts
+++ b/apps/sim/lib/webhooks/polling/utils.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import { account, webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
 import type { Logger } from '@sim/logger'
 import { and, eq, isNull, ne, or, sql } from 'drizzle-orm'
+import { deliverableWebhookPredicate } from '@/lib/webhooks/delivery-predicate'
 import type { WebhookRecord, WorkflowRecord } from '@/lib/webhooks/polling/types'
 import {
   getOAuthToken,
@@ -80,8 +81,7 @@ export async function fetchActiveWebhooks(
     .where(
       and(
         eq(webhook.provider, provider),
-        eq(webhook.isActive, true),
-        isNull(webhook.archivedAt),
+        deliverableWebhookPredicate(webhook),
         eq(workflow.isDeployed, true),
         isNull(workflow.archivedAt),
         or(
diff --git a/apps/sim/lib/webhooks/processor.test.ts b/apps/sim/lib/webhooks/processor.test.ts
index a2702d4aa20..92f0e9c6927 100644
--- a/apps/sim/lib/webhooks/processor.test.ts
+++ b/apps/sim/lib/webhooks/processor.test.ts
@@ -42,7 +42,10 @@ const {
   mockReleaseExecutionSlot: vi.fn(),
   mockProviderHandler: { current: {} as Record<string, unknown> },
   mockShouldExecuteInline: vi.fn(),
-  mockWebhookLookupResult: { rows: [] as WebhookLookupRow[] },
+  mockWebhookLookupResult: {
+    rows: [] as WebhookLookupRow[],
+    claim: [] as Array<{ workflowId: string }>,
+  },
 }))
 
 const mockPreprocessExecution = executionPreprocessingMockFns.mockPreprocessExecution
@@ -52,11 +55,15 @@ vi.mock('@sim/db', () => {
     from: () => selectChain,
     innerJoin: () => selectChain,
     leftJoin: () => selectChain,
-    where: () => Promise.resolve(mockWebhookLookupResult.rows),
+    where: () => ({
+      then: (resolve: (rows: WebhookLookupRow[]) => void) => resolve(mockWebhookLookupResult.rows),
+      limit: () => Promise.resolve(mockWebhookLookupResult.claim),
+    }),
   }
   return {
     db: { select: () => selectChain },
     webhook: {},
+    webhookPathClaim: {},
     workflow: {},
     workflowDeploymentVersion: {},
   }
@@ -222,6 +229,7 @@ describe('findAllWebhooksForPath cross-tenant collision', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     mockWebhookLookupResult.rows = []
+    mockWebhookLookupResult.claim = []
   })
 
   const makeRow = (workflowId: string, webhookId: string, createdAt: Date) => ({
@@ -253,6 +261,30 @@ describe('findAllWebhooksForPath cross-tenant collision', () => {
     expect(results[0].webhook.workflowId).toBe('victim-workflow')
   })
 
+  it('prefers the path-claim owner over an earlier-created interloper', async () => {
+    const interloper = makeRow('interloper-workflow', 'interloper-wh', new Date('2026-01-01'))
+    const claimHolder = makeRow('claim-workflow', 'claim-wh', new Date('2026-05-01'))
+    mockWebhookLookupResult.rows = [interloper, claimHolder]
+    mockWebhookLookupResult.claim = [{ workflowId: 'claim-workflow' }]
+
+    const results = await findAllWebhooksForPath({ requestId: 'req-6', path: 'shared-path' })
+
+    expect(results).toHaveLength(1)
+    expect(results[0].webhook.workflowId).toBe('claim-workflow')
+  })
+
+  it('falls back to earliest registration when the claim owner has no deliverable rows', async () => {
+    const victim = makeRow('victim-workflow', 'victim-wh', new Date('2026-01-01'))
+    const attacker = makeRow('attacker-workflow', 'attacker-wh', new Date('2026-05-01'))
+    mockWebhookLookupResult.rows = [attacker, victim]
+    mockWebhookLookupResult.claim = [{ workflowId: 'absent-workflow' }]
+
+    const results = await findAllWebhooksForPath({ requestId: 'req-7', path: 'shared-path' })
+
+    expect(results).toHaveLength(1)
+    expect(results[0].webhook.workflowId).toBe('victim-workflow')
+  })
+
   it("preserves the owner's full multi-webhook match while dropping a foreign row", async () => {
     const victimA = makeRow('victim-workflow', 'victim-wh-a', new Date('2026-01-01'))
     const victimB = makeRow('victim-workflow', 'victim-wh-b', new Date('2026-01-03'))
@@ -436,6 +468,7 @@ describe('webhook processor execution identity', () => {
       makeWebhookRecord({
         path: 'incoming/gmail',
         provider: 'gmail',
+        deploymentVersionId: 'deployment-admitted',
       }),
       makeWorkflowRecord({}),
       { event: 'message.received' },
@@ -453,6 +486,7 @@ describe('webhook processor execution identity', () => {
       expect.objectContaining({
         workflowId: 'workflow-1',
         provider: 'gmail',
+        deploymentVersionId: 'deployment-admitted',
       }),
       expect.objectContaining({
         metadata: expect.objectContaining({
diff --git a/apps/sim/lib/webhooks/processor.ts b/apps/sim/lib/webhooks/processor.ts
index d9fb2c82aa9..dff289f8aaa 100644
--- a/apps/sim/lib/webhooks/processor.ts
+++ b/apps/sim/lib/webhooks/processor.ts
@@ -1,4 +1,4 @@
-import { db, webhook, workflow, workflowDeploymentVersion } from '@sim/db'
+import { db, webhook, webhookPathClaim, workflow, workflowDeploymentVersion } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
@@ -23,6 +23,7 @@ import {
 import { getEffectiveDecryptedEnv } from '@/lib/environment/utils'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { WEBHOOK_MAX_BODY_BYTES } from '@/lib/webhooks/constants'
+import { deliverableWebhookPredicate } from '@/lib/webhooks/delivery-predicate'
 import {
   getPendingWebhookVerification,
   matchesPendingWebhookVerificationProbe,
@@ -30,6 +31,7 @@ import {
 } from '@/lib/webhooks/pending-verification'
 import { getProviderHandler } from '@/lib/webhooks/providers'
 import type { WebhookProviderHandler } from '@/lib/webhooks/providers/types'
+import { normalizeWebhookRegistrationPath } from '@/lib/webhooks/registration-identity'
 import { blockExistsInDeployment } from '@/lib/workflows/persistence/utils'
 import { SIM_TRIGGER_PROVIDER } from '@/lib/workspace-events/constants'
 import { executeWebhookJob, type WebhookExecutionPayload } from '@/background/webhook-execution'
@@ -316,8 +318,7 @@ async function findWebhookAndWorkflow(
       .where(
         and(
           eq(webhook.id, options.webhookId),
-          eq(webhook.isActive, true),
-          isNull(webhook.archivedAt),
+          deliverableWebhookPredicate(webhook),
           isNull(workflow.archivedAt),
           or(
             eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
@@ -353,8 +354,7 @@ async function findWebhookAndWorkflow(
       .where(
         and(
           eq(webhook.path, options.path),
-          eq(webhook.isActive, true),
-          isNull(webhook.archivedAt),
+          deliverableWebhookPredicate(webhook),
           isNull(workflow.archivedAt),
           or(
             eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
@@ -380,8 +380,9 @@ async function findWebhookAndWorkflow(
  *
  * Legitimate multi-webhook matches are always within one workflow, but paths
  * are user-controlled and only unique per deployment version, so two tenants can
- * register the same path. On collision we keep only the workflow that registered
- * the path first, so one tenant can never receive another's webhook deliveries.
+ * register the same path. On collision the `webhook_path_claim` owner wins;
+ * without a claim we keep the workflow that registered the path first, so one
+ * tenant can never receive another's webhook deliveries.
  */
 export async function findAllWebhooksForPath(
   options: WebhookProcessorOptions
@@ -407,8 +408,7 @@ export async function findAllWebhooksForPath(
     .where(
       and(
         eq(webhook.path, options.path),
-        eq(webhook.isActive, true),
-        isNull(webhook.archivedAt),
+        deliverableWebhookPredicate(webhook),
         isNull(workflow.archivedAt),
         or(
           eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
@@ -425,19 +425,23 @@ export async function findAllWebhooksForPath(
   const distinctWorkflowIds = new Set(results.map((result) => result.webhook.workflowId))
 
   if (distinctWorkflowIds.size > 1) {
-    const owner = results.reduce((earliest, candidate) => {
-      const candidateTime = new Date(candidate.webhook.createdAt).getTime()
-      const earliestTime = new Date(earliest.webhook.createdAt).getTime()
-      if (candidateTime !== earliestTime) {
-        return candidateTime < earliestTime ? candidate : earliest
-      }
-      return candidate.webhook.id < earliest.webhook.id ? candidate : earliest
-    })
+    const claimOwnerWorkflowId = await findWebhookPathClaimOwner(options.path)
+    const owner =
+      (claimOwnerWorkflowId &&
+        results.find((result) => result.webhook.workflowId === claimOwnerWorkflowId)) ||
+      results.reduce((earliest, candidate) => {
+        const candidateTime = new Date(candidate.webhook.createdAt).getTime()
+        const earliestTime = new Date(earliest.webhook.createdAt).getTime()
+        if (candidateTime !== earliestTime) {
+          return candidateTime < earliestTime ? candidate : earliest
+        }
+        return candidate.webhook.id < earliest.webhook.id ? candidate : earliest
+      })
     const ownerWorkflowId = owner.webhook.workflowId
     const ownerResults = results.filter((result) => result.webhook.workflowId === ownerWorkflowId)
 
     logger.error(
-      `[${options.requestId}] Cross-tenant webhook path collision for path: ${options.path}. Found ${results.length} active webhooks across ${distinctWorkflowIds.size} workflows. Dispatching only to owner workflow ${ownerWorkflowId} and dropping ${results.length - ownerResults.length} foreign webhook(s).`
+      `[${options.requestId}] Cross-tenant webhook path collision for path: ${options.path}. Found ${results.length} active webhooks across ${distinctWorkflowIds.size} workflows. Dispatching only to owner workflow ${ownerWorkflowId} (${claimOwnerWorkflowId === ownerWorkflowId ? 'path-claim owner' : 'earliest registration'}) and dropping ${results.length - ownerResults.length} foreign webhook(s).`
     )
 
     return ownerResults
@@ -450,6 +454,22 @@ export async function findAllWebhooksForPath(
   return results
 }
 
+/**
+ * Resolves the sticky `webhook_path_claim` owner for a delivery path, so
+ * collision resolution can prefer the workflow that legitimately claimed the
+ * path over an interloper that registered a row first.
+ */
+async function findWebhookPathClaimOwner(path: string): Promise<string | null> {
+  const normalizedPath = normalizeWebhookRegistrationPath(path)
+  if (!normalizedPath) return null
+  const [claim] = await db
+    .select({ workflowId: webhookPathClaim.workflowId })
+    .from(webhookPathClaim)
+    .where(eq(webhookPathClaim.path, normalizedPath))
+    .limit(1)
+  return claim?.workflowId ?? null
+}
+
 /**
  * Finds all active `slack_app` webhooks for a Slack `team_id` (the routing key).
  *
@@ -486,8 +506,7 @@ export async function findWebhooksByRoutingKey(
       and(
         eq(webhook.routingKey, routingKey),
         eq(webhook.provider, provider),
-        eq(webhook.isActive, true),
-        isNull(webhook.archivedAt),
+        deliverableWebhookPredicate(webhook),
         isNull(workflow.archivedAt),
         or(
           eq(webhook.deploymentVersionId, workflowDeploymentVersion.id),
@@ -752,6 +771,9 @@ async function queueWebhookExecutionWithResult(
       headers,
       path: options.path || foundWebhook.path || '',
       blockId: foundWebhook.blockId ?? undefined,
+      ...(foundWebhook.deploymentVersionId
+        ? { deploymentVersionId: foundWebhook.deploymentVersionId }
+        : {}),
       workspaceId,
       ...(credentialId ? { credentialId } : {}),
       ...(options.receivedAt !== undefined ? { webhookReceivedAt: options.receivedAt } : {}),
@@ -1063,6 +1085,9 @@ export async function processPolledWebhookEvent(
       headers: { 'content-type': 'application/json' } as Record<string, string>,
       path: foundWebhook.path ?? '',
       blockId: foundWebhook.blockId ?? undefined,
+      ...(foundWebhook.deploymentVersionId
+        ? { deploymentVersionId: foundWebhook.deploymentVersionId }
+        : {}),
       workspaceId,
       ...(credentialId ? { credentialId } : {}),
     } satisfies WebhookExecutionPayload
diff --git a/apps/sim/lib/webhooks/provider-subscriptions.test.ts b/apps/sim/lib/webhooks/provider-subscriptions.test.ts
index beef3d4a62d..336dc8ed3da 100644
--- a/apps/sim/lib/webhooks/provider-subscriptions.test.ts
+++ b/apps/sim/lib/webhooks/provider-subscriptions.test.ts
@@ -17,7 +17,10 @@ vi.mock('@/lib/webhooks/providers', () => ({
   getProviderHandler: mockGetProviderHandler,
 }))
 
-import { createExternalWebhookSubscription } from '@/lib/webhooks/provider-subscriptions'
+import {
+  cleanupExternalWebhook,
+  createExternalWebhookSubscription,
+} from '@/lib/webhooks/provider-subscriptions'
 
 describe('createExternalWebhookSubscription', () => {
   beforeEach(() => {
@@ -119,3 +122,44 @@ describe('createExternalWebhookSubscription', () => {
     expect(result.updatedProviderConfig.token).toBe('{{SLACK_TOKEN}}')
   })
 })
+
+describe('cleanupExternalWebhook', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockGetEffectiveDecryptedEnv.mockResolvedValue({ CALENDLY_API_KEY: 'real-secret-key' })
+  })
+
+  it('resolves {{ENV_VAR}} references before deleting the provider subscription', async () => {
+    const deleteSubscription = vi.fn().mockResolvedValue(undefined)
+    mockGetProviderHandler.mockReturnValue({ deleteSubscription })
+
+    const webhook = {
+      id: 'webhook-1',
+      provider: 'calendly',
+      providerConfig: {
+        apiKey: '{{CALENDLY_API_KEY}}',
+        externalId: 'external-1',
+      },
+    }
+    const workflow = {
+      id: 'workflow-1',
+      userId: 'user-1',
+      workspaceId: 'workspace-1',
+    }
+
+    await cleanupExternalWebhook(webhook, workflow, 'request-1')
+
+    expect(mockGetEffectiveDecryptedEnv).toHaveBeenCalledWith('user-1', 'workspace-1')
+    expect(deleteSubscription).toHaveBeenCalledWith(
+      expect.objectContaining({
+        webhook: expect.objectContaining({
+          providerConfig: {
+            apiKey: 'real-secret-key',
+            externalId: 'external-1',
+          },
+        }),
+      })
+    )
+    expect(webhook.providerConfig.apiKey).toBe('{{CALENDLY_API_KEY}}')
+  })
+})
diff --git a/apps/sim/lib/webhooks/provider-subscriptions.ts b/apps/sim/lib/webhooks/provider-subscriptions.ts
index afd9a926648..35cad91fafa 100644
--- a/apps/sim/lib/webhooks/provider-subscriptions.ts
+++ b/apps/sim/lib/webhooks/provider-subscriptions.ts
@@ -1,7 +1,11 @@
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
+import { omit } from '@sim/utils/object'
 import type { NextRequest } from 'next/server'
-import { resolveWebhookProviderConfig } from '@/lib/webhooks/env-resolver'
+import {
+  resolveWebhookProviderConfig,
+  resolveWebhookRecordProviderConfig,
+} from '@/lib/webhooks/env-resolver'
 import { getProviderHandler } from '@/lib/webhooks/providers'
 
 const logger = createLogger('WebhookProviderSubscriptions')
@@ -29,10 +33,23 @@ const SYSTEM_MANAGED_FIELDS = new Set([
   'secretToken',
   'historyId',
   'lastCheckedTimestamp',
+  'lastSeenGuids',
   'setupCompleted',
+  'subscriptionExpiration',
   'userId',
 ])
 
+/**
+ * Returns the user-controlled projection used for stable registration identity.
+ *
+ * Provider-managed subscription metadata and mutable polling cursors are intentionally omitted.
+ */
+export function projectDesiredWebhookProviderConfig(
+  providerConfig: Readonly<Record<string, unknown>>
+): Record<string, unknown> {
+  return omit(providerConfig, [...SYSTEM_MANAGED_FIELDS])
+}
+
 /** Returns true when user-controlled persisted webhook configuration changed. */
 export function hasWebhookConfigChanged(
   previousConfig: Record<string, unknown>,
@@ -105,7 +122,8 @@ export async function createExternalWebhookSubscription(
   webhookData: Record<string, unknown>,
   workflow: Record<string, unknown>,
   userId: string,
-  requestId: string
+  requestId: string,
+  options: { signal?: AbortSignal } = {}
 ): Promise<ExternalSubscriptionResult> {
   const provider = webhookData.provider as string
   const providerConfig = (webhookData.providerConfig as Record<string, unknown>) || {}
@@ -123,6 +141,13 @@ export async function createExternalWebhookSubscription(
     workspaceId
   )
 
+  /**
+   * Last abort check before the irreversible external call: a lease-expired
+   * outbox handler must not mint a provider resource it can no longer
+   * durably record.
+   */
+  options.signal?.throwIfAborted()
+
   const result = await handler.createSubscription({
     webhook: { ...webhookData, providerConfig: resolvedProviderConfig },
     workflow,
@@ -143,6 +168,9 @@ export async function createExternalWebhookSubscription(
 
 /**
  * Clean up external webhook subscriptions for a webhook.
+ * Resolves persisted `{{ENV_VAR}}` references with the workflow owner's
+ * effective environment before invoking the provider.
+ *
  * By default, cleanup failure is logged but non-fatal for legacy best-effort callers.
  * Deployment outbox cleanup passes `throwOnError` so provider failures stay retryable.
  */
@@ -160,7 +188,23 @@ export async function cleanupExternalWebhook(
   }
 
   try {
-    await handler.deleteSubscription({ webhook, workflow, requestId, strict: options.throwOnError })
+    if (typeof workflow.userId !== 'string') {
+      throw new Error('Cannot resolve webhook credentials without a workflow owner')
+    }
+
+    const workspaceId = typeof workflow.workspaceId === 'string' ? workflow.workspaceId : undefined
+    const resolvedWebhook = await resolveWebhookRecordProviderConfig(
+      webhook,
+      workflow.userId,
+      workspaceId
+    )
+
+    await handler.deleteSubscription({
+      webhook: resolvedWebhook,
+      workflow,
+      requestId,
+      strict: options.throwOnError,
+    })
   } catch (error) {
     logger.warn(`[${requestId}] Error cleaning up external webhook (non-fatal)`, {
       provider,
diff --git a/apps/sim/lib/webhooks/providers/gmail.ts b/apps/sim/lib/webhooks/providers/gmail.ts
index 650ebfb0980..ca5e1094bb4 100644
--- a/apps/sim/lib/webhooks/providers/gmail.ts
+++ b/apps/sim/lib/webhooks/providers/gmail.ts
@@ -21,7 +21,11 @@ export const gmailHandler: WebhookProviderHandler = {
     return { input: b }
   },
 
-  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+  async configurePolling({
+    webhook: webhookData,
+    requestId,
+    persistProviderConfig,
+  }: PollingConfigContext) {
     logger.info(`[${requestId}] Setting up Gmail polling for webhook ${webhookData.id}`)
 
     try {
@@ -79,26 +83,27 @@ export const gmailHandler: WebhookProviderHandler = {
 
       const now = new Date()
 
-      await db
-        .update(webhook)
-        .set({
-          providerConfig: {
-            ...providerConfig,
-            userId: effectiveUserId,
-            credentialId,
-            maxEmailsPerPoll,
-            pollingInterval,
-            markAsRead: providerConfig.markAsRead || false,
-            includeRawEmail: providerConfig.includeRawEmail || false,
-            labelIds: providerConfig.labelIds || ['INBOX'],
-            labelFilterBehavior: providerConfig.labelFilterBehavior || 'INCLUDE',
-            lastCheckedTimestamp:
-              (providerConfig.lastCheckedTimestamp as string) || now.toISOString(),
-            setupCompleted: true,
-          },
-          updatedAt: now,
-        })
-        .where(eq(webhook.id, webhookData.id as string))
+      const configuredProviderConfig = {
+        ...providerConfig,
+        userId: effectiveUserId,
+        credentialId,
+        maxEmailsPerPoll,
+        pollingInterval,
+        markAsRead: providerConfig.markAsRead || false,
+        includeRawEmail: providerConfig.includeRawEmail || false,
+        labelIds: providerConfig.labelIds || ['INBOX'],
+        labelFilterBehavior: providerConfig.labelFilterBehavior || 'INCLUDE',
+        lastCheckedTimestamp: (providerConfig.lastCheckedTimestamp as string) || now.toISOString(),
+        setupCompleted: true,
+      }
+      if (persistProviderConfig) {
+        await persistProviderConfig(configuredProviderConfig)
+      } else {
+        await db
+          .update(webhook)
+          .set({ providerConfig: configuredProviderConfig, updatedAt: now })
+          .where(eq(webhook.id, webhookData.id as string))
+      }
 
       logger.info(
         `[${requestId}] Successfully configured Gmail polling for webhook ${webhookData.id}`
diff --git a/apps/sim/lib/webhooks/providers/imap.ts b/apps/sim/lib/webhooks/providers/imap.ts
index aff02b2a341..201af195116 100644
--- a/apps/sim/lib/webhooks/providers/imap.ts
+++ b/apps/sim/lib/webhooks/providers/imap.ts
@@ -36,7 +36,11 @@ export const imapHandler: WebhookProviderHandler = {
     return { input: b }
   },
 
-  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+  async configurePolling({
+    webhook: webhookData,
+    requestId,
+    persistProviderConfig,
+  }: PollingConfigContext) {
     logger.info(`[${requestId}] Setting up IMAP polling for webhook ${webhookData.id}`)
 
     try {
@@ -50,23 +54,25 @@ export const imapHandler: WebhookProviderHandler = {
         return false
       }
 
-      await db
-        .update(webhook)
-        .set({
-          providerConfig: {
-            ...providerConfig,
-            port: providerConfig.port || '993',
-            secure: providerConfig.secure !== false,
-            mailbox: providerConfig.mailbox || 'INBOX',
-            searchCriteria: providerConfig.searchCriteria || 'UNSEEN',
-            markAsRead: providerConfig.markAsRead || false,
-            includeAttachments: providerConfig.includeAttachments !== false,
-            lastCheckedTimestamp: now.toISOString(),
-            setupCompleted: true,
-          },
-          updatedAt: now,
-        })
-        .where(eq(webhook.id, webhookData.id as string))
+      const configuredProviderConfig = {
+        ...providerConfig,
+        port: providerConfig.port || '993',
+        secure: providerConfig.secure !== false,
+        mailbox: providerConfig.mailbox || 'INBOX',
+        searchCriteria: providerConfig.searchCriteria || 'UNSEEN',
+        markAsRead: providerConfig.markAsRead || false,
+        includeAttachments: providerConfig.includeAttachments !== false,
+        lastCheckedTimestamp: now.toISOString(),
+        setupCompleted: true,
+      }
+      if (persistProviderConfig) {
+        await persistProviderConfig(configuredProviderConfig)
+      } else {
+        await db
+          .update(webhook)
+          .set({ providerConfig: configuredProviderConfig, updatedAt: now })
+          .where(eq(webhook.id, webhookData.id as string))
+      }
 
       logger.info(
         `[${requestId}] Successfully configured IMAP polling for webhook ${webhookData.id}`
diff --git a/apps/sim/lib/webhooks/providers/outlook.ts b/apps/sim/lib/webhooks/providers/outlook.ts
index 01f9656bc15..f9d6727fb98 100644
--- a/apps/sim/lib/webhooks/providers/outlook.ts
+++ b/apps/sim/lib/webhooks/providers/outlook.ts
@@ -21,7 +21,11 @@ export const outlookHandler: WebhookProviderHandler = {
     return { input: b }
   },
 
-  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+  async configurePolling({
+    webhook: webhookData,
+    requestId,
+    persistProviderConfig,
+  }: PollingConfigContext) {
     logger.info(`[${requestId}] Setting up Outlook polling for webhook ${webhookData.id}`)
 
     try {
@@ -69,32 +73,33 @@ export const outlookHandler: WebhookProviderHandler = {
 
       const now = new Date()
 
-      await db
-        .update(webhook)
-        .set({
-          providerConfig: {
-            ...providerConfig,
-            userId: effectiveUserId,
-            credentialId,
-            maxEmailsPerPoll:
-              typeof providerConfig.maxEmailsPerPoll === 'string'
-                ? Number.parseInt(providerConfig.maxEmailsPerPoll, 10) || 25
-                : (providerConfig.maxEmailsPerPoll as number) || 25,
-            pollingInterval:
-              typeof providerConfig.pollingInterval === 'string'
-                ? Number.parseInt(providerConfig.pollingInterval, 10) || 5
-                : (providerConfig.pollingInterval as number) || 5,
-            markAsRead: providerConfig.markAsRead || false,
-            includeRawEmail: providerConfig.includeRawEmail || false,
-            folderIds: providerConfig.folderIds || ['inbox'],
-            folderFilterBehavior: providerConfig.folderFilterBehavior || 'INCLUDE',
-            lastCheckedTimestamp:
-              (providerConfig.lastCheckedTimestamp as string) || now.toISOString(),
-            setupCompleted: true,
-          },
-          updatedAt: now,
-        })
-        .where(eq(webhook.id, webhookData.id as string))
+      const configuredProviderConfig = {
+        ...providerConfig,
+        userId: effectiveUserId,
+        credentialId,
+        maxEmailsPerPoll:
+          typeof providerConfig.maxEmailsPerPoll === 'string'
+            ? Number.parseInt(providerConfig.maxEmailsPerPoll, 10) || 25
+            : (providerConfig.maxEmailsPerPoll as number) || 25,
+        pollingInterval:
+          typeof providerConfig.pollingInterval === 'string'
+            ? Number.parseInt(providerConfig.pollingInterval, 10) || 5
+            : (providerConfig.pollingInterval as number) || 5,
+        markAsRead: providerConfig.markAsRead || false,
+        includeRawEmail: providerConfig.includeRawEmail || false,
+        folderIds: providerConfig.folderIds || ['inbox'],
+        folderFilterBehavior: providerConfig.folderFilterBehavior || 'INCLUDE',
+        lastCheckedTimestamp: (providerConfig.lastCheckedTimestamp as string) || now.toISOString(),
+        setupCompleted: true,
+      }
+      if (persistProviderConfig) {
+        await persistProviderConfig(configuredProviderConfig)
+      } else {
+        await db
+          .update(webhook)
+          .set({ providerConfig: configuredProviderConfig, updatedAt: now })
+          .where(eq(webhook.id, webhookData.id as string))
+      }
 
       logger.info(
         `[${requestId}] Successfully configured Outlook polling for webhook ${webhookData.id}`
diff --git a/apps/sim/lib/webhooks/providers/rss.ts b/apps/sim/lib/webhooks/providers/rss.ts
index e517fd1cda1..26f140f65d6 100644
--- a/apps/sim/lib/webhooks/providers/rss.ts
+++ b/apps/sim/lib/webhooks/providers/rss.ts
@@ -29,25 +29,31 @@ export const rssHandler: WebhookProviderHandler = {
     return { input: b }
   },
 
-  async configurePolling({ webhook: webhookData, requestId }: PollingConfigContext) {
+  async configurePolling({
+    webhook: webhookData,
+    requestId,
+    persistProviderConfig,
+  }: PollingConfigContext) {
     logger.info(`[${requestId}] Setting up RSS polling for webhook ${webhookData.id}`)
 
     try {
       const providerConfig = (webhookData.providerConfig as Record<string, unknown>) || {}
       const now = new Date()
 
-      await db
-        .update(webhook)
-        .set({
-          providerConfig: {
-            ...providerConfig,
-            lastCheckedTimestamp: now.toISOString(),
-            lastSeenGuids: [],
-            setupCompleted: true,
-          },
-          updatedAt: now,
-        })
-        .where(eq(webhook.id, webhookData.id as string))
+      const configuredProviderConfig = {
+        ...providerConfig,
+        lastCheckedTimestamp: now.toISOString(),
+        lastSeenGuids: [],
+        setupCompleted: true,
+      }
+      if (persistProviderConfig) {
+        await persistProviderConfig(configuredProviderConfig)
+      } else {
+        await db
+          .update(webhook)
+          .set({ providerConfig: configuredProviderConfig, updatedAt: now })
+          .where(eq(webhook.id, webhookData.id as string))
+      }
 
       logger.info(
         `[${requestId}] Successfully configured RSS polling for webhook ${webhookData.id}`
diff --git a/apps/sim/lib/webhooks/providers/tiktok-targets.ts b/apps/sim/lib/webhooks/providers/tiktok-targets.ts
index 8fc4dc2aeaf..4ff63b415fb 100644
--- a/apps/sim/lib/webhooks/providers/tiktok-targets.ts
+++ b/apps/sim/lib/webhooks/providers/tiktok-targets.ts
@@ -9,6 +9,7 @@ import {
 } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, like, or } from 'drizzle-orm'
+import { deliverableWebhookPredicate } from '@/lib/webhooks/delivery-predicate'
 
 const logger = createLogger('TikTokWebhookTargets')
 const ACCOUNT_ID_UUID_SUFFIX = /-[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
@@ -56,8 +57,7 @@ export async function findTikTokWebhookTargets(
       and(
         eq(webhookCredentialIdExpression(webhook.providerConfig), credential.id),
         eq(webhook.provider, 'tiktok'),
-        eq(webhook.isActive, true),
-        isNull(webhook.archivedAt)
+        deliverableWebhookPredicate(webhook)
       )
     )
     .innerJoin(
diff --git a/apps/sim/lib/webhooks/providers/types.ts b/apps/sim/lib/webhooks/providers/types.ts
index b773b1e3fd1..45a6dd5b03e 100644
--- a/apps/sim/lib/webhooks/providers/types.ts
+++ b/apps/sim/lib/webhooks/providers/types.ts
@@ -9,7 +9,6 @@ export interface AuthContext {
   requestId: string
   providerConfig: Record<string, unknown>
 }
-
 /** Context for event matching against trigger configuration. */
 export interface EventMatchContext {
   webhook: Record<string, unknown>
@@ -82,6 +81,11 @@ export interface DeleteSubscriptionContext {
 export interface PollingConfigContext {
   webhook: Record<string, unknown>
   requestId: string
+  /**
+   * Stable registration preparation supplies a generation-fenced persistence callback.
+   * Legacy callers omit it and retain the existing provider-owned write behavior.
+   */
+  persistProviderConfig?(providerConfig: Record<string, unknown>): Promise<boolean>
 }
 
 /**
diff --git a/apps/sim/lib/webhooks/registration-identity.test.ts b/apps/sim/lib/webhooks/registration-identity.test.ts
new file mode 100644
index 00000000000..07400992aa2
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-identity.test.ts
@@ -0,0 +1,132 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import {
+  fingerprintDesiredWebhookRegistration,
+  normalizeWebhookRegistrationPath,
+} from '@/lib/webhooks/registration-identity'
+
+function permutations<T>(values: readonly T[]): T[][] {
+  if (values.length <= 1) return [[...values]]
+
+  return values.flatMap((value, index) =>
+    permutations([...values.slice(0, index), ...values.slice(index + 1)]).map((rest) => [
+      value,
+      ...rest,
+    ])
+  )
+}
+
+const BASE_IDENTITY = {
+  provider: 'example',
+  path: 'events/incoming',
+  routingKey: 'tenant-1',
+} as const
+
+describe('fingerprintDesiredWebhookRegistration', () => {
+  it('is invariant across deep object key orderings', () => {
+    const outerEntries = [
+      ['enabled', false],
+      ['filter', { zeta: 0, alpha: '', nested: { second: null, first: 'value' } }],
+      ['topics', [{ beta: 2, alpha: 1 }, 'created']],
+    ] as const
+    const nestedEntries = [
+      ['zeta', 0],
+      ['alpha', ''],
+      ['nested', { second: null, first: 'value' }],
+    ] as const
+
+    const fingerprints = new Set<string>()
+    for (const outerOrder of permutations(outerEntries)) {
+      for (const nestedOrder of permutations(nestedEntries)) {
+        const desiredConfig = Object.fromEntries(outerOrder) as Record<string, unknown>
+        desiredConfig.filter = Object.fromEntries(nestedOrder)
+        fingerprints.add(fingerprintDesiredWebhookRegistration({ ...BASE_IDENTITY, desiredConfig }))
+      }
+    }
+
+    expect(fingerprints.size).toBe(1)
+  })
+
+  it('is stable as provider-managed and polling state changes outside the desired projection', () => {
+    const desiredConfig = {
+      credentialId: 'credential-1',
+      eventType: 'message.created',
+      includeThreads: false,
+    }
+    const expected = fingerprintDesiredWebhookRegistration({
+      ...BASE_IDENTITY,
+      desiredConfig,
+    })
+    const managedStateVariants = Array.from({ length: 32 }, (_, index) => ({
+      externalSubscriptionId: `external-${index}`,
+      historyId: String(10_000 + index),
+      lastCheckedTimestamp: new Date(1_700_000_000_000 + index * 1000).toISOString(),
+      lastSeenGuids: [`guid-${index}`],
+      setupCompleted: index % 2 === 0,
+      subscriptionExpiration: new Date(1_800_000_000_000 + index * 1000).toISOString(),
+    }))
+
+    for (const managedState of managedStateVariants) {
+      const persistedProviderConfig = { ...desiredConfig, ...managedState }
+      expect(persistedProviderConfig).toMatchObject(managedState)
+      expect(
+        fingerprintDesiredWebhookRegistration({
+          ...BASE_IDENTITY,
+          desiredConfig,
+        })
+      ).toBe(expected)
+    }
+  })
+
+  it('preserves null, false, zero, empty, undefined, and missing distinctions', () => {
+    const variants: ReadonlyArray<Record<string, unknown>> = [
+      { value: null },
+      { value: false },
+      { value: 0 },
+      { value: '' },
+      { value: {} },
+      { value: [] },
+      { value: undefined },
+      {},
+    ]
+
+    const fingerprints = variants.map((desiredConfig) =>
+      fingerprintDesiredWebhookRegistration({ ...BASE_IDENTITY, desiredConfig })
+    )
+
+    expect(new Set(fingerprints).size).toBe(variants.length)
+  })
+
+  it('normalizes equivalent callback paths without collapsing null and empty paths', () => {
+    const desiredConfig = { eventType: 'created' }
+    const canonical = fingerprintDesiredWebhookRegistration({
+      ...BASE_IDENTITY,
+      path: 'events/incoming',
+      desiredConfig,
+    })
+
+    expect(
+      fingerprintDesiredWebhookRegistration({
+        ...BASE_IDENTITY,
+        path: ' /events/incoming/ ',
+        desiredConfig,
+      })
+    ).toBe(canonical)
+    expect(normalizeWebhookRegistrationPath(null)).toBeNull()
+    expect(normalizeWebhookRegistrationPath(' / ')).toBe('')
+    expect(
+      fingerprintDesiredWebhookRegistration({ ...BASE_IDENTITY, path: null, desiredConfig })
+    ).not.toBe(fingerprintDesiredWebhookRegistration({ ...BASE_IDENTITY, path: '', desiredConfig }))
+  })
+
+  it('rejects cyclic desired config instead of emitting an unstable fingerprint', () => {
+    const desiredConfig: Record<string, unknown> = {}
+    desiredConfig.self = desiredConfig
+
+    expect(() =>
+      fingerprintDesiredWebhookRegistration({ ...BASE_IDENTITY, desiredConfig })
+    ).toThrow('cannot contain cycles')
+  })
+})
diff --git a/apps/sim/lib/webhooks/registration-identity.ts b/apps/sim/lib/webhooks/registration-identity.ts
new file mode 100644
index 00000000000..b34907ffbb4
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-identity.ts
@@ -0,0 +1,99 @@
+import { sha256Hex } from '@sim/security/hash'
+import { isPlainRecord } from '@sim/utils/object'
+
+export interface DesiredWebhookRegistrationIdentity {
+  provider: string
+  path: string | null
+  routingKey: string | null
+  /**
+   * The user-controlled projection produced while building the desired trigger configuration.
+   * Provider-managed subscription metadata and polling cursors must not be included.
+   */
+  desiredConfig: Readonly<Record<string, unknown>>
+}
+
+type CanonicalValue =
+  | ['array', CanonicalValue[]]
+  | ['bigint', string]
+  | ['boolean', boolean]
+  | ['null']
+  | ['number', string]
+  | ['object', Array<[string, CanonicalValue]>]
+  | ['string', string]
+  | ['undefined']
+
+/** Normalizes a webhook path for desired-registration identity comparisons. */
+export function normalizeWebhookRegistrationPath(path: string | null): string | null {
+  if (path === null) return null
+  return path.trim().replace(/^\/+|\/+$/g, '')
+}
+
+function canonicalizeNumber(value: number): string {
+  if (Number.isNaN(value)) return 'NaN'
+  if (value === Number.POSITIVE_INFINITY) return 'Infinity'
+  if (value === Number.NEGATIVE_INFINITY) return '-Infinity'
+  if (Object.is(value, -0)) return '-0'
+  return String(value)
+}
+
+function canonicalize(value: unknown, ancestors: Set<object>): CanonicalValue {
+  if (value === null) return ['null']
+  if (value === undefined) return ['undefined']
+  if (typeof value === 'boolean') return ['boolean', value]
+  if (typeof value === 'number') return ['number', canonicalizeNumber(value)]
+  if (typeof value === 'string') return ['string', value]
+  if (typeof value === 'bigint') return ['bigint', value.toString()]
+
+  if (Array.isArray(value)) {
+    if (ancestors.has(value)) {
+      throw new TypeError('Desired webhook registration config cannot contain cycles')
+    }
+    ancestors.add(value)
+    try {
+      return ['array', value.map((entry) => canonicalize(entry, ancestors))]
+    } finally {
+      ancestors.delete(value)
+    }
+  }
+
+  if (isPlainRecord(value)) {
+    if (ancestors.has(value)) {
+      throw new TypeError('Desired webhook registration config cannot contain cycles')
+    }
+    ancestors.add(value)
+    try {
+      const entries = Object.keys(value)
+        .sort()
+        .map<[string, CanonicalValue]>((key) => [key, canonicalize(value[key], ancestors)])
+      return ['object', entries]
+    } finally {
+      ancestors.delete(value)
+    }
+  }
+
+  throw new TypeError(
+    `Unsupported desired webhook registration config value: ${Object.prototype.toString.call(value)}`
+  )
+}
+
+/**
+ * Returns a deterministic fingerprint for a desired webhook registration.
+ *
+ * The caller must pass the explicit user-controlled config projection built from the trigger,
+ * never a persisted providerConfig row that may contain mutable provider or polling state.
+ */
+export function fingerprintDesiredWebhookRegistration(
+  identity: DesiredWebhookRegistrationIdentity
+): string {
+  const canonicalIdentity = canonicalize(
+    {
+      provider: identity.provider,
+      path: normalizeWebhookRegistrationPath(identity.path),
+      routingKey: identity.routingKey,
+      desiredConfig: identity.desiredConfig,
+    },
+    new Set()
+  )
+
+  return sha256Hex(JSON.stringify(canonicalIdentity))
+}
diff --git a/apps/sim/lib/webhooks/registration-reconciliation.test.ts b/apps/sim/lib/webhooks/registration-reconciliation.test.ts
new file mode 100644
index 00000000000..e6f623024e9
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-reconciliation.test.ts
@@ -0,0 +1,158 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import {
+  type ExistingWebhookRegistration,
+  planWebhookRegistrationReconciliation,
+} from '@/lib/webhooks/registration-reconciliation'
+
+interface RegistrationRow {
+  id: string
+  providerConfig: Record<string, unknown>
+}
+
+function existingRegistration(
+  triggerId: string,
+  fingerprint: string | null,
+  generation: number,
+  providerConfig: Record<string, unknown> = {}
+): ExistingWebhookRegistration<RegistrationRow> {
+  return {
+    triggerId,
+    fingerprint,
+    generation,
+    row: {
+      id: `row-${triggerId}`,
+      providerConfig,
+    },
+  }
+}
+
+describe('planWebhookRegistrationReconciliation', () => {
+  it('reuses an unchanged physical row across generations with provider state intact', () => {
+    const providerConfig = {
+      credentialId: 'credential-1',
+      externalSubscriptionId: 'external-1',
+      historyId: 'history-9',
+      setupCompleted: true,
+    }
+    const existing = existingRegistration('trigger-1', 'fingerprint-1', 4, providerConfig)
+
+    const plan = planWebhookRegistrationReconciliation({
+      generation: 5,
+      desired: [
+        {
+          triggerId: 'trigger-1',
+          fingerprint: 'fingerprint-1',
+          desired: { provider: 'example' },
+        },
+      ],
+      existing: [existing],
+    })
+
+    expect(plan.actions).toEqual([
+      expect.objectContaining({
+        kind: 'reuse',
+        triggerId: 'trigger-1',
+      }),
+    ])
+    const [action] = plan.actions
+    expect(action.kind).toBe('reuse')
+    if (action.kind !== 'reuse') throw new Error('Expected reuse action')
+    expect(action.existing).toBe(existing)
+    expect(action.existing.row).toBe(existing.row)
+    expect(action.existing.row.id).toBe('row-trigger-1')
+    expect(action.existing.row.providerConfig).toBe(providerConfig)
+  })
+
+  it('prepares candidates for changed and missing registrations without mutating current rows', () => {
+    const changed = existingRegistration('changed', 'old-fingerprint', 7, {
+      externalId: 'external-1',
+    })
+    const before = structuredClone(changed)
+
+    const plan = planWebhookRegistrationReconciliation({
+      generation: 7,
+      desired: [
+        {
+          triggerId: 'changed',
+          fingerprint: 'new-fingerprint',
+          desired: { provider: 'example', event: 'updated' },
+        },
+        {
+          triggerId: 'new',
+          fingerprint: 'new-trigger-fingerprint',
+          desired: { provider: 'example', event: 'created' },
+        },
+      ],
+      existing: [changed],
+    })
+
+    expect(plan.actions).toEqual([
+      expect.objectContaining({
+        kind: 'prepare_candidate',
+        triggerId: 'changed',
+        existing: changed,
+      }),
+      expect.objectContaining({
+        kind: 'prepare_candidate',
+        triggerId: 'new',
+        existing: null,
+      }),
+    ])
+    expect(changed).toEqual(before)
+  })
+
+  it('leaves removed-row retirement to the atomic activation step', () => {
+    const kept = existingRegistration('kept', 'same', 2)
+    const removed = existingRegistration('removed', 'old', 2)
+
+    const plan = planWebhookRegistrationReconciliation({
+      generation: 3,
+      desired: [{ triggerId: 'kept', fingerprint: 'same', desired: {} }],
+      existing: [kept, removed],
+    })
+
+    expect(plan.actions.map((action) => action.kind)).toEqual(['reuse'])
+  })
+
+  it('rejects a stale generation before planning over newer rows', () => {
+    const newer = existingRegistration('trigger-1', 'same', 11)
+
+    expect(() =>
+      planWebhookRegistrationReconciliation({
+        generation: 10,
+        desired: [{ triggerId: 'trigger-1', fingerprint: 'same', desired: {} }],
+        existing: [newer],
+      })
+    ).toThrow('newer registration generation 11')
+  })
+
+  it.each([
+    {
+      label: 'desired',
+      desired: [
+        { triggerId: 'duplicate', fingerprint: 'one', desired: {} },
+        { triggerId: 'duplicate', fingerprint: 'two', desired: {} },
+      ],
+      existing: [],
+    },
+    {
+      label: 'existing',
+      desired: [],
+      existing: [
+        existingRegistration('duplicate', 'one', 1),
+        existingRegistration('duplicate', 'two', 1),
+      ],
+    },
+  ])('rejects duplicate trigger identities in $label registrations', ({ desired, existing }) => {
+    expect(() =>
+      planWebhookRegistrationReconciliation({
+        generation: 1,
+        desired,
+        existing,
+      })
+    ).toThrow('duplicate triggerId "duplicate"')
+  })
+})
diff --git a/apps/sim/lib/webhooks/registration-reconciliation.ts b/apps/sim/lib/webhooks/registration-reconciliation.ts
new file mode 100644
index 00000000000..451857f10cf
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-reconciliation.ts
@@ -0,0 +1,110 @@
+export interface DesiredWebhookRegistration<TDesired = unknown> {
+  triggerId: string
+  fingerprint: string
+  desired: TDesired
+}
+
+export interface ExistingWebhookRegistration<TRow extends { id: string }> {
+  triggerId: string
+  generation: number
+  fingerprint: string | null
+  row: TRow
+}
+
+export type WebhookRegistrationReconciliationAction<TDesired, TRow extends { id: string }> =
+  | {
+      kind: 'reuse'
+      triggerId: string
+      desired: DesiredWebhookRegistration<TDesired>
+      existing: ExistingWebhookRegistration<TRow>
+    }
+  | {
+      kind: 'prepare_candidate'
+      triggerId: string
+      desired: DesiredWebhookRegistration<TDesired>
+      existing: ExistingWebhookRegistration<TRow> | null
+    }
+
+export interface WebhookRegistrationReconciliationPlan<TDesired, TRow extends { id: string }> {
+  actions: Array<WebhookRegistrationReconciliationAction<TDesired, TRow>>
+}
+
+function assertGeneration(generation: number, label: string): void {
+  if (!Number.isSafeInteger(generation) || generation < 0) {
+    throw new TypeError(`${label} must be a non-negative safe integer`)
+  }
+}
+
+function indexUniqueByTriggerId<T extends { triggerId: string }>(
+  entries: readonly T[],
+  label: string
+): Map<string, T> {
+  const entriesByTriggerId = new Map<string, T>()
+  for (const entry of entries) {
+    if (!entry.triggerId) {
+      throw new TypeError(`${label} triggerId cannot be empty`)
+    }
+    if (entriesByTriggerId.has(entry.triggerId)) {
+      throw new TypeError(`${label} contains duplicate triggerId "${entry.triggerId}"`)
+    }
+    entriesByTriggerId.set(entry.triggerId, entry)
+  }
+  return entriesByTriggerId
+}
+
+/**
+ * Produces the side-effect-free registration work for one deployment generation.
+ *
+ * Fingerprint matches reuse the exact persisted row object, retaining its physical ID and
+ * provider-managed state. Changed or missing registrations prepare candidates, while registrations
+ * absent from the desired trigger set are retired. A stale generation cannot act on newer rows.
+ */
+export function planWebhookRegistrationReconciliation<
+  TDesired,
+  TRow extends { id: string },
+>(input: {
+  generation: number
+  desired: readonly DesiredWebhookRegistration<TDesired>[]
+  existing: readonly ExistingWebhookRegistration<TRow>[]
+}): WebhookRegistrationReconciliationPlan<TDesired, TRow> {
+  assertGeneration(input.generation, 'Reconciliation generation')
+
+  indexUniqueByTriggerId(input.desired, 'Desired registrations')
+  const existingByTriggerId = indexUniqueByTriggerId(input.existing, 'Existing registrations')
+
+  for (const existing of input.existing) {
+    assertGeneration(
+      existing.generation,
+      `Existing registration "${existing.triggerId}" generation`
+    )
+    if (existing.generation > input.generation) {
+      throw new Error(
+        `Cannot reconcile generation ${input.generation} over newer registration generation ${existing.generation} for trigger "${existing.triggerId}"`
+      )
+    }
+  }
+
+  const actions: Array<WebhookRegistrationReconciliationAction<TDesired, TRow>> = []
+
+  for (const desired of input.desired) {
+    const existing = existingByTriggerId.get(desired.triggerId)
+    if (existing?.fingerprint === desired.fingerprint) {
+      actions.push({
+        kind: 'reuse',
+        triggerId: desired.triggerId,
+        desired,
+        existing,
+      })
+      continue
+    }
+
+    actions.push({
+      kind: 'prepare_candidate',
+      triggerId: desired.triggerId,
+      desired,
+      existing: existing ?? null,
+    })
+  }
+
+  return { actions }
+}
diff --git a/apps/sim/lib/webhooks/registration-service.test.ts b/apps/sim/lib/webhooks/registration-service.test.ts
new file mode 100644
index 00000000000..1d3742f1808
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-service.test.ts
@@ -0,0 +1,277 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { providerHandler } = vi.hoisted(() => ({
+  providerHandler: {
+    createSubscription: vi.fn(),
+  },
+}))
+
+vi.mock('@/lib/webhooks/providers', () => ({
+  getProviderHandler: vi.fn(() => providerHandler),
+}))
+
+import type { NextRequest } from 'next/server'
+import {
+  cleanupRetiredWebhookRegistrationsAfterActivation,
+  prepareStableWebhookRegistrations,
+  type StableWebhookRegistrationDependencies,
+} from '@/lib/webhooks/registration-service'
+import {
+  buildLegacyInvisibleCandidateValues,
+  type DesiredWebhookRegistrationIntent,
+  type WebhookRegistrationOperationFence,
+  type WebhookRegistrationRow,
+} from '@/lib/webhooks/registration-store'
+
+const fence: WebhookRegistrationOperationFence = {
+  workflowId: 'workflow-1',
+  operationId: 'operation-5',
+  generation: 5,
+  deploymentVersionId: 'version-5',
+}
+
+function registrationRow(overrides: Partial<WebhookRegistrationRow> = {}): WebhookRegistrationRow {
+  return {
+    id: 'webhook-1',
+    workflowId: fence.workflowId,
+    deploymentVersionId: 'version-4',
+    registrationStatus: 'active',
+    registrationGeneration: 4,
+    configFingerprint: 'old-fingerprint',
+    preparedAt: new Date('2026-01-01T00:00:00Z'),
+    blockId: 'trigger-1',
+    path: 'events',
+    routingKey: null,
+    provider: 'parallel-provider',
+    providerConfig: { externalId: 'external-old', cursor: 'cursor-9' },
+    isActive: true,
+    failedCount: 3,
+    lastFailedAt: new Date('2026-01-02T00:00:00Z'),
+    archivedAt: null,
+    createdAt: new Date('2025-01-01T00:00:00Z'),
+    updatedAt: new Date('2026-01-02T00:00:00Z'),
+    ...overrides,
+  }
+}
+
+function dependencies(
+  overrides: Partial<StableWebhookRegistrationDependencies> = {}
+): StableWebhookRegistrationDependencies {
+  return {
+    prepareIntents: vi.fn(),
+    checkpointCandidate: vi.fn(),
+    listRetired: vi.fn(),
+    getCleanupSnapshot: vi.fn(),
+    deleteAfterCleanup: vi.fn(),
+    createExternal: vi.fn(),
+    cleanupExternal: vi.fn(),
+    ...overrides,
+  } as unknown as StableWebhookRegistrationDependencies
+}
+
+describe('stable webhook registration service', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('persists candidate intent as invisible to legacy delivery queries', () => {
+    const now = new Date('2026-07-14T00:00:00Z')
+    const desired: DesiredWebhookRegistrationIntent = {
+      blockId: 'trigger-1',
+      provider: 'parallel-provider',
+      path: '/events/',
+      routingKey: null,
+      providerConfig: { event: 'created' },
+      configFingerprint: 'fingerprint-5',
+    }
+
+    const values = buildLegacyInvisibleCandidateValues({
+      id: 'candidate-5',
+      fence,
+      desired,
+      now,
+    })
+
+    expect(values).toMatchObject({
+      registrationStatus: 'candidate',
+      registrationGeneration: 5,
+      path: 'events',
+      isActive: false,
+      archivedAt: now,
+      preparedAt: null,
+    })
+  })
+
+  it('never touches the live subscription when candidate preparation fails', async () => {
+    const candidate = registrationRow({
+      id: 'candidate-5',
+      deploymentVersionId: fence.deploymentVersionId,
+      registrationStatus: 'candidate',
+      registrationGeneration: fence.generation,
+      configFingerprint: 'new-fingerprint',
+      preparedAt: null,
+      providerConfig: { event: 'updated' },
+      isActive: false,
+      failedCount: 0,
+      lastFailedAt: null,
+      archivedAt: new Date('2026-07-14T00:00:00Z'),
+    })
+    const createExternal = vi.fn().mockRejectedValue(new Error('provider unavailable'))
+    const cleanupExternal = vi.fn()
+    const checkpointCandidate = vi.fn()
+    const store = dependencies({
+      prepareIntents: vi.fn().mockResolvedValue({
+        candidates: [
+          {
+            desired: {
+              blockId: 'trigger-1',
+              provider: 'parallel-provider',
+              path: 'events',
+              routingKey: null,
+              providerConfig: { event: 'updated' },
+              configFingerprint: 'new-fingerprint',
+            },
+            row: candidate,
+          },
+        ],
+        orphanedCandidates: [],
+      }),
+      createExternal,
+      cleanupExternal,
+      checkpointCandidate,
+    })
+
+    await expect(
+      prepareStableWebhookRegistrations(
+        {
+          request: {} as NextRequest,
+          fence,
+          workflow: { id: fence.workflowId },
+          userId: 'user-1',
+          requestId: 'request-1',
+          desired: [
+            {
+              blockId: 'trigger-1',
+              provider: 'parallel-provider',
+              path: 'events',
+              routingKey: null,
+              providerConfig: { event: 'updated' },
+              desiredConfig: { event: 'updated' },
+            },
+          ],
+        },
+        store
+      )
+    ).rejects.toThrow('Failed to prepare 1 webhook registration')
+
+    expect(createExternal).toHaveBeenCalledTimes(1)
+    expect(cleanupExternal).not.toHaveBeenCalled()
+    expect(checkpointCandidate).not.toHaveBeenCalled()
+  })
+
+  it('durably records the external subscription before finishing preparation', async () => {
+    const candidate = registrationRow({
+      id: 'candidate-5',
+      deploymentVersionId: fence.deploymentVersionId,
+      registrationStatus: 'candidate',
+      registrationGeneration: fence.generation,
+      configFingerprint: 'new-fingerprint',
+      preparedAt: null,
+      providerConfig: null,
+      isActive: false,
+      archivedAt: new Date('2026-07-14T00:00:00Z'),
+    })
+    const abortController = new AbortController()
+    const createExternal = vi.fn().mockResolvedValue({
+      updatedProviderConfig: { event: 'updated', externalId: 'external-new' },
+      externalSubscriptionCreated: true,
+    })
+    const cleanupExternal = vi.fn()
+    const checkpointCandidate = vi.fn()
+    const store = dependencies({
+      prepareIntents: vi.fn().mockResolvedValue({
+        candidates: [
+          {
+            desired: {
+              blockId: 'trigger-1',
+              provider: 'parallel-provider',
+              path: 'events',
+              routingKey: null,
+              providerConfig: { event: 'updated' },
+              configFingerprint: 'new-fingerprint',
+            },
+            row: candidate,
+          },
+        ],
+        orphanedCandidates: [],
+      }),
+      createExternal,
+      cleanupExternal,
+      checkpointCandidate,
+    })
+
+    await prepareStableWebhookRegistrations(
+      {
+        request: {} as NextRequest,
+        fence,
+        workflow: { id: fence.workflowId },
+        userId: 'user-1',
+        requestId: 'request-1',
+        signal: abortController.signal,
+        desired: [
+          {
+            blockId: 'trigger-1',
+            provider: 'parallel-provider',
+            path: 'events',
+            routingKey: null,
+            providerConfig: { event: 'updated' },
+            desiredConfig: { event: 'updated' },
+          },
+        ],
+      },
+      store
+    )
+
+    expect(cleanupExternal).not.toHaveBeenCalled()
+    expect(createExternal.mock.calls[0][5]).toEqual({ signal: abortController.signal })
+    expect(checkpointCandidate).toHaveBeenCalledTimes(2)
+    expect(checkpointCandidate.mock.calls[0][0]).toEqual(
+      expect.objectContaining({
+        prepared: false,
+        providerConfig: { event: 'updated', externalId: 'external-new' },
+      })
+    )
+    expect(checkpointCandidate.mock.calls[1][0]).not.toHaveProperty('prepared')
+  })
+
+  it('skips external cleanup when the row was reused by a newer generation', async () => {
+    const staleRetired = registrationRow({
+      registrationStatus: 'retired',
+      isActive: false,
+      archivedAt: new Date(),
+    })
+    const cleanupExternal = vi.fn()
+    const deleteAfterCleanup = vi.fn()
+    const store = dependencies({
+      listRetired: vi.fn().mockResolvedValueOnce([staleRetired]).mockResolvedValue([]),
+      getCleanupSnapshot: vi.fn().mockResolvedValue(null),
+      cleanupExternal,
+      deleteAfterCleanup,
+    })
+
+    await cleanupRetiredWebhookRegistrationsAfterActivation(
+      {
+        fence,
+        workflow: { id: fence.workflowId },
+        requestId: 'request-cleanup',
+      },
+      store
+    )
+
+    expect(cleanupExternal).not.toHaveBeenCalled()
+    expect(deleteAfterCleanup).not.toHaveBeenCalled()
+  })
+})
diff --git a/apps/sim/lib/webhooks/registration-service.ts b/apps/sim/lib/webhooks/registration-service.ts
new file mode 100644
index 00000000000..36cce1b46d8
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-service.ts
@@ -0,0 +1,366 @@
+import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
+import type { NextRequest } from 'next/server'
+import { PendingWebhookVerificationTracker } from '@/lib/webhooks/pending-verification'
+import {
+  cleanupExternalWebhook,
+  createExternalWebhookSubscription,
+} from '@/lib/webhooks/provider-subscriptions'
+import { getProviderHandler } from '@/lib/webhooks/providers'
+import type { WebhookProviderHandler } from '@/lib/webhooks/providers/types'
+import { fingerprintDesiredWebhookRegistration } from '@/lib/webhooks/registration-identity'
+import {
+  checkpointWebhookCandidate,
+  type DesiredWebhookRegistrationIntent,
+  deleteWebhookRegistrationAfterCleanup,
+  getWebhookCleanupSnapshotIfCurrent,
+  listRetiredWebhookRegistrationsForCleanup,
+  type PreparedWebhookCandidate,
+  type PreparedWebhookRegistrationWork,
+  prepareWebhookRegistrationIntents,
+  type WebhookRegistrationOperationFence,
+  type WebhookRegistrationRow,
+} from '@/lib/webhooks/registration-store'
+
+const logger = createLogger('StableWebhookRegistration')
+
+export interface StableDesiredWebhookRegistration {
+  blockId: string
+  provider: string
+  path: string | null
+  routingKey: string | null
+  providerConfig: Record<string, unknown>
+  desiredConfig: Readonly<Record<string, unknown>>
+}
+
+export interface StableWebhookRegistrationDependencies {
+  prepareIntents(input: {
+    fence: WebhookRegistrationOperationFence
+    desired: readonly DesiredWebhookRegistrationIntent[]
+  }): Promise<PreparedWebhookRegistrationWork>
+  checkpointCandidate: typeof checkpointWebhookCandidate
+  listRetired: typeof listRetiredWebhookRegistrationsForCleanup
+  getCleanupSnapshot: typeof getWebhookCleanupSnapshotIfCurrent
+  deleteAfterCleanup: typeof deleteWebhookRegistrationAfterCleanup
+  createExternal: typeof createExternalWebhookSubscription
+  cleanupExternal: typeof cleanupExternalWebhook
+}
+
+const DEFAULT_DEPENDENCIES: StableWebhookRegistrationDependencies = {
+  prepareIntents: prepareWebhookRegistrationIntents,
+  checkpointCandidate: checkpointWebhookCandidate,
+  listRetired: listRetiredWebhookRegistrationsForCleanup,
+  getCleanupSnapshot: getWebhookCleanupSnapshotIfCurrent,
+  deleteAfterCleanup: deleteWebhookRegistrationAfterCleanup,
+  createExternal: createExternalWebhookSubscription,
+  cleanupExternal: cleanupExternalWebhook,
+}
+
+export interface PrepareStableWebhookRegistrationsInput {
+  request: NextRequest
+  fence: WebhookRegistrationOperationFence
+  workflow: Record<string, unknown>
+  userId: string
+  requestId: string
+  desired: readonly StableDesiredWebhookRegistration[]
+  signal?: AbortSignal
+}
+
+function buildDesiredIntents(
+  desired: readonly StableDesiredWebhookRegistration[]
+): DesiredWebhookRegistrationIntent[] {
+  return desired.map((registration) => ({
+    blockId: registration.blockId,
+    provider: registration.provider,
+    path: registration.path,
+    routingKey: registration.routingKey,
+    providerConfig: registration.providerConfig,
+    configFingerprint: fingerprintDesiredWebhookRegistration({
+      provider: registration.provider,
+      path: registration.path,
+      routingKey: registration.routingKey,
+      desiredConfig: registration.desiredConfig,
+    }),
+  }))
+}
+
+async function cleanupGenerationFencedRegistration(
+  row: WebhookRegistrationRow,
+  workflow: Record<string, unknown>,
+  requestId: string,
+  statuses: readonly ('candidate' | 'orphaned' | 'retired')[],
+  dependencies: StableWebhookRegistrationDependencies
+): Promise<boolean> {
+  if (row.registrationGeneration === null) return false
+  const snapshot = await dependencies.getCleanupSnapshot({
+    workflowId: row.workflowId,
+    webhookId: row.id,
+    expectedGeneration: row.registrationGeneration,
+    statuses,
+  })
+  if (!snapshot) return false
+
+  await dependencies.cleanupExternal(snapshot, workflow, requestId, { throwOnError: true })
+  return dependencies.deleteAfterCleanup({
+    workflowId: snapshot.workflowId,
+    webhookId: snapshot.id,
+    expectedGeneration: row.registrationGeneration,
+    statuses,
+  })
+}
+
+async function createCandidateProviderState(
+  input: PrepareStableWebhookRegistrationsInput,
+  candidate: PreparedWebhookCandidate,
+  dependencies: StableWebhookRegistrationDependencies
+): Promise<Record<string, unknown>> {
+  const webhookData = {
+    ...candidate.row,
+    provider: candidate.desired.provider,
+    providerConfig: candidate.row.providerConfig ?? candidate.desired.providerConfig,
+  }
+  const handler = getProviderHandler(candidate.desired.provider)
+
+  const externalResult = await dependencies.createExternal(
+    input.request,
+    webhookData,
+    input.workflow,
+    input.userId,
+    input.requestId,
+    { signal: input.signal }
+  )
+  let providerConfig = externalResult.updatedProviderConfig
+
+  if (externalResult.externalSubscriptionCreated) {
+    /**
+     * Persist the provider-returned state immediately so the external
+     * subscription is never unrecorded: if the lease aborts or the process
+     * dies between here and the final checkpoint, the retry (or orphan
+     * cleanup) can delete this subscription from the row instead of leaking
+     * it and creating a duplicate.
+     */
+    await dependencies.checkpointCandidate({
+      fence: input.fence,
+      webhookId: candidate.row.id,
+      providerConfig,
+      prepared: false,
+    })
+  }
+
+  if (handler.configurePolling) {
+    let persistedProviderConfig: Record<string, unknown> | undefined
+    const configured = await handler.configurePolling({
+      webhook: { ...webhookData, providerConfig },
+      requestId: input.requestId,
+      persistProviderConfig: async (configuredProviderConfig) => {
+        persistedProviderConfig = configuredProviderConfig
+        await dependencies.checkpointCandidate({
+          fence: input.fence,
+          webhookId: candidate.row.id,
+          providerConfig: configuredProviderConfig,
+          prepared: false,
+        })
+        return true
+      },
+    })
+    if (!configured) {
+      throw new Error(`Failed to configure ${candidate.desired.provider} polling`)
+    }
+    if (persistedProviderConfig) {
+      providerConfig = persistedProviderConfig
+    } else {
+      const configuredRow = await dependencies.getCleanupSnapshot({
+        workflowId: input.fence.workflowId,
+        webhookId: candidate.row.id,
+        expectedGeneration: input.fence.generation,
+        statuses: ['candidate'],
+      })
+      if (!configuredRow) {
+        throw new Error('Webhook candidate became stale while configuring polling')
+      }
+      if (configuredRow.providerConfig && typeof configuredRow.providerConfig === 'object') {
+        providerConfig = configuredRow.providerConfig as Record<string, unknown>
+      }
+    }
+  }
+
+  return providerConfig
+}
+
+/**
+ * Prepares one candidate registration without ever touching the currently
+ * serving external subscription: the candidate's subscription is created
+ * alongside the live one, and the old subscription is deleted only after
+ * activation retires its row (cleanupRetiredWebhookRegistrationsAfterActivation).
+ * A failed or superseded attempt therefore leaves live delivery intact — the
+ * candidate's own external state is rolled back or garbage-collected as an
+ * orphan on the next preparation.
+ *
+ * Providers with singleton registrations per credential (e.g. Telegram
+ * setWebhook) implicitly repoint on create; their delete handlers already
+ * skip teardown while an active deployment uses the same credential, so the
+ * retired-row cleanup after cutover cannot disturb the new subscription.
+ */
+async function prepareCandidate(
+  input: PrepareStableWebhookRegistrationsInput,
+  candidate: PreparedWebhookCandidate,
+  dependencies: StableWebhookRegistrationDependencies
+): Promise<void> {
+  if (candidate.row.preparedAt) return
+  input.signal?.throwIfAborted()
+
+  const handler: WebhookProviderHandler = getProviderHandler(candidate.desired.provider)
+  const hasProviderPreparation = Boolean(handler.createSubscription || handler.configurePolling)
+
+  if (!hasProviderPreparation) {
+    await dependencies.checkpointCandidate({
+      fence: input.fence,
+      webhookId: candidate.row.id,
+      providerConfig: candidate.desired.providerConfig,
+    })
+    return
+  }
+
+  const verificationTracker = new PendingWebhookVerificationTracker()
+  let preparedProviderConfig: Record<string, unknown> | undefined
+  try {
+    if (candidate.row.path) {
+      await verificationTracker.register({
+        path: candidate.row.path,
+        provider: candidate.desired.provider,
+        workflowId: input.fence.workflowId,
+        blockId: candidate.desired.blockId,
+        metadata: candidate.desired.providerConfig,
+      })
+    }
+
+    input.signal?.throwIfAborted()
+    preparedProviderConfig = await createCandidateProviderState(input, candidate, dependencies)
+    input.signal?.throwIfAborted()
+    await dependencies.checkpointCandidate({
+      fence: input.fence,
+      webhookId: candidate.row.id,
+      providerConfig: preparedProviderConfig,
+    })
+  } catch (error) {
+    if (preparedProviderConfig) {
+      try {
+        const currentCandidate = await dependencies.getCleanupSnapshot({
+          workflowId: input.fence.workflowId,
+          webhookId: candidate.row.id,
+          expectedGeneration: input.fence.generation,
+          statuses: ['candidate'],
+        })
+        if (currentCandidate) {
+          await dependencies.cleanupExternal(
+            { ...currentCandidate, providerConfig: preparedProviderConfig },
+            input.workflow,
+            input.requestId,
+            { throwOnError: true }
+          )
+        }
+      } catch (cleanupError) {
+        logger.error('Failed to rollback an uncheckpointed webhook candidate', {
+          workflowId: input.fence.workflowId,
+          webhookId: candidate.row.id,
+          error: toError(cleanupError).message,
+        })
+      }
+    }
+    throw error
+  } finally {
+    await verificationTracker.clearAll()
+  }
+}
+
+/**
+ * Prepares each registration action independently while leaving the currently active set untouched.
+ */
+export async function prepareStableWebhookRegistrations(
+  input: PrepareStableWebhookRegistrationsInput,
+  dependencies: StableWebhookRegistrationDependencies = DEFAULT_DEPENDENCIES
+): Promise<void> {
+  input.signal?.throwIfAborted()
+  const work = await dependencies.prepareIntents({
+    fence: input.fence,
+    desired: buildDesiredIntents(input.desired),
+  })
+
+  const failures: Error[] = []
+  const blocksWithFailedOrphanCleanup = new Set<string>()
+  for (const orphaned of work.orphanedCandidates) {
+    try {
+      await cleanupGenerationFencedRegistration(
+        orphaned,
+        input.workflow,
+        input.requestId,
+        ['orphaned'],
+        dependencies
+      )
+    } catch (error) {
+      failures.push(toError(error))
+      if (orphaned.blockId) blocksWithFailedOrphanCleanup.add(orphaned.blockId)
+    }
+  }
+
+  for (const candidate of work.candidates) {
+    if (blocksWithFailedOrphanCleanup.has(candidate.desired.blockId)) continue
+    try {
+      await prepareCandidate(input, candidate, dependencies)
+    } catch (error) {
+      failures.push(toError(error))
+      logger.warn('Webhook registration candidate preparation failed', {
+        workflowId: input.fence.workflowId,
+        webhookId: candidate.row.id,
+        provider: candidate.desired.provider,
+        error: toError(error).message,
+      })
+    }
+  }
+
+  if (failures.length > 0) {
+    throw new AggregateError(
+      failures,
+      `Failed to prepare ${failures.length} webhook registration(s)`
+    )
+  }
+}
+
+/**
+ * Cleans retired provider resources after activation without trusting stale cleanup payloads.
+ */
+export async function cleanupRetiredWebhookRegistrationsAfterActivation(
+  input: {
+    fence: WebhookRegistrationOperationFence
+    workflow: Record<string, unknown>
+    requestId: string
+    signal?: AbortSignal
+  },
+  dependencies: StableWebhookRegistrationDependencies = DEFAULT_DEPENDENCIES
+): Promise<void> {
+  while (true) {
+    input.signal?.throwIfAborted()
+    const retiredRows = await dependencies.listRetired({ ...input.fence, limit: 100 })
+    if (retiredRows.length === 0) return
+
+    const failures: Error[] = []
+    for (const row of retiredRows) {
+      input.signal?.throwIfAborted()
+      try {
+        await cleanupGenerationFencedRegistration(
+          row,
+          input.workflow,
+          input.requestId,
+          ['retired'],
+          dependencies
+        )
+      } catch (error) {
+        failures.push(toError(error))
+      }
+    }
+
+    if (failures.length > 0) {
+      throw new AggregateError(failures, `Failed to clean ${failures.length} retired webhook(s)`)
+    }
+  }
+}
diff --git a/apps/sim/lib/webhooks/registration-store.test.ts b/apps/sim/lib/webhooks/registration-store.test.ts
new file mode 100644
index 00000000000..f75f4938afa
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-store.test.ts
@@ -0,0 +1,290 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+interface Condition {
+  kind: string
+  column?: unknown
+  value?: unknown
+  conditions?: Condition[]
+}
+
+const { mockTransaction, mockIsDeploymentOperationCurrent, mockClaimWebhookPath } = vi.hoisted(
+  () => ({
+    mockTransaction: vi.fn(),
+    mockIsDeploymentOperationCurrent: vi.fn(),
+    mockClaimWebhookPath: vi.fn(),
+  })
+)
+
+vi.mock('@sim/db', () => ({
+  db: { transaction: mockTransaction },
+}))
+
+vi.mock('drizzle-orm', () => ({
+  and: (...conditions: Condition[]) => ({ kind: 'and', conditions }),
+  eq: (column: unknown, value: unknown) => ({ kind: 'eq', column, value }),
+  gt: (column: unknown, value: unknown) => ({ kind: 'gt', column, value }),
+  inArray: (column: unknown, value: unknown) => ({ kind: 'inArray', column, value }),
+  isNull: (column: unknown) => ({ kind: 'isNull', column }),
+  lt: (column: unknown, value: unknown) => ({ kind: 'lt', column, value }),
+  lte: (column: unknown, value: unknown) => ({ kind: 'lte', column, value }),
+}))
+
+vi.mock('@/lib/webhooks/provider-subscriptions', () => ({
+  projectDesiredWebhookProviderConfig: (config: Record<string, unknown>) => config,
+}))
+
+vi.mock('@/lib/webhooks/path-claims', () => ({
+  claimWebhookPath: mockClaimWebhookPath,
+}))
+
+vi.mock('@/lib/workflows/persistence/deployment-operations', () => ({
+  isDeploymentOperationCurrent: mockIsDeploymentOperationCurrent,
+}))
+
+import type { DbOrTx } from '@sim/workflow-persistence/types'
+import {
+  activateWebhookRegistrations,
+  prepareWebhookRegistrationIntents,
+  StaleWebhookRegistrationOperationError,
+  type WebhookRegistrationOperationFence,
+} from '@/lib/webhooks/registration-store'
+
+const FENCE: WebhookRegistrationOperationFence = {
+  workflowId: 'workflow-1',
+  operationId: 'operation-1',
+  generation: 3,
+  deploymentVersionId: 'version-3',
+}
+
+interface UpdateCall {
+  payload: Record<string, unknown>
+  condition: Condition
+}
+
+interface InsertCall {
+  values: Record<string, unknown>
+}
+
+/**
+ * Queue-driven transaction mock: every select drains the next result from the
+ * queue regardless of terminal call shape (`for`, `limit`, direct await), and
+ * updates/inserts capture their payloads for assertions.
+ */
+function createTx(selectResults: unknown[][]) {
+  const updates: UpdateCall[] = []
+  const inserts: InsertCall[] = []
+  const updateResults: unknown[][] = []
+
+  const nextSelect = () => {
+    const result = selectResults.shift()
+    if (!result) throw new Error('Unexpected select: result queue is empty')
+    return result
+  }
+
+  const tx = {
+    select: vi.fn(() => ({
+      from: vi.fn(() => {
+        const terminal = (result: unknown[]) => ({
+          for: vi.fn(async () => result),
+          limit: vi.fn(async () => result),
+          orderBy: vi.fn(() => ({ limit: vi.fn(async () => result) })),
+          then: (resolve: (rows: unknown[]) => void) => resolve(result),
+        })
+        return {
+          where: vi.fn(() => terminal(nextSelect())),
+        }
+      }),
+    })),
+    update: vi.fn(() => ({
+      set: vi.fn((payload: Record<string, unknown>) => ({
+        where: vi.fn((condition: Condition) => {
+          updates.push({ payload, condition })
+          const result = updateResults.shift() ?? [{ id: 'updated' }]
+          return {
+            returning: vi.fn(async () => result),
+            then: (resolve: (rows: unknown[]) => void) => resolve(result),
+          }
+        }),
+      })),
+    })),
+    insert: vi.fn(() => ({
+      values: vi.fn((values: Record<string, unknown>) => {
+        inserts.push({ values })
+        return { returning: vi.fn(async () => [{ ...values }]) }
+      }),
+    })),
+  }
+
+  return { tx: tx as unknown as DbOrTx, updates, inserts, updateResults }
+}
+
+function activeRow(overrides: Record<string, unknown> = {}) {
+  return {
+    id: 'wh-active',
+    workflowId: 'workflow-1',
+    blockId: 'block-1',
+    provider: 'slack',
+    path: 'hooks/a',
+    routingKey: null,
+    providerConfig: {},
+    registrationStatus: 'active',
+    registrationGeneration: 2,
+    configFingerprint: 'fp-old',
+    preparedAt: new Date('2026-07-01T00:00:00Z'),
+    isActive: true,
+    archivedAt: null,
+    deploymentVersionId: 'version-2',
+    updatedAt: new Date('2026-07-01T00:00:00Z'),
+    createdAt: new Date('2026-07-01T00:00:00Z'),
+    ...overrides,
+  }
+}
+
+describe('activateWebhookRegistrations', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockIsDeploymentOperationCurrent.mockResolvedValue(true)
+  })
+
+  it('rejects when candidates are not fully prepared', async () => {
+    const { tx, updates } = createTx([[{ id: 'workflow-1' }], [{ id: 'wh-unprepared' }]])
+
+    await expect(activateWebhookRegistrations(tx, FENCE)).rejects.toThrow(
+      'Webhook registration candidates are not fully prepared'
+    )
+    expect(updates).toHaveLength(0)
+  })
+
+  it('rejects stale operations when newer generation rows exist', async () => {
+    const { tx, updates } = createTx([[{ id: 'workflow-1' }], [], [{ id: 'wh-newer' }]])
+
+    await expect(activateWebhookRegistrations(tx, FENCE)).rejects.toBeInstanceOf(
+      StaleWebhookRegistrationOperationError
+    )
+    expect(updates).toHaveLength(0)
+  })
+
+  it('rejects when the operation is no longer current', async () => {
+    mockIsDeploymentOperationCurrent.mockResolvedValue(false)
+    const { tx, updates } = createTx([[{ id: 'workflow-1' }]])
+
+    await expect(activateWebhookRegistrations(tx, FENCE)).rejects.toBeInstanceOf(
+      StaleWebhookRegistrationOperationError
+    )
+    expect(updates).toHaveLength(0)
+  })
+
+  it('retires older actives, repoints reused rows, and promotes candidates atomically', async () => {
+    const { tx, updates } = createTx([[{ id: 'workflow-1' }], [], []])
+
+    await activateWebhookRegistrations(tx, FENCE)
+
+    expect(updates).toHaveLength(3)
+    expect(updates[0].payload).toEqual(
+      expect.objectContaining({ registrationStatus: 'retired', isActive: false })
+    )
+    expect(updates[0].payload.archivedAt).toBeInstanceOf(Date)
+    expect(JSON.stringify(updates[0].condition)).toContain('"lt"')
+
+    expect(updates[1].payload).toEqual(
+      expect.objectContaining({
+        deploymentVersionId: 'version-3',
+        isActive: true,
+        archivedAt: null,
+      })
+    )
+
+    expect(updates[2].payload).toEqual(
+      expect.objectContaining({
+        registrationStatus: 'active',
+        deploymentVersionId: 'version-3',
+        isActive: true,
+        archivedAt: null,
+      })
+    )
+  })
+})
+
+describe('prepareWebhookRegistrationIntents', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockIsDeploymentOperationCurrent.mockResolvedValue(true)
+    mockClaimWebhookPath.mockResolvedValue('hooks/a')
+    mockTransaction.mockImplementation(async (callback: (tx: DbOrTx) => Promise<unknown>) => {
+      throw new Error('mockTransaction not configured for this test')
+    })
+  })
+
+  function runInTx(selectResults: unknown[][]) {
+    const harness = createTx(selectResults)
+    mockTransaction.mockImplementation(async (callback: (tx: DbOrTx) => Promise<unknown>) =>
+      callback(harness.tx)
+    )
+    return harness
+  }
+
+  const desired = {
+    blockId: 'block-1',
+    provider: 'slack',
+    path: 'hooks/a',
+    routingKey: null,
+    providerConfig: { url: 'https://example.test' },
+    configFingerprint: 'fp-new',
+  }
+
+  it('claims paths and writes legacy-invisible candidates for changed registrations', async () => {
+    const previousActive = activeRow()
+    const { inserts, updates } = runInTx([[{ id: 'workflow-1' }], [], [previousActive], []])
+
+    const work = await prepareWebhookRegistrationIntents({ fence: FENCE, desired: [desired] })
+
+    expect(mockClaimWebhookPath).toHaveBeenCalledWith(expect.anything(), {
+      path: 'hooks/a',
+      workflowId: 'workflow-1',
+      generation: 3,
+    })
+    expect(updates).toHaveLength(0)
+    expect(inserts).toHaveLength(1)
+    expect(inserts[0].values).toEqual(
+      expect.objectContaining({
+        registrationStatus: 'candidate',
+        registrationGeneration: 3,
+        configFingerprint: 'fp-new',
+        isActive: false,
+        preparedAt: null,
+        deploymentVersionId: 'version-3',
+      })
+    )
+    expect(inserts[0].values.archivedAt).toBeInstanceOf(Date)
+    expect(work.candidates).toHaveLength(1)
+    expect(work.candidates[0].row.blockId).toBe('block-1')
+  })
+
+  it('reuses fingerprint-matched active rows by bumping their generation fence', async () => {
+    const reusable = activeRow({ configFingerprint: 'fp-new' })
+    const { inserts, updates } = runInTx([[{ id: 'workflow-1' }], [], [reusable], []])
+
+    const work = await prepareWebhookRegistrationIntents({ fence: FENCE, desired: [desired] })
+
+    expect(inserts).toHaveLength(0)
+    expect(updates).toHaveLength(1)
+    expect(updates[0].payload).toEqual(
+      expect.objectContaining({ registrationGeneration: 3, configFingerprint: 'fp-new' })
+    )
+    expect(work.candidates).toHaveLength(0)
+  })
+
+  it('rejects stale generations before touching rows', async () => {
+    mockIsDeploymentOperationCurrent.mockResolvedValue(false)
+    const { inserts, updates } = runInTx([[{ id: 'workflow-1' }]])
+
+    await expect(
+      prepareWebhookRegistrationIntents({ fence: FENCE, desired: [desired] })
+    ).rejects.toBeInstanceOf(StaleWebhookRegistrationOperationError)
+    expect(inserts).toHaveLength(0)
+    expect(updates).toHaveLength(0)
+  })
+})
diff --git a/apps/sim/lib/webhooks/registration-store.ts b/apps/sim/lib/webhooks/registration-store.ts
new file mode 100644
index 00000000000..bc619b891a2
--- /dev/null
+++ b/apps/sim/lib/webhooks/registration-store.ts
@@ -0,0 +1,552 @@
+import { db } from '@sim/db'
+import { webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
+import { generateShortId } from '@sim/utils/id'
+import { isPlainRecord } from '@sim/utils/object'
+import type { DbOrTx } from '@sim/workflow-persistence/types'
+import { and, eq, gt, inArray, isNull, lt, lte } from 'drizzle-orm'
+import { claimWebhookPath } from '@/lib/webhooks/path-claims'
+import { projectDesiredWebhookProviderConfig } from '@/lib/webhooks/provider-subscriptions'
+import {
+  fingerprintDesiredWebhookRegistration,
+  normalizeWebhookRegistrationPath,
+} from '@/lib/webhooks/registration-identity'
+import { planWebhookRegistrationReconciliation } from '@/lib/webhooks/registration-reconciliation'
+import type { DeploymentOperationStatus } from '@/lib/workflows/deployment-lifecycle'
+import { isDeploymentOperationCurrent } from '@/lib/workflows/persistence/deployment-operations'
+
+export type WebhookRegistrationRow = typeof webhook.$inferSelect
+export type WebhookRegistrationStatus = 'active' | 'candidate' | 'retired' | 'orphaned'
+
+export interface WebhookRegistrationOperationFence {
+  workflowId: string
+  operationId: string
+  generation: number
+  deploymentVersionId: string
+}
+
+export interface DesiredWebhookRegistrationIntent {
+  blockId: string
+  provider: string
+  path: string | null
+  routingKey: string | null
+  providerConfig: Record<string, unknown>
+  configFingerprint: string
+}
+
+export interface PreparedWebhookCandidate {
+  desired: DesiredWebhookRegistrationIntent
+  row: WebhookRegistrationRow
+}
+
+export interface PreparedWebhookRegistrationWork {
+  candidates: PreparedWebhookCandidate[]
+  orphanedCandidates: WebhookRegistrationRow[]
+}
+
+export class StaleWebhookRegistrationOperationError extends Error {
+  readonly code = 'stale_webhook_registration_operation'
+
+  constructor(message = 'Webhook registration operation is stale') {
+    super(message)
+    this.name = 'StaleWebhookRegistrationOperationError'
+  }
+}
+
+function assertOperationGeneration(generation: number): void {
+  if (!Number.isSafeInteger(generation) || generation <= 0) {
+    throw new TypeError('Webhook registration generation must be a positive safe integer')
+  }
+}
+
+async function assertCurrentOperation(
+  tx: DbOrTx,
+  fence: WebhookRegistrationOperationFence,
+  allowedStatuses: readonly DeploymentOperationStatus[]
+): Promise<void> {
+  assertOperationGeneration(fence.generation)
+
+  const [workflowRow] = await tx
+    .select({ id: workflow.id })
+    .from(workflow)
+    .where(eq(workflow.id, fence.workflowId))
+    .for('update')
+  if (!workflowRow) {
+    throw new StaleWebhookRegistrationOperationError('Webhook registration workflow is missing')
+  }
+
+  const isCurrent = await isDeploymentOperationCurrent(
+    {
+      workflowId: fence.workflowId,
+      operationId: fence.operationId,
+      generation: fence.generation,
+      deploymentVersionId: fence.deploymentVersionId,
+      statuses: allowedStatuses,
+    },
+    tx
+  )
+  if (!isCurrent) {
+    throw new StaleWebhookRegistrationOperationError()
+  }
+}
+
+function rowProviderConfig(row: WebhookRegistrationRow): Record<string, unknown> {
+  return isPlainRecord(row.providerConfig) ? row.providerConfig : {}
+}
+
+function rowRegistrationGeneration(row: WebhookRegistrationRow): number {
+  if (
+    row.registrationGeneration === null ||
+    !Number.isSafeInteger(row.registrationGeneration) ||
+    row.registrationGeneration < 0
+  ) {
+    throw new StaleWebhookRegistrationOperationError(
+      `Webhook registration ${row.id} has no valid generation`
+    )
+  }
+  return row.registrationGeneration
+}
+
+function fingerprintPersistedWebhook(row: WebhookRegistrationRow): string {
+  if (!row.provider) {
+    throw new Error(`Webhook registration ${row.id} has no provider`)
+  }
+  return fingerprintDesiredWebhookRegistration({
+    provider: row.provider,
+    path: row.path,
+    routingKey: row.routingKey,
+    desiredConfig: projectDesiredWebhookProviderConfig(rowProviderConfig(row)),
+  })
+}
+
+async function adoptLegacyActiveRows(
+  tx: DbOrTx,
+  fence: WebhookRegistrationOperationFence
+): Promise<void> {
+  const [activeVersion] = await tx
+    .select({ id: workflowDeploymentVersion.id })
+    .from(workflowDeploymentVersion)
+    .where(
+      and(
+        eq(workflowDeploymentVersion.workflowId, fence.workflowId),
+        eq(workflowDeploymentVersion.isActive, true)
+      )
+    )
+    .limit(1)
+
+  if (!activeVersion) return
+
+  const legacyRows = await tx
+    .select()
+    .from(webhook)
+    .where(
+      and(
+        eq(webhook.workflowId, fence.workflowId),
+        eq(webhook.deploymentVersionId, activeVersion.id),
+        isNull(webhook.registrationStatus),
+        eq(webhook.isActive, true),
+        isNull(webhook.archivedAt)
+      )
+    )
+
+  const adoptedGeneration = fence.generation - 1
+  for (const row of legacyRows) {
+    if (!row.blockId || !row.provider) continue
+    if (row.path) {
+      await claimWebhookPath(tx, {
+        path: row.path,
+        workflowId: fence.workflowId,
+        generation: adoptedGeneration,
+      })
+    }
+
+    const [adopted] = await tx
+      .update(webhook)
+      .set({
+        registrationStatus: 'active',
+        registrationGeneration: adoptedGeneration,
+        configFingerprint: fingerprintPersistedWebhook(row),
+        preparedAt: row.updatedAt,
+      })
+      .where(and(eq(webhook.id, row.id), isNull(webhook.registrationStatus)))
+      .returning({ id: webhook.id })
+
+    if (!adopted) {
+      throw new StaleWebhookRegistrationOperationError(
+        `Legacy webhook registration ${row.id} changed during adoption`
+      )
+    }
+  }
+}
+
+/**
+ * Builds the insert shape that keeps a candidate invisible to every legacy delivery query.
+ */
+export function buildLegacyInvisibleCandidateValues(input: {
+  id: string
+  fence: WebhookRegistrationOperationFence
+  desired: DesiredWebhookRegistrationIntent
+  now: Date
+}) {
+  return {
+    id: input.id,
+    workflowId: input.fence.workflowId,
+    deploymentVersionId: input.fence.deploymentVersionId,
+    registrationStatus: 'candidate' as const,
+    registrationGeneration: input.fence.generation,
+    configFingerprint: input.desired.configFingerprint,
+    preparedAt: null,
+    blockId: input.desired.blockId,
+    path: normalizeWebhookRegistrationPath(input.desired.path),
+    routingKey: input.desired.routingKey,
+    provider: input.desired.provider,
+    providerConfig: input.desired.providerConfig,
+    isActive: false,
+    failedCount: 0,
+    archivedAt: input.now,
+    createdAt: input.now,
+    updatedAt: input.now,
+  }
+}
+
+/**
+ * Persists one generation's registration intent before any provider call is made.
+ */
+export async function prepareWebhookRegistrationIntents(input: {
+  fence: WebhookRegistrationOperationFence
+  desired: readonly DesiredWebhookRegistrationIntent[]
+}): Promise<PreparedWebhookRegistrationWork> {
+  return db.transaction(async (tx) => {
+    await assertCurrentOperation(tx, input.fence, ['preparing'])
+    await adoptLegacyActiveRows(tx, input.fence)
+
+    for (const desired of input.desired) {
+      if (desired.path) {
+        await claimWebhookPath(tx, {
+          path: desired.path,
+          workflowId: input.fence.workflowId,
+          generation: input.fence.generation,
+        })
+      }
+    }
+
+    const activeRows = await tx
+      .select()
+      .from(webhook)
+      .where(
+        and(
+          eq(webhook.workflowId, input.fence.workflowId),
+          eq(webhook.registrationStatus, 'active'),
+          eq(webhook.isActive, true),
+          isNull(webhook.archivedAt)
+        )
+      )
+
+    const activeRegistrations = activeRows
+      .filter(
+        (row): row is WebhookRegistrationRow & { blockId: string } =>
+          typeof row.blockId === 'string'
+      )
+      .map((row) => ({
+        triggerId: row.blockId,
+        generation: rowRegistrationGeneration(row),
+        fingerprint: row.configFingerprint,
+        row,
+      }))
+
+    const plan = planWebhookRegistrationReconciliation({
+      generation: input.fence.generation,
+      desired: input.desired.map((desired) => ({
+        triggerId: desired.blockId,
+        fingerprint: desired.configFingerprint,
+        desired,
+      })),
+      existing: activeRegistrations,
+    })
+
+    const candidateRows = await tx
+      .select()
+      .from(webhook)
+      .where(
+        and(
+          eq(webhook.workflowId, input.fence.workflowId),
+          eq(webhook.registrationStatus, 'candidate')
+        )
+      )
+    const candidatesByBlockId = new Map(
+      candidateRows
+        .filter(
+          (row): row is WebhookRegistrationRow & { blockId: string } =>
+            typeof row.blockId === 'string'
+        )
+        .map((row) => [row.blockId, row])
+    )
+
+    const candidates: PreparedWebhookCandidate[] = []
+    const orphanedCandidates: WebhookRegistrationRow[] = []
+    const now = new Date()
+
+    for (const action of plan.actions) {
+      if (action.kind === 'reuse') {
+        const currentGeneration = rowRegistrationGeneration(action.existing.row)
+        const [updated] = await tx
+          .update(webhook)
+          .set({
+            registrationGeneration: input.fence.generation,
+            configFingerprint: action.desired.fingerprint,
+            preparedAt: now,
+            updatedAt: now,
+          })
+          .where(
+            and(
+              eq(webhook.id, action.existing.row.id),
+              eq(webhook.registrationStatus, 'active'),
+              eq(webhook.registrationGeneration, currentGeneration),
+              lte(webhook.registrationGeneration, input.fence.generation)
+            )
+          )
+          .returning()
+        if (!updated) throw new StaleWebhookRegistrationOperationError()
+        continue
+      }
+
+      const desired = action.desired.desired
+      const existingCandidate = candidatesByBlockId.get(action.triggerId)
+      if (
+        existingCandidate &&
+        existingCandidate.registrationGeneration === input.fence.generation &&
+        existingCandidate.configFingerprint === action.desired.fingerprint
+      ) {
+        candidates.push({ desired, row: existingCandidate })
+        continue
+      }
+
+      if (existingCandidate) {
+        const existingGeneration = rowRegistrationGeneration(existingCandidate)
+        const [orphaned] = await tx
+          .update(webhook)
+          .set({
+            registrationStatus: 'orphaned',
+            updatedAt: now,
+          })
+          .where(
+            and(
+              eq(webhook.id, existingCandidate.id),
+              eq(webhook.registrationStatus, 'candidate'),
+              eq(webhook.registrationGeneration, existingGeneration)
+            )
+          )
+          .returning()
+        if (!orphaned) throw new StaleWebhookRegistrationOperationError()
+        orphanedCandidates.push(orphaned)
+      }
+
+      const [candidate] = await tx
+        .insert(webhook)
+        .values(
+          buildLegacyInvisibleCandidateValues({
+            id: generateShortId(),
+            fence: input.fence,
+            desired,
+            now,
+          })
+        )
+        .returning()
+      if (!candidate) throw new Error('Failed to persist webhook registration candidate')
+      candidates.push({ desired, row: candidate })
+    }
+
+    return { candidates, orphanedCandidates }
+  })
+}
+
+/** Checkpoints provider-managed candidate state under the operation and generation fences. */
+export async function checkpointWebhookCandidate(input: {
+  fence: WebhookRegistrationOperationFence
+  webhookId: string
+  providerConfig: Record<string, unknown>
+  prepared?: boolean
+}): Promise<WebhookRegistrationRow> {
+  return db.transaction(async (tx) => {
+    await assertCurrentOperation(tx, input.fence, ['preparing'])
+    const now = new Date()
+    const [updated] = await tx
+      .update(webhook)
+      .set({
+        providerConfig: input.providerConfig,
+        ...(input.prepared === false ? {} : { preparedAt: now }),
+        updatedAt: now,
+      })
+      .where(
+        and(
+          eq(webhook.id, input.webhookId),
+          eq(webhook.workflowId, input.fence.workflowId),
+          eq(webhook.registrationStatus, 'candidate'),
+          eq(webhook.registrationGeneration, input.fence.generation)
+        )
+      )
+      .returning()
+    if (!updated) throw new StaleWebhookRegistrationOperationError()
+    return updated
+  })
+}
+
+/**
+ * Atomically promotes prepared candidates, repoints reused rows, and retires superseded rows.
+ *
+ * This is designed to be passed directly to a v2 deployment operation's activation transaction.
+ */
+export async function activateWebhookRegistrations(
+  tx: DbOrTx,
+  fence: WebhookRegistrationOperationFence
+): Promise<void> {
+  await assertCurrentOperation(tx, fence, ['active'])
+
+  const unpreparedCandidates = await tx
+    .select({ id: webhook.id })
+    .from(webhook)
+    .where(
+      and(
+        eq(webhook.workflowId, fence.workflowId),
+        eq(webhook.registrationStatus, 'candidate'),
+        eq(webhook.registrationGeneration, fence.generation),
+        isNull(webhook.preparedAt)
+      )
+    )
+    .limit(1)
+  if (unpreparedCandidates.length > 0) {
+    throw new Error('Webhook registration candidates are not fully prepared')
+  }
+
+  const newerRows = await tx
+    .select({ id: webhook.id })
+    .from(webhook)
+    .where(
+      and(
+        eq(webhook.workflowId, fence.workflowId),
+        inArray(webhook.registrationStatus, ['active', 'candidate']),
+        gt(webhook.registrationGeneration, fence.generation)
+      )
+    )
+    .limit(1)
+  if (newerRows.length > 0) throw new StaleWebhookRegistrationOperationError()
+
+  const now = new Date()
+  await tx
+    .update(webhook)
+    .set({
+      registrationStatus: 'retired',
+      isActive: false,
+      archivedAt: now,
+      updatedAt: now,
+    })
+    .where(
+      and(
+        eq(webhook.workflowId, fence.workflowId),
+        eq(webhook.registrationStatus, 'active'),
+        lt(webhook.registrationGeneration, fence.generation)
+      )
+    )
+
+  await tx
+    .update(webhook)
+    .set({
+      deploymentVersionId: fence.deploymentVersionId,
+      isActive: true,
+      archivedAt: null,
+      updatedAt: now,
+    })
+    .where(
+      and(
+        eq(webhook.workflowId, fence.workflowId),
+        eq(webhook.registrationStatus, 'active'),
+        eq(webhook.registrationGeneration, fence.generation)
+      )
+    )
+
+  await tx
+    .update(webhook)
+    .set({
+      registrationStatus: 'active',
+      deploymentVersionId: fence.deploymentVersionId,
+      isActive: true,
+      archivedAt: null,
+      updatedAt: now,
+    })
+    .where(
+      and(
+        eq(webhook.workflowId, fence.workflowId),
+        eq(webhook.registrationStatus, 'candidate'),
+        eq(webhook.registrationGeneration, fence.generation)
+      )
+    )
+}
+
+/** Lists retired rows only while the supplied activation is still the current generation. */
+export async function listRetiredWebhookRegistrationsForCleanup(
+  input: WebhookRegistrationOperationFence & { limit?: number }
+): Promise<WebhookRegistrationRow[]> {
+  return db.transaction(async (tx) => {
+    await assertCurrentOperation(tx, input, ['active'])
+    return tx
+      .select()
+      .from(webhook)
+      .where(
+        and(
+          eq(webhook.workflowId, input.workflowId),
+          eq(webhook.registrationStatus, 'retired'),
+          lt(webhook.registrationGeneration, input.generation)
+        )
+      )
+      .orderBy(webhook.registrationGeneration, webhook.id)
+      .limit(input.limit ?? 100)
+  })
+}
+
+/**
+ * Reloads an exact cleanup snapshot. A row advanced or reused by a newer generation is rejected.
+ */
+export async function getWebhookCleanupSnapshotIfCurrent(input: {
+  workflowId: string
+  webhookId: string
+  expectedGeneration: number
+  statuses: readonly WebhookRegistrationStatus[]
+}): Promise<WebhookRegistrationRow | null> {
+  return db.transaction(async (tx) => {
+    const [row] = await tx
+      .select()
+      .from(webhook)
+      .where(
+        and(
+          eq(webhook.workflowId, input.workflowId),
+          eq(webhook.id, input.webhookId),
+          eq(webhook.registrationGeneration, input.expectedGeneration),
+          inArray(webhook.registrationStatus, input.statuses)
+        )
+      )
+      .for('update')
+    return row ?? null
+  })
+}
+
+/** Deletes an externally cleaned row while preserving sticky path ownership. */
+export async function deleteWebhookRegistrationAfterCleanup(input: {
+  workflowId: string
+  webhookId: string
+  expectedGeneration: number
+  statuses: readonly WebhookRegistrationStatus[]
+}): Promise<boolean> {
+  return db.transaction(async (tx) => {
+    const [deleted] = await tx
+      .delete(webhook)
+      .where(
+        and(
+          eq(webhook.workflowId, input.workflowId),
+          eq(webhook.id, input.webhookId),
+          eq(webhook.registrationGeneration, input.expectedGeneration),
+          inArray(webhook.registrationStatus, input.statuses)
+        )
+      )
+      .returning({ id: webhook.id })
+    return Boolean(deleted)
+  })
+}
diff --git a/apps/sim/lib/webhooks/utils.server.test.ts b/apps/sim/lib/webhooks/utils.server.test.ts
new file mode 100644
index 00000000000..6668984a600
--- /dev/null
+++ b/apps/sim/lib/webhooks/utils.server.test.ts
@@ -0,0 +1,109 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+interface Condition {
+  kind: string
+  column?: unknown
+  value?: unknown
+  conditions?: Condition[]
+}
+
+const { mockSelect } = vi.hoisted(() => ({ mockSelect: vi.fn() }))
+
+vi.mock('@sim/db', () => ({ db: { select: mockSelect } }))
+
+vi.mock('drizzle-orm', () => ({
+  and: (...conditions: Condition[]) => ({ kind: 'and', conditions }),
+  eq: (column: unknown, value: unknown) => ({ kind: 'eq', column, value }),
+  isNull: (column: unknown) => ({ kind: 'isNull', column }),
+}))
+
+import { findConflictingWebhookPathOwner } from '@/lib/webhooks/utils.server'
+
+function claimLookupChain(rows: unknown[], captureCondition?: (condition: Condition) => void) {
+  return {
+    from: vi.fn(() => ({
+      where: vi.fn((condition: Condition) => {
+        captureCondition?.(condition)
+        return { limit: vi.fn().mockResolvedValue(rows) }
+      }),
+    })),
+  }
+}
+
+function liveRowsChain(rows: unknown[]) {
+  return {
+    from: vi.fn(() => ({
+      innerJoin: vi.fn(() => ({
+        where: vi.fn().mockResolvedValue(rows),
+      })),
+    })),
+  }
+}
+
+describe('findConflictingWebhookPathOwner', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('returns the claim owner while the claim holder is mid-rotation', async () => {
+    let claimCondition: Condition | undefined
+    mockSelect.mockReturnValueOnce(
+      claimLookupChain([{ workflowId: 'workflow-owner' }], (condition) => {
+        claimCondition = condition
+      })
+    )
+
+    const owner = await findConflictingWebhookPathOwner({
+      path: ' /leads/ ',
+      workflowId: 'workflow-caller',
+    })
+
+    expect(owner).toBe('workflow-owner')
+    expect(mockSelect).toHaveBeenCalledTimes(1)
+    expect(claimCondition).toEqual(expect.objectContaining({ kind: 'eq', value: 'leads' }))
+  })
+
+  it('ignores the caller-owned claim and falls through to live rows', async () => {
+    mockSelect
+      .mockReturnValueOnce(claimLookupChain([{ workflowId: 'workflow-caller' }]))
+      .mockReturnValueOnce(liveRowsChain([]))
+
+    const owner = await findConflictingWebhookPathOwner({
+      path: 'leads',
+      workflowId: 'workflow-caller',
+    })
+
+    expect(owner).toBeNull()
+    expect(mockSelect).toHaveBeenCalledTimes(2)
+  })
+
+  it('returns a foreign live-row owner when no claim exists', async () => {
+    mockSelect
+      .mockReturnValueOnce(claimLookupChain([]))
+      .mockReturnValueOnce(
+        liveRowsChain([{ workflowId: 'workflow-caller' }, { workflowId: 'workflow-foreign' }])
+      )
+
+    const owner = await findConflictingWebhookPathOwner({
+      path: 'leads',
+      workflowId: 'workflow-caller',
+    })
+
+    expect(owner).toBe('workflow-foreign')
+  })
+
+  it('skips the claim lookup entirely for empty paths', async () => {
+    mockSelect.mockReturnValueOnce(liveRowsChain([]))
+
+    const owner = await findConflictingWebhookPathOwner({
+      path: '   ',
+      workflowId: 'workflow-caller',
+    })
+
+    expect(owner).toBeNull()
+    expect(mockSelect).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/apps/sim/lib/webhooks/utils.server.ts b/apps/sim/lib/webhooks/utils.server.ts
index 0bff56de94e..d4b21423e8c 100644
--- a/apps/sim/lib/webhooks/utils.server.ts
+++ b/apps/sim/lib/webhooks/utils.server.ts
@@ -1,19 +1,23 @@
 import { db } from '@sim/db'
-import { webhook, workflow } from '@sim/db/schema'
+import { webhook, webhookPathClaim, workflow } from '@sim/db/schema'
 import { and, eq, isNull } from 'drizzle-orm'
 import type { DbOrTx } from '@/lib/db/types'
+import { normalizeWebhookRegistrationPath } from '@/lib/webhooks/registration-identity'
 
 /**
- * Returns the id of a different workflow that already owns an active webhook on
- * the given path, or `null` if the path is free or owned by `workflowId`.
+ * Returns the id of a different workflow that already owns the given path, or
+ * `null` when the path is free or owned by `workflowId`.
  *
- * Webhook paths are user-controlled and the database only enforces uniqueness
- * per deployment version, so this is the single guard against cross-tenant path
- * collisions for every webhook creation path. The filter mirrors the runtime
- * dispatcher (`findAllWebhooksForPath`): an active, non-archived webhook on a
- * non-archived workflow — inactive or archived webhooks never receive
- * deliveries, so they must not reserve a path. All matching rows are scanned so
- * a same-workflow row can never mask a foreign collision.
+ * Ownership has two sources, checked in order:
+ *
+ * 1. `webhook_path_claim` — sticky ownership acquired by the stable
+ *    registration protocol. Claims must be honored even while the owner's
+ *    rows are non-deliverable candidates (mid-prepare) or mid-rotation,
+ *    otherwise another workflow could take over the path in that window.
+ * 2. Live webhook rows — mirrors the runtime dispatcher
+ *    (`findAllWebhooksForPath`): an active, non-archived webhook on a
+ *    non-archived workflow. All matching rows are scanned so a same-workflow
+ *    row can never mask a foreign collision.
  */
 export async function findConflictingWebhookPathOwner(params: {
   path: string
@@ -23,6 +27,18 @@ export async function findConflictingWebhookPathOwner(params: {
   const { path, workflowId, tx } = params
   const dbCtx = tx ?? db
 
+  const normalizedPath = normalizeWebhookRegistrationPath(path)
+  if (normalizedPath) {
+    const [claim] = await dbCtx
+      .select({ workflowId: webhookPathClaim.workflowId })
+      .from(webhookPathClaim)
+      .where(eq(webhookPathClaim.path, normalizedPath))
+      .limit(1)
+    if (claim && claim.workflowId !== workflowId) {
+      return claim.workflowId
+    }
+  }
+
   const existing = await dbCtx
     .select({ workflowId: webhook.workflowId })
     .from(webhook)
diff --git a/apps/sim/lib/workflows/conditions.test.ts b/apps/sim/lib/workflows/conditions.test.ts
new file mode 100644
index 00000000000..9aba21bd912
--- /dev/null
+++ b/apps/sim/lib/workflows/conditions.test.ts
@@ -0,0 +1,23 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { isElseConditionTitle } from '@/lib/workflows/conditions'
+
+describe('isElseConditionTitle', () => {
+  it.each(['else', 'Else', ' \t eLsE \n'])('recognizes "%s" as an else title', (title) => {
+    expect(isElseConditionTitle(title)).toBe(true)
+  })
+
+  it('rejects other condition titles', () => {
+    expect(isElseConditionTitle('else if')).toBe(false)
+  })
+
+  it('does not mutate legacy snapshot titles', () => {
+    const condition = { title: ' Else ' }
+
+    isElseConditionTitle(condition.title)
+
+    expect(condition.title).toBe(' Else ')
+  })
+})
diff --git a/apps/sim/lib/workflows/conditions.ts b/apps/sim/lib/workflows/conditions.ts
new file mode 100644
index 00000000000..e1591fc3aa5
--- /dev/null
+++ b/apps/sim/lib/workflows/conditions.ts
@@ -0,0 +1,9 @@
+/**
+ * Returns whether a condition title represents the fallback branch.
+ *
+ * @param title - Condition title from a workflow snapshot
+ * @returns Whether the normalized title is `else`
+ */
+export function isElseConditionTitle(title: unknown): boolean {
+  return typeof title === 'string' && title.trim().toLowerCase() === 'else'
+}
diff --git a/apps/sim/lib/workflows/deployment-lifecycle.test.ts b/apps/sim/lib/workflows/deployment-lifecycle.test.ts
new file mode 100644
index 00000000000..6422d8c4043
--- /dev/null
+++ b/apps/sim/lib/workflows/deployment-lifecycle.test.ts
@@ -0,0 +1,52 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import {
+  canTransitionDeploymentOperation,
+  createDeploymentReadiness,
+  isDeploymentReadinessComplete,
+  parseDeploymentReadiness,
+  toSafeDeploymentError,
+} from '@/lib/workflows/deployment-lifecycle'
+
+describe('deployment lifecycle', () => {
+  it('allows only forward in-flight transitions', () => {
+    expect(canTransitionDeploymentOperation('preparing', 'activating')).toBe(true)
+    expect(canTransitionDeploymentOperation('preparing', 'failed')).toBe(true)
+    expect(canTransitionDeploymentOperation('activating', 'active')).toBe(true)
+    expect(canTransitionDeploymentOperation('active', 'activating')).toBe(false)
+    expect(canTransitionDeploymentOperation('failed', 'preparing')).toBe(false)
+  })
+
+  it('tracks required component readiness without accepting malformed state', () => {
+    const readiness = createDeploymentReadiness(
+      ['webhooks', 'schedules'],
+      new Date('2026-07-14T08:00:00.000Z')
+    )
+    expect(isDeploymentReadinessComplete(readiness)).toBe(false)
+
+    readiness.webhooks.status = 'ready'
+    readiness.schedules.status = 'ready'
+    expect(isDeploymentReadinessComplete(readiness)).toBe(true)
+    expect(parseDeploymentReadiness(readiness)).toEqual(readiness)
+    expect(
+      parseDeploymentReadiness({ schedules: { status: 'unknown', updatedAt: 'now' } })
+    ).toBeNull()
+  })
+
+  it('sanitizes persisted errors', () => {
+    const error = Object.assign(
+      new Error(
+        'authorization=Bearer-secret password=hunter2 https://user:pass@example.com failed\nnext'
+      ),
+      { code: 'UPSTREAM SECRET/FAILURE' }
+    )
+
+    expect(toSafeDeploymentError(error)).toEqual({
+      code: 'upstream_secret_failure',
+      message:
+        'authorization=[redacted] password=[redacted] https://[redacted]@example.com failed next',
+    })
+  })
+})
diff --git a/apps/sim/lib/workflows/deployment-lifecycle.ts b/apps/sim/lib/workflows/deployment-lifecycle.ts
new file mode 100644
index 00000000000..576051b6971
--- /dev/null
+++ b/apps/sim/lib/workflows/deployment-lifecycle.ts
@@ -0,0 +1,189 @@
+import { getErrorMessage } from '@sim/utils/errors'
+import { truncate } from '@sim/utils/string'
+
+export const DEPLOYMENT_OPERATION_PROTOCOL_VERSION = 2
+
+export const DEPLOYMENT_OPERATION_STATUSES = [
+  'preparing',
+  'activating',
+  'active',
+  'failed',
+  'superseded',
+] as const
+
+export const DEPLOYMENT_OPERATION_ACTIONS = ['deploy', 'activate'] as const
+
+export const DEPLOYMENT_COMPONENT_STATUSES = ['pending', 'ready'] as const
+
+export type DeploymentOperationStatus = (typeof DEPLOYMENT_OPERATION_STATUSES)[number]
+export type DeploymentOperationAction = (typeof DEPLOYMENT_OPERATION_ACTIONS)[number]
+export type DeploymentComponentStatus = (typeof DEPLOYMENT_COMPONENT_STATUSES)[number]
+
+export interface SafeDeploymentError {
+  code: string
+  message: string
+}
+
+export interface DeploymentComponentReadiness {
+  status: DeploymentComponentStatus
+  updatedAt: string
+}
+
+export type DeploymentReadiness = Record<string, DeploymentComponentReadiness>
+
+const ALLOWED_TRANSITIONS: Readonly<
+  Record<DeploymentOperationStatus, DeploymentOperationStatus[]>
+> = {
+  preparing: ['activating', 'failed', 'superseded'],
+  activating: ['active', 'failed', 'superseded'],
+  active: [],
+  failed: [],
+  superseded: [],
+}
+
+const MAX_ERROR_CODE_LENGTH = 64
+const MAX_ERROR_MESSAGE_LENGTH = 500
+
+/**
+ * Narrows a persisted value to a supported operation status.
+ */
+export function isDeploymentOperationStatus(value: unknown): value is DeploymentOperationStatus {
+  return DEPLOYMENT_OPERATION_STATUSES.includes(value as DeploymentOperationStatus)
+}
+
+/**
+ * Narrows a persisted value to a supported operation action.
+ */
+export function isDeploymentOperationAction(value: unknown): value is DeploymentOperationAction {
+  return DEPLOYMENT_OPERATION_ACTIONS.includes(value as DeploymentOperationAction)
+}
+
+/**
+ * Returns whether an operation may move between two lifecycle states.
+ */
+export function canTransitionDeploymentOperation(
+  from: DeploymentOperationStatus,
+  to: DeploymentOperationStatus
+): boolean {
+  return ALLOWED_TRANSITIONS[from].includes(to)
+}
+
+/**
+ * Builds the initial readiness map for the components required by an attempt.
+ */
+export function createDeploymentReadiness(
+  components: readonly string[],
+  updatedAt = new Date()
+): DeploymentReadiness {
+  const readiness: DeploymentReadiness = {}
+  for (const component of components) {
+    const normalizedComponent = component.trim()
+    if (!normalizedComponent) {
+      throw new Error('Deployment readiness component names cannot be empty')
+    }
+    if (readiness[normalizedComponent]) {
+      throw new Error(`Duplicate deployment readiness component: ${normalizedComponent}`)
+    }
+    readiness[normalizedComponent] = {
+      status: 'pending',
+      updatedAt: updatedAt.toISOString(),
+    }
+  }
+  return readiness
+}
+
+/**
+ * Returns true only when every declared component is ready.
+ */
+export function isDeploymentReadinessComplete(readiness: DeploymentReadiness): boolean {
+  return Object.values(readiness).every((component) => component.status === 'ready')
+}
+
+/**
+ * Narrows persisted JSON to the lifecycle readiness shape.
+ */
+export function parseDeploymentReadiness(value: unknown): DeploymentReadiness | null {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return null
+
+  const readiness: DeploymentReadiness = {}
+  for (const [component, rawState] of Object.entries(value)) {
+    if (!rawState || typeof rawState !== 'object' || Array.isArray(rawState)) return null
+
+    const state = rawState as Record<string, unknown>
+    if (
+      !DEPLOYMENT_COMPONENT_STATUSES.includes(state.status as DeploymentComponentStatus) ||
+      typeof state.updatedAt !== 'string'
+    ) {
+      return null
+    }
+
+    readiness[component] = {
+      status: state.status as DeploymentComponentStatus,
+      updatedAt: state.updatedAt,
+    }
+  }
+
+  return readiness
+}
+
+/**
+ * A preparation failure that cannot succeed on retry (path conflicts, invalid
+ * trigger configuration). The outbox handler fails the operation immediately
+ * instead of burning the full retry budget.
+ */
+export class NonRetryableDeploymentError extends Error {
+  constructor(
+    message: string,
+    readonly errorCode: string = 'preparation_failed'
+  ) {
+    super(message)
+    this.name = 'NonRetryableDeploymentError'
+  }
+}
+
+/**
+ * Narrows an unknown caught value to {@link NonRetryableDeploymentError}.
+ */
+export function isNonRetryableDeploymentError(
+  error: unknown
+): error is NonRetryableDeploymentError {
+  return error instanceof NonRetryableDeploymentError
+}
+
+/**
+ * Converts an unknown failure into the bounded public shape persisted on an attempt.
+ */
+export function toSafeDeploymentError(error: unknown, errorCode?: string): SafeDeploymentError {
+  const source =
+    errorCode ??
+    (error && typeof error === 'object' && 'code' in error
+      ? String((error as { code?: unknown }).code ?? 'deployment_failed')
+      : 'deployment_failed')
+  const code =
+    truncate(
+      source
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9_.-]+/g, '_'),
+      MAX_ERROR_CODE_LENGTH,
+      ''
+    ) || 'deployment_failed'
+
+  const message = sanitizeDeploymentErrorMessage(
+    getErrorMessage(error, 'Deployment operation failed')
+  )
+  return { code, message }
+}
+
+function sanitizeDeploymentErrorMessage(message: string): string {
+  const withoutControlCharacters = message.replace(/[\u0000-\u001F\u007F]+/g, ' ').trim()
+  const withoutUrlCredentials = withoutControlCharacters.replace(
+    /:\/\/[^/\s:@]+:[^/\s@]+@/g,
+    '://[redacted]@'
+  )
+  const withoutSecrets = withoutUrlCredentials.replace(
+    /\b(authorization|api[-_ ]?key|access[-_ ]?token|refresh[-_ ]?token|secret|password)\b(\s*[:=]\s*)([^\s,;]+)/gi,
+    '$1$2[redacted]'
+  )
+  return truncate(withoutSecrets || 'Deployment operation failed', MAX_ERROR_MESSAGE_LENGTH, '')
+}
diff --git a/apps/sim/lib/workflows/deployment-outbox.test.ts b/apps/sim/lib/workflows/deployment-outbox.test.ts
new file mode 100644
index 00000000000..dfb524a6962
--- /dev/null
+++ b/apps/sim/lib/workflows/deployment-outbox.test.ts
@@ -0,0 +1,505 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const {
+  mockLimit,
+  mockPrepareWebhooks,
+  mockGetDeploymentOperation,
+  mockMarkDeploymentComponentReadiness,
+  mockBeginDeploymentOperationActivation,
+  mockActivateDeploymentOperation,
+  mockMarkDeploymentOperationFailed,
+  mockIsDeploymentOperationCurrent,
+  mockIsDeploymentVersionProtectedByCurrentOperation,
+  mockCreateSchedulesForDeploy,
+  mockSyncMcpToolsForWorkflow,
+  mockNotifyMcpToolServers,
+  mockSetWorkflowMcpTransactionLockTimeout,
+  mockCleanupWebhooksForWorkflow,
+  mockActivateWebhookRegistrations,
+  mockCleanupRetiredWebhookRegistrations,
+  mockRecordAudit,
+  mockEmitWorkflowDeployedEvent,
+  mockCaptureServerEvent,
+  mockTx,
+} = vi.hoisted(() => ({
+  mockLimit: vi.fn(),
+  mockPrepareWebhooks: vi.fn(),
+  mockGetDeploymentOperation: vi.fn(),
+  mockMarkDeploymentComponentReadiness: vi.fn(),
+  mockBeginDeploymentOperationActivation: vi.fn(),
+  mockActivateDeploymentOperation: vi.fn(),
+  mockMarkDeploymentOperationFailed: vi.fn(),
+  mockIsDeploymentOperationCurrent: vi.fn(),
+  mockIsDeploymentVersionProtectedByCurrentOperation: vi.fn(),
+  mockCreateSchedulesForDeploy: vi.fn(),
+  mockSyncMcpToolsForWorkflow: vi.fn(),
+  mockNotifyMcpToolServers: vi.fn(),
+  mockSetWorkflowMcpTransactionLockTimeout: vi.fn(),
+  mockCleanupWebhooksForWorkflow: vi.fn(),
+  mockActivateWebhookRegistrations: vi.fn(),
+  mockCleanupRetiredWebhookRegistrations: vi.fn(),
+  mockRecordAudit: vi.fn(),
+  mockEmitWorkflowDeployedEvent: vi.fn(),
+  mockCaptureServerEvent: vi.fn(),
+  mockTx: { select: vi.fn(), update: vi.fn(), execute: vi.fn() },
+}))
+
+vi.mock('@sim/audit', () => ({
+  AuditAction: {
+    WORKFLOW_DEPLOYED: 'WORKFLOW_DEPLOYED',
+    WORKFLOW_DEPLOYMENT_ACTIVATED: 'WORKFLOW_DEPLOYMENT_ACTIVATED',
+  },
+  AuditResourceType: { WORKFLOW: 'WORKFLOW' },
+  recordAudit: mockRecordAudit,
+}))
+
+vi.mock('@sim/db', () => ({
+  db: {
+    select: vi.fn(() => ({
+      from: vi.fn(() => ({
+        where: vi.fn(() => ({
+          limit: mockLimit,
+        })),
+      })),
+    })),
+    insert: vi.fn(),
+    update: vi.fn(),
+    delete: vi.fn(),
+    transaction: vi.fn(),
+  },
+  workflow: {
+    id: 'workflow.id',
+    isDeployed: 'workflow.isDeployed',
+  },
+  workflowDeploymentVersion: {
+    id: 'workflowDeploymentVersion.id',
+    workflowId: 'workflowDeploymentVersion.workflowId',
+    state: 'workflowDeploymentVersion.state',
+    isActive: 'workflowDeploymentVersion.isActive',
+  },
+}))
+
+vi.mock('@sim/logger', () => ({
+  createLogger: () => ({ info: vi.fn(), warn: vi.fn(), error: vi.fn() }),
+}))
+
+vi.mock('drizzle-orm', () => ({
+  and: vi.fn((...args) => ({ type: 'and', args })),
+  eq: vi.fn((column, value) => ({ type: 'eq', column, value })),
+  ne: vi.fn((column, value) => ({ type: 'ne', column, value })),
+}))
+
+vi.mock('@/lib/core/config/env', () => ({
+  env: { INTERNAL_API_SECRET: 'secret' },
+}))
+
+vi.mock('@/lib/core/outbox/service', () => ({
+  enqueueOutboxEvent: vi.fn(),
+  processOutboxEventById: vi.fn(),
+}))
+
+vi.mock('@/lib/core/utils/request', () => ({
+  generateRequestId: () => 'request-generated',
+}))
+
+vi.mock('@/lib/core/utils/urls', () => ({
+  getBaseUrl: () => 'http://localhost:3000',
+  getSocketServerUrl: () => 'http://localhost:3002',
+}))
+
+vi.mock('@/lib/mcp/server-locks', () => ({
+  setWorkflowMcpTransactionLockTimeout: mockSetWorkflowMcpTransactionLockTimeout,
+}))
+
+vi.mock('@/lib/posthog/server', () => ({
+  captureServerEvent: mockCaptureServerEvent,
+}))
+
+vi.mock('@/lib/mcp/workflow-mcp-sync', () => ({
+  notifyMcpToolServers: mockNotifyMcpToolServers,
+  removeMcpToolsForWorkflow: vi.fn(),
+  syncMcpToolsForWorkflow: mockSyncMcpToolsForWorkflow,
+}))
+
+vi.mock('@/lib/webhooks/deploy', () => ({
+  cleanupWebhooksForWorkflow: mockCleanupWebhooksForWorkflow,
+  prepareStableTriggerWebhooksForDeploy: vi.fn(),
+  saveTriggerWebhooksForDeploy: vi.fn(),
+}))
+
+vi.mock('@/lib/webhooks/registration-service', () => ({
+  cleanupRetiredWebhookRegistrationsAfterActivation: mockCleanupRetiredWebhookRegistrations,
+}))
+
+vi.mock('@/lib/webhooks/registration-store', () => ({
+  activateWebhookRegistrations: mockActivateWebhookRegistrations,
+}))
+
+vi.mock('@/lib/workflows/persistence/deployment-operations', () => ({
+  activateDeploymentOperation: mockActivateDeploymentOperation,
+  beginDeploymentOperationActivation: mockBeginDeploymentOperationActivation,
+  getDeploymentOperation: mockGetDeploymentOperation,
+  isDeploymentOperationCurrent: mockIsDeploymentOperationCurrent,
+  isDeploymentVersionProtectedByCurrentOperation:
+    mockIsDeploymentVersionProtectedByCurrentOperation,
+  markDeploymentComponentReadiness: mockMarkDeploymentComponentReadiness,
+  markDeploymentOperationFailed: mockMarkDeploymentOperationFailed,
+}))
+
+vi.mock('@/lib/workflows/schedules', () => ({
+  createSchedulesForDeploy: mockCreateSchedulesForDeploy,
+  deleteSchedulesForWorkflow: vi.fn(),
+}))
+
+vi.mock('@/lib/workspace-events/emitter', () => ({
+  emitWorkflowDeployedEvent: mockEmitWorkflowDeployedEvent,
+}))
+
+import type { OutboxEventContext } from '@/lib/core/outbox/service'
+import { NonRetryableDeploymentError } from '@/lib/workflows/deployment-lifecycle'
+import {
+  createWorkflowDeploymentOutboxHandlers,
+  type PrepareDeploymentV2Payload,
+  WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS,
+} from '@/lib/workflows/deployment-outbox'
+
+const NOW = new Date('2026-07-14T08:00:00.000Z')
+
+function operation(overrides: Record<string, unknown> = {}) {
+  return {
+    id: 'operation-1',
+    workflowId: 'workflow-1',
+    deploymentVersionId: 'version-2',
+    version: 2,
+    previousActiveVersionId: 'version-1',
+    action: 'deploy' as const,
+    protocolVersion: 2,
+    generation: 2,
+    status: 'preparing' as const,
+    componentReadiness: {
+      webhooks: { status: 'pending', updatedAt: NOW.toISOString() },
+      schedules: { status: 'pending', updatedAt: NOW.toISOString() },
+      mcp: { status: 'pending', updatedAt: NOW.toISOString() },
+    },
+    errorCode: null,
+    errorMessage: null,
+    idempotencyKey: 'request-1',
+    requestHash: 'hash',
+    actorId: 'user-1',
+    completedAt: null,
+    createdAt: NOW,
+    updatedAt: NOW,
+    ...overrides,
+  }
+}
+
+function payload(): PrepareDeploymentV2Payload {
+  return {
+    protocolVersion: 2,
+    operationId: 'operation-1',
+    generation: 2,
+    workflowId: 'workflow-1',
+    deploymentVersionId: 'version-2',
+    version: 2,
+    userId: 'user-1',
+    requestId: 'request-1',
+    checkpoints: {},
+  }
+}
+
+function context(controller = new AbortController(), attempts = 0): OutboxEventContext {
+  return {
+    eventId: 'event-1',
+    eventType: WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.PREPARE_V2,
+    attempts,
+    maxAttempts: 10,
+    signal: controller.signal,
+    checkpointPayload: vi.fn().mockResolvedValue(undefined),
+  }
+}
+
+function handler() {
+  return createWorkflowDeploymentOutboxHandlers({
+    prepareWebhooks: mockPrepareWebhooks,
+  })[WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.PREPARE_V2]
+}
+
+describe('versioned deployment preparation outbox', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(null, { status: 200 })))
+    mockPrepareWebhooks.mockResolvedValue(undefined)
+    mockActivateWebhookRegistrations.mockResolvedValue(undefined)
+    mockCleanupRetiredWebhookRegistrations.mockResolvedValue(undefined)
+    mockCreateSchedulesForDeploy.mockResolvedValue({ success: true })
+    mockSyncMcpToolsForWorkflow.mockResolvedValue([{ serverId: 'mcp-server-1' }])
+    mockSetWorkflowMcpTransactionLockTimeout.mockResolvedValue(undefined)
+    mockEmitWorkflowDeployedEvent.mockResolvedValue(undefined)
+    mockMarkDeploymentOperationFailed.mockResolvedValue({
+      success: true,
+      operation: operation({ status: 'failed' }),
+    })
+    mockIsDeploymentOperationCurrent.mockResolvedValue(false)
+    mockIsDeploymentVersionProtectedByCurrentOperation.mockResolvedValue(false)
+  })
+
+  it('activates only after every preparation component is ready', async () => {
+    const preparing = operation()
+    const webhooksReady = operation({
+      componentReadiness: {
+        ...preparing.componentReadiness,
+        webhooks: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    const schedulesReady = operation({
+      componentReadiness: {
+        ...webhooksReady.componentReadiness,
+        schedules: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    const allReady = operation({
+      componentReadiness: {
+        ...schedulesReady.componentReadiness,
+        mcp: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    const activating = operation({
+      status: 'activating',
+      componentReadiness: allReady.componentReadiness,
+    })
+    const active = operation({
+      status: 'active',
+      componentReadiness: allReady.componentReadiness,
+      completedAt: NOW,
+    })
+    mockGetDeploymentOperation.mockResolvedValue(preparing)
+    mockLimit
+      .mockResolvedValueOnce([{ id: 'workflow-1', name: 'Workflow', workspaceId: 'workspace-1' }])
+      .mockResolvedValueOnce([{ id: 'version-2', state: { blocks: {} } }])
+    mockMarkDeploymentComponentReadiness
+      .mockResolvedValueOnce({ success: true, operation: webhooksReady })
+      .mockResolvedValueOnce({ success: true, operation: schedulesReady })
+      .mockResolvedValueOnce({ success: true, operation: allReady })
+    mockBeginDeploymentOperationActivation.mockResolvedValue({
+      success: true,
+      operation: activating,
+    })
+    mockActivateDeploymentOperation.mockImplementation(async (input) => {
+      await input.onActivateTransaction?.(mockTx, active)
+      return { success: true, operation: active }
+    })
+
+    await handler()(payload(), context())
+
+    expect(mockPrepareWebhooks).toHaveBeenCalledTimes(1)
+    expect(mockCreateSchedulesForDeploy).toHaveBeenCalledWith(
+      'workflow-1',
+      {},
+      undefined,
+      'version-2',
+      'operation-1'
+    )
+    expect(
+      mockMarkDeploymentComponentReadiness.mock.calls.map(([input]) => input.component)
+    ).toEqual(['webhooks', 'schedules', 'mcp'])
+    expect(mockSyncMcpToolsForWorkflow).toHaveBeenCalledWith(
+      expect.objectContaining({
+        tx: mockTx,
+        notify: false,
+        state: { blocks: {} },
+      })
+    )
+    expect(mockActivateWebhookRegistrations).toHaveBeenCalledWith(mockTx, {
+      workflowId: 'workflow-1',
+      operationId: 'operation-1',
+      generation: 2,
+      deploymentVersionId: 'version-2',
+    })
+    expect(mockCleanupRetiredWebhookRegistrations).toHaveBeenCalledTimes(1)
+    expect(mockNotifyMcpToolServers).toHaveBeenCalledWith([{ serverId: 'mcp-server-1' }])
+    expect(mockRecordAudit).toHaveBeenCalledTimes(1)
+    expect(mockCaptureServerEvent).toHaveBeenCalledWith(
+      'user-1',
+      'workflow_deployed',
+      { workflow_id: 'workflow-1', workspace_id: 'workspace-1' },
+      expect.objectContaining({
+        groups: { workspace: 'workspace-1' },
+        setOnce: expect.objectContaining({ first_workflow_deployed_at: expect.any(String) }),
+      })
+    )
+    expect(mockEmitWorkflowDeployedEvent).toHaveBeenCalledTimes(1)
+    expect(mockRecordAudit.mock.invocationCallOrder[0]).toBeGreaterThan(
+      mockActivateDeploymentOperation.mock.invocationCallOrder[0]
+    )
+  })
+
+  it('ignores a superseded generation without preparing side effects', async () => {
+    mockGetDeploymentOperation.mockResolvedValue(operation({ status: 'superseded' }))
+
+    await handler()(payload(), context())
+
+    expect(mockPrepareWebhooks).not.toHaveBeenCalled()
+    expect(mockCreateSchedulesForDeploy).not.toHaveBeenCalled()
+    expect(mockMarkDeploymentComponentReadiness).not.toHaveBeenCalled()
+    expect(mockActivateDeploymentOperation).not.toHaveBeenCalled()
+  })
+
+  it('honors an aborted signal before starting any side effect', async () => {
+    const controller = new AbortController()
+    controller.abort()
+
+    await expect(handler()(payload(), context(controller))).rejects.toMatchObject({
+      name: 'AbortError',
+    })
+
+    expect(mockGetDeploymentOperation).not.toHaveBeenCalled()
+    expect(mockPrepareWebhooks).not.toHaveBeenCalled()
+  })
+
+  it('generation-guards failure on the final outbox attempt', async () => {
+    const preparing = operation()
+    mockGetDeploymentOperation.mockResolvedValue(preparing)
+    mockLimit
+      .mockResolvedValueOnce([{ id: 'workflow-1', name: 'Workflow', workspaceId: 'workspace-1' }])
+      .mockResolvedValueOnce([{ id: 'version-2', state: { blocks: {} } }])
+    mockPrepareWebhooks.mockRejectedValue(new Error('provider unavailable'))
+
+    await expect(handler()(payload(), context(new AbortController(), 9))).rejects.toThrow(
+      'provider unavailable'
+    )
+
+    expect(mockMarkDeploymentOperationFailed).toHaveBeenCalledWith({
+      workflowId: 'workflow-1',
+      operationId: 'operation-1',
+      generation: 2,
+      error: expect.objectContaining({ message: 'provider unavailable' }),
+      errorCode: 'preparation_failed',
+    })
+    expect(mockActivateDeploymentOperation).not.toHaveBeenCalled()
+  })
+
+  it('retries transient mid-attempt failures without failing the operation', async () => {
+    const preparing = operation()
+    mockGetDeploymentOperation.mockResolvedValue(preparing)
+    mockLimit
+      .mockResolvedValueOnce([{ id: 'workflow-1', name: 'Workflow', workspaceId: 'workspace-1' }])
+      .mockResolvedValueOnce([{ id: 'version-2', state: { blocks: {} } }])
+    mockPrepareWebhooks.mockRejectedValue(new Error('provider briefly unavailable'))
+
+    await expect(handler()(payload(), context(new AbortController(), 0))).rejects.toThrow(
+      'provider briefly unavailable'
+    )
+
+    expect(mockMarkDeploymentOperationFailed).not.toHaveBeenCalled()
+    expect(mockActivateDeploymentOperation).not.toHaveBeenCalled()
+  })
+
+  it('skips checkpointed webhook preparation on resume without re-running provider work', async () => {
+    const preparing = operation()
+    const webhooksReady = operation({
+      componentReadiness: {
+        ...preparing.componentReadiness,
+        webhooks: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    const schedulesReady = operation({
+      componentReadiness: {
+        ...webhooksReady.componentReadiness,
+        schedules: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    const allReady = operation({
+      componentReadiness: {
+        ...schedulesReady.componentReadiness,
+        mcp: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    mockGetDeploymentOperation.mockResolvedValue(preparing)
+    mockLimit
+      .mockResolvedValueOnce([{ id: 'workflow-1', name: 'Workflow', workspaceId: 'workspace-1' }])
+      .mockResolvedValueOnce([{ id: 'version-2', state: { blocks: {} } }])
+    mockMarkDeploymentComponentReadiness
+      .mockResolvedValueOnce({ success: true, operation: webhooksReady })
+      .mockResolvedValueOnce({ success: true, operation: schedulesReady })
+      .mockResolvedValueOnce({ success: true, operation: allReady })
+    mockBeginDeploymentOperationActivation.mockResolvedValue({
+      success: true,
+      operation: operation({
+        status: 'activating',
+        componentReadiness: allReady.componentReadiness,
+      }),
+    })
+    mockActivateDeploymentOperation.mockResolvedValue({
+      success: true,
+      operation: operation({
+        status: 'active',
+        componentReadiness: allReady.componentReadiness,
+        completedAt: NOW,
+      }),
+    })
+
+    const resumedPayload = { ...payload(), checkpoints: { webhooksPrepared: true } }
+    await handler()(resumedPayload, context())
+
+    expect(mockPrepareWebhooks).not.toHaveBeenCalled()
+    expect(mockCreateSchedulesForDeploy).toHaveBeenCalledTimes(1)
+    expect(mockMarkDeploymentComponentReadiness.mock.calls[0][0]).toEqual(
+      expect.objectContaining({ component: 'webhooks', status: 'ready' })
+    )
+  })
+
+  it('fails the operation immediately on a non-retryable preparation error', async () => {
+    const preparing = operation()
+    mockGetDeploymentOperation.mockResolvedValue(preparing)
+    mockLimit
+      .mockResolvedValueOnce([{ id: 'workflow-1', name: 'Workflow', workspaceId: 'workspace-1' }])
+      .mockResolvedValueOnce([{ id: 'version-2', state: { blocks: {} } }])
+    mockPrepareWebhooks.mockRejectedValue(
+      new NonRetryableDeploymentError(
+        'Webhook path "/leads" is already in use. Choose a different path.',
+        'webhook_path_conflict'
+      )
+    )
+
+    await expect(handler()(payload(), context())).resolves.toBeUndefined()
+
+    expect(mockMarkDeploymentOperationFailed).toHaveBeenCalledWith({
+      workflowId: 'workflow-1',
+      operationId: 'operation-1',
+      generation: 2,
+      error: expect.objectContaining({
+        message: 'Webhook path "/leads" is already in use. Choose a different path.',
+      }),
+      errorCode: 'webhook_path_conflict',
+    })
+    expect(mockActivateDeploymentOperation).not.toHaveBeenCalled()
+  })
+
+  it('keeps v1 cleanup from deleting a candidate owned by the current v2 operation', async () => {
+    mockLimit
+      .mockResolvedValueOnce([{ id: 'workflow-1', name: 'Workflow', workspaceId: 'workspace-1' }])
+      .mockResolvedValueOnce([{ isActive: false }])
+      .mockResolvedValueOnce([{ isDeployed: true }])
+    mockIsDeploymentVersionProtectedByCurrentOperation.mockResolvedValue(true)
+    const cleanupHandler =
+      createWorkflowDeploymentOutboxHandlers()[
+        WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.CLEANUP_UNDEPLOYED_SIDE_EFFECTS
+      ]
+
+    await cleanupHandler(
+      {
+        workflowId: 'workflow-1',
+        deploymentVersionIds: ['version-2'],
+        userId: 'user-1',
+        requestId: 'request-1',
+      },
+      context()
+    )
+
+    expect(mockCleanupWebhooksForWorkflow).not.toHaveBeenCalled()
+    expect(mockCreateSchedulesForDeploy).not.toHaveBeenCalled()
+  })
+})
diff --git a/apps/sim/lib/workflows/deployment-outbox.ts b/apps/sim/lib/workflows/deployment-outbox.ts
index 3c4ce5e9952..e57831aea67 100644
--- a/apps/sim/lib/workflows/deployment-outbox.ts
+++ b/apps/sim/lib/workflows/deployment-outbox.ts
@@ -1,33 +1,112 @@
+import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db, workflowDeploymentVersion, workflow as workflowTable } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { and, eq, ne } from 'drizzle-orm'
 import { NextRequest } from 'next/server'
+import { env } from '@/lib/core/config/env'
 import {
   enqueueOutboxEvent,
+  type OutboxEventContext,
+  type OutboxHandler,
   type OutboxHandlerRegistry,
   type ProcessSingleOutboxResult,
   processOutboxEventById,
 } from '@/lib/core/outbox/service'
 import { generateRequestId } from '@/lib/core/utils/request'
-import { getBaseUrl } from '@/lib/core/utils/urls'
+import { getBaseUrl, getSocketServerUrl } from '@/lib/core/utils/urls'
 import { setWorkflowMcpTransactionLockTimeout } from '@/lib/mcp/server-locks'
 import {
   notifyMcpToolServers,
   removeMcpToolsForWorkflow,
   syncMcpToolsForWorkflow,
 } from '@/lib/mcp/workflow-mcp-sync'
-import { cleanupWebhooksForWorkflow, saveTriggerWebhooksForDeploy } from '@/lib/webhooks/deploy'
+import { captureServerEvent } from '@/lib/posthog/server'
+import {
+  cleanupWebhooksForWorkflow,
+  prepareStableTriggerWebhooksForDeploy,
+  saveTriggerWebhooksForDeploy,
+} from '@/lib/webhooks/deploy'
+import { cleanupRetiredWebhookRegistrationsAfterActivation } from '@/lib/webhooks/registration-service'
+import { activateWebhookRegistrations } from '@/lib/webhooks/registration-store'
+import {
+  DEPLOYMENT_OPERATION_PROTOCOL_VERSION,
+  type DeploymentOperationStatus,
+  isDeploymentReadinessComplete,
+  isNonRetryableDeploymentError,
+  NonRetryableDeploymentError,
+  parseDeploymentReadiness,
+} from '@/lib/workflows/deployment-lifecycle'
+import {
+  activateDeploymentOperation,
+  beginDeploymentOperationActivation,
+  type DeploymentOperationGeneration,
+  getDeploymentOperation,
+  isDeploymentOperationCurrent,
+  isDeploymentVersionProtectedByCurrentOperation,
+  markDeploymentComponentReadiness,
+  markDeploymentOperationFailed,
+  type WorkflowDeploymentOperation,
+} from '@/lib/workflows/persistence/deployment-operations'
 import { createSchedulesForDeploy, deleteSchedulesForWorkflow } from '@/lib/workflows/schedules'
+import { emitWorkflowDeployedEvent } from '@/lib/workspace-events/emitter'
 import type { BlockState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('WorkflowDeploymentOutbox')
 
 export const WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS = {
+  PREPARE_V2: 'workflow.deployment.prepare.v2',
+  /** One-release rolling compatibility for events admitted by pre-v2 pods. */
   SYNC_ACTIVE_SIDE_EFFECTS: 'workflow.deployment.sync-active-side-effects',
+  /** One-release rolling compatibility for cleanup admitted by pre-v2 pods. */
   CLEANUP_INACTIVE_SIDE_EFFECTS: 'workflow.deployment.cleanup-inactive-side-effects',
   CLEANUP_UNDEPLOYED_SIDE_EFFECTS: 'workflow.deployment.cleanup-undeployed-side-effects',
 } as const
 
+export const DEPLOYMENT_READINESS_COMPONENTS = ['webhooks', 'schedules', 'mcp'] as const
+
+interface DeploymentPreparationCheckpoints {
+  webhooksPrepared?: boolean
+  schedulesPrepared?: boolean
+  mcpReadyForActivation?: boolean
+  inactiveCleanupCompleted?: boolean
+  auditEmitted?: boolean
+  analyticsCaptured?: boolean
+  socketNotified?: boolean
+  workspaceEventEmitted?: boolean
+}
+
+interface DeploymentCleanupOperationFence extends DeploymentOperationGeneration {
+  deploymentVersionId: string
+  statuses: readonly DeploymentOperationStatus[]
+}
+
+export interface PrepareDeploymentV2Payload {
+  protocolVersion: number
+  operationId: string
+  generation: number
+  workflowId: string
+  deploymentVersionId: string
+  version: number
+  userId: string
+  requestId: string
+  checkpoints: DeploymentPreparationCheckpoints
+}
+
+export interface PrepareDeploymentWebhooksInput {
+  request: NextRequest
+  workflowId: string
+  workflow: Record<string, unknown>
+  userId: string
+  blocks: Record<string, BlockState>
+  requestId: string
+  deploymentVersionId: string
+  operationId: string
+  generation: number
+  signal: AbortSignal
+}
+
+export type PrepareDeploymentWebhooksHook = (input: PrepareDeploymentWebhooksInput) => Promise<void>
+
 interface SyncActiveSideEffectsPayload {
   workflowId: string
   deploymentVersionId: string
@@ -50,16 +129,13 @@ interface CleanupInactiveSideEffectsPayload {
   requestId?: string
 }
 
-export async function enqueueWorkflowDeploymentSideEffects(
+export async function enqueueWorkflowDeploymentPreparation(
   executor: Pick<typeof db, 'insert'>,
-  payload: SyncActiveSideEffectsPayload
+  payload: PrepareDeploymentV2Payload
 ): Promise<string> {
-  return enqueueOutboxEvent(
-    executor,
-    WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.SYNC_ACTIVE_SIDE_EFFECTS,
-    payload,
-    { maxAttempts: 10 }
-  )
+  return enqueueOutboxEvent(executor, WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.PREPARE_V2, payload, {
+    maxAttempts: 10,
+  })
 }
 
 export async function enqueueWorkflowUndeploySideEffects(
@@ -92,6 +168,508 @@ export async function processWorkflowDeploymentOutboxEvent(
   return processOutboxEventById(eventId, workflowDeploymentOutboxHandlers)
 }
 
+/**
+ * Notifies connected clients after deployment compatibility state changes.
+ */
+export async function notifySocketDeploymentChanged(
+  workflowId: string,
+  options: { signal?: AbortSignal; throwOnError?: boolean } = {}
+): Promise<void> {
+  try {
+    const response = await fetch(`${getSocketServerUrl()}/api/workflow-deployed`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'x-api-key': env.INTERNAL_API_SECRET,
+      },
+      body: JSON.stringify({ workflowId }),
+      signal: options.signal,
+    })
+    if (!response.ok) {
+      const error = new Error(
+        `Socket deployment notification failed (${response.status}) for workflow ${workflowId}`
+      )
+      if (options.throwOnError) throw error
+      logger.warn(error.message)
+    }
+  } catch (error) {
+    if (options.throwOnError) throw error
+    logger.error('Error sending workflow deployed event to socket server', error)
+  }
+}
+
+const defaultPrepareDeploymentWebhooks: PrepareDeploymentWebhooksHook = async (input) => {
+  input.signal.throwIfAborted()
+  const result = await prepareStableTriggerWebhooksForDeploy({
+    request: input.request,
+    workflowId: input.workflowId,
+    workflow: input.workflow,
+    userId: input.userId,
+    blocks: input.blocks,
+    requestId: input.requestId,
+    deploymentVersionId: input.deploymentVersionId,
+    operationId: input.operationId,
+    generation: input.generation,
+    signal: input.signal,
+  })
+  input.signal.throwIfAborted()
+  if (!result.success) {
+    const message = result.error?.message || 'Failed to prepare trigger configuration'
+    const status = result.error?.status ?? 500
+    if (status >= 400 && status < 500) {
+      throw new NonRetryableDeploymentError(
+        message,
+        status === 409 ? 'webhook_path_conflict' : 'invalid_trigger_configuration'
+      )
+    }
+    throw new Error(message)
+  }
+}
+
+function createPrepareDeploymentHandler(
+  prepareWebhooks: PrepareDeploymentWebhooksHook
+): OutboxHandler {
+  return async (rawPayload, context) => {
+    const payload = parsePrepareDeploymentV2Payload(rawPayload)
+    try {
+      await prepareDeploymentOperation(payload, context, prepareWebhooks)
+    } catch (error) {
+      const isFinalAttempt = context.attempts + 1 >= context.maxAttempts
+      if (isNonRetryableDeploymentError(error) || isFinalAttempt) {
+        const operation = await getDeploymentOperation(payload)
+        if (operation?.status === 'preparing' || operation?.status === 'activating') {
+          await markDeploymentOperationFailed({
+            workflowId: payload.workflowId,
+            operationId: payload.operationId,
+            generation: payload.generation,
+            error,
+            errorCode: isNonRetryableDeploymentError(error)
+              ? error.errorCode
+              : 'preparation_failed',
+          })
+        }
+        if (isNonRetryableDeploymentError(error)) {
+          logger.warn('Deployment preparation failed permanently; not retrying', {
+            workflowId: payload.workflowId,
+            operationId: payload.operationId,
+            error: error.message,
+          })
+          return
+        }
+      }
+      throw error
+    }
+  }
+}
+
+async function prepareDeploymentOperation(
+  payload: PrepareDeploymentV2Payload,
+  context: OutboxEventContext,
+  prepareWebhooks: PrepareDeploymentWebhooksHook
+): Promise<void> {
+  context.signal.throwIfAborted()
+  let operation = await getDeploymentOperation(payload)
+  context.signal.throwIfAborted()
+  if (!operation || isTerminalNonActiveOperation(operation)) return
+  assertPreparationPayloadMatchesOperation(payload, operation)
+
+  const [workflowRecord] = await db
+    .select()
+    .from(workflowTable)
+    .where(eq(workflowTable.id, payload.workflowId))
+    .limit(1)
+  context.signal.throwIfAborted()
+  if (!workflowRecord) throw new Error('Workflow missing during deployment preparation')
+
+  const checkpoints = { ...payload.checkpoints }
+  const checkpoint = async (patch: Partial<DeploymentPreparationCheckpoints>) => {
+    Object.assign(checkpoints, patch)
+    context.signal.throwIfAborted()
+    await context.checkpointPayload({ checkpoints })
+    context.signal.throwIfAborted()
+  }
+
+  if (operation.status === 'active') {
+    await cleanupRetiredWebhooksForOperation({
+      payload,
+      workflow: workflowRecord as Record<string, unknown>,
+      context,
+    })
+    await cleanupInactiveDeploymentsForOperation({
+      payload,
+      workflow: workflowRecord as Record<string, unknown>,
+      checkpoints,
+      checkpoint,
+      context,
+    })
+    await emitPostActivationSideEffects({
+      payload,
+      operation,
+      workflow: workflowRecord as Record<string, unknown>,
+      checkpoints,
+      checkpoint,
+      context,
+    })
+    return
+  }
+  if (operation.status !== 'preparing' && operation.status !== 'activating') return
+
+  const [versionRow] = await db
+    .select({
+      id: workflowDeploymentVersion.id,
+      state: workflowDeploymentVersion.state,
+    })
+    .from(workflowDeploymentVersion)
+    .where(
+      and(
+        eq(workflowDeploymentVersion.workflowId, payload.workflowId),
+        eq(workflowDeploymentVersion.id, payload.deploymentVersionId)
+      )
+    )
+    .limit(1)
+  context.signal.throwIfAborted()
+  if (!versionRow?.state) throw new Error('Deployment version missing during preparation')
+
+  const state = versionRow.state as { blocks?: Record<string, BlockState> }
+  const blocks = state.blocks
+  if (!blocks || typeof blocks !== 'object') {
+    throw new Error('Invalid deployed state structure')
+  }
+
+  operation = await prepareReadinessComponent({
+    payload,
+    operation,
+    component: 'webhooks',
+    checkpointKey: 'webhooksPrepared',
+    checkpoints,
+    checkpoint,
+    context,
+    prepare: async () => {
+      await prepareWebhooks({
+        request: new NextRequest(new URL('/api/webhooks', getBaseUrl())),
+        workflowId: payload.workflowId,
+        workflow: workflowRecord as Record<string, unknown>,
+        userId: payload.userId,
+        blocks,
+        requestId: payload.requestId,
+        deploymentVersionId: payload.deploymentVersionId,
+        operationId: payload.operationId,
+        generation: payload.generation,
+        signal: context.signal,
+      })
+    },
+  })
+  if (!operation) return
+
+  operation = await prepareReadinessComponent({
+    payload,
+    operation,
+    component: 'schedules',
+    checkpointKey: 'schedulesPrepared',
+    checkpoints,
+    checkpoint,
+    context,
+    prepare: async () => {
+      const result = await createSchedulesForDeploy(
+        payload.workflowId,
+        blocks,
+        undefined,
+        payload.deploymentVersionId,
+        payload.operationId
+      )
+      if (!result.success) {
+        throw new Error(result.error || 'Failed to prepare schedules')
+      }
+    },
+  })
+  if (!operation) return
+
+  operation = await prepareReadinessComponent({
+    payload,
+    operation,
+    component: 'mcp',
+    checkpointKey: 'mcpReadyForActivation',
+    checkpoints,
+    checkpoint,
+    context,
+    prepare: async () => {},
+  })
+  if (!operation) return
+
+  const readiness = parseDeploymentReadiness(operation.componentReadiness)
+  if (!readiness || !isDeploymentReadinessComplete(readiness)) return
+
+  if (operation.status === 'preparing') {
+    context.signal.throwIfAborted()
+    const activating = await beginDeploymentOperationActivation(payload)
+    context.signal.throwIfAborted()
+    if (!activating.success) {
+      if (activating.reason === 'stale_generation' || activating.reason === 'invalid_transition') {
+        return
+      }
+      throw new Error(activating.error)
+    }
+    operation = activating.operation
+  }
+  if (operation.status !== 'activating') return
+
+  let affectedMcpServers: Array<{ serverId: string }> = []
+  context.signal.throwIfAborted()
+  const activated = await activateDeploymentOperation({
+    workflowId: payload.workflowId,
+    operationId: payload.operationId,
+    generation: payload.generation,
+    onActivateTransaction: async (tx) => {
+      context.signal.throwIfAborted()
+      await activateWebhookRegistrations(tx, {
+        workflowId: payload.workflowId,
+        operationId: payload.operationId,
+        generation: payload.generation,
+        deploymentVersionId: payload.deploymentVersionId,
+      })
+      context.signal.throwIfAborted()
+      await setWorkflowMcpTransactionLockTimeout(tx)
+      context.signal.throwIfAborted()
+      affectedMcpServers = await syncMcpToolsForWorkflow({
+        workflowId: payload.workflowId,
+        requestId: payload.requestId,
+        state,
+        context: 'deployment-activation',
+        tx,
+        notify: false,
+        throwOnError: true,
+      })
+      context.signal.throwIfAborted()
+    },
+  })
+  context.signal.throwIfAborted()
+  if (!activated.success) {
+    if (activated.reason === 'stale_generation' || activated.reason === 'invalid_transition') return
+    throw new Error(activated.error)
+  }
+
+  operation = activated.operation
+  notifyMcpToolServers(affectedMcpServers)
+  context.signal.throwIfAborted()
+
+  await cleanupRetiredWebhooksForOperation({
+    payload,
+    workflow: workflowRecord as Record<string, unknown>,
+    context,
+  })
+  await cleanupInactiveDeploymentsForOperation({
+    payload,
+    workflow: workflowRecord as Record<string, unknown>,
+    checkpoints,
+    checkpoint,
+    context,
+  })
+  await emitPostActivationSideEffects({
+    payload,
+    operation,
+    workflow: workflowRecord as Record<string, unknown>,
+    checkpoints,
+    checkpoint,
+    context,
+  })
+}
+
+async function prepareReadinessComponent(params: {
+  payload: PrepareDeploymentV2Payload
+  operation: WorkflowDeploymentOperation
+  component: (typeof DEPLOYMENT_READINESS_COMPONENTS)[number]
+  checkpointKey: keyof DeploymentPreparationCheckpoints
+  checkpoints: DeploymentPreparationCheckpoints
+  checkpoint: (patch: Partial<DeploymentPreparationCheckpoints>) => Promise<void>
+  context: OutboxEventContext
+  prepare: () => Promise<void>
+}): Promise<WorkflowDeploymentOperation | null> {
+  const readiness = parseDeploymentReadiness(params.operation.componentReadiness)
+  if (readiness?.[params.component]?.status === 'ready') {
+    if (!params.checkpoints[params.checkpointKey]) {
+      await params.checkpoint({ [params.checkpointKey]: true })
+    }
+    return params.operation
+  }
+
+  if (!params.checkpoints[params.checkpointKey]) {
+    params.context.signal.throwIfAborted()
+    await params.prepare()
+    params.context.signal.throwIfAborted()
+    await params.checkpoint({ [params.checkpointKey]: true })
+  }
+
+  params.context.signal.throwIfAborted()
+  const result = await markDeploymentComponentReadiness({
+    workflowId: params.payload.workflowId,
+    operationId: params.payload.operationId,
+    generation: params.payload.generation,
+    component: params.component,
+    status: 'ready',
+    expectedStatus: 'pending',
+  })
+  params.context.signal.throwIfAborted()
+  if (result.success) return result.operation
+  if (result.reason === 'stale_generation' || result.reason === 'invalid_transition') return null
+  throw new Error(result.error)
+}
+
+async function cleanupRetiredWebhooksForOperation(params: {
+  payload: PrepareDeploymentV2Payload
+  workflow: Record<string, unknown>
+  context: OutboxEventContext
+}): Promise<void> {
+  params.context.signal.throwIfAborted()
+  await cleanupRetiredWebhookRegistrationsAfterActivation({
+    fence: {
+      workflowId: params.payload.workflowId,
+      operationId: params.payload.operationId,
+      generation: params.payload.generation,
+      deploymentVersionId: params.payload.deploymentVersionId,
+    },
+    workflow: params.workflow,
+    requestId: params.payload.requestId,
+    signal: params.context.signal,
+  })
+}
+
+async function cleanupInactiveDeploymentsForOperation(params: {
+  payload: PrepareDeploymentV2Payload
+  workflow: Record<string, unknown>
+  checkpoints: DeploymentPreparationCheckpoints
+  checkpoint: (patch: Partial<DeploymentPreparationCheckpoints>) => Promise<void>
+  context: OutboxEventContext
+}): Promise<void> {
+  if (params.checkpoints.inactiveCleanupCompleted) return
+  const operationFence = {
+    workflowId: params.payload.workflowId,
+    operationId: params.payload.operationId,
+    generation: params.payload.generation,
+    deploymentVersionId: params.payload.deploymentVersionId,
+    statuses: ['active'] as const,
+  }
+  const shouldContinue = async () => {
+    params.context.signal.throwIfAborted()
+    const isCurrent = await isDeploymentOperationCurrent(operationFence)
+    params.context.signal.throwIfAborted()
+    return isCurrent
+  }
+
+  if (!(await shouldContinue())) return
+  await cleanupInactiveDeploymentVersions({
+    workflowId: params.payload.workflowId,
+    activeDeploymentVersionId: params.payload.deploymentVersionId,
+    workflow: params.workflow,
+    userId: params.payload.userId,
+    requestId: params.payload.requestId,
+    shouldContinue,
+    operationFence,
+  })
+  if (!(await shouldContinue())) return
+  await params.checkpoint({ inactiveCleanupCompleted: true })
+}
+
+async function emitPostActivationSideEffects(params: {
+  payload: PrepareDeploymentV2Payload
+  operation: WorkflowDeploymentOperation
+  workflow: Record<string, unknown>
+  checkpoints: DeploymentPreparationCheckpoints
+  checkpoint: (patch: Partial<DeploymentPreparationCheckpoints>) => Promise<void>
+  context: OutboxEventContext
+}): Promise<void> {
+  if (!params.checkpoints.auditEmitted) {
+    params.context.signal.throwIfAborted()
+    const isVersionActivation = params.operation.action === 'activate'
+    recordAudit({
+      workspaceId: (params.workflow.workspaceId as string) || null,
+      actorId: params.operation.actorId,
+      action: isVersionActivation
+        ? AuditAction.WORKFLOW_DEPLOYMENT_ACTIVATED
+        : AuditAction.WORKFLOW_DEPLOYED,
+      resourceType: AuditResourceType.WORKFLOW,
+      resourceId: params.payload.workflowId,
+      resourceName: (params.workflow.name as string) || undefined,
+      description: isVersionActivation
+        ? `Activated deployment version ${params.payload.version}`
+        : `Deployed workflow "${(params.workflow.name as string) || params.payload.workflowId}"`,
+      metadata: {
+        deploymentVersionId: params.payload.deploymentVersionId,
+        version: params.payload.version,
+        previousVersionId: params.operation.previousActiveVersionId || undefined,
+      },
+    })
+    params.context.signal.throwIfAborted()
+    await params.checkpoint({ auditEmitted: true })
+  }
+
+  if (!params.checkpoints.analyticsCaptured) {
+    params.context.signal.throwIfAborted()
+    const workspaceId = (params.workflow.workspaceId as string) || ''
+    const isVersionActivation = params.operation.action === 'activate'
+    captureServerEvent(
+      params.payload.userId,
+      isVersionActivation ? 'deployment_version_activated' : 'workflow_deployed',
+      {
+        workflow_id: params.payload.workflowId,
+        workspace_id: workspaceId,
+        ...(isVersionActivation ? { version: params.payload.version } : {}),
+      },
+      {
+        groups: workspaceId ? { workspace: workspaceId } : undefined,
+        ...(isVersionActivation
+          ? {}
+          : { setOnce: { first_workflow_deployed_at: new Date().toISOString() } }),
+      }
+    )
+    await params.checkpoint({ analyticsCaptured: true })
+  }
+
+  if (!params.checkpoints.socketNotified) {
+    params.context.signal.throwIfAborted()
+    await notifySocketDeploymentChanged(params.payload.workflowId, {
+      signal: params.context.signal,
+      throwOnError: true,
+    })
+    params.context.signal.throwIfAborted()
+    await params.checkpoint({ socketNotified: true })
+  }
+
+  const workspaceId = params.workflow.workspaceId as string | null
+  if (workspaceId && !params.checkpoints.workspaceEventEmitted) {
+    params.context.signal.throwIfAborted()
+    await emitWorkflowDeployedEvent({
+      workflowId: params.payload.workflowId,
+      workflowName: (params.workflow.name as string) || params.payload.workflowId,
+      workspaceId,
+      version: params.payload.version,
+    })
+    params.context.signal.throwIfAborted()
+    await params.checkpoint({ workspaceEventEmitted: true })
+  }
+}
+
+function isTerminalNonActiveOperation(operation: WorkflowDeploymentOperation): boolean {
+  return operation.status === 'failed' || operation.status === 'superseded'
+}
+
+function assertPreparationPayloadMatchesOperation(
+  payload: PrepareDeploymentV2Payload,
+  operation: WorkflowDeploymentOperation
+): void {
+  if (
+    payload.protocolVersion !== DEPLOYMENT_OPERATION_PROTOCOL_VERSION ||
+    operation.protocolVersion !== payload.protocolVersion
+  ) {
+    throw new Error(`Unsupported deployment preparation protocol ${payload.protocolVersion}`)
+  }
+  if (
+    operation.deploymentVersionId !== payload.deploymentVersionId ||
+    operation.version !== payload.version
+  ) {
+    throw new Error('Deployment preparation payload does not match its operation')
+  }
+}
+
 const syncActiveSideEffects = async (rawPayload: unknown): Promise<void> => {
   const payload = parseSyncActiveSideEffectsPayload(rawPayload)
   const requestId = payload.requestId ?? generateRequestId()
@@ -319,7 +897,10 @@ async function cleanupInactiveDeploymentVersions(params: {
   workflow: Record<string, unknown>
   userId: string
   requestId: string
+  shouldContinue?: () => Promise<boolean>
+  operationFence?: DeploymentCleanupOperationFence
 }): Promise<void> {
+  if (params.shouldContinue && !(await params.shouldContinue())) return
   const inactiveVersions = await db
     .select({ id: workflowDeploymentVersion.id })
     .from(workflowDeploymentVersion)
@@ -332,12 +913,18 @@ async function cleanupInactiveDeploymentVersions(params: {
     )
 
   for (const version of inactiveVersions) {
+    if (params.shouldContinue && !(await params.shouldContinue())) return
+    if (await isDeploymentVersionProtectedByCurrentOperation(params.workflowId, version.id)) {
+      continue
+    }
     await cleanupDeploymentVersionIfInactive({
       workflowId: params.workflowId,
       workflow: params.workflow,
       userId: params.userId,
       requestId: params.requestId,
       deploymentVersionId: version.id,
+      shouldContinue: params.shouldContinue,
+      operationFence: params.operationFence,
     })
   }
 }
@@ -348,20 +935,32 @@ async function cleanupDeploymentVersionIfInactive(params: {
   workflow: Record<string, unknown>
   userId: string
   requestId: string
+  shouldContinue?: () => Promise<boolean>
+  operationFence?: DeploymentCleanupOperationFence
 }): Promise<void> {
-  if (await isDeploymentVersionActive(params.workflowId, params.deploymentVersionId)) {
-    await enqueueWorkflowDeploymentSideEffects(db, {
-      workflowId: params.workflowId,
-      deploymentVersionId: params.deploymentVersionId,
-      userId: params.userId,
-      requestId: params.requestId,
-      forceRecreateSubscriptions: true,
-    })
+  if (params.shouldContinue && !(await params.shouldContinue())) return
+  if (
+    await isDeploymentVersionProtectedByCurrentOperation(
+      params.workflowId,
+      params.deploymentVersionId
+    )
+  ) {
     return
   }
-
-  const isStillInactive = async () =>
-    !(await isDeploymentVersionActive(params.workflowId, params.deploymentVersionId))
+  if (await isDeploymentVersionActive(params.workflowId, params.deploymentVersionId)) return
+
+  const isStillInactive = async () => {
+    if (params.shouldContinue && !(await params.shouldContinue())) return false
+    if (
+      await isDeploymentVersionProtectedByCurrentOperation(
+        params.workflowId,
+        params.deploymentVersionId
+      )
+    ) {
+      return false
+    }
+    return !(await isDeploymentVersionActive(params.workflowId, params.deploymentVersionId))
+  }
 
   await cleanupWebhooksForWorkflow(
     params.workflowId,
@@ -373,50 +972,39 @@ async function cleanupDeploymentVersionIfInactive(params: {
     isStillInactive
   )
 
-  if (!(await isStillInactive())) {
-    await enqueueWorkflowDeploymentSideEffects(db, {
-      workflowId: params.workflowId,
-      deploymentVersionId: params.deploymentVersionId,
-      userId: params.userId,
-      requestId: params.requestId,
-      forceRecreateSubscriptions: true,
-    })
-    return
-  }
+  if (!(await isStillInactive())) return
 
-  const deletedSchedules = await deleteSchedulesForDeploymentIfInactive({
+  await deleteSchedulesForDeploymentIfInactive({
     workflowId: params.workflowId,
     deploymentVersionId: params.deploymentVersionId,
+    operationFence: params.operationFence,
   })
-  if (!deletedSchedules) {
-    if (await isDeploymentVersionActive(params.workflowId, params.deploymentVersionId)) {
-      await enqueueWorkflowDeploymentSideEffects(db, {
-        workflowId: params.workflowId,
-        deploymentVersionId: params.deploymentVersionId,
-        userId: params.userId,
-        requestId: params.requestId,
-        forceRecreateSubscriptions: true,
-      })
-    }
-    return
-  }
-
-  if (await isDeploymentVersionActive(params.workflowId, params.deploymentVersionId)) {
-    await enqueueWorkflowDeploymentSideEffects(db, {
-      workflowId: params.workflowId,
-      deploymentVersionId: params.deploymentVersionId,
-      userId: params.userId,
-      requestId: params.requestId,
-      forceRecreateSubscriptions: true,
-    })
-  }
 }
 
 async function deleteSchedulesForDeploymentIfInactive(params: {
   workflowId: string
   deploymentVersionId: string
+  operationFence?: DeploymentCleanupOperationFence
 }): Promise<boolean> {
   return db.transaction(async (tx) => {
+    await tx
+      .select({ id: workflowTable.id })
+      .from(workflowTable)
+      .where(eq(workflowTable.id, params.workflowId))
+      .for('update')
+    if (params.operationFence && !(await isDeploymentOperationCurrent(params.operationFence, tx))) {
+      return false
+    }
+    if (
+      await isDeploymentVersionProtectedByCurrentOperation(
+        params.workflowId,
+        params.deploymentVersionId,
+        tx
+      )
+    ) {
+      return false
+    }
+
     const [versionRow] = await tx
       .select({ id: workflowDeploymentVersion.id })
       .from(workflowDeploymentVersion)
@@ -678,6 +1266,46 @@ function parseSyncActiveSideEffectsPayload(payload: unknown): SyncActiveSideEffe
   return { workflowId, deploymentVersionId, userId, requestId, forceRecreateSubscriptions }
 }
 
+function parsePrepareDeploymentV2Payload(payload: unknown): PrepareDeploymentV2Payload {
+  const record = parsePayloadRecord(payload)
+  const protocolVersion = parseRequiredPositiveInteger(record.protocolVersion, 'protocolVersion')
+  const operationId = parseRequiredString(record.operationId, 'operationId')
+  const generation = parseRequiredPositiveInteger(record.generation, 'generation')
+  const workflowId = parseRequiredString(record.workflowId, 'workflowId')
+  const deploymentVersionId = parseRequiredString(record.deploymentVersionId, 'deploymentVersionId')
+  const version = parseRequiredPositiveInteger(record.version, 'version')
+  const userId = parseRequiredString(record.userId, 'userId')
+  const requestId = parseRequiredString(record.requestId, 'requestId')
+  const checkpoints = parseDeploymentPreparationCheckpoints(record.checkpoints)
+
+  return {
+    protocolVersion,
+    operationId,
+    generation,
+    workflowId,
+    deploymentVersionId,
+    version,
+    userId,
+    requestId,
+    checkpoints,
+  }
+}
+
+function parseDeploymentPreparationCheckpoints(value: unknown): DeploymentPreparationCheckpoints {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return {}
+  const record = value as Record<string, unknown>
+  return {
+    ...(record.webhooksPrepared === true ? { webhooksPrepared: true } : {}),
+    ...(record.schedulesPrepared === true ? { schedulesPrepared: true } : {}),
+    ...(record.mcpReadyForActivation === true ? { mcpReadyForActivation: true } : {}),
+    ...(record.inactiveCleanupCompleted === true ? { inactiveCleanupCompleted: true } : {}),
+    ...(record.auditEmitted === true ? { auditEmitted: true } : {}),
+    ...(record.analyticsCaptured === true ? { analyticsCaptured: true } : {}),
+    ...(record.socketNotified === true ? { socketNotified: true } : {}),
+    ...(record.workspaceEventEmitted === true ? { workspaceEventEmitted: true } : {}),
+  }
+}
+
 function parseCleanupUndeployedSideEffectsPayload(
   payload: unknown
 ): CleanupUndeployedSideEffectsPayload {
@@ -728,6 +1356,13 @@ function parseRequiredString(value: unknown, fieldName: string): string {
   return value
 }
 
+function parseRequiredPositiveInteger(value: unknown, fieldName: string): number {
+  if (typeof value !== 'number' || !Number.isInteger(value) || value < 1) {
+    throw new Error(`Deployment outbox payload is missing ${fieldName}`)
+  }
+  return value
+}
+
 function parseRequiredStringArray(value: unknown, fieldName: string): string[] {
   if (
     !Array.isArray(value) ||
@@ -738,8 +1373,18 @@ function parseRequiredStringArray(value: unknown, fieldName: string): string[] {
   return value
 }
 
-export const workflowDeploymentOutboxHandlers: OutboxHandlerRegistry = {
-  [WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.SYNC_ACTIVE_SIDE_EFFECTS]: syncActiveSideEffects,
-  [WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.CLEANUP_INACTIVE_SIDE_EFFECTS]: cleanupInactiveSideEffects,
-  [WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.CLEANUP_UNDEPLOYED_SIDE_EFFECTS]: cleanupUndeployedSideEffects,
+export function createWorkflowDeploymentOutboxHandlers(
+  options: { prepareWebhooks?: PrepareDeploymentWebhooksHook } = {}
+): OutboxHandlerRegistry {
+  return {
+    [WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.PREPARE_V2]: createPrepareDeploymentHandler(
+      options.prepareWebhooks ?? defaultPrepareDeploymentWebhooks
+    ),
+    [WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.SYNC_ACTIVE_SIDE_EFFECTS]: syncActiveSideEffects,
+    [WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.CLEANUP_INACTIVE_SIDE_EFFECTS]: cleanupInactiveSideEffects,
+    [WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.CLEANUP_UNDEPLOYED_SIDE_EFFECTS]:
+      cleanupUndeployedSideEffects,
+  }
 }
+
+export const workflowDeploymentOutboxHandlers = createWorkflowDeploymentOutboxHandlers()
diff --git a/apps/sim/lib/workflows/executor/execution-state.test.ts b/apps/sim/lib/workflows/executor/execution-state.test.ts
new file mode 100644
index 00000000000..c2a6c967e70
--- /dev/null
+++ b/apps/sim/lib/workflows/executor/execution-state.test.ts
@@ -0,0 +1,173 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockMaterializeExecutionData, mockSelect } = vi.hoisted(() => ({
+  mockMaterializeExecutionData: vi.fn(),
+  mockSelect: vi.fn(),
+}))
+
+vi.mock('@sim/db', () => ({
+  db: { select: mockSelect },
+}))
+
+vi.mock('@/lib/logs/execution/trace-store', () => ({
+  materializeExecutionData: mockMaterializeExecutionData,
+  TRACE_STORE_REF_KEY: 'traceStoreRef',
+}))
+
+import {
+  getExecutionInputForWorkflow,
+  getExecutionStateForWorkflow,
+  getLatestExecutionStateWithExecutionId,
+} from '@/lib/workflows/executor/execution-state'
+
+const EXECUTION_STATE = {
+  blockStates: {},
+  executedBlocks: ['block-1'],
+  blockLogs: [],
+  decisions: {},
+  completedLoops: [],
+  activeExecutionPath: [],
+}
+
+function createSelectChain(rows: unknown[]) {
+  const chain = {
+    from: vi.fn(),
+    where: vi.fn(),
+    orderBy: vi.fn(),
+    limit: vi.fn().mockResolvedValue(rows),
+  }
+  chain.from.mockReturnValue(chain)
+  chain.where.mockReturnValue(chain)
+  chain.orderBy.mockReturnValue(chain)
+  return chain
+}
+
+describe('execution state lookup', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockMaterializeExecutionData.mockReset()
+    mockSelect.mockReset()
+  })
+
+  it('materializes externalized execution data for a specific execution', async () => {
+    const slimExecutionData = {
+      traceStoreRef: {
+        __simLargeValueRef: true,
+        id: 'value-1',
+        key: 'execution/workspace-1/workflow-1/execution-1/value.json',
+        kind: 'object',
+        size: 100,
+        version: 1,
+        executionId: 'execution-1',
+      },
+    }
+    mockSelect.mockReturnValueOnce(
+      createSelectChain([
+        {
+          executionId: 'execution-1',
+          workflowId: 'workflow-1',
+          workspaceId: 'workspace-1',
+          executionData: slimExecutionData,
+        },
+      ])
+    )
+    mockMaterializeExecutionData.mockResolvedValueOnce({
+      executionState: EXECUTION_STATE,
+    })
+
+    const result = await getExecutionStateForWorkflow('execution-1', 'workflow-1')
+
+    expect(mockMaterializeExecutionData).toHaveBeenCalledWith(slimExecutionData, {
+      workspaceId: 'workspace-1',
+      workflowId: 'workflow-1',
+      executionId: 'execution-1',
+    })
+    expect(result).toEqual(EXECUTION_STATE)
+  })
+
+  it('materializes externalized execution data when reusing workflow input', async () => {
+    const slimExecutionData = {
+      traceStoreRef: {
+        __simLargeValueRef: true,
+        id: 'value-1',
+        key: 'execution/workspace-1/workflow-1/execution-1/value.json',
+        kind: 'object',
+        size: 100,
+        version: 1,
+        executionId: 'execution-1',
+      },
+    }
+    mockSelect.mockReturnValueOnce(
+      createSelectChain([
+        {
+          executionId: 'execution-1',
+          workflowId: 'workflow-1',
+          workspaceId: 'workspace-1',
+          executionData: slimExecutionData,
+        },
+      ])
+    )
+    mockMaterializeExecutionData.mockResolvedValueOnce({
+      workflowInput: { leadId: 'lead-1' },
+    })
+
+    const result = await getExecutionInputForWorkflow('execution-1', 'workflow-1')
+
+    expect(result).toEqual({
+      found: true,
+      input: { leadId: 'lead-1' },
+    })
+    expect(mockMaterializeExecutionData).toHaveBeenCalledWith(slimExecutionData, {
+      workspaceId: 'workspace-1',
+      workflowId: 'workflow-1',
+      executionId: 'execution-1',
+    })
+  })
+
+  it('checks older pointer-backed candidates when the latest has no execution state', async () => {
+    mockSelect.mockReturnValueOnce(
+      createSelectChain([
+        {
+          executionId: 'execution-2',
+          workflowId: 'workflow-1',
+          workspaceId: 'workspace-1',
+          executionState: null,
+          traceStoreRef: { id: 'value-2' },
+        },
+        {
+          executionId: 'execution-1',
+          workflowId: 'workflow-1',
+          workspaceId: 'workspace-1',
+          executionState: null,
+          traceStoreRef: { id: 'value-1' },
+        },
+      ])
+    )
+    mockMaterializeExecutionData
+      .mockResolvedValueOnce({})
+      .mockResolvedValueOnce({ executionState: EXECUTION_STATE })
+
+    const result = await getLatestExecutionStateWithExecutionId('workflow-1')
+
+    expect(result).toEqual({
+      executionId: 'execution-1',
+      state: EXECUTION_STATE,
+    })
+    expect(mockMaterializeExecutionData).toHaveBeenCalledTimes(2)
+    expect(mockMaterializeExecutionData).toHaveBeenNthCalledWith(
+      1,
+      {
+        executionState: null,
+        traceStoreRef: { id: 'value-2' },
+      },
+      {
+        workspaceId: 'workspace-1',
+        workflowId: 'workflow-1',
+        executionId: 'execution-2',
+      }
+    )
+  })
+})
diff --git a/apps/sim/lib/workflows/executor/execution-state.ts b/apps/sim/lib/workflows/executor/execution-state.ts
index 862b823209a..3c8cb8f9fd9 100644
--- a/apps/sim/lib/workflows/executor/execution-state.ts
+++ b/apps/sim/lib/workflows/executor/execution-state.ts
@@ -1,9 +1,12 @@
 import { db } from '@sim/db'
 import { workflowExecutionLogs } from '@sim/db/schema'
-import { and, desc, eq, sql } from 'drizzle-orm'
+import { and, desc, eq, or, sql } from 'drizzle-orm'
+import { materializeExecutionData, TRACE_STORE_REF_KEY } from '@/lib/logs/execution/trace-store'
 import type { SerializableExecutionState } from '@/executor/execution/types'
 
-export interface ExecutionStateRecord {
+const LATEST_EXECUTION_STATE_CANDIDATE_LIMIT = 10
+
+interface ExecutionStateRecord {
   executionId: string
   state: SerializableExecutionState
 }
@@ -27,16 +30,30 @@ function extractExecutionState(executionData: unknown): SerializableExecutionSta
   return isSerializableExecutionState(state) ? state : null
 }
 
-export async function getExecutionState(
+interface ExecutionStateRow {
   executionId: string
-): Promise<SerializableExecutionState | null> {
-  const [row] = await db
-    .select({ executionData: workflowExecutionLogs.executionData })
-    .from(workflowExecutionLogs)
-    .where(eq(workflowExecutionLogs.executionId, executionId))
-    .limit(1)
+  workflowId: string | null
+  workspaceId: string
+  executionData: unknown
+}
+
+async function materializeExecutionDataFromRow(
+  row: ExecutionStateRow | undefined
+): Promise<Record<string, unknown> | null> {
+  if (!row) return null
 
-  return extractExecutionState(row?.executionData)
+  return materializeExecutionData(row.executionData as Record<string, unknown> | null, {
+    workspaceId: row.workspaceId,
+    workflowId: row.workflowId,
+    executionId: row.executionId,
+  })
+}
+
+async function extractExecutionStateFromRow(
+  row: ExecutionStateRow | undefined
+): Promise<SerializableExecutionState | null> {
+  const executionData = await materializeExecutionDataFromRow(row)
+  return extractExecutionState(executionData)
 }
 
 export async function getExecutionStateForWorkflow(
@@ -44,7 +61,12 @@ export async function getExecutionStateForWorkflow(
   workflowId: string
 ): Promise<SerializableExecutionState | null> {
   const [row] = await db
-    .select({ executionData: workflowExecutionLogs.executionData })
+    .select({
+      executionId: workflowExecutionLogs.executionId,
+      workflowId: workflowExecutionLogs.workflowId,
+      workspaceId: workflowExecutionLogs.workspaceId,
+      executionData: workflowExecutionLogs.executionData,
+    })
     .from(workflowExecutionLogs)
     .where(
       and(
@@ -54,7 +76,7 @@ export async function getExecutionStateForWorkflow(
     )
     .limit(1)
 
-  return extractExecutionState(row?.executionData)
+  return extractExecutionStateFromRow(row)
 }
 
 /**
@@ -67,7 +89,12 @@ export async function getExecutionInputForWorkflow(
   workflowId: string
 ): Promise<{ found: boolean; input?: unknown }> {
   const [row] = await db
-    .select({ executionData: workflowExecutionLogs.executionData })
+    .select({
+      executionId: workflowExecutionLogs.executionId,
+      workflowId: workflowExecutionLogs.workflowId,
+      workspaceId: workflowExecutionLogs.workspaceId,
+      executionData: workflowExecutionLogs.executionData,
+    })
     .from(workflowExecutionLogs)
     .where(
       and(
@@ -81,35 +108,46 @@ export async function getExecutionInputForWorkflow(
     return { found: false }
   }
 
-  const data = row.executionData as { workflowInput?: unknown } | null | undefined
+  const data = await materializeExecutionDataFromRow(row)
   return { found: true, input: data?.workflowInput }
 }
 
-export async function getLatestExecutionState(
-  workflowId: string
-): Promise<SerializableExecutionState | null> {
-  const record = await getLatestExecutionStateWithExecutionId(workflowId)
-  return record?.state ?? null
-}
-
 export async function getLatestExecutionStateWithExecutionId(
   workflowId: string
 ): Promise<ExecutionStateRecord | null> {
-  const [row] = await db
+  const rows = await db
     .select({
       executionId: workflowExecutionLogs.executionId,
-      executionData: workflowExecutionLogs.executionData,
+      workflowId: workflowExecutionLogs.workflowId,
+      workspaceId: workflowExecutionLogs.workspaceId,
+      executionState: sql<unknown>`${workflowExecutionLogs.executionData} -> 'executionState'`,
+      traceStoreRef: sql<unknown>`${workflowExecutionLogs.executionData} -> ${TRACE_STORE_REF_KEY}`,
     })
     .from(workflowExecutionLogs)
     .where(
       and(
         eq(workflowExecutionLogs.workflowId, workflowId),
-        sql`${workflowExecutionLogs.executionData} -> 'executionState' IS NOT NULL`
+        or(
+          sql`${workflowExecutionLogs.executionData} -> 'executionState' IS NOT NULL`,
+          sql`${workflowExecutionLogs.executionData} -> ${TRACE_STORE_REF_KEY} IS NOT NULL`
+        )
       )
     )
     .orderBy(desc(workflowExecutionLogs.startedAt))
-    .limit(1)
+    .limit(LATEST_EXECUTION_STATE_CANDIDATE_LIMIT)
+
+  for (const row of rows) {
+    const state = await extractExecutionStateFromRow({
+      executionId: row.executionId,
+      workflowId: row.workflowId,
+      workspaceId: row.workspaceId,
+      executionData: {
+        executionState: row.executionState,
+        [TRACE_STORE_REF_KEY]: row.traceStoreRef,
+      },
+    })
+    if (state) return { executionId: row.executionId, state }
+  }
 
-  const state = extractExecutionState(row?.executionData)
-  return row && state ? { executionId: row.executionId, state } : null
+  return null
 }
diff --git a/apps/sim/lib/workflows/lifecycle.test.ts b/apps/sim/lib/workflows/lifecycle.test.ts
index db4af82822e..2a6d3f03182 100644
--- a/apps/sim/lib/workflows/lifecycle.test.ts
+++ b/apps/sim/lib/workflows/lifecycle.test.ts
@@ -26,6 +26,9 @@ vi.mock('@sim/db', () => ({
     select: mockSelect,
     transaction: mockTransaction,
   },
+  workflow: { id: 'id' },
+  workflowDeploymentOperation: { workflowId: 'workflowId', status: 'status' },
+  workflowDeploymentVersion: { workflowId: 'workflowId', isActive: 'isActive' },
 }))
 
 vi.mock('@/lib/workflows/utils', () => workflowsUtilsMock)
@@ -94,6 +97,9 @@ describe('workflow lifecycle', () => {
 
     const tx = {
       update: vi.fn().mockImplementation(() => createUpdateChain()),
+      delete: vi.fn().mockImplementation(() => ({
+        where: vi.fn().mockResolvedValue([]),
+      })),
     }
     mockTransaction.mockImplementation(async (callback: (trx: typeof tx) => Promise<void>) =>
       callback(tx)
@@ -102,7 +108,10 @@ describe('workflow lifecycle', () => {
     const result = await archiveWorkflow('workflow-1', { requestId: 'req-1' })
 
     expect(result.archived).toBe(true)
-    expect(tx.update).toHaveBeenCalledTimes(6)
+    expect(tx.update).toHaveBeenCalledTimes(7)
+    const supersedeSet = tx.update.mock.results[0]?.value.set
+    expect(supersedeSet).toHaveBeenCalledWith(expect.objectContaining({ status: 'superseded' }))
+    expect(tx.delete).toHaveBeenCalledTimes(1)
     expect(mockWorkflowDeleted).toHaveBeenCalledWith({
       workflowId: 'workflow-1',
       workspaceId: 'workspace-1',
diff --git a/apps/sim/lib/workflows/lifecycle.ts b/apps/sim/lib/workflows/lifecycle.ts
index 82040e2750e..d1b08caed71 100644
--- a/apps/sim/lib/workflows/lifecycle.ts
+++ b/apps/sim/lib/workflows/lifecycle.ts
@@ -18,6 +18,8 @@ import { PlatformEvents } from '@/lib/core/telemetry'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getSocketServerUrl } from '@/lib/core/utils/urls'
 import { mcpPubSub } from '@/lib/mcp/pubsub'
+import { releaseWebhookPathClaims } from '@/lib/webhooks/path-claims'
+import { supersedeInFlightDeploymentOperations } from '@/lib/workflows/persistence/deployment-operations'
 import { getWorkflowById } from '@/lib/workflows/utils'
 
 const logger = createLogger('WorkflowLifecycle')
@@ -106,6 +108,9 @@ export async function archiveWorkflow(
     .where(and(eq(workflowMcpTool.workflowId, workflowId), isNull(workflowMcpTool.archivedAt)))
 
   await db.transaction(async (tx) => {
+    await supersedeInFlightDeploymentOperations(tx, workflowId)
+    await releaseWebhookPathClaims(tx, workflowId)
+
     await tx
       .update(workflowSchedule)
       .set({
diff --git a/apps/sim/lib/workflows/orchestration/chat-deploy.ts b/apps/sim/lib/workflows/orchestration/chat-deploy.ts
index 8288766b900..c55941120ab 100644
--- a/apps/sim/lib/workflows/orchestration/chat-deploy.ts
+++ b/apps/sim/lib/workflows/orchestration/chat-deploy.ts
@@ -73,6 +73,14 @@ export async function performChatDeploy(
   if (!deployResult.success) {
     return { success: false, error: deployResult.error || 'Failed to deploy workflow' }
   }
+  if (deployResult.latestDeploymentAttempt?.status !== 'active') {
+    return {
+      success: false,
+      error:
+        deployResult.warnings?.[0] ??
+        'Workflow deployment is still preparing. Retry chat deployment after it becomes active.',
+    }
+  }
 
   let encryptedPassword: string | null = null
   if (authType === 'password' && password) {
diff --git a/apps/sim/lib/workflows/orchestration/deploy.test.ts b/apps/sim/lib/workflows/orchestration/deploy.test.ts
index ffe40b6fc9d..ac2a5341b81 100644
--- a/apps/sim/lib/workflows/orchestration/deploy.test.ts
+++ b/apps/sim/lib/workflows/orchestration/deploy.test.ts
@@ -10,11 +10,16 @@ const {
   mockRecordAudit,
   mockCaptureServerEvent,
   mockTransaction,
-  mockDeployWorkflow,
-  mockActivateWorkflowVersion,
   mockValidateWorkflowSchedules,
   mockValidateTriggerWebhookConfigForDeploy,
   mockEmitWorkflowDeployedEvent,
+  mockPrepareWorkflowDeployment,
+  mockPrepareWorkflowVersionActivation,
+  mockGetWorkflowDeploymentStatus,
+  mockEnqueueWorkflowDeploymentPreparation,
+  mockProcessWorkflowDeploymentOutboxEvent,
+  mockNotifySocketDeploymentChanged,
+  mockLoadWorkflowDeploymentSnapshot,
   mockTx,
 } = vi.hoisted(() => ({
   mockLimit: vi.fn(),
@@ -23,11 +28,16 @@ const {
   mockRecordAudit: vi.fn(),
   mockCaptureServerEvent: vi.fn(),
   mockTransaction: vi.fn(),
-  mockDeployWorkflow: vi.fn(),
-  mockActivateWorkflowVersion: vi.fn(),
   mockValidateWorkflowSchedules: vi.fn(),
   mockValidateTriggerWebhookConfigForDeploy: vi.fn(),
   mockEmitWorkflowDeployedEvent: vi.fn(),
+  mockPrepareWorkflowDeployment: vi.fn(),
+  mockPrepareWorkflowVersionActivation: vi.fn(),
+  mockGetWorkflowDeploymentStatus: vi.fn(),
+  mockEnqueueWorkflowDeploymentPreparation: vi.fn(),
+  mockProcessWorkflowDeploymentOutboxEvent: vi.fn(),
+  mockNotifySocketDeploymentChanged: vi.fn(),
+  mockLoadWorkflowDeploymentSnapshot: vi.fn(),
   mockTx: {
     select: vi.fn(() => ({
       from: vi.fn(() => ({
@@ -59,7 +69,11 @@ vi.mock('@sim/db', () => ({
     })),
     transaction: mockTransaction,
   },
-  workflow: { id: 'workflow.id' },
+  workflow: {
+    id: 'workflow.id',
+    deployedAt: 'workflow.deployedAt',
+    workspaceId: 'workflow.workspaceId',
+  },
   workflowDeploymentVersion: {
     workflowId: 'workflowDeploymentVersion.workflowId',
     version: 'workflowDeploymentVersion.version',
@@ -80,13 +94,22 @@ vi.mock('@sim/audit', () => ({
 }))
 
 vi.mock('@/lib/workflows/deployment-outbox', () => ({
-  enqueueWorkflowDeploymentSideEffects: vi.fn().mockResolvedValue('outbox-1'),
+  enqueueWorkflowDeploymentPreparation: mockEnqueueWorkflowDeploymentPreparation,
   enqueueWorkflowUndeploySideEffects: vi.fn().mockResolvedValue('outbox-2'),
-  processWorkflowDeploymentOutboxEvent: vi.fn().mockResolvedValue('completed'),
+  notifySocketDeploymentChanged: mockNotifySocketDeploymentChanged,
+  processWorkflowDeploymentOutboxEvent: mockProcessWorkflowDeploymentOutboxEvent,
+  DEPLOYMENT_READINESS_COMPONENTS: ['webhooks', 'schedules', 'mcp'],
+}))
+
+vi.mock('@/lib/workflows/persistence/deployment-operations', () => ({
+  getWorkflowDeploymentStatus: mockGetWorkflowDeploymentStatus,
+  prepareWorkflowDeployment: mockPrepareWorkflowDeployment,
+  prepareWorkflowVersionActivation: mockPrepareWorkflowVersionActivation,
 }))
 
 vi.mock('@/lib/workspace-events/emitter', () => ({
   emitWorkflowDeployedEvent: mockEmitWorkflowDeployedEvent,
+  emitWorkflowUndeployedEvent: vi.fn(),
 }))
 
 vi.mock('@/lib/core/config/env', () => ({
@@ -103,29 +126,16 @@ vi.mock('@/lib/posthog/server', () => ({
 }))
 
 vi.mock('@/lib/workflows/persistence/utils', () => ({
-  activateWorkflowVersion: mockActivateWorkflowVersion,
-  activateWorkflowVersionById: vi.fn(),
-  deployWorkflow: mockDeployWorkflow,
-  loadWorkflowDeploymentSnapshot: vi.fn(),
+  loadWorkflowDeploymentSnapshot: mockLoadWorkflowDeploymentSnapshot,
   saveWorkflowToNormalizedTables: mockSaveWorkflowToNormalizedTables,
   undeployWorkflow: vi.fn(),
 }))
 
-vi.mock('@/lib/mcp/workflow-mcp-sync', () => ({
-  removeMcpToolsForWorkflow: vi.fn(),
-  syncMcpToolsForWorkflow: vi.fn(),
-}))
-
 vi.mock('@/lib/webhooks/deploy', () => ({
-  cleanupWebhooksForWorkflow: vi.fn(),
-  restorePreviousVersionWebhooks: vi.fn(),
-  saveTriggerWebhooksForDeploy: vi.fn(),
   validateTriggerWebhookConfigForDeploy: mockValidateTriggerWebhookConfigForDeploy,
 }))
 
 vi.mock('@/lib/workflows/schedules', () => ({
-  cleanupDeploymentVersion: vi.fn(),
-  createSchedulesForDeploy: vi.fn(),
   validateWorkflowSchedules: mockValidateWorkflowSchedules,
 }))
 
@@ -244,37 +254,221 @@ describe('performFullDeploy workspace event emission', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(null, { status: 200 })))
+    const now = new Date('2026-07-14T08:00:00.000Z')
+    const operation = {
+      id: 'operation-default',
+      workflowId: 'workflow-1',
+      deploymentVersionId: 'dv-1',
+      version: 4,
+      previousActiveVersionId: null,
+      action: 'deploy',
+      protocolVersion: 2,
+      generation: 1,
+      status: 'active',
+      componentReadiness: {
+        webhooks: { status: 'ready', updatedAt: now.toISOString() },
+        schedules: { status: 'ready', updatedAt: now.toISOString() },
+        mcp: { status: 'ready', updatedAt: now.toISOString() },
+      },
+      errorCode: null,
+      errorMessage: null,
+      idempotencyKey: 'request-default',
+      requestHash: 'hash',
+      actorId: 'user-1',
+      completedAt: now,
+      createdAt: now,
+      updatedAt: now,
+    }
+    mockProcessWorkflowDeploymentOutboxEvent.mockResolvedValue('completed')
+    mockNotifySocketDeploymentChanged.mockResolvedValue(undefined)
     mockLimit.mockResolvedValue([
       { id: 'workflow-1', name: 'My Workflow', workspaceId: 'workspace-1' },
     ])
-    mockDeployWorkflow.mockResolvedValue({
-      success: true,
-      deployedAt: new Date(),
-      version: 4,
-      deploymentVersionId: 'dv-1',
-      previousVersionId: null,
-      currentState: { blocks: {} },
+    mockLoadWorkflowDeploymentSnapshot.mockResolvedValue({
+      blocks: {},
+      edges: [],
+      loops: {},
+      parallels: {},
+      variables: {},
+      lastSaved: now.getTime(),
+    })
+    mockValidateWorkflowSchedules.mockReturnValue({ isValid: true })
+    mockValidateTriggerWebhookConfigForDeploy.mockResolvedValue({ success: true })
+    mockEnqueueWorkflowDeploymentPreparation.mockResolvedValue('prepare-event-default')
+    mockPrepareWorkflowDeployment.mockImplementation(async (input) => {
+      await input.onPrepareTransaction?.(mockTx, operation)
+      return { success: true, operation, reused: false }
+    })
+    mockGetWorkflowDeploymentStatus.mockResolvedValue({
+      activeDeployment: {
+        deploymentVersionId: 'dv-1',
+        version: 4,
+        deployedAt: now,
+      },
+      latestOperation: operation,
     })
   })
 
-  it('emits workflow_deployed after a successful deploy', async () => {
+  it('always admits deploys through v2 without legacy immediate activation', async () => {
     const result = await performFullDeploy({
       workflowId: 'workflow-1',
       userId: 'user-1',
     })
 
     expect(result.success).toBe(true)
-    expect(mockEmitWorkflowDeployedEvent).toHaveBeenCalledTimes(1)
-    expect(mockEmitWorkflowDeployedEvent).toHaveBeenCalledWith({
+    expect(mockPrepareWorkflowDeployment).toHaveBeenCalledTimes(1)
+    expect(mockEnqueueWorkflowDeploymentPreparation).toHaveBeenCalledWith(
+      mockTx,
+      expect.objectContaining({ protocolVersion: 2 })
+    )
+    expect(mockEmitWorkflowDeployedEvent).not.toHaveBeenCalled()
+  })
+
+  it('keeps a first deploy pending without claiming an active deployment', async () => {
+    const now = new Date('2026-07-14T08:00:00.000Z')
+    const operation = {
+      id: 'operation-1',
+      workflowId: 'workflow-1',
+      deploymentVersionId: 'dv-candidate',
+      version: 1,
+      previousActiveVersionId: null,
+      action: 'deploy',
+      protocolVersion: 2,
+      generation: 1,
+      status: 'preparing',
+      componentReadiness: {
+        webhooks: { status: 'pending', updatedAt: now.toISOString() },
+        schedules: { status: 'pending', updatedAt: now.toISOString() },
+        mcp: { status: 'pending', updatedAt: now.toISOString() },
+      },
+      errorCode: null,
+      errorMessage: null,
+      idempotencyKey: 'request-1',
+      requestHash: 'hash',
+      actorId: 'user-1',
+      completedAt: null,
+      createdAt: now,
+      updatedAt: now,
+    }
+    mockLoadWorkflowDeploymentSnapshot.mockResolvedValue({
+      blocks: {},
+      edges: [],
+      loops: {},
+      parallels: {},
+      variables: {},
+      lastSaved: now.getTime(),
+    })
+    mockValidateWorkflowSchedules.mockReturnValue({ isValid: true })
+    mockValidateTriggerWebhookConfigForDeploy.mockResolvedValue({ success: true })
+    mockEnqueueWorkflowDeploymentPreparation.mockResolvedValue('prepare-event-1')
+    mockPrepareWorkflowDeployment.mockImplementation(async (input) => {
+      await input.onPrepareTransaction?.(mockTx, operation)
+      return { success: true, operation, reused: false }
+    })
+    mockProcessWorkflowDeploymentOutboxEvent.mockResolvedValue('pending')
+    mockGetWorkflowDeploymentStatus.mockResolvedValue({
+      activeDeployment: null,
+      latestOperation: operation,
+    })
+
+    const result = await performFullDeploy({
+      workflowId: 'workflow-1',
+      userId: 'user-1',
+      requestId: 'request-1',
+    })
+
+    expect(result).toMatchObject({
+      success: true,
+      activeDeployment: null,
+      latestDeploymentAttempt: {
+        id: 'operation-1',
+        status: 'preparing',
+        deploymentVersionId: 'dv-candidate',
+      },
+      warnings: [expect.stringContaining('workflow remains undeployed')],
+    })
+    expect(result.deployedAt).toBeUndefined()
+  })
+
+  it('preserves the old active deployment while a redeploy prepares', async () => {
+    const now = new Date('2026-07-14T08:00:00.000Z')
+    const operation = {
+      id: 'operation-2',
+      workflowId: 'workflow-1',
+      deploymentVersionId: 'dv-candidate',
+      version: 5,
+      previousActiveVersionId: 'dv-live',
+      action: 'deploy',
+      protocolVersion: 2,
+      generation: 2,
+      status: 'preparing',
+      componentReadiness: {
+        webhooks: { status: 'ready', updatedAt: now.toISOString() },
+        schedules: { status: 'pending', updatedAt: now.toISOString() },
+        mcp: { status: 'pending', updatedAt: now.toISOString() },
+      },
+      errorCode: null,
+      errorMessage: null,
+      idempotencyKey: 'request-2',
+      requestHash: 'hash',
+      actorId: 'user-1',
+      completedAt: null,
+      createdAt: now,
+      updatedAt: now,
+    }
+    mockLoadWorkflowDeploymentSnapshot.mockResolvedValue({
+      blocks: {},
+      edges: [],
+      loops: {},
+      parallels: {},
+      variables: {},
+      lastSaved: now.getTime(),
+    })
+    mockValidateWorkflowSchedules.mockReturnValue({ isValid: true })
+    mockValidateTriggerWebhookConfigForDeploy.mockResolvedValue({ success: true })
+    mockEnqueueWorkflowDeploymentPreparation.mockResolvedValue('prepare-event-2')
+    mockPrepareWorkflowDeployment.mockImplementation(async (input) => {
+      await input.onPrepareTransaction?.(mockTx, operation)
+      return { success: true, operation, reused: false }
+    })
+    mockProcessWorkflowDeploymentOutboxEvent.mockResolvedValue('pending')
+    mockGetWorkflowDeploymentStatus.mockResolvedValue({
+      activeDeployment: {
+        deploymentVersionId: 'dv-live',
+        version: 4,
+        deployedAt: now,
+      },
+      latestOperation: operation,
+    })
+
+    const result = await performFullDeploy({
       workflowId: 'workflow-1',
-      workflowName: 'My Workflow',
-      workspaceId: 'workspace-1',
+      userId: 'user-1',
+      requestId: 'request-2',
+    })
+
+    expect(result).toMatchObject({
+      success: true,
+      deploymentVersionId: 'dv-live',
       version: 4,
+      activeDeployment: {
+        deploymentVersionId: 'dv-live',
+        version: 4,
+      },
+      latestDeploymentAttempt: {
+        deploymentVersionId: 'dv-candidate',
+        status: 'preparing',
+      },
     })
+    expect(mockEmitWorkflowDeployedEvent).not.toHaveBeenCalled()
   })
 
-  it('does not emit when the deploy fails', async () => {
-    mockDeployWorkflow.mockResolvedValueOnce({ success: false, error: 'nope' })
+  it('surfaces v2 admission failure without falling back to legacy activation', async () => {
+    mockPrepareWorkflowDeployment.mockResolvedValueOnce({
+      success: false,
+      reason: 'invalid_request',
+      error: 'nope',
+    })
 
     const result = await performFullDeploy({
       workflowId: 'workflow-1',
@@ -282,18 +476,63 @@ describe('performFullDeploy workspace event emission', () => {
     })
 
     expect(result.success).toBe(false)
+    expect(result.error).toBe('nope')
     expect(mockEmitWorkflowDeployedEvent).not.toHaveBeenCalled()
   })
 
-  it('emission rejection does not fail the deploy', async () => {
-    mockEmitWorkflowDeployedEvent.mockRejectedValueOnce(new Error('emit failed'))
+  it('returns a failure response when this request attempt fails terminally inline', async () => {
+    const now = new Date('2026-07-14T08:00:00.000Z')
+    const operation = {
+      id: 'operation-conflict',
+      workflowId: 'workflow-1',
+      deploymentVersionId: 'dv-candidate',
+      version: 5,
+      previousActiveVersionId: null,
+      action: 'deploy',
+      protocolVersion: 2,
+      generation: 2,
+      status: 'preparing',
+      componentReadiness: {
+        webhooks: { status: 'pending', updatedAt: now.toISOString() },
+        schedules: { status: 'pending', updatedAt: now.toISOString() },
+        mcp: { status: 'pending', updatedAt: now.toISOString() },
+      },
+      errorCode: null,
+      errorMessage: null,
+      idempotencyKey: 'request-conflict',
+      requestHash: 'hash',
+      actorId: 'user-1',
+      completedAt: null,
+      createdAt: now,
+      updatedAt: now,
+    }
+    mockPrepareWorkflowDeployment.mockImplementation(async (input) => {
+      await input.onPrepareTransaction?.(mockTx, operation)
+      return { success: true, operation, reused: false }
+    })
+    mockProcessWorkflowDeploymentOutboxEvent.mockResolvedValue('completed')
+    mockGetWorkflowDeploymentStatus.mockResolvedValue({
+      activeDeployment: null,
+      latestOperation: {
+        ...operation,
+        status: 'failed',
+        errorCode: 'webhook_path_conflict',
+        errorMessage: 'Webhook path "/leads" is already in use. Choose a different path.',
+        completedAt: now,
+      },
+    })
 
     const result = await performFullDeploy({
       workflowId: 'workflow-1',
       userId: 'user-1',
+      requestId: 'request-conflict',
     })
 
-    expect(result.success).toBe(true)
+    expect(result).toMatchObject({
+      success: false,
+      error: 'Webhook path "/leads" is already in use. Choose a different path.',
+      errorCode: 'conflict',
+    })
   })
 })
 
@@ -301,31 +540,129 @@ describe('performActivateVersion workspace event emission', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response(null, { status: 200 })))
+    const now = new Date('2026-07-14T08:00:00.000Z')
+    const operation = {
+      id: 'operation-activate-default',
+      workflowId: 'workflow-1',
+      deploymentVersionId: 'dv-2',
+      version: 2,
+      previousActiveVersionId: 'dv-1',
+      action: 'activate',
+      protocolVersion: 2,
+      generation: 4,
+      status: 'active',
+      componentReadiness: {
+        webhooks: { status: 'ready', updatedAt: now.toISOString() },
+        schedules: { status: 'ready', updatedAt: now.toISOString() },
+        mcp: { status: 'ready', updatedAt: now.toISOString() },
+      },
+      errorCode: null,
+      errorMessage: null,
+      idempotencyKey: 'request-activate-default',
+      requestHash: 'hash',
+      actorId: 'user-1',
+      completedAt: now,
+      createdAt: now,
+      updatedAt: now,
+    }
+    mockProcessWorkflowDeploymentOutboxEvent.mockResolvedValue('completed')
+    mockNotifySocketDeploymentChanged.mockResolvedValue(undefined)
     mockValidateWorkflowSchedules.mockReturnValue({ isValid: true })
     mockValidateTriggerWebhookConfigForDeploy.mockResolvedValue({ success: true })
     mockLimit.mockResolvedValue([{ id: 'dv-2', state: { blocks: {} }, isActive: false }])
-    mockActivateWorkflowVersion.mockResolvedValue({
-      success: true,
-      deployedAt: new Date(),
-      previousVersionId: 'dv-1',
+    mockEnqueueWorkflowDeploymentPreparation.mockResolvedValue('prepare-event-activate-default')
+    mockPrepareWorkflowVersionActivation.mockImplementation(async (input) => {
+      await input.onPrepareTransaction?.(mockTx, operation)
+      return { success: true, operation, reused: false }
+    })
+    mockGetWorkflowDeploymentStatus.mockResolvedValue({
+      activeDeployment: {
+        deploymentVersionId: 'dv-2',
+        version: 2,
+        deployedAt: now,
+      },
+      latestOperation: operation,
     })
   })
 
-  it('emits workflow_deployed when activating a version (rollback/activation)', async () => {
+  it('always admits version activation through v2 without legacy activation', async () => {
     const result = await performActivateVersion({
       workflowId: 'workflow-1',
       version: 2,
       userId: 'user-1',
-      workflow: { id: 'workflow-1', name: 'My Workflow', workspaceId: 'workspace-1' },
     })
 
     expect(result.success).toBe(true)
-    expect(mockEmitWorkflowDeployedEvent).toHaveBeenCalledWith({
+    expect(mockPrepareWorkflowVersionActivation).toHaveBeenCalledTimes(1)
+    expect(mockEnqueueWorkflowDeploymentPreparation).toHaveBeenCalledWith(
+      mockTx,
+      expect.objectContaining({ protocolVersion: 2 })
+    )
+    expect(mockEmitWorkflowDeployedEvent).not.toHaveBeenCalled()
+  })
+
+  it('keeps the current version active while version activation prepares', async () => {
+    const now = new Date('2026-07-14T08:00:00.000Z')
+    const operation = {
+      id: 'operation-activate',
+      workflowId: 'workflow-1',
+      deploymentVersionId: 'dv-2',
+      version: 2,
+      previousActiveVersionId: 'dv-1',
+      action: 'activate',
+      protocolVersion: 2,
+      generation: 4,
+      status: 'preparing',
+      componentReadiness: {
+        webhooks: { status: 'pending', updatedAt: now.toISOString() },
+        schedules: { status: 'pending', updatedAt: now.toISOString() },
+        mcp: { status: 'pending', updatedAt: now.toISOString() },
+      },
+      errorCode: null,
+      errorMessage: null,
+      idempotencyKey: 'request-activate',
+      requestHash: 'hash',
+      actorId: 'user-1',
+      completedAt: null,
+      createdAt: now,
+      updatedAt: now,
+    }
+    mockEnqueueWorkflowDeploymentPreparation.mockResolvedValue('prepare-event-activate')
+    mockPrepareWorkflowVersionActivation.mockImplementation(async (input) => {
+      await input.onPrepareTransaction?.(mockTx, operation)
+      return { success: true, operation, reused: false }
+    })
+    mockProcessWorkflowDeploymentOutboxEvent.mockResolvedValue('pending')
+    mockGetWorkflowDeploymentStatus.mockResolvedValue({
+      activeDeployment: {
+        deploymentVersionId: 'dv-1',
+        version: 1,
+        deployedAt: now,
+      },
+      latestOperation: operation,
+    })
+
+    const result = await performActivateVersion({
       workflowId: 'workflow-1',
-      workflowName: 'My Workflow',
-      workspaceId: 'workspace-1',
       version: 2,
+      userId: 'user-1',
+      requestId: 'request-activate',
     })
+
+    expect(result).toMatchObject({
+      success: true,
+      activeDeployment: {
+        deploymentVersionId: 'dv-1',
+        version: 1,
+      },
+      latestDeploymentAttempt: {
+        id: 'operation-activate',
+        deploymentVersionId: 'dv-2',
+        status: 'preparing',
+      },
+      warnings: [expect.stringContaining('prior workflow version remains active')],
+    })
+    expect(mockEmitWorkflowDeployedEvent).not.toHaveBeenCalled()
   })
 
   it('does not emit when the version is already active (no-op activation)', async () => {
@@ -337,24 +674,27 @@ describe('performActivateVersion workspace event emission', () => {
       workflowId: 'workflow-1',
       version: 2,
       userId: 'user-1',
-      workflow: { id: 'workflow-1', name: 'My Workflow', workspaceId: 'workspace-1' },
     })
 
     expect(result.success).toBe(true)
     expect(mockEmitWorkflowDeployedEvent).not.toHaveBeenCalled()
   })
 
-  it('does not emit when activation fails', async () => {
-    mockActivateWorkflowVersion.mockResolvedValueOnce({ success: false, error: 'nope' })
+  it('surfaces v2 activation admission failure without legacy fallback', async () => {
+    mockPrepareWorkflowVersionActivation.mockResolvedValueOnce({
+      success: false,
+      reason: 'invalid_request',
+      error: 'nope',
+    })
 
     const result = await performActivateVersion({
       workflowId: 'workflow-1',
       version: 2,
       userId: 'user-1',
-      workflow: { id: 'workflow-1', name: 'My Workflow', workspaceId: 'workspace-1' },
     })
 
     expect(result.success).toBe(false)
+    expect(result.error).toBe('nope')
     expect(mockEmitWorkflowDeployedEvent).not.toHaveBeenCalled()
   })
 })
diff --git a/apps/sim/lib/workflows/orchestration/deploy.ts b/apps/sim/lib/workflows/orchestration/deploy.ts
index 7f7617f3402..16179218d05 100644
--- a/apps/sim/lib/workflows/orchestration/deploy.ts
+++ b/apps/sim/lib/workflows/orchestration/deploy.ts
@@ -2,6 +2,8 @@ import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db, workflowDeploymentVersion, workflow as workflowTable } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { assertWorkflowMutable, WorkflowLockedError } from '@sim/platform-authz/workflow'
+import { sha256Hex } from '@sim/security/hash'
+import { getErrorMessage } from '@sim/utils/errors'
 import { and, eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { env } from '@/lib/core/config/env'
@@ -10,54 +12,68 @@ import { getSocketServerUrl } from '@/lib/core/utils/urls'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { validateTriggerWebhookConfigForDeploy } from '@/lib/webhooks/deploy'
 import {
-  enqueueWorkflowDeploymentSideEffects,
+  type DeploymentComponentStatus,
+  isDeploymentOperationAction,
+  isDeploymentOperationStatus,
+  parseDeploymentReadiness,
+} from '@/lib/workflows/deployment-lifecycle'
+import {
+  DEPLOYMENT_READINESS_COMPONENTS,
+  enqueueWorkflowDeploymentPreparation,
   enqueueWorkflowUndeploySideEffects,
+  notifySocketDeploymentChanged,
   processWorkflowDeploymentOutboxEvent,
 } from '@/lib/workflows/deployment-outbox'
 import type { OrchestrationErrorCode } from '@/lib/workflows/orchestration/types'
 import {
-  activateWorkflowVersion,
-  deployWorkflow,
+  getWorkflowDeploymentStatus,
+  prepareWorkflowDeployment,
+  prepareWorkflowVersionActivation,
+  type WorkflowDeploymentOperation,
+  type WorkflowDeploymentStatus,
+} from '@/lib/workflows/persistence/deployment-operations'
+import {
+  loadWorkflowDeploymentSnapshot,
   saveWorkflowToNormalizedTables,
   undeployWorkflow,
 } from '@/lib/workflows/persistence/utils'
 import { validateWorkflowSchedules } from '@/lib/workflows/schedules'
-import {
-  emitWorkflowDeployedEvent,
-  emitWorkflowUndeployedEvent,
-} from '@/lib/workspace-events/emitter'
+import { emitWorkflowUndeployedEvent } from '@/lib/workspace-events/emitter'
 import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('DeployOrchestration')
 
-/**
- * Notifies the socket server that a workflow's deployment state has changed,
- * so all connected clients can refresh their deployment queries.
- */
-async function notifySocketDeploymentChanged(workflowId: string): Promise<void> {
-  try {
-    const response = await fetch(`${getSocketServerUrl()}/api/workflow-deployed`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': env.INTERNAL_API_SECRET,
-      },
-      body: JSON.stringify({ workflowId }),
-    })
-    if (!response.ok) {
-      logger.warn(
-        `Socket deployment notification failed (${response.status}) for workflow ${workflowId}`
-      )
-    }
-  } catch (error) {
-    logger.error('Error sending workflow deployed event to socket server', error)
+type DeploymentReadinessSummaryStatus = DeploymentComponentStatus | 'not_applicable'
+
+export interface ActiveDeploymentResult {
+  deploymentVersionId: string
+  version: number
+  deployedAt: string
+}
+
+export interface DeploymentAttemptResult {
+  id: string
+  deploymentVersionId: string
+  version: number
+  action: 'deploy' | 'activate'
+  status: 'preparing' | 'activating' | 'active' | 'failed' | 'superseded'
+  readiness: {
+    webhooks: DeploymentReadinessSummaryStatus
+    schedules: DeploymentReadinessSummaryStatus
+    mcp: DeploymentReadinessSummaryStatus
   }
+  requestedAt: string
+  activatedAt?: string | null
+  error?: {
+    code: string
+    message: string
+    retryable: boolean
+  } | null
 }
 
 export interface PerformFullDeployParams {
   workflowId: string
   userId: string
-  workflowName?: string
   /**
    * Optional summary of what changed, stored on the created deployment version.
    * The copilot deploy tools require this; the UI deploy route sets it
@@ -71,11 +87,6 @@ export interface PerformFullDeployParams {
    */
   versionName?: string
   requestId?: string
-  /**
-   * Optional NextRequest for external webhook subscriptions.
-   * If not provided, a synthetic request is constructed from the base URL.
-   */
-  request?: NextRequest
   /**
    * Override the actor ID used in audit logs and the `deployedBy` field.
    * Defaults to `userId`. Use `'admin-api'` for admin-initiated actions.
@@ -88,21 +99,21 @@ export interface PerformFullDeployResult {
   deployedAt?: Date
   version?: number
   deploymentVersionId?: string
+  activeDeployment?: ActiveDeploymentResult | null
+  latestDeploymentAttempt?: DeploymentAttemptResult | null
   error?: string
   errorCode?: OrchestrationErrorCode
   warnings?: string[]
 }
 
 /**
- * Performs a full workflow deployment: creates a deployment version, queues
- * external side effects transactionally, processes that outbox event after
- * commit, and notifies clients. Both the deploy API route and the copilot
- * deploy tools must use this single function so behaviour stays consistent.
+ * Admits a deployment through the v2 prepare/activate protocol. The candidate
+ * version remains inactive until every required side effect is ready.
  */
 export async function performFullDeploy(
   params: PerformFullDeployParams
 ): Promise<PerformFullDeployResult> {
-  const { workflowId, userId, workflowName } = params
+  const { workflowId, userId } = params
   const actorId = params.actorId ?? userId
   const requestId = params.requestId ?? generateRequestId()
 
@@ -116,99 +127,295 @@ export async function performFullDeploy(
     return { success: false, error: 'Workflow not found', errorCode: 'not_found' }
   }
 
-  const workflowData = workflowRecord as Record<string, unknown>
-  let outboxEventId: string | undefined
+  try {
+    return await performStableFullDeploy({
+      params,
+      actorId,
+      requestId,
+    })
+  } catch (error) {
+    logger.error(`[${requestId}] Deployment preparation failed`, { workflowId, error })
+    return {
+      success: false,
+      error: getErrorMessage(error, 'Failed to prepare workflow deployment'),
+      errorCode: 'internal',
+    }
+  }
+}
 
-  const deployResult = await deployWorkflow({
-    workflowId,
-    deployedBy: actorId,
-    workflowName: workflowName || workflowRecord.name || undefined,
-    description: params.versionDescription,
-    name: params.versionName,
-    validateWorkflowState: async (workflowState) => {
-      const scheduleValidation = validateWorkflowSchedules(workflowState.blocks)
-      if (!scheduleValidation.isValid) {
-        return {
-          success: false,
-          error: `Invalid schedule configuration: ${scheduleValidation.error}`,
-          errorCode: 'validation',
-        }
-      }
-      const triggerValidation = await validateTriggerWebhookConfigForDeploy(workflowState.blocks)
-      if (!triggerValidation.success) {
-        return {
-          success: false,
-          error: triggerValidation.error?.message || 'Invalid trigger configuration',
-          errorCode: 'validation',
-        }
+async function performStableFullDeploy(params: {
+  params: PerformFullDeployParams
+  actorId: string
+  requestId: string
+}): Promise<PerformFullDeployResult> {
+  const workflowState = await loadWorkflowDeploymentSnapshot(params.params.workflowId)
+  if (!workflowState) {
+    return {
+      success: false,
+      error: 'Failed to load workflow state',
+      errorCode: 'validation',
+    }
+  }
+
+  const validation = await validateDeploymentState(workflowState.blocks)
+  if (!validation.success) return validation
+
+  let outboxEventId: string | undefined
+  const prepared = await prepareWorkflowDeployment({
+    workflowId: params.params.workflowId,
+    actorId: params.actorId,
+    requestHash: createDeploymentRequestHash({
+      action: 'deploy',
+      workflowId: params.params.workflowId,
+      userId: params.params.userId,
+      workflowState,
+      versionName: params.params.versionName ?? null,
+      versionDescription: params.params.versionDescription ?? null,
+    }),
+    idempotencyKey: params.requestId,
+    workflowState,
+    name: params.params.versionName,
+    description: params.params.versionDescription,
+    readinessComponents: DEPLOYMENT_READINESS_COMPONENTS,
+    onPrepareTransaction: async (tx, operation) => {
+      if (!operation.deploymentVersionId || operation.version === null) {
+        throw new Error('Prepared deployment operation is missing its target version')
       }
-      return { success: true }
-    },
-    onDeployTransaction: async (tx, result) => {
-      outboxEventId = await enqueueWorkflowDeploymentSideEffects(tx, {
-        workflowId,
-        deploymentVersionId: result.deploymentVersionId,
-        userId,
-        requestId,
+      outboxEventId = await enqueueWorkflowDeploymentPreparation(tx, {
+        protocolVersion: operation.protocolVersion,
+        operationId: operation.id,
+        generation: operation.generation,
+        workflowId: operation.workflowId,
+        deploymentVersionId: operation.deploymentVersionId,
+        version: operation.version,
+        userId: params.params.userId,
+        requestId: params.requestId,
+        checkpoints: {},
       })
     },
   })
 
-  if (!deployResult.success) {
-    const error = deployResult.error || 'Failed to deploy workflow'
+  if (!prepared.success) {
     return {
       success: false,
-      error,
-      errorCode: deployResult.errorCode,
+      error: prepared.error,
+      errorCode: mapPrepareFailureCode(prepared.reason),
     }
   }
 
-  const deployedAt = deployResult.deployedAt!
-  const deploymentVersionId = deployResult.deploymentVersionId
-  const previousVersionId = deployResult.previousVersionId
-  const deploymentSnapshot = deployResult.currentState
+  const processResult = await processStableDeploymentPreparationNow(outboxEventId, params.requestId)
+  const deploymentStatus = await getWorkflowDeploymentStatus(params.params.workflowId)
+  const inlineFailure = buildInlinePreparationFailure(prepared.operation.id, deploymentStatus)
+  if (inlineFailure) return inlineFailure
+  return buildStableDeploymentResult(deploymentStatus, processResult)
+}
 
-  if (!deploymentVersionId || !deploymentSnapshot) {
-    await undeployWorkflow({ workflowId })
-    return { success: false, error: 'Failed to resolve deployment version' }
+/**
+ * Surfaces a synchronous failure when the attempt created by this request
+ * already failed terminally, so callers get an error response instead of a
+ * success payload with a buried failed status.
+ */
+function buildInlinePreparationFailure(
+  operationId: string,
+  status: WorkflowDeploymentStatus
+): { success: false; error: string; errorCode: OrchestrationErrorCode } | null {
+  const latest = status.latestOperation
+  if (!latest || latest.id !== operationId || latest.status !== 'failed') return null
+  return {
+    success: false,
+    error: latest.errorMessage || 'Deployment preparation failed',
+    errorCode:
+      latest.errorCode === 'webhook_path_conflict'
+        ? 'conflict'
+        : latest.errorCode === 'invalid_trigger_configuration'
+          ? 'validation'
+          : 'internal',
   }
+}
 
-  recordAudit({
-    workspaceId: (workflowData.workspaceId as string) || null,
-    actorId: actorId,
-    action: AuditAction.WORKFLOW_DEPLOYED,
-    resourceType: AuditResourceType.WORKFLOW,
-    resourceId: workflowId,
-    resourceName: (workflowData.name as string) || undefined,
-    description: `Deployed workflow "${(workflowData.name as string) || workflowId}"`,
-    metadata: {
-      deploymentVersionId,
-      version: deployResult.version,
-      previousVersionId: previousVersionId || undefined,
-    },
-    request: params.request,
-  })
+async function validateDeploymentState(
+  blocks: Record<string, BlockState>
+): Promise<
+  | { success: true }
+  | { success: false; error: string; errorCode: Extract<OrchestrationErrorCode, 'validation'> }
+> {
+  const scheduleValidation = validateWorkflowSchedules(blocks)
+  if (!scheduleValidation.isValid) {
+    return {
+      success: false,
+      error: `Invalid schedule configuration: ${scheduleValidation.error}`,
+      errorCode: 'validation',
+    }
+  }
+  const triggerValidation = await validateTriggerWebhookConfigForDeploy(blocks)
+  if (!triggerValidation.success) {
+    return {
+      success: false,
+      error: triggerValidation.error?.message || 'Invalid trigger configuration',
+      errorCode: 'validation',
+    }
+  }
+  return { success: true }
+}
 
-  const sideEffectWarning = await processDeploymentSideEffectsNow(outboxEventId, requestId)
-  await notifySocketDeploymentChanged(workflowId)
+function createDeploymentRequestHash(value: Record<string, unknown>): string {
+  return sha256Hex(JSON.stringify(value))
+}
 
-  const workspaceId = workflowData.workspaceId as string | null
-  if (workspaceId) {
-    void emitWorkflowDeployedEvent({
-      workflowId,
-      workflowName: (workflowData.name as string) || workflowId,
-      workspaceId,
-      version: deployResult.version ?? null,
+function mapPrepareFailureCode(
+  reason:
+    | 'workflow_not_found'
+    | 'workflow_archived'
+    | 'deployment_version_not_found'
+    | 'idempotency_conflict'
+    | 'invalid_request'
+): OrchestrationErrorCode {
+  if (reason === 'workflow_not_found' || reason === 'deployment_version_not_found') {
+    return 'not_found'
+  }
+  if (reason === 'idempotency_conflict') return 'conflict'
+  return 'validation'
+}
+
+async function processStableDeploymentPreparationNow(
+  outboxEventId: string | undefined,
+  requestId: string
+): Promise<string | undefined> {
+  if (!outboxEventId) return undefined
+  try {
+    return await processWorkflowDeploymentOutboxEvent(outboxEventId)
+  } catch (error) {
+    logger.warn(`[${requestId}] Inline deployment preparation errored; outbox will retry`, {
+      outboxEventId,
+      error,
     })
+    return 'processing_error'
   }
+}
+
+function buildStableDeploymentResult(
+  status: WorkflowDeploymentStatus,
+  processResult: string | undefined
+): PerformFullDeployResult {
+  const activeDeployment = status.activeDeployment
+    ? {
+        deploymentVersionId: status.activeDeployment.deploymentVersionId,
+        version: status.activeDeployment.version,
+        deployedAt: status.activeDeployment.deployedAt.toISOString(),
+      }
+    : null
+  const latestDeploymentAttempt = summarizeDeploymentOperation(status.latestOperation)
+  const warning = getStableDeploymentWarning(
+    latestDeploymentAttempt,
+    processResult,
+    activeDeployment !== null
+  )
 
   return {
     success: true,
-    deployedAt,
-    version: deployResult.version,
-    deploymentVersionId,
-    warnings: sideEffectWarning ? [sideEffectWarning] : undefined,
+    deployedAt: status.activeDeployment?.deployedAt,
+    version: status.activeDeployment?.version,
+    deploymentVersionId: status.activeDeployment?.deploymentVersionId,
+    activeDeployment,
+    latestDeploymentAttempt,
+    warnings: warning ? [warning] : undefined,
+  }
+}
+
+/**
+ * Returns the active deployment and latest attempt without mutating deployment state.
+ */
+export async function getWorkflowDeploymentSummary(workflowId: string): Promise<{
+  activeDeployment: ActiveDeploymentResult | null
+  latestDeploymentAttempt: DeploymentAttemptResult | null
+  warnings?: string[]
+}> {
+  const result = buildStableDeploymentResult(
+    await getWorkflowDeploymentStatus(workflowId),
+    undefined
+  )
+  return {
+    activeDeployment: result.activeDeployment ?? null,
+    latestDeploymentAttempt: result.latestDeploymentAttempt ?? null,
+    warnings: result.warnings,
+  }
+}
+
+function summarizeDeploymentOperation(
+  operation: WorkflowDeploymentOperation | null
+): DeploymentAttemptResult | null {
+  if (!operation) return null
+  if (
+    !isDeploymentOperationAction(operation.action) ||
+    !isDeploymentOperationStatus(operation.status)
+  ) {
+    return null
+  }
+  const readiness = parseDeploymentReadiness(operation.componentReadiness)
+  const componentStatus = (
+    component: (typeof DEPLOYMENT_READINESS_COMPONENTS)[number]
+  ): DeploymentReadinessSummaryStatus => readiness?.[component]?.status ?? 'not_applicable'
+
+  return {
+    id: operation.id,
+    deploymentVersionId: operation.deploymentVersionId,
+    version: operation.version,
+    action: operation.action,
+    status: operation.status,
+    readiness: {
+      webhooks: componentStatus('webhooks'),
+      schedules: componentStatus('schedules'),
+      mcp: componentStatus('mcp'),
+    },
+    requestedAt: operation.createdAt.toISOString(),
+    activatedAt:
+      operation.status === 'active' ? (operation.completedAt?.toISOString() ?? null) : null,
+    error:
+      operation.errorCode && operation.errorMessage
+        ? {
+            code: operation.errorCode,
+            message: operation.errorMessage,
+            retryable: false,
+          }
+        : null,
+  }
+}
+
+function getStableDeploymentWarning(
+  attempt: DeploymentAttemptResult | null,
+  processResult: string | undefined,
+  hasActiveDeployment: boolean
+): string | undefined {
+  if (!attempt) return undefined
+  if (attempt.status === 'preparing' || attempt.status === 'activating') {
+    if (processResult === 'processing_error') {
+      return hasActiveDeployment
+        ? 'Deployment preparation hit an error and will retry automatically. The prior workflow version remains active until cutover.'
+        : 'Deployment preparation hit an error and will retry automatically. The workflow remains undeployed until activation.'
+    }
+    return hasActiveDeployment
+      ? 'Deployment preparation is queued and may finish shortly. The prior workflow version remains active until cutover.'
+      : 'Deployment preparation is queued and may finish shortly. The workflow remains undeployed until activation.'
+  }
+  if (attempt.status === 'failed') {
+    return hasActiveDeployment
+      ? 'Deployment preparation failed. The prior workflow version remains active.'
+      : 'Deployment preparation failed. The workflow remains undeployed.'
+  }
+  if (attempt.status === 'superseded') {
+    return 'This deployment attempt was superseded by a newer request.'
   }
+  if (processResult === 'dead_letter' || processResult === 'not_found') {
+    return 'Deployment activation completed, but its post-activation event could not be retried automatically.'
+  }
+  if (
+    processResult === 'pending' ||
+    processResult === 'processing' ||
+    processResult === 'lease_lost'
+  ) {
+    return 'Deployment activation completed, and post-activation notifications are queued.'
+  }
+  return undefined
 }
 
 export interface PerformFullUndeployParams {
@@ -304,9 +511,7 @@ export interface PerformActivateVersionParams {
   workflowId: string
   version: number
   userId: string
-  workflow: Record<string, unknown>
   requestId?: string
-  request?: NextRequest
   /** Override the actor ID used in audit logs. Defaults to `userId`. */
   actorId?: string
 }
@@ -314,6 +519,8 @@ export interface PerformActivateVersionParams {
 export interface PerformActivateVersionResult {
   success: boolean
   deployedAt?: Date
+  activeDeployment?: ActiveDeploymentResult | null
+  latestDeploymentAttempt?: DeploymentAttemptResult | null
   error?: string
   errorCode?: OrchestrationErrorCode
   warnings?: string[]
@@ -339,15 +546,12 @@ export interface PerformRevertToVersionResult {
 }
 
 /**
- * Activates an existing deployment version: validates schedules, activates the
- * version, queues external side effects transactionally, processes that outbox
- * event after commit, and records an audit entry. Both the deployment version
- * PATCH handler and the admin activate route must use this function.
+ * Admits an existing version through the v2 prepare/activate protocol.
  */
 export async function performActivateVersion(
   params: PerformActivateVersionParams
 ): Promise<PerformActivateVersionResult> {
-  const { workflowId, version, userId, workflow } = params
+  const { workflowId, version, userId } = params
   const actorId = params.actorId ?? userId
   const requestId = params.requestId ?? generateRequestId()
 
@@ -377,7 +581,15 @@ export async function performActivateVersion(
       .where(eq(workflowTable.id, workflowId))
       .limit(1)
 
-    return { success: true, deployedAt: workflowDeployment?.deployedAt ?? new Date(), warnings: [] }
+    const status = await getWorkflowDeploymentStatus(workflowId)
+    const stableResult = buildStableDeploymentResult(status, 'completed')
+    return {
+      success: true,
+      deployedAt: stableResult.deployedAt ?? workflowDeployment?.deployedAt ?? new Date(),
+      activeDeployment: stableResult.activeDeployment,
+      latestDeploymentAttempt: stableResult.latestDeploymentAttempt,
+      warnings: stableResult.warnings,
+    }
   }
 
   const deployedState = versionRow.state as { blocks?: Record<string, unknown> }
@@ -406,56 +618,88 @@ export async function performActivateVersion(
     }
   }
 
-  let outboxEventId: string | undefined
-  const result = await activateWorkflowVersion({
-    workflowId,
-    version,
-    onActivateTransaction: async (tx, activation) => {
-      outboxEventId = await enqueueWorkflowDeploymentSideEffects(tx, {
-        workflowId,
-        deploymentVersionId: activation.deploymentVersionId,
-        userId,
-        requestId,
-        forceRecreateSubscriptions: true,
-      })
-    },
-  })
-  if (!result.success) {
-    return { success: false, error: result.error || 'Failed to activate version' }
+  try {
+    return await performStableVersionActivation({
+      workflowId,
+      deploymentVersionId: versionRow.id,
+      version,
+      userId,
+      actorId,
+      requestId,
+    })
+  } catch (error) {
+    logger.error(`[${requestId}] Version activation preparation failed`, {
+      workflowId,
+      version,
+      error,
+    })
+    return {
+      success: false,
+      error: getErrorMessage(error, 'Failed to prepare version activation'),
+      errorCode: 'internal',
+    }
   }
+}
 
-  recordAudit({
-    workspaceId: (workflow.workspaceId as string) || null,
-    actorId: actorId,
-    action: AuditAction.WORKFLOW_DEPLOYMENT_ACTIVATED,
-    resourceType: AuditResourceType.WORKFLOW,
-    resourceId: workflowId,
-    description: `Activated deployment version ${version}`,
-    resourceName: (workflow.name as string) || undefined,
-    metadata: {
-      version,
-      deploymentVersionId: versionRow.id,
-      previousVersionId: result.previousVersionId || undefined,
+async function performStableVersionActivation(params: {
+  workflowId: string
+  deploymentVersionId: string
+  version: number
+  userId: string
+  actorId: string
+  requestId: string
+}): Promise<PerformActivateVersionResult> {
+  let outboxEventId: string | undefined
+  const prepared = await prepareWorkflowVersionActivation({
+    workflowId: params.workflowId,
+    deploymentVersionId: params.deploymentVersionId,
+    actorId: params.actorId,
+    requestHash: createDeploymentRequestHash({
+      action: 'activate',
+      workflowId: params.workflowId,
+      deploymentVersionId: params.deploymentVersionId,
+      version: params.version,
+      userId: params.userId,
+    }),
+    idempotencyKey: params.requestId,
+    readinessComponents: DEPLOYMENT_READINESS_COMPONENTS,
+    onPrepareTransaction: async (tx, operation) => {
+      if (!operation.deploymentVersionId || operation.version === null) {
+        throw new Error('Prepared activation operation is missing its target version')
+      }
+      outboxEventId = await enqueueWorkflowDeploymentPreparation(tx, {
+        protocolVersion: operation.protocolVersion,
+        operationId: operation.id,
+        generation: operation.generation,
+        workflowId: operation.workflowId,
+        deploymentVersionId: operation.deploymentVersionId,
+        version: operation.version,
+        userId: params.userId,
+        requestId: params.requestId,
+        checkpoints: {},
+      })
     },
   })
 
-  const sideEffectWarning = await processDeploymentSideEffectsNow(outboxEventId, requestId)
-  await notifySocketDeploymentChanged(workflowId)
-
-  const activationWorkspaceId = (workflow.workspaceId as string) || null
-  if (activationWorkspaceId) {
-    void emitWorkflowDeployedEvent({
-      workflowId,
-      workflowName: (workflow.name as string) || workflowId,
-      workspaceId: activationWorkspaceId,
-      version,
-    })
+  if (!prepared.success) {
+    return {
+      success: false,
+      error: prepared.error,
+      errorCode: mapPrepareFailureCode(prepared.reason),
+    }
   }
 
+  const processResult = await processStableDeploymentPreparationNow(outboxEventId, params.requestId)
+  const status = await getWorkflowDeploymentStatus(params.workflowId)
+  const inlineFailure = buildInlinePreparationFailure(prepared.operation.id, status)
+  if (inlineFailure) return inlineFailure
+  const result = buildStableDeploymentResult(status, processResult)
   return {
-    success: true,
+    success: result.success,
     deployedAt: result.deployedAt,
-    warnings: sideEffectWarning ? [sideEffectWarning] : undefined,
+    activeDeployment: result.activeDeployment,
+    latestDeploymentAttempt: result.latestDeploymentAttempt,
+    warnings: result.warnings,
   }
 }
 
diff --git a/apps/sim/lib/workflows/orchestration/index.ts b/apps/sim/lib/workflows/orchestration/index.ts
index d1a25867e59..b47ab417e3f 100644
--- a/apps/sim/lib/workflows/orchestration/index.ts
+++ b/apps/sim/lib/workflows/orchestration/index.ts
@@ -3,6 +3,7 @@ export {
   performChatUndeploy,
 } from './chat-deploy'
 export {
+  getWorkflowDeploymentSummary,
   performActivateVersion,
   performFullDeploy,
   performFullUndeploy,
diff --git a/apps/sim/lib/workflows/orchestration/types.test.ts b/apps/sim/lib/workflows/orchestration/types.test.ts
new file mode 100644
index 00000000000..26be2502be4
--- /dev/null
+++ b/apps/sim/lib/workflows/orchestration/types.test.ts
@@ -0,0 +1,17 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { statusForOrchestrationError } from '@/lib/workflows/orchestration/types'
+
+describe('statusForOrchestrationError', () => {
+  it.each([
+    ['validation', 400],
+    ['not_found', 404],
+    ['conflict', 409],
+    ['internal', 500],
+    [undefined, 500],
+  ] as const)('maps %s to %i', (code, expected) => {
+    expect(statusForOrchestrationError(code)).toBe(expected)
+  })
+})
diff --git a/apps/sim/lib/workflows/orchestration/types.ts b/apps/sim/lib/workflows/orchestration/types.ts
index 03dd0050dca..70c715ffb2c 100644
--- a/apps/sim/lib/workflows/orchestration/types.ts
+++ b/apps/sim/lib/workflows/orchestration/types.ts
@@ -7,5 +7,6 @@ export type OrchestrationErrorCode = 'validation' | 'not_found' | 'conflict' | '
 export function statusForOrchestrationError(code: OrchestrationErrorCode | undefined): number {
   if (code === 'validation') return 400
   if (code === 'not_found') return 404
+  if (code === 'conflict') return 409
   return 500
 }
diff --git a/apps/sim/lib/workflows/persistence/deployment-operations.test.ts b/apps/sim/lib/workflows/persistence/deployment-operations.test.ts
new file mode 100644
index 00000000000..e3a5f9a8d25
--- /dev/null
+++ b/apps/sim/lib/workflows/persistence/deployment-operations.test.ts
@@ -0,0 +1,436 @@
+/**
+ * @vitest-environment node
+ */
+import { dbChainMock, dbChainMockFns, resetDbChainMock, schemaMock } from '@sim/testing'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const { mockGenerateId } = vi.hoisted(() => ({
+  mockGenerateId: vi.fn(),
+}))
+
+vi.mock('@sim/db', () => ({
+  ...dbChainMock,
+  workflow: schemaMock.workflow,
+  workflowDeploymentOperation: schemaMock.workflowDeploymentOperation,
+  workflowDeploymentVersion: schemaMock.workflowDeploymentVersion,
+}))
+
+vi.mock('@sim/utils/id', () => ({
+  generateId: mockGenerateId,
+}))
+
+import {
+  activateDeploymentOperation,
+  markDeploymentComponentReadiness,
+  markDeploymentOperationFailed,
+  prepareWorkflowDeployment,
+} from '@/lib/workflows/persistence/deployment-operations'
+
+const WORKFLOW_ID = 'workflow-1'
+const NOW = new Date('2026-07-14T08:00:00.000Z')
+
+function operationRow(
+  overrides: Partial<{
+    id: string
+    workflowId: string
+    deploymentVersionId: string
+    version: number
+    previousActiveVersionId: string | null
+    action: 'deploy' | 'activate'
+    protocolVersion: number
+    generation: number
+    status: 'preparing' | 'activating' | 'active' | 'failed' | 'superseded'
+    componentReadiness: Record<string, unknown>
+    errorCode: string | null
+    errorMessage: string | null
+    idempotencyKey: string | null
+    requestHash: string
+    actorId: string
+    completedAt: Date | null
+    createdAt: Date
+    updatedAt: Date
+  }> = {}
+) {
+  return {
+    id: 'operation-1',
+    workflowId: WORKFLOW_ID,
+    deploymentVersionId: 'version-2',
+    version: 2,
+    previousActiveVersionId: 'version-1',
+    action: 'deploy' as const,
+    protocolVersion: 2,
+    generation: 2,
+    status: 'preparing' as const,
+    componentReadiness: {},
+    errorCode: null,
+    errorMessage: null,
+    idempotencyKey: null,
+    requestHash: 'request-hash',
+    actorId: 'user-1',
+    completedAt: null,
+    createdAt: NOW,
+    updatedAt: NOW,
+    ...overrides,
+  }
+}
+
+function workflowState() {
+  return {
+    blocks: {},
+    edges: [],
+    loops: {},
+    parallels: {},
+    variables: {},
+    lastSaved: NOW.getTime(),
+  }
+}
+
+function scriptPrepare(params: {
+  operation: ReturnType<typeof operationRow>
+  activeVersionId: string | null
+  maxVersion: number
+  maxGeneration: number
+}) {
+  dbChainMockFns.for.mockResolvedValueOnce([{ id: WORKFLOW_ID, archivedAt: null }])
+  dbChainMockFns.limit
+    .mockResolvedValueOnce([])
+    .mockResolvedValueOnce(params.activeVersionId ? [{ id: params.activeVersionId }] : [])
+    .mockResolvedValueOnce([{ maxVersion: params.maxVersion }])
+    .mockResolvedValueOnce([{ maxGeneration: params.maxGeneration }])
+  dbChainMockFns.returning.mockResolvedValueOnce([params.operation])
+}
+
+describe('deployment operation persistence', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    resetDbChainMock()
+    mockGenerateId.mockReset()
+  })
+
+  it('creates first-deploy and redeploy snapshots inactive while generations supersede rapidly', async () => {
+    const firstOperation = operationRow({
+      id: 'operation-1',
+      deploymentVersionId: 'version-1',
+      version: 1,
+      previousActiveVersionId: null,
+      generation: 1,
+    })
+    const secondOperation = operationRow({
+      id: 'operation-2',
+      deploymentVersionId: 'version-2',
+      version: 2,
+      previousActiveVersionId: 'version-live',
+      generation: 2,
+    })
+    mockGenerateId
+      .mockReturnValueOnce('version-1')
+      .mockReturnValueOnce('operation-1')
+      .mockReturnValueOnce('version-2')
+      .mockReturnValueOnce('operation-2')
+    scriptPrepare({
+      operation: firstOperation,
+      activeVersionId: null,
+      maxVersion: 0,
+      maxGeneration: 0,
+    })
+    scriptPrepare({
+      operation: secondOperation,
+      activeVersionId: 'version-live',
+      maxVersion: 1,
+      maxGeneration: 1,
+    })
+
+    const first = await prepareWorkflowDeployment({
+      workflowId: WORKFLOW_ID,
+      actorId: 'user-1',
+      requestHash: 'hash-1',
+      idempotencyKey: 'deploy-1',
+      workflowState: workflowState(),
+      readinessComponents: ['webhooks'],
+    })
+    const second = await prepareWorkflowDeployment({
+      workflowId: WORKFLOW_ID,
+      actorId: 'user-1',
+      requestHash: 'hash-2',
+      idempotencyKey: 'deploy-2',
+      workflowState: workflowState(),
+      readinessComponents: ['webhooks'],
+    })
+
+    expect(first).toEqual({ success: true, operation: firstOperation, reused: false })
+    expect(second).toEqual({ success: true, operation: secondOperation, reused: false })
+
+    const insertedValues = dbChainMockFns.values.mock.calls.map(([values]) => values)
+    expect(insertedValues).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: 'version-1',
+          version: 1,
+          isActive: false,
+        }),
+        expect.objectContaining({
+          id: 'operation-1',
+          generation: 1,
+          previousActiveVersionId: null,
+          status: 'preparing',
+        }),
+        expect.objectContaining({
+          id: 'version-2',
+          version: 2,
+          isActive: false,
+        }),
+        expect.objectContaining({
+          id: 'operation-2',
+          generation: 2,
+          previousActiveVersionId: 'version-live',
+          status: 'preparing',
+        }),
+      ])
+    )
+    expect(dbChainMockFns.set).toHaveBeenCalledTimes(2)
+    expect(dbChainMockFns.set).toHaveBeenNthCalledWith(
+      2,
+      expect.objectContaining({ status: 'superseded' })
+    )
+    expect(dbChainMockFns.update).not.toHaveBeenCalledWith(schemaMock.workflow)
+    expect(dbChainMockFns.update).not.toHaveBeenCalledWith(schemaMock.workflowDeploymentVersion)
+  })
+
+  it('runs the prepare callback in the operation transaction after insertion', async () => {
+    const operation = operationRow({
+      deploymentVersionId: 'version-1',
+      version: 1,
+      previousActiveVersionId: null,
+      generation: 1,
+    })
+    const onPrepareTransaction = vi.fn().mockResolvedValue(undefined)
+    mockGenerateId.mockReturnValueOnce('version-1').mockReturnValueOnce('operation-1')
+    scriptPrepare({
+      operation,
+      activeVersionId: null,
+      maxVersion: 0,
+      maxGeneration: 0,
+    })
+
+    const result = await prepareWorkflowDeployment({
+      workflowId: WORKFLOW_ID,
+      actorId: 'user-1',
+      requestHash: 'hash-1',
+      idempotencyKey: 'deploy-1',
+      workflowState: workflowState(),
+      readinessComponents: ['webhooks'],
+      onPrepareTransaction,
+    })
+
+    expect(result.success).toBe(true)
+    expect(onPrepareTransaction).toHaveBeenCalledWith(
+      expect.objectContaining({ insert: expect.any(Function) }),
+      operation
+    )
+    expect(dbChainMockFns.transaction).toHaveBeenCalledTimes(1)
+  })
+
+  it('rejects reuse of an idempotency key with a different request hash', async () => {
+    dbChainMockFns.for.mockResolvedValueOnce([{ id: WORKFLOW_ID, archivedAt: null }])
+    dbChainMockFns.limit.mockResolvedValueOnce([
+      operationRow({ idempotencyKey: 'deploy-1', requestHash: 'original-hash' }),
+    ])
+
+    const result = await prepareWorkflowDeployment({
+      workflowId: WORKFLOW_ID,
+      actorId: 'user-1',
+      requestHash: 'different-hash',
+      idempotencyKey: 'deploy-1',
+      workflowState: workflowState(),
+    })
+
+    expect(result).toEqual({
+      success: false,
+      reason: 'idempotency_conflict',
+      error: 'Idempotency key was already used for a different deployment request',
+    })
+    expect(dbChainMockFns.insert).not.toHaveBeenCalled()
+    expect(dbChainMockFns.update).not.toHaveBeenCalled()
+  })
+
+  it('rejects stale generation callbacks before mutating legacy deployment state', async () => {
+    dbChainMockFns.for
+      .mockResolvedValueOnce([{ id: WORKFLOW_ID }])
+      .mockResolvedValueOnce([
+        operationRow({ status: 'activating', generation: 4, componentReadiness: {} }),
+      ])
+    dbChainMockFns.limit.mockResolvedValueOnce([{ maxGeneration: 5 }])
+
+    const result = await activateDeploymentOperation({
+      workflowId: WORKFLOW_ID,
+      operationId: 'operation-1',
+      generation: 4,
+    })
+
+    expect(result).toEqual({
+      success: false,
+      reason: 'stale_generation',
+      error: 'Deployment operation generation is stale',
+    })
+    expect(dbChainMockFns.update).not.toHaveBeenCalled()
+  })
+
+  it('uses operation and generation CAS for component readiness', async () => {
+    dbChainMockFns.returning.mockResolvedValueOnce([])
+
+    const result = await markDeploymentComponentReadiness({
+      workflowId: WORKFLOW_ID,
+      operationId: 'operation-1',
+      generation: 1,
+      component: 'webhooks',
+      status: 'ready',
+    })
+
+    expect(result).toEqual({
+      success: false,
+      reason: 'stale_generation',
+      error: 'Deployment operation generation or component state is stale',
+    })
+    expect(dbChainMockFns.update).toHaveBeenCalledWith(schemaMock.workflowDeploymentOperation)
+  })
+
+  it('marks failure without changing the previously active deployment', async () => {
+    const failedOperation = operationRow({
+      status: 'failed',
+      errorCode: 'provider_failed',
+      errorMessage: 'authorization=[redacted]',
+      completedAt: NOW,
+    })
+    dbChainMockFns.returning.mockResolvedValueOnce([failedOperation])
+
+    const result = await markDeploymentOperationFailed({
+      workflowId: WORKFLOW_ID,
+      operationId: 'operation-1',
+      generation: 2,
+      errorCode: 'provider_failed',
+      error: new Error('authorization=secret'),
+    })
+
+    expect(result).toEqual({ success: true, operation: failedOperation })
+    expect(dbChainMockFns.update).toHaveBeenCalledTimes(1)
+    expect(dbChainMockFns.update).toHaveBeenCalledWith(schemaMock.workflowDeploymentOperation)
+    expect(dbChainMockFns.update).not.toHaveBeenCalledWith(schemaMock.workflow)
+    expect(dbChainMockFns.update).not.toHaveBeenCalledWith(schemaMock.workflowDeploymentVersion)
+    expect(dbChainMockFns.set).toHaveBeenCalledWith(
+      expect.objectContaining({
+        status: 'failed',
+        errorCode: 'provider_failed',
+        errorMessage: 'authorization=[redacted]',
+      })
+    )
+  })
+
+  it('refuses activation while any required component is pending', async () => {
+    const operation = operationRow({
+      status: 'activating',
+      componentReadiness: {
+        webhooks: { status: 'ready', updatedAt: NOW.toISOString() },
+        schedules: { status: 'pending', updatedAt: NOW.toISOString() },
+      },
+    })
+    dbChainMockFns.for
+      .mockResolvedValueOnce([{ id: WORKFLOW_ID }])
+      .mockResolvedValueOnce([operation])
+    dbChainMockFns.limit.mockResolvedValueOnce([{ maxGeneration: 2 }])
+
+    const result = await activateDeploymentOperation({
+      workflowId: WORKFLOW_ID,
+      operationId: operation.id,
+      generation: operation.generation,
+    })
+
+    expect(result).toEqual({
+      success: false,
+      reason: 'not_ready',
+      error: 'Deployment operation components are not all ready',
+    })
+    expect(dbChainMockFns.update).not.toHaveBeenCalled()
+  })
+
+  it('atomically flips compatibility fields only for an all-ready current operation', async () => {
+    const operation = operationRow({
+      status: 'activating',
+      componentReadiness: {
+        webhooks: { status: 'ready', updatedAt: NOW.toISOString() },
+        schedules: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    dbChainMockFns.for
+      .mockResolvedValueOnce([{ id: WORKFLOW_ID }])
+      .mockResolvedValueOnce([operation])
+    dbChainMockFns.limit
+      .mockResolvedValueOnce([{ maxGeneration: 2 }])
+      .mockResolvedValueOnce([{ id: 'version-1' }])
+      .mockResolvedValueOnce([{ id: 'version-2' }])
+    const onActivateTransaction = vi.fn().mockResolvedValue(undefined)
+
+    const result = await activateDeploymentOperation({
+      workflowId: WORKFLOW_ID,
+      operationId: operation.id,
+      generation: operation.generation,
+      onActivateTransaction,
+    })
+
+    expect(result.success).toBe(true)
+    expect(dbChainMockFns.update.mock.calls.map(([table]) => table)).toEqual([
+      schemaMock.workflowDeploymentVersion,
+      schemaMock.workflowDeploymentVersion,
+      schemaMock.workflow,
+      schemaMock.workflowDeploymentOperation,
+    ])
+    expect(dbChainMockFns.set).toHaveBeenNthCalledWith(1, { isActive: false })
+    expect(dbChainMockFns.set).toHaveBeenNthCalledWith(2, { isActive: true })
+    expect(dbChainMockFns.set).toHaveBeenNthCalledWith(
+      3,
+      expect.objectContaining({ isDeployed: true, deployedAt: expect.any(Date) })
+    )
+    expect(dbChainMockFns.set).toHaveBeenNthCalledWith(
+      4,
+      expect.objectContaining({
+        status: 'active',
+        completedAt: expect.any(Date),
+      })
+    )
+    expect(onActivateTransaction).toHaveBeenCalledTimes(1)
+    expect(dbChainMockFns.transaction).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not activate after a legacy writer changes the active deployment', async () => {
+    const operation = operationRow({
+      status: 'activating',
+      componentReadiness: {
+        webhooks: { status: 'ready', updatedAt: NOW.toISOString() },
+      },
+    })
+    dbChainMockFns.for
+      .mockResolvedValueOnce([{ id: WORKFLOW_ID }])
+      .mockResolvedValueOnce([operation])
+    dbChainMockFns.limit
+      .mockResolvedValueOnce([{ maxGeneration: operation.generation }])
+      .mockResolvedValueOnce([{ id: 'version-written-by-legacy-pod' }])
+
+    const result = await activateDeploymentOperation({
+      workflowId: WORKFLOW_ID,
+      operationId: operation.id,
+      generation: operation.generation,
+    })
+
+    expect(result).toEqual({
+      success: false,
+      reason: 'stale_generation',
+      error: 'Active deployment changed while this operation was preparing',
+    })
+    expect(dbChainMockFns.update).toHaveBeenCalledTimes(1)
+    expect(dbChainMockFns.update).toHaveBeenCalledWith(schemaMock.workflowDeploymentOperation)
+    expect(dbChainMockFns.set).toHaveBeenCalledWith(
+      expect.objectContaining({ status: 'superseded', completedAt: expect.any(Date) })
+    )
+    expect(dbChainMockFns.update).not.toHaveBeenCalledWith(schemaMock.workflowDeploymentVersion)
+    expect(dbChainMockFns.update).not.toHaveBeenCalledWith(schemaMock.workflow)
+  })
+})
diff --git a/apps/sim/lib/workflows/persistence/deployment-operations.ts b/apps/sim/lib/workflows/persistence/deployment-operations.ts
new file mode 100644
index 00000000000..be2161ee6c9
--- /dev/null
+++ b/apps/sim/lib/workflows/persistence/deployment-operations.ts
@@ -0,0 +1,865 @@
+import { db, workflow, workflowDeploymentOperation, workflowDeploymentVersion } from '@sim/db'
+import { generateId } from '@sim/utils/id'
+import type { DbOrTx } from '@sim/workflow-persistence/types'
+import type { WorkflowState } from '@sim/workflow-types/workflow'
+import type { InferSelectModel } from 'drizzle-orm'
+import { and, desc, eq, inArray, sql } from 'drizzle-orm'
+import {
+  canTransitionDeploymentOperation,
+  createDeploymentReadiness,
+  DEPLOYMENT_OPERATION_PROTOCOL_VERSION,
+  type DeploymentComponentStatus,
+  type DeploymentOperationAction,
+  type DeploymentOperationStatus,
+  type DeploymentReadiness,
+  isDeploymentOperationAction,
+  isDeploymentOperationStatus,
+  isDeploymentReadinessComplete,
+  parseDeploymentReadiness,
+  toSafeDeploymentError,
+} from '@/lib/workflows/deployment-lifecycle'
+
+export type WorkflowDeploymentOperation = InferSelectModel<typeof workflowDeploymentOperation>
+
+type PrepareFailureReason =
+  | 'workflow_not_found'
+  | 'workflow_archived'
+  | 'deployment_version_not_found'
+  | 'idempotency_conflict'
+  | 'invalid_request'
+
+type MutationFailureReason =
+  | 'operation_not_found'
+  | 'invalid_transition'
+  | 'stale_generation'
+  | 'invalid_readiness'
+  | 'not_ready'
+  | 'deployment_version_not_found'
+
+export type PrepareDeploymentOperationResult =
+  | { success: true; operation: WorkflowDeploymentOperation; reused: boolean }
+  | { success: false; reason: PrepareFailureReason; error: string }
+
+export type DeploymentOperationMutationResult =
+  | { success: true; operation: WorkflowDeploymentOperation }
+  | { success: false; reason: MutationFailureReason; error: string }
+
+interface PrepareOperationBase {
+  workflowId: string
+  actorId: string
+  requestHash: string
+  idempotencyKey?: string
+  readinessComponents?: readonly string[]
+  tx?: DbOrTx
+  onPrepareTransaction?: (tx: DbOrTx, operation: WorkflowDeploymentOperation) => Promise<void>
+}
+
+export interface PrepareWorkflowDeploymentParams extends PrepareOperationBase {
+  workflowState: WorkflowState
+  name?: string | null
+  description?: string | null
+}
+
+export interface PrepareWorkflowVersionActivationParams extends PrepareOperationBase {
+  deploymentVersionId: string
+}
+
+export interface DeploymentOperationGeneration {
+  workflowId: string
+  operationId: string
+  generation: number
+}
+
+export interface WorkflowDeploymentStatus {
+  activeDeployment: {
+    deploymentVersionId: string
+    version: number
+    deployedAt: Date
+  } | null
+  latestOperation: WorkflowDeploymentOperation | null
+}
+
+export interface MarkDeploymentComponentReadinessParams extends DeploymentOperationGeneration {
+  component: string
+  status: DeploymentComponentStatus
+  expectedStatus?: DeploymentComponentStatus
+}
+
+export interface ActivateDeploymentOperationParams extends DeploymentOperationGeneration {
+  onActivateTransaction?: (tx: DbOrTx, operation: WorkflowDeploymentOperation) => Promise<void>
+}
+
+interface PrepareOperationContext {
+  tx: DbOrTx
+  now: Date
+  actorId: string
+  workflowId: string
+}
+
+interface OperationTarget {
+  deploymentVersionId: string
+  version: number
+}
+
+type ResolveOperationTarget = (context: PrepareOperationContext) =>
+  | Promise<
+      | { success: true; target: OperationTarget }
+      | { success: false; reason: PrepareFailureReason; error: string }
+    >
+  | {
+      success: true
+      target: OperationTarget
+    }
+  | { success: false; reason: PrepareFailureReason; error: string }
+
+const IN_FLIGHT_STATUSES: DeploymentOperationStatus[] = ['preparing', 'activating']
+
+/**
+ * Creates an inactive immutable snapshot and a preparing deployment attempt.
+ */
+export async function prepareWorkflowDeployment(
+  params: PrepareWorkflowDeploymentParams
+): Promise<PrepareDeploymentOperationResult> {
+  return prepareOperation(params, 'deploy', async ({ tx, now, actorId, workflowId }) => {
+    const [{ maxVersion }] = await tx
+      .select({ maxVersion: sql<number>`COALESCE(MAX(${workflowDeploymentVersion.version}), 0)` })
+      .from(workflowDeploymentVersion)
+      .where(eq(workflowDeploymentVersion.workflowId, workflowId))
+      .limit(1)
+    const version = Number(maxVersion) + 1
+    const deploymentVersionId = generateId()
+
+    await tx.insert(workflowDeploymentVersion).values({
+      id: deploymentVersionId,
+      workflowId,
+      version,
+      name: params.name?.trim() || null,
+      description: params.description?.trim() || null,
+      state: params.workflowState,
+      isActive: false,
+      createdAt: now,
+      createdBy: actorId,
+    })
+
+    return {
+      success: true,
+      target: { deploymentVersionId, version },
+    }
+  })
+}
+
+/**
+ * Creates a preparing attempt targeting an existing immutable snapshot.
+ */
+export async function prepareWorkflowVersionActivation(
+  params: PrepareWorkflowVersionActivationParams
+): Promise<PrepareDeploymentOperationResult> {
+  return prepareOperation(params, 'activate', async ({ tx, workflowId }) => {
+    const [versionRow] = await tx
+      .select({
+        id: workflowDeploymentVersion.id,
+        version: workflowDeploymentVersion.version,
+        createdAt: workflowDeploymentVersion.createdAt,
+      })
+      .from(workflowDeploymentVersion)
+      .where(
+        and(
+          eq(workflowDeploymentVersion.workflowId, workflowId),
+          eq(workflowDeploymentVersion.id, params.deploymentVersionId)
+        )
+      )
+      .limit(1)
+
+    if (!versionRow) {
+      return {
+        success: false,
+        reason: 'deployment_version_not_found',
+        error: 'Deployment version not found',
+      }
+    }
+
+    return {
+      success: true,
+      target: {
+        deploymentVersionId: versionRow.id,
+        version: versionRow.version,
+      },
+    }
+  })
+}
+
+/**
+ * Returns the active immutable version and latest deployment attempt for a workflow.
+ */
+export async function getWorkflowDeploymentStatus(
+  workflowId: string
+): Promise<WorkflowDeploymentStatus> {
+  const [[activeVersion], [workflowRow], [latestOperation]] = await Promise.all([
+    db
+      .select({
+        id: workflowDeploymentVersion.id,
+        version: workflowDeploymentVersion.version,
+        createdAt: workflowDeploymentVersion.createdAt,
+      })
+      .from(workflowDeploymentVersion)
+      .where(
+        and(
+          eq(workflowDeploymentVersion.workflowId, workflowId),
+          eq(workflowDeploymentVersion.isActive, true)
+        )
+      )
+      .orderBy(desc(workflowDeploymentVersion.version))
+      .limit(1),
+    db
+      .select({ deployedAt: workflow.deployedAt })
+      .from(workflow)
+      .where(eq(workflow.id, workflowId))
+      .limit(1),
+    db
+      .select()
+      .from(workflowDeploymentOperation)
+      .where(eq(workflowDeploymentOperation.workflowId, workflowId))
+      .orderBy(desc(workflowDeploymentOperation.generation))
+      .limit(1),
+  ])
+
+  return {
+    activeDeployment: activeVersion
+      ? {
+          deploymentVersionId: activeVersion.id,
+          version: activeVersion.version,
+          deployedAt: workflowRow?.deployedAt ?? activeVersion.createdAt,
+        }
+      : null,
+    latestOperation: latestOperation ?? null,
+  }
+}
+
+/**
+ * Loads one generation-scoped operation for an outbox worker.
+ */
+export async function getDeploymentOperation(
+  params: DeploymentOperationGeneration
+): Promise<WorkflowDeploymentOperation | null> {
+  const [operation] = await db
+    .select()
+    .from(workflowDeploymentOperation)
+    .where(
+      and(
+        eq(workflowDeploymentOperation.id, params.operationId),
+        eq(workflowDeploymentOperation.workflowId, params.workflowId),
+        eq(workflowDeploymentOperation.generation, params.generation)
+      )
+    )
+    .limit(1)
+
+  return operation ?? null
+}
+
+/**
+ * Confirms an operation still owns the workflow's latest generation.
+ */
+export async function isDeploymentOperationCurrent(
+  params: DeploymentOperationGeneration & {
+    deploymentVersionId?: string
+    statuses?: readonly DeploymentOperationStatus[]
+  },
+  executor: Pick<DbOrTx, 'select'> = db
+): Promise<boolean> {
+  const [latestOperation] = await executor
+    .select({
+      id: workflowDeploymentOperation.id,
+      generation: workflowDeploymentOperation.generation,
+      deploymentVersionId: workflowDeploymentOperation.deploymentVersionId,
+      status: workflowDeploymentOperation.status,
+    })
+    .from(workflowDeploymentOperation)
+    .where(eq(workflowDeploymentOperation.workflowId, params.workflowId))
+    .orderBy(desc(workflowDeploymentOperation.generation))
+    .limit(1)
+
+  if (
+    !latestOperation ||
+    latestOperation.id !== params.operationId ||
+    latestOperation.generation !== params.generation ||
+    (params.deploymentVersionId !== undefined &&
+      latestOperation.deploymentVersionId !== params.deploymentVersionId)
+  ) {
+    return false
+  }
+  if (!params.statuses) return true
+  if (!isDeploymentOperationStatus(latestOperation.status)) return false
+  return params.statuses.includes(latestOperation.status)
+}
+
+/**
+ * Protects an inactive v2 candidate from rolling-deploy v1 cleanup workers.
+ */
+export async function isDeploymentVersionProtectedByCurrentOperation(
+  workflowId: string,
+  deploymentVersionId: string,
+  executor: Pick<DbOrTx, 'select'> = db
+): Promise<boolean> {
+  const [latestOperation] = await executor
+    .select({
+      deploymentVersionId: workflowDeploymentOperation.deploymentVersionId,
+      protocolVersion: workflowDeploymentOperation.protocolVersion,
+      status: workflowDeploymentOperation.status,
+    })
+    .from(workflowDeploymentOperation)
+    .where(eq(workflowDeploymentOperation.workflowId, workflowId))
+    .orderBy(desc(workflowDeploymentOperation.generation))
+    .limit(1)
+
+  return (
+    latestOperation?.deploymentVersionId === deploymentVersionId &&
+    latestOperation.protocolVersion === DEPLOYMENT_OPERATION_PROTOCOL_VERSION &&
+    isDeploymentOperationStatus(latestOperation.status) &&
+    IN_FLIGHT_STATUSES.includes(latestOperation.status)
+  )
+}
+
+/**
+ * Moves the current preparing generation into its activation phase.
+ */
+export async function beginDeploymentOperationActivation(
+  params: DeploymentOperationGeneration
+): Promise<DeploymentOperationMutationResult> {
+  return db.transaction(async (tx) => {
+    const operation = await lockCurrentOperation(tx, params)
+    if (!operation.success) return operation
+
+    if (
+      !isDeploymentOperationStatus(operation.operation.status) ||
+      !canTransitionDeploymentOperation(operation.operation.status, 'activating')
+    ) {
+      return {
+        success: false,
+        reason: 'invalid_transition',
+        error: `Cannot transition deployment operation from ${operation.operation.status} to activating`,
+      }
+    }
+
+    const now = new Date()
+    await tx
+      .update(workflowDeploymentOperation)
+      .set({
+        status: 'activating',
+        updatedAt: now,
+      })
+      .where(
+        and(
+          eq(workflowDeploymentOperation.id, params.operationId),
+          eq(workflowDeploymentOperation.workflowId, params.workflowId),
+          eq(workflowDeploymentOperation.generation, params.generation),
+          eq(workflowDeploymentOperation.status, 'preparing')
+        )
+      )
+
+    return {
+      success: true,
+      operation: {
+        ...operation.operation,
+        status: 'activating',
+        updatedAt: now,
+      },
+    }
+  })
+}
+
+/**
+ * Atomically updates one declared component using operation, generation, and
+ * component-state compare-and-swap predicates.
+ */
+export async function markDeploymentComponentReadiness(
+  params: MarkDeploymentComponentReadinessParams
+): Promise<DeploymentOperationMutationResult> {
+  const component = params.component.trim()
+  if (!component) {
+    return {
+      success: false,
+      reason: 'invalid_readiness',
+      error: 'Deployment readiness component name cannot be empty',
+    }
+  }
+
+  const now = new Date()
+  const expectedStatus = params.expectedStatus ?? 'pending'
+  const nextState = {
+    status: params.status,
+    updatedAt: now.toISOString(),
+  }
+
+  const [updated] = await db
+    .update(workflowDeploymentOperation)
+    .set({
+      componentReadiness: sql`jsonb_set(
+        ${workflowDeploymentOperation.componentReadiness},
+        ARRAY[${component}]::text[],
+        ${JSON.stringify(nextState)}::jsonb,
+        false
+      )`,
+      updatedAt: now,
+    })
+    .where(
+      and(
+        eq(workflowDeploymentOperation.id, params.operationId),
+        eq(workflowDeploymentOperation.workflowId, params.workflowId),
+        eq(workflowDeploymentOperation.generation, params.generation),
+        inArray(workflowDeploymentOperation.status, IN_FLIGHT_STATUSES),
+        sql`${workflowDeploymentOperation.componentReadiness} ? ${component}`,
+        sql`${workflowDeploymentOperation.componentReadiness} -> ${component} ->> 'status' = ${expectedStatus}`
+      )
+    )
+    .returning()
+
+  if (!updated) {
+    return {
+      success: false,
+      reason: 'stale_generation',
+      error: 'Deployment operation generation or component state is stale',
+    }
+  }
+
+  return { success: true, operation: updated }
+}
+
+/**
+ * Atomically activates an all-ready current operation and projects it onto the
+ * legacy workflow/version fields.
+ */
+export async function activateDeploymentOperation(
+  params: ActivateDeploymentOperationParams
+): Promise<DeploymentOperationMutationResult> {
+  return db.transaction(async (tx) => {
+    const operationResult = await lockCurrentOperation(tx, params)
+    if (!operationResult.success) return operationResult
+
+    const operation = operationResult.operation
+    if (
+      !isDeploymentOperationStatus(operation.status) ||
+      !canTransitionDeploymentOperation(operation.status, 'active')
+    ) {
+      return {
+        success: false,
+        reason: 'invalid_transition',
+        error: `Cannot transition deployment operation from ${operation.status} to active`,
+      }
+    }
+
+    const readiness = parseDeploymentReadiness(operation.componentReadiness)
+    if (!readiness) {
+      return {
+        success: false,
+        reason: 'invalid_readiness',
+        error: 'Deployment operation readiness is invalid',
+      }
+    }
+    if (!isDeploymentReadinessComplete(readiness)) {
+      return {
+        success: false,
+        reason: 'not_ready',
+        error: 'Deployment operation components are not all ready',
+      }
+    }
+
+    const [currentActiveVersion] = await tx
+      .select({ id: workflowDeploymentVersion.id })
+      .from(workflowDeploymentVersion)
+      .where(
+        and(
+          eq(workflowDeploymentVersion.workflowId, operation.workflowId),
+          eq(workflowDeploymentVersion.isActive, true)
+        )
+      )
+      .orderBy(desc(workflowDeploymentVersion.version))
+      .limit(1)
+    if ((currentActiveVersion?.id ?? null) !== operation.previousActiveVersionId) {
+      const supersededAt = new Date()
+      await tx
+        .update(workflowDeploymentOperation)
+        .set({
+          status: 'superseded',
+          completedAt: supersededAt,
+          updatedAt: supersededAt,
+        })
+        .where(
+          and(
+            eq(workflowDeploymentOperation.id, operation.id),
+            eq(workflowDeploymentOperation.workflowId, operation.workflowId),
+            eq(workflowDeploymentOperation.generation, operation.generation),
+            eq(workflowDeploymentOperation.status, 'activating')
+          )
+        )
+      return {
+        success: false,
+        reason: 'stale_generation',
+        error: 'Active deployment changed while this operation was preparing',
+      }
+    }
+
+    if (!operation.deploymentVersionId) {
+      return {
+        success: false,
+        reason: 'deployment_version_not_found',
+        error: 'Deployment operation has no target version',
+      }
+    }
+
+    const [targetVersion] = await tx
+      .select({ id: workflowDeploymentVersion.id })
+      .from(workflowDeploymentVersion)
+      .where(
+        and(
+          eq(workflowDeploymentVersion.workflowId, operation.workflowId),
+          eq(workflowDeploymentVersion.id, operation.deploymentVersionId)
+        )
+      )
+      .limit(1)
+    if (!targetVersion) {
+      return {
+        success: false,
+        reason: 'deployment_version_not_found',
+        error: 'Deployment version not found',
+      }
+    }
+
+    const now = new Date()
+    if (!isDeploymentOperationAction(operation.action)) {
+      return {
+        success: false,
+        reason: 'invalid_transition',
+        error: `Deployment operation action is invalid: ${operation.action}`,
+      }
+    }
+
+    await tx
+      .update(workflowDeploymentVersion)
+      .set({ isActive: false })
+      .where(eq(workflowDeploymentVersion.workflowId, operation.workflowId))
+
+    await tx
+      .update(workflowDeploymentVersion)
+      .set({ isActive: true })
+      .where(
+        and(
+          eq(workflowDeploymentVersion.workflowId, operation.workflowId),
+          eq(workflowDeploymentVersion.id, operation.deploymentVersionId)
+        )
+      )
+
+    await tx
+      .update(workflow)
+      .set({
+        isDeployed: true,
+        deployedAt: now,
+      })
+      .where(eq(workflow.id, operation.workflowId))
+
+    await tx
+      .update(workflowDeploymentOperation)
+      .set({
+        status: 'active',
+        errorCode: null,
+        errorMessage: null,
+        completedAt: now,
+        updatedAt: now,
+      })
+      .where(
+        and(
+          eq(workflowDeploymentOperation.id, operation.id),
+          eq(workflowDeploymentOperation.generation, operation.generation),
+          eq(workflowDeploymentOperation.status, 'activating')
+        )
+      )
+
+    const activatedOperation: WorkflowDeploymentOperation = {
+      ...operation,
+      status: 'active',
+      errorCode: null,
+      errorMessage: null,
+      completedAt: now,
+      updatedAt: now,
+    }
+    await params.onActivateTransaction?.(tx, activatedOperation)
+
+    return { success: true, operation: activatedOperation }
+  })
+}
+
+/**
+ * Marks an in-flight operation failed without changing the live deployment.
+ */
+export async function markDeploymentOperationFailed(
+  params: DeploymentOperationGeneration & { error: unknown; errorCode?: string }
+): Promise<DeploymentOperationMutationResult> {
+  const safeError = toSafeDeploymentError(params.error, params.errorCode)
+  return markDeploymentOperationTerminal(params, 'failed', safeError)
+}
+
+/**
+ * Supersedes every in-flight operation for a workflow. Must run inside the
+ * undeploy/archive transaction so a queued preparation cannot activate a
+ * version after the user explicitly took the workflow offline.
+ */
+export async function supersedeInFlightDeploymentOperations(
+  executor: DbOrTx,
+  workflowId: string
+): Promise<void> {
+  const now = new Date()
+  await executor
+    .update(workflowDeploymentOperation)
+    .set({
+      status: 'superseded',
+      completedAt: now,
+      updatedAt: now,
+    })
+    .where(
+      and(
+        eq(workflowDeploymentOperation.workflowId, workflowId),
+        inArray(workflowDeploymentOperation.status, IN_FLIGHT_STATUSES)
+      )
+    )
+}
+
+async function prepareOperation(
+  params: PrepareOperationBase,
+  action: DeploymentOperationAction,
+  resolveTarget: ResolveOperationTarget
+): Promise<PrepareDeploymentOperationResult> {
+  const actorId = params.actorId.trim()
+  const requestHash = params.requestHash.trim()
+  const idempotencyKey = params.idempotencyKey?.trim() || null
+  if (!actorId || !requestHash) {
+    return {
+      success: false,
+      reason: 'invalid_request',
+      error: 'Deployment operation actor and request hash are required',
+    }
+  }
+
+  let readiness: DeploymentReadiness
+  try {
+    readiness = createDeploymentReadiness(params.readinessComponents ?? [])
+  } catch (error) {
+    return {
+      success: false,
+      reason: 'invalid_request',
+      error: toSafeDeploymentError(error, 'invalid_readiness').message,
+    }
+  }
+
+  const executePrepare = async (tx: DbOrTx): Promise<PrepareDeploymentOperationResult> => {
+    const now = new Date()
+    const [workflowRow] = await tx
+      .select({
+        id: workflow.id,
+        archivedAt: workflow.archivedAt,
+      })
+      .from(workflow)
+      .where(eq(workflow.id, params.workflowId))
+      .for('update')
+    if (!workflowRow) {
+      return {
+        success: false,
+        reason: 'workflow_not_found',
+        error: 'Workflow not found',
+      }
+    }
+    if (workflowRow.archivedAt) {
+      return {
+        success: false,
+        reason: 'workflow_archived',
+        error: 'Cannot change deployment state for an archived workflow',
+      }
+    }
+
+    if (idempotencyKey) {
+      const [existing] = await tx
+        .select()
+        .from(workflowDeploymentOperation)
+        .where(
+          and(
+            eq(workflowDeploymentOperation.workflowId, params.workflowId),
+            eq(workflowDeploymentOperation.idempotencyKey, idempotencyKey)
+          )
+        )
+        .limit(1)
+      if (existing) {
+        if (existing.requestHash !== requestHash) {
+          return {
+            success: false,
+            reason: 'idempotency_conflict',
+            error: 'Idempotency key was already used for a different deployment request',
+          }
+        }
+        return { success: true, operation: existing, reused: true }
+      }
+    }
+
+    const [currentActiveVersion] = await tx
+      .select({ id: workflowDeploymentVersion.id })
+      .from(workflowDeploymentVersion)
+      .where(
+        and(
+          eq(workflowDeploymentVersion.workflowId, params.workflowId),
+          eq(workflowDeploymentVersion.isActive, true)
+        )
+      )
+      .orderBy(desc(workflowDeploymentVersion.version))
+      .limit(1)
+
+    const targetResult = await resolveTarget({
+      tx,
+      now,
+      actorId,
+      workflowId: params.workflowId,
+    })
+    if (!targetResult.success) return targetResult
+
+    const [{ maxGeneration }] = await tx
+      .select({
+        maxGeneration: sql<number>`COALESCE(MAX(${workflowDeploymentOperation.generation}), 0)`,
+      })
+      .from(workflowDeploymentOperation)
+      .where(eq(workflowDeploymentOperation.workflowId, params.workflowId))
+      .limit(1)
+    const generation = Number(maxGeneration) + 1
+
+    await tx
+      .update(workflowDeploymentOperation)
+      .set({
+        status: 'superseded',
+        completedAt: now,
+        updatedAt: now,
+      })
+      .where(
+        and(
+          eq(workflowDeploymentOperation.workflowId, params.workflowId),
+          inArray(workflowDeploymentOperation.status, IN_FLIGHT_STATUSES)
+        )
+      )
+
+    const [operation] = await tx
+      .insert(workflowDeploymentOperation)
+      .values({
+        id: generateId(),
+        workflowId: params.workflowId,
+        deploymentVersionId: targetResult.target.deploymentVersionId,
+        version: targetResult.target.version,
+        previousActiveVersionId: currentActiveVersion?.id ?? null,
+        action,
+        protocolVersion: DEPLOYMENT_OPERATION_PROTOCOL_VERSION,
+        generation,
+        status: 'preparing',
+        componentReadiness: readiness,
+        errorCode: null,
+        errorMessage: null,
+        idempotencyKey,
+        requestHash,
+        actorId,
+        completedAt: null,
+        createdAt: now,
+        updatedAt: now,
+      })
+      .returning()
+
+    if (!operation) {
+      throw new Error('Failed to create deployment operation')
+    }
+    await params.onPrepareTransaction?.(tx, operation)
+    return { success: true, operation, reused: false }
+  }
+
+  return params.tx ? executePrepare(params.tx) : db.transaction(executePrepare)
+}
+
+async function lockCurrentOperation(
+  tx: DbOrTx,
+  params: DeploymentOperationGeneration
+): Promise<DeploymentOperationMutationResult> {
+  const [workflowRow] = await tx
+    .select({ id: workflow.id })
+    .from(workflow)
+    .where(eq(workflow.id, params.workflowId))
+    .for('update')
+  if (!workflowRow) {
+    return {
+      success: false,
+      reason: 'operation_not_found',
+      error: 'Deployment operation workflow not found',
+    }
+  }
+
+  const [operation] = await tx
+    .select()
+    .from(workflowDeploymentOperation)
+    .where(
+      and(
+        eq(workflowDeploymentOperation.id, params.operationId),
+        eq(workflowDeploymentOperation.workflowId, params.workflowId),
+        eq(workflowDeploymentOperation.generation, params.generation)
+      )
+    )
+    .for('update')
+  if (!operation) {
+    return {
+      success: false,
+      reason: 'operation_not_found',
+      error: 'Deployment operation not found',
+    }
+  }
+
+  const [{ maxGeneration }] = await tx
+    .select({
+      maxGeneration: sql<number>`COALESCE(MAX(${workflowDeploymentOperation.generation}), 0)`,
+    })
+    .from(workflowDeploymentOperation)
+    .where(eq(workflowDeploymentOperation.workflowId, operation.workflowId))
+    .limit(1)
+  if (Number(maxGeneration) !== params.generation) {
+    return {
+      success: false,
+      reason: 'stale_generation',
+      error: 'Deployment operation generation is stale',
+    }
+  }
+
+  return { success: true, operation }
+}
+
+async function markDeploymentOperationTerminal(
+  params: DeploymentOperationGeneration,
+  status: Extract<DeploymentOperationStatus, 'failed' | 'superseded'>,
+  error?: { code: string; message: string }
+): Promise<DeploymentOperationMutationResult> {
+  const now = new Date()
+  const [updated] = await db
+    .update(workflowDeploymentOperation)
+    .set({
+      status,
+      errorCode: error?.code ?? null,
+      errorMessage: error?.message ?? null,
+      completedAt: now,
+      updatedAt: now,
+    })
+    .where(
+      and(
+        eq(workflowDeploymentOperation.id, params.operationId),
+        eq(workflowDeploymentOperation.workflowId, params.workflowId),
+        eq(workflowDeploymentOperation.generation, params.generation),
+        inArray(workflowDeploymentOperation.status, IN_FLIGHT_STATUSES)
+      )
+    )
+    .returning()
+
+  if (!updated) {
+    return {
+      success: false,
+      reason: 'invalid_transition',
+      error: `Deployment operation cannot transition to ${status}`,
+    }
+  }
+
+  return { success: true, operation: updated }
+}
diff --git a/apps/sim/lib/workflows/persistence/utils.test.ts b/apps/sim/lib/workflows/persistence/utils.test.ts
index 964577f9cf8..c719913e6cb 100644
--- a/apps/sim/lib/workflows/persistence/utils.test.ts
+++ b/apps/sim/lib/workflows/persistence/utils.test.ts
@@ -111,6 +111,15 @@ vi.mock('@sim/db', () => ({
   },
   workflow: {},
   webhook: {},
+  workflowDeploymentOperation: {
+    workflowId: 'workflowId',
+    status: 'status',
+  },
+  workflowSchedule: {
+    workflowId: 'workflowId',
+    deploymentVersionId: 'deploymentVersionId',
+    archivedAt: 'archivedAt',
+  },
 }))
 
 const { mockSanitizeAgentToolsInBlocks } = vi.hoisted(() => ({
@@ -869,35 +878,60 @@ describe('Database Helpers', () => {
       }
     }
 
-    it('returns not_found when deploy cannot lock a workflow row', async () => {
-      const { tx, lockFor } = createMissingWorkflowTx()
+    it('returns an error when undeploy cannot lock a workflow row', async () => {
+      const { tx, update } = createMissingWorkflowTx()
       mockDb.transaction = vi.fn().mockImplementation(async (callback) => callback(tx))
 
-      const result = await dbHelpers.deployWorkflow({
-        workflowId: mockWorkflowId,
-        deployedBy: 'user-123',
-      })
+      const result = await dbHelpers.undeployWorkflow({ workflowId: mockWorkflowId })
 
       expect(result).toEqual({
         success: false,
         error: 'Workflow not found',
-        errorCode: 'not_found',
       })
-      expect(lockFor).toHaveBeenCalledWith('update')
-      expect(tx.execute).not.toHaveBeenCalled()
+      expect(update).not.toHaveBeenCalled()
     })
 
-    it('returns an error when undeploy cannot lock a workflow row', async () => {
-      const { tx, update } = createMissingWorkflowTx()
+    it('supersedes in-flight operations and releases path claims during undeploy', async () => {
+      const versionRows = [{ id: 'dv-1' }, { id: 'dv-2' }]
+      const createWhereResult = () => ({
+        limit: vi.fn(() => ({
+          for: vi.fn().mockResolvedValue([{ id: mockWorkflowId }]),
+        })),
+        then: (resolve: (rows: typeof versionRows) => void) => resolve(versionRows),
+      })
+      const setCalls: unknown[] = []
+      const tx = {
+        select: vi.fn(() => ({
+          from: vi.fn(() => ({ where: vi.fn(() => createWhereResult()) })),
+        })),
+        update: vi.fn(() => ({
+          set: vi.fn((payload: unknown) => {
+            setCalls.push(payload)
+            return { where: vi.fn().mockResolvedValue([]) }
+          }),
+        })),
+        delete: vi.fn(() => ({ where: vi.fn().mockResolvedValue([]) })),
+      }
       mockDb.transaction = vi.fn().mockImplementation(async (callback) => callback(tx))
+      const onUndeployTransaction = vi.fn().mockResolvedValue(undefined)
 
-      const result = await dbHelpers.undeployWorkflow({ workflowId: mockWorkflowId })
+      const result = await dbHelpers.undeployWorkflow({
+        workflowId: mockWorkflowId,
+        onUndeployTransaction,
+      })
 
-      expect(result).toEqual({
-        success: false,
-        error: 'Workflow not found',
+      expect(result).toEqual({ success: true })
+      expect(setCalls[0]).toEqual(expect.objectContaining({ status: 'superseded' }))
+      expect(setCalls).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ isActive: false }),
+          expect.objectContaining({ isDeployed: false, deployedAt: null }),
+        ])
+      )
+      expect(tx.delete).toHaveBeenCalledTimes(2)
+      expect(onUndeployTransaction).toHaveBeenCalledWith(tx, {
+        deploymentVersionIds: ['dv-1', 'dv-2'],
       })
-      expect(update).not.toHaveBeenCalled()
     })
   })
 
@@ -1690,6 +1724,25 @@ describe('Database Helpers', () => {
       expect(mockSanitizeAgentToolsInBlocks).toHaveBeenCalledTimes(2)
     })
 
+    it('loads an admitted immutable deployment version even after a later cutover', async () => {
+      const state = buildDeployedState()
+      const limit = vi.fn().mockResolvedValue([{ id: 'dv-admitted', state }])
+      const where = vi.fn().mockReturnValue({ limit })
+      mockDb.select.mockReturnValue({
+        from: vi.fn().mockReturnValue({ where }),
+      })
+
+      const result = await dbHelpers.loadWorkflowDeploymentVersionState(
+        'wf-admitted',
+        'dv-admitted',
+        'workspace-1'
+      )
+
+      expect(result.deploymentVersionId).toBe('dv-admitted')
+      expect(result.blocks).toEqual(state.blocks)
+      expect(where).toHaveBeenCalledTimes(1)
+    })
+
     it('invalidateDeployedStateCache(id) forces a rebuild on the next call', async () => {
       mockActiveVersionSelect('dv-inv', buildDeployedState())
 
diff --git a/apps/sim/lib/workflows/persistence/utils.ts b/apps/sim/lib/workflows/persistence/utils.ts
index 8f3df9326d4..37ecd73016e 100644
--- a/apps/sim/lib/workflows/persistence/utils.ts
+++ b/apps/sim/lib/workflows/persistence/utils.ts
@@ -1,4 +1,10 @@
-import { db, runOutsideTransactionContext, workflow, workflowDeploymentVersion } from '@sim/db'
+import {
+  db,
+  runOutsideTransactionContext,
+  workflow,
+  workflowDeploymentOperation,
+  workflowDeploymentVersion,
+} from '@sim/db'
 import { credential } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { getActiveWorkflowContext } from '@sim/platform-authz/workflow'
@@ -12,14 +18,16 @@ import { saveWorkflowToNormalizedTables as saveWorkflowToNormalizedTablesRaw } f
 import type { DbOrTx, NormalizedWorkflowData } from '@sim/workflow-persistence/types'
 import type { BlockState, Loop, Parallel, WorkflowState } from '@sim/workflow-types/workflow'
 import type { InferSelectModel } from 'drizzle-orm'
-import { and, desc, eq, inArray, lt, sql } from 'drizzle-orm'
+import { and, desc, eq, inArray, isNotNull, lt, sql } from 'drizzle-orm'
 import { LRUCache } from 'lru-cache'
 import type { Edge } from 'reactflow'
+import { releaseWebhookPathClaims } from '@/lib/webhooks/path-claims'
 import { remapConditionBlockIds, remapConditionEdgeHandle } from '@/lib/workflows/condition-ids'
 import {
   backfillCanonicalModes,
   migrateSubblockIds,
 } from '@/lib/workflows/migrations/subblock-migrations'
+import { supersedeInFlightDeploymentOperations } from '@/lib/workflows/persistence/deployment-operations'
 import { sanitizeAgentToolsInBlocks } from '@/lib/workflows/sanitization/validation'
 
 const logger = createLogger('WorkflowDBHelpers')
@@ -65,6 +73,7 @@ export interface WorkflowDeploymentVersionResponse {
   createdAt: string
   createdBy?: string | null
   deployedBy?: string | null
+  latestOperationStatus?: 'preparing' | 'activating' | 'active' | 'failed' | 'superseded' | null
 }
 
 export interface DeployedWorkflowData extends NormalizedWorkflowData {
@@ -123,6 +132,50 @@ export function invalidateDeployedStateCache(deploymentVersionId?: string): void
   deployedStateCache.clear()
 }
 
+interface DeploymentStateRow {
+  id: string
+  state: unknown
+}
+
+async function materializeDeploymentState(
+  workflowId: string,
+  version: DeploymentStateRow,
+  providedWorkspaceId?: string
+): Promise<DeployedWorkflowData> {
+  const cached = deployedStateCache.get(version.id)
+  if (cached) {
+    return structuredClone(cached)
+  }
+
+  const state = version.state as WorkflowState & { variables?: Record<string, unknown> }
+  let resolvedWorkspaceId = providedWorkspaceId
+  if (!resolvedWorkspaceId) {
+    const workflowContext = await getActiveWorkflowContext(workflowId)
+    resolvedWorkspaceId = workflowContext?.workspaceId
+  }
+
+  if (!resolvedWorkspaceId) {
+    throw new Error(`Workflow ${workflowId} has no workspace`)
+  }
+
+  const { blocks: migratedBlocks } = await applyBlockMigrations(
+    state.blocks || {},
+    resolvedWorkspaceId
+  )
+  const deployedState: DeployedWorkflowData = {
+    blocks: migratedBlocks,
+    edges: state.edges || [],
+    loops: state.loops || {},
+    parallels: state.parallels || {},
+    variables: state.variables || {},
+    isFromNormalizedTables: false,
+    deploymentVersionId: version.id,
+  }
+
+  deployedStateCache.set(version.id, deployedState)
+  return structuredClone(deployedState)
+}
+
 export async function loadDeployedWorkflowState(
   workflowId: string,
   providedWorkspaceId?: string
@@ -148,47 +201,42 @@ export async function loadDeployedWorkflowState(
       throw new Error(`Workflow ${workflowId} has no active deployment`)
     }
 
-    const cached = deployedStateCache.get(active.id)
-    if (cached) {
-      return structuredClone(cached)
-    }
-
-    const state = active.state as WorkflowState & { variables?: Record<string, unknown> }
-
-    let resolvedWorkspaceId = providedWorkspaceId
-    if (!resolvedWorkspaceId) {
-      const workflowContext = await getActiveWorkflowContext(workflowId)
-      resolvedWorkspaceId = workflowContext?.workspaceId
-    }
-
-    if (!resolvedWorkspaceId) {
-      throw new Error(`Workflow ${workflowId} has no workspace`)
-    }
-
-    const { blocks: migratedBlocks } = await applyBlockMigrations(
-      state.blocks || {},
-      resolvedWorkspaceId
-    )
-
-    const deployedState: DeployedWorkflowData = {
-      blocks: migratedBlocks,
-      edges: state.edges || [],
-      loops: state.loops || {},
-      parallels: state.parallels || {},
-      variables: state.variables || {},
-      isFromNormalizedTables: false,
-      deploymentVersionId: active.id,
-    }
-
-    deployedStateCache.set(active.id, deployedState)
-
-    return structuredClone(deployedState)
+    return materializeDeploymentState(workflowId, active, providedWorkspaceId)
   } catch (error) {
     logger.error(`Error loading deployed workflow state ${workflowId}:`, error)
     throw error
   }
 }
 
+/**
+ * Loads an immutable deployment snapshot by ID for work admitted before a later cutover.
+ */
+export async function loadWorkflowDeploymentVersionState(
+  workflowId: string,
+  deploymentVersionId: string,
+  providedWorkspaceId?: string
+): Promise<DeployedWorkflowData> {
+  const [version] = await db
+    .select({
+      id: workflowDeploymentVersion.id,
+      state: workflowDeploymentVersion.state,
+    })
+    .from(workflowDeploymentVersion)
+    .where(
+      and(
+        eq(workflowDeploymentVersion.workflowId, workflowId),
+        eq(workflowDeploymentVersion.id, deploymentVersionId)
+      )
+    )
+    .limit(1)
+
+  if (!version?.state) {
+    throw new Error(`Deployment ${deploymentVersionId} was not found for workflow ${workflowId}`)
+  }
+
+  return materializeDeploymentState(workflowId, version, providedWorkspaceId)
+}
+
 interface MigrationContext {
   blocks: Record<string, BlockState>
   workspaceId: string
@@ -542,10 +590,6 @@ export async function workflowExistsInNormalizedTables(workflowId: string): Prom
   }
 }
 
-type DeployWorkflowValidationResult =
-  | { success: true }
-  | { success: false; error: string; errorCode?: 'validation' }
-
 /**
  * Update the name and/or description metadata of an existing deployment version.
  * Shared by the workflow deployment-version PATCH route and the copilot
@@ -595,198 +639,6 @@ export async function updateDeploymentVersionMetadata(params: {
   return updated ?? null
 }
 
-export async function deployWorkflow(params: {
-  workflowId: string
-  deployedBy: string
-  workflowName?: string
-  /** Optional human-readable summary of what changed, stored on the deployment version. */
-  description?: string | null
-  /** Optional human-readable name/label for the deployment version. */
-  name?: string | null
-  workflowState?: WorkflowState
-  validateWorkflowState?: (
-    workflowState: WorkflowState,
-    executor: DbOrTx
-  ) => DeployWorkflowValidationResult | Promise<DeployWorkflowValidationResult>
-  onDeployTransaction?: (
-    tx: DbOrTx,
-    result: { deploymentVersionId: string; version: number; previousVersionId?: string }
-  ) => Promise<void>
-}): Promise<{
-  success: boolean
-  version?: number
-  deploymentVersionId?: string
-  deployedAt?: Date
-  previousVersionId?: string
-  currentState?: WorkflowState
-  error?: string
-  errorCode?: 'validation' | 'not_found'
-}> {
-  const { workflowId, deployedBy, workflowName } = params
-
-  try {
-    const now = new Date()
-    let currentState: WorkflowState | null = null
-
-    const deployedVersion = await db.transaction(async (tx) => {
-      if (!(await lockWorkflowForUpdate(tx, workflowId))) {
-        return {
-          success: false as const,
-          error: 'Workflow not found',
-          errorCode: 'not_found' as const,
-        }
-      }
-
-      // Refuse to deploy an archived (soft-deleted) workflow. Checked under the row
-      // lock so it's atomic with a concurrent fork rollback that archives a
-      // promote-created workflow: a stale promote deploy can never resurrect it into
-      // an archived-but-deployed (incoherent) state.
-      const [archivedRow] = await tx
-        .select({ archivedAt: workflow.archivedAt })
-        .from(workflow)
-        .where(eq(workflow.id, workflowId))
-        .limit(1)
-      if (archivedRow?.archivedAt != null) {
-        return {
-          success: false as const,
-          error: 'Cannot deploy an archived workflow',
-          errorCode: 'validation' as const,
-        }
-      }
-
-      currentState = params.workflowState ?? (await loadWorkflowDeploymentSnapshot(workflowId, tx))
-      if (!currentState) {
-        return {
-          success: false as const,
-          error: 'Failed to load workflow state',
-          errorCode: 'validation' as const,
-        }
-      }
-
-      const validationError = await params.validateWorkflowState?.(currentState, tx)
-      if (validationError && !validationError.success) {
-        return {
-          success: false as const,
-          error: validationError.error,
-          errorCode: validationError.errorCode,
-        }
-      }
-
-      const [currentActiveVersion] = await tx
-        .select({ id: workflowDeploymentVersion.id })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.isActive, true)
-          )
-        )
-        .limit(1)
-      const previousVersionId = currentActiveVersion?.id
-
-      const [{ maxVersion }] = await tx
-        .select({ maxVersion: sql`COALESCE(MAX("version"), 0)` })
-        .from(workflowDeploymentVersion)
-        .where(eq(workflowDeploymentVersion.workflowId, workflowId))
-
-      const nextVersion = Number(maxVersion) + 1
-      const deploymentVersionId = generateId()
-
-      await tx
-        .update(workflowDeploymentVersion)
-        .set({ isActive: false })
-        .where(eq(workflowDeploymentVersion.workflowId, workflowId))
-
-      await tx.insert(workflowDeploymentVersion).values({
-        id: deploymentVersionId,
-        workflowId,
-        version: nextVersion,
-        state: currentState,
-        isActive: true,
-        createdBy: deployedBy,
-        createdAt: now,
-        description: params.description?.trim() || null,
-        name: params.name?.trim() || null,
-      })
-
-      const updateData: Record<string, unknown> = {
-        isDeployed: true,
-        deployedAt: now,
-      }
-
-      await tx.update(workflow).set(updateData).where(eq(workflow.id, workflowId))
-
-      await params.onDeployTransaction?.(tx, {
-        deploymentVersionId,
-        version: nextVersion,
-        previousVersionId,
-      })
-
-      return {
-        success: true as const,
-        version: nextVersion,
-        deploymentVersionId,
-        previousVersionId,
-        currentState,
-      }
-    })
-
-    if (!deployedVersion.success) {
-      return {
-        success: false,
-        error: deployedVersion.error,
-        errorCode: deployedVersion.errorCode,
-      }
-    }
-    const deployedState = deployedVersion.currentState
-    if (!deployedState) {
-      return { success: false, error: 'Failed to load workflow state' }
-    }
-
-    logger.info(`Deployed workflow ${workflowId} as v${deployedVersion.version}`)
-
-    if (workflowName) {
-      try {
-        const { PlatformEvents } = await import('@/lib/core/telemetry')
-
-        const blockTypeCounts: Record<string, number> = {}
-        for (const block of Object.values(deployedState.blocks)) {
-          const blockType = block.type || 'unknown'
-          blockTypeCounts[blockType] = (blockTypeCounts[blockType] || 0) + 1
-        }
-
-        PlatformEvents.workflowDeployed({
-          workflowId,
-          workflowName,
-          blocksCount: Object.keys(deployedState.blocks).length,
-          edgesCount: deployedState.edges.length,
-          version: deployedVersion.version,
-          loopsCount: Object.keys(deployedState.loops).length,
-          parallelsCount: Object.keys(deployedState.parallels).length,
-          blockTypes: JSON.stringify(blockTypeCounts),
-        })
-      } catch (telemetryError) {
-        logger.warn(`Failed to track deployment telemetry for ${workflowId}`, telemetryError)
-      }
-    }
-
-    return {
-      success: true,
-      version: deployedVersion.version,
-      deploymentVersionId: deployedVersion.deploymentVersionId,
-      previousVersionId: deployedVersion.previousVersionId,
-      deployedAt: now,
-      currentState: deployedState,
-    }
-  } catch (error) {
-    logger.error(`Error deploying workflow ${workflowId}:`, error)
-    return {
-      success: false,
-      error: getErrorMessage(error, 'Unknown error'),
-    }
-  }
-}
-
 export interface RegenerateStateInput {
   blocks?: Record<string, BlockState>
   edges?: Edge[]
@@ -956,8 +808,10 @@ export async function undeployWorkflow(params: {
       .where(eq(workflowDeploymentVersion.workflowId, workflowId))
     const deploymentVersionIds = deploymentVersions.map((version) => version.id)
 
+    await supersedeInFlightDeploymentOperations(dbCtx, workflowId)
     const { deleteSchedulesForWorkflow } = await import('@/lib/workflows/schedules/deploy')
     await deleteSchedulesForWorkflow(workflowId, dbCtx)
+    await releaseWebhookPathClaims(dbCtx, workflowId)
 
     await dbCtx
       .update(workflowDeploymentVersion)
@@ -992,207 +846,6 @@ export async function undeployWorkflow(params: {
   }
 }
 
-export async function activateWorkflowVersion(params: {
-  workflowId: string
-  version: number
-  onActivateTransaction?: (
-    tx: DbOrTx,
-    result: { deploymentVersionId: string; previousVersionId?: string }
-  ) => Promise<void>
-}): Promise<{
-  success: boolean
-  deployedAt?: Date
-  state?: unknown
-  previousVersionId?: string
-  error?: string
-}> {
-  const { workflowId, version } = params
-
-  try {
-    const now = new Date()
-    let versionState: unknown
-
-    const result = await db.transaction(async (tx) => {
-      if (!(await lockWorkflowForUpdate(tx, workflowId))) {
-        return { success: false as const, error: 'Workflow not found' }
-      }
-
-      const [currentActiveVersion] = await tx
-        .select({ id: workflowDeploymentVersion.id })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.isActive, true)
-          )
-        )
-        .limit(1)
-
-      const [versionData] = await tx
-        .select({ id: workflowDeploymentVersion.id, state: workflowDeploymentVersion.state })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.version, version)
-          )
-        )
-        .limit(1)
-
-      if (!versionData) {
-        return { success: false as const, error: 'Deployment version not found' }
-      }
-      versionState = versionData.state
-
-      await tx
-        .update(workflowDeploymentVersion)
-        .set({ isActive: false })
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.isActive, true)
-          )
-        )
-
-      await tx
-        .update(workflowDeploymentVersion)
-        .set({ isActive: true })
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.version, version)
-          )
-        )
-
-      await tx
-        .update(workflow)
-        .set({ isDeployed: true, deployedAt: now })
-        .where(eq(workflow.id, workflowId))
-
-      await params.onActivateTransaction?.(tx, {
-        deploymentVersionId: versionData.id,
-        previousVersionId: currentActiveVersion?.id,
-      })
-
-      return { success: true as const, previousVersionId: currentActiveVersion?.id }
-    })
-
-    if (!result.success) {
-      return { success: false, error: result.error }
-    }
-
-    logger.info(`Activated version ${version} for workflow ${workflowId}`)
-
-    return {
-      success: true,
-      deployedAt: now,
-      state: versionState,
-      previousVersionId: result.previousVersionId,
-    }
-  } catch (error) {
-    logger.error(`Error activating version ${version} for workflow ${workflowId}:`, error)
-    return {
-      success: false,
-      error: getErrorMessage(error, 'Failed to activate version'),
-    }
-  }
-}
-
-async function activateWorkflowVersionById(params: {
-  workflowId: string
-  deploymentVersionId: string
-}): Promise<{
-  success: boolean
-  deployedAt?: Date
-  state?: unknown
-  previousVersionId?: string
-  error?: string
-}> {
-  const { workflowId, deploymentVersionId } = params
-
-  try {
-    const now = new Date()
-    let versionState: unknown
-
-    const result = await db.transaction(async (tx) => {
-      if (!(await lockWorkflowForUpdate(tx, workflowId))) {
-        return { success: false as const, error: 'Workflow not found' }
-      }
-
-      const [currentActiveVersion] = await tx
-        .select({ id: workflowDeploymentVersion.id })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.isActive, true)
-          )
-        )
-        .limit(1)
-
-      const [versionData] = await tx
-        .select({ id: workflowDeploymentVersion.id, state: workflowDeploymentVersion.state })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.id, deploymentVersionId)
-          )
-        )
-        .limit(1)
-
-      if (!versionData) {
-        return { success: false as const, error: 'Deployment version not found' }
-      }
-      versionState = versionData.state
-
-      await tx
-        .update(workflowDeploymentVersion)
-        .set({ isActive: false })
-        .where(eq(workflowDeploymentVersion.workflowId, workflowId))
-
-      await tx
-        .update(workflowDeploymentVersion)
-        .set({ isActive: true })
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.id, deploymentVersionId)
-          )
-        )
-
-      await tx
-        .update(workflow)
-        .set({ isDeployed: true, deployedAt: now })
-        .where(eq(workflow.id, workflowId))
-
-      return { success: true as const, previousVersionId: currentActiveVersion?.id }
-    })
-
-    if (!result.success) {
-      return { success: false, error: result.error }
-    }
-
-    logger.info(`Activated deployment version ${deploymentVersionId} for workflow ${workflowId}`)
-
-    return {
-      success: true,
-      deployedAt: now,
-      state: versionState,
-      previousVersionId: result.previousVersionId,
-    }
-  } catch (error) {
-    logger.error(
-      `Error activating deployment version ${deploymentVersionId} for workflow ${workflowId}:`,
-      error
-    )
-    return {
-      success: false,
-      error: getErrorMessage(error, 'Failed to activate version'),
-    }
-  }
-}
-
 /**
  * Resolves the deployment version that precedes the currently active one —
  * the default rollback target when no explicit version is given.
@@ -1284,30 +937,59 @@ export async function listWorkflowVersions(workflowId: string): Promise<{
     createdAt: Date
     createdBy: string | null
     deployedByName: string | null
+    latestOperationStatus: string | null
   }>
 }> {
   const { user } = await import('@sim/db')
 
-  const rows = await db
-    .select({
-      id: workflowDeploymentVersion.id,
-      version: workflowDeploymentVersion.version,
-      name: workflowDeploymentVersion.name,
-      description: workflowDeploymentVersion.description,
-      isActive: workflowDeploymentVersion.isActive,
-      createdAt: workflowDeploymentVersion.createdAt,
-      createdBy: workflowDeploymentVersion.createdBy,
-      deployedByName: user.name,
-    })
-    .from(workflowDeploymentVersion)
-    .leftJoin(user, eq(workflowDeploymentVersion.createdBy, user.id))
-    .where(eq(workflowDeploymentVersion.workflowId, workflowId))
-    .orderBy(desc(workflowDeploymentVersion.version))
+  const [rows, operations] = await Promise.all([
+    db
+      .select({
+        id: workflowDeploymentVersion.id,
+        version: workflowDeploymentVersion.version,
+        name: workflowDeploymentVersion.name,
+        description: workflowDeploymentVersion.description,
+        isActive: workflowDeploymentVersion.isActive,
+        createdAt: workflowDeploymentVersion.createdAt,
+        createdBy: workflowDeploymentVersion.createdBy,
+        deployedByName: user.name,
+      })
+      .from(workflowDeploymentVersion)
+      .leftJoin(user, eq(workflowDeploymentVersion.createdBy, user.id))
+      .where(eq(workflowDeploymentVersion.workflowId, workflowId))
+      .orderBy(desc(workflowDeploymentVersion.version)),
+    db
+      .selectDistinctOn([workflowDeploymentOperation.deploymentVersionId], {
+        deploymentVersionId: workflowDeploymentOperation.deploymentVersionId,
+        status: workflowDeploymentOperation.status,
+      })
+      .from(workflowDeploymentOperation)
+      .where(
+        and(
+          eq(workflowDeploymentOperation.workflowId, workflowId),
+          isNotNull(workflowDeploymentOperation.deploymentVersionId)
+        )
+      )
+      .orderBy(
+        workflowDeploymentOperation.deploymentVersionId,
+        desc(workflowDeploymentOperation.generation)
+      ),
+  ])
+  const latestStatusByVersion = new Map<string, string>()
+  for (const operation of operations) {
+    if (
+      operation.deploymentVersionId &&
+      !latestStatusByVersion.has(operation.deploymentVersionId)
+    ) {
+      latestStatusByVersion.set(operation.deploymentVersionId, operation.status)
+    }
+  }
 
   return {
     versions: rows.map((row) => ({
       ...row,
       deployedByName: row.deployedByName ?? (row.createdBy === 'admin-api' ? 'Admin' : null),
+      latestOperationStatus: latestStatusByVersion.get(row.id) ?? null,
     })),
   }
 }
diff --git a/apps/sim/lib/workflows/schedules/deploy.test.ts b/apps/sim/lib/workflows/schedules/deploy.test.ts
index 9bbac181f7e..041bf4bbc5a 100644
--- a/apps/sim/lib/workflows/schedules/deploy.test.ts
+++ b/apps/sim/lib/workflows/schedules/deploy.test.ts
@@ -43,6 +43,7 @@ vi.mock('@sim/db', () => ({
     workflowId: 'workflow_id',
     blockId: 'block_id',
     deploymentVersionId: 'deployment_version_id',
+    deploymentOperationId: 'deployment_operation_id',
     id: 'id',
     archivedAt: 'archived_at',
   },
@@ -813,7 +814,7 @@ describe('Schedule Deploy Utilities', () => {
 
       setupMockTransaction()
 
-      await createSchedulesForDeploy('workflow-1', blocks)
+      await createSchedulesForDeploy('workflow-1', blocks, undefined, 'version-1', 'operation-1')
 
       expect(mockOnConflictDoUpdate).toHaveBeenCalledWith({
         target: expect.any(Array),
@@ -821,6 +822,7 @@ describe('Schedule Deploy Utilities', () => {
         set: expect.objectContaining({
           blockId: 'block-1',
           cronExpression: '0 9 * * *',
+          deploymentOperationId: 'operation-1',
           status: 'active',
           failedCount: 0,
         }),
diff --git a/apps/sim/lib/workflows/schedules/deploy.ts b/apps/sim/lib/workflows/schedules/deploy.ts
index 4a6d7893d9b..1f2a1bfd662 100644
--- a/apps/sim/lib/workflows/schedules/deploy.ts
+++ b/apps/sim/lib/workflows/schedules/deploy.ts
@@ -4,7 +4,6 @@ import { getErrorMessage } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
 import { and, eq, inArray, isNull } from 'drizzle-orm'
 import type { DbOrTx } from '@/lib/db/types'
-import { cleanupWebhooksForWorkflow } from '@/lib/webhooks/deploy'
 import type { BlockState } from '@/lib/workflows/schedules/utils'
 import { findScheduleBlocks, validateScheduleBlock } from '@/lib/workflows/schedules/validation'
 
@@ -31,7 +30,8 @@ export async function createSchedulesForDeploy(
   workflowId: string,
   blocks: Record<string, BlockState>,
   tx?: DbOrTx,
-  deploymentVersionId?: string
+  deploymentVersionId?: string,
+  deploymentOperationId?: string
 ): Promise<ScheduleDeployResult> {
   const scheduleBlocks = findScheduleBlocks(blocks)
 
@@ -110,6 +110,7 @@ export async function createSchedulesForDeploy(
           id: scheduleId,
           workflowId,
           deploymentVersionId: deploymentVersionId || null,
+          deploymentOperationId: deploymentOperationId || null,
           blockId,
           cronExpression,
           triggerType: 'schedule',
@@ -126,6 +127,7 @@ export async function createSchedulesForDeploy(
           blockId,
           cronExpression,
           ...(deploymentVersionId ? { deploymentVersionId } : {}),
+          ...(deploymentOperationId ? { deploymentOperationId } : {}),
           updatedAt: now,
           nextRunAt,
           timezone,
@@ -201,34 +203,3 @@ export async function deleteSchedulesForWorkflow(
       : `Deleted all schedules for workflow ${workflowId}`
   )
 }
-
-async function cleanupDeploymentVersion(params: {
-  workflowId: string
-  workflow: Record<string, unknown>
-  requestId: string
-  deploymentVersionId: string
-  /**
-   * If true, skip external subscription cleanup (already done by saveTriggerWebhooksForDeploy).
-   * Only deletes DB records.
-   */
-  skipExternalCleanup?: boolean
-  strictExternalCleanup?: boolean
-}): Promise<void> {
-  const {
-    workflowId,
-    workflow,
-    requestId,
-    deploymentVersionId,
-    skipExternalCleanup = false,
-    strictExternalCleanup = false,
-  } = params
-  await cleanupWebhooksForWorkflow(
-    workflowId,
-    workflow,
-    requestId,
-    deploymentVersionId,
-    skipExternalCleanup,
-    strictExternalCleanup
-  )
-  await deleteSchedulesForWorkflow(workflowId, db, deploymentVersionId)
-}
diff --git a/apps/sim/lib/workspace-events/no-activity.ts b/apps/sim/lib/workspace-events/no-activity.ts
index a93a822a73c..8f633f94726 100644
--- a/apps/sim/lib/workspace-events/no-activity.ts
+++ b/apps/sim/lib/workspace-events/no-activity.ts
@@ -2,6 +2,7 @@ import { db, dbReplica } from '@sim/db'
 import { webhook, workflow, workflowDeploymentVersion, workflowExecutionLogs } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, asc, eq, gt, gte, inArray, isNull, ne, or, sql } from 'drizzle-orm'
+import { deliverableWebhookPredicate } from '@/lib/webhooks/delivery-predicate'
 import { SIM_RULE_COOLDOWN_HOURS, SIM_TRIGGER_PROVIDER } from '@/lib/workspace-events/constants'
 import { dispatchSimEvent } from '@/lib/workspace-events/emitter'
 import { buildNoActivityEventPayload } from '@/lib/workspace-events/payload'
@@ -56,8 +57,7 @@ async function fetchNoActivitySubscriptionPage(
     .where(
       and(
         eq(webhook.provider, SIM_TRIGGER_PROVIDER),
-        eq(webhook.isActive, true),
-        isNull(webhook.archivedAt),
+        deliverableWebhookPredicate(webhook),
         eq(workflow.isDeployed, true),
         isNull(workflow.archivedAt),
         sql`${webhook.providerConfig}->>'eventType' = 'no_activity'`,
diff --git a/apps/sim/lib/workspace-events/subscriptions.ts b/apps/sim/lib/workspace-events/subscriptions.ts
index d44ef32bc19..67951b46519 100644
--- a/apps/sim/lib/workspace-events/subscriptions.ts
+++ b/apps/sim/lib/workspace-events/subscriptions.ts
@@ -1,6 +1,7 @@
 import { db } from '@sim/db'
 import { webhook, workflow, workflowDeploymentVersion } from '@sim/db/schema'
 import { and, eq, isNull, or } from 'drizzle-orm'
+import { deliverableWebhookPredicate } from '@/lib/webhooks/delivery-predicate'
 import {
   SIM_EVENT_TYPES,
   SIM_RULE_DEFAULTS,
@@ -34,8 +35,7 @@ export async function fetchSimTriggerSubscriptions(
     .where(
       and(
         eq(webhook.provider, SIM_TRIGGER_PROVIDER),
-        eq(webhook.isActive, true),
-        isNull(webhook.archivedAt),
+        deliverableWebhookPredicate(webhook),
         eq(workflow.workspaceId, workspaceId),
         eq(workflow.isDeployed, true),
         isNull(workflow.archivedAt),
diff --git a/apps/sim/stores/workflows/registry/store.test.ts b/apps/sim/stores/workflows/registry/store.test.ts
index 77e4fd8a02c..4392fab735f 100644
--- a/apps/sim/stores/workflows/registry/store.test.ts
+++ b/apps/sim/stores/workflows/registry/store.test.ts
@@ -152,6 +152,43 @@ describe('registry store loadWorkflowState (collapsed cache)', () => {
     expect(useWorkflowRegistry.getState().hydration.phase).toBe('ready')
   })
 
+  it('preserves the cached in-flight deployment attempt across envelope hydration', async () => {
+    const client = sharedQueryClient.current as QueryClient
+    const preparingAttempt = {
+      id: 'op-1',
+      deploymentVersionId: 'dv-1',
+      version: 2,
+      action: 'deploy',
+      status: 'preparing',
+      readiness: { webhooks: 'pending', schedules: 'pending', mcp: 'pending' },
+      requestedAt: '2026-07-14T00:00:00.000Z',
+      activatedAt: null,
+      error: null,
+    }
+    client.setQueryData(['deployments', 'info', 'wf-1'], {
+      isDeployed: false,
+      deployedAt: null,
+      apiKey: 'Workspace API keys',
+      needsRedeployment: true,
+      isPublicApi: false,
+      warnings: ['Deployment preparation is queued'],
+      activeDeployment: null,
+      latestDeploymentAttempt: preparingAttempt,
+    })
+    mockRequestJson.mockResolvedValue({ data: makeEnvelope({ isDeployed: false }) })
+
+    await useWorkflowRegistry.getState().loadWorkflowState('wf-1')
+
+    const deploymentInfo = client.getQueryData(['deployments', 'info', 'wf-1'])
+    expect(deploymentInfo).toMatchObject({
+      isDeployed: false,
+      apiKey: 'Workspace API keys',
+      needsRedeployment: true,
+      warnings: ['Deployment preparation is queued'],
+      latestDeploymentAttempt: { id: 'op-1', status: 'preparing' },
+    })
+  })
+
   it('hydrates the SAME workflowKeys.state(id) cache entry the hooks read', async () => {
     const envelope = makeEnvelope()
     mockRequestJson.mockResolvedValue({ data: envelope })
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 97a0b556728..083b116d848 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -114,6 +114,13 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               apiKey: prev?.apiKey ?? null,
               needsRedeployment: prev?.needsRedeployment ?? false,
               isPublicApi: workflowData.isPublicApi,
+              /**
+               * Envelope hydration has no lifecycle data; keep the cached
+               * attempt so in-flight status polling is not interrupted.
+               */
+              warnings: prev?.warnings,
+              activeDeployment: prev?.activeDeployment ?? null,
+              latestDeploymentAttempt: prev?.latestDeploymentAttempt ?? null,
             })
           )
 
diff --git a/apps/sim/tools/airtable/airtable.test.ts b/apps/sim/tools/airtable/airtable.test.ts
new file mode 100644
index 00000000000..3fd800f8c76
--- /dev/null
+++ b/apps/sim/tools/airtable/airtable.test.ts
@@ -0,0 +1,92 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { airtableCreateRecordsTool } from '@/tools/airtable/create_records'
+import { airtableUpdateMultipleRecordsTool } from '@/tools/airtable/update_multiple_records'
+import { airtableUpdateRecordTool } from '@/tools/airtable/update_record'
+import { airtableUpsertRecordsTool } from '@/tools/airtable/upsert_records'
+
+const nestedFields = {
+  StringBoolean: 'false',
+  StringNumber: '42',
+  Boolean: true,
+  Number: 42,
+  Nested: {
+    values: ['true', false, '001'],
+  },
+}
+
+const baseParams = {
+  accessToken: 'token',
+  baseId: 'app123',
+  tableId: 'tbl123',
+}
+
+const requestCases = [
+  {
+    operation: 'create records',
+    buildBody: (typecast?: boolean) =>
+      airtableCreateRecordsTool.request.body!({
+        ...baseParams,
+        records: [{ fields: nestedFields }],
+        typecast,
+      }),
+    body: {
+      records: [{ fields: nestedFields }],
+    },
+  },
+  {
+    operation: 'update record',
+    buildBody: (typecast?: boolean) =>
+      airtableUpdateRecordTool.request.body!({
+        ...baseParams,
+        recordId: 'rec123',
+        fields: nestedFields,
+        typecast,
+      }),
+    body: {
+      fields: nestedFields,
+    },
+  },
+  {
+    operation: 'update multiple records',
+    buildBody: (typecast?: boolean) =>
+      airtableUpdateMultipleRecordsTool.request.body!({
+        ...baseParams,
+        records: [{ id: 'rec123', fields: nestedFields }],
+        typecast,
+      }),
+    body: {
+      records: [{ id: 'rec123', fields: nestedFields }],
+    },
+  },
+  {
+    operation: 'upsert records',
+    buildBody: (typecast?: boolean) =>
+      airtableUpsertRecordsTool.request.body!({
+        ...baseParams,
+        records: [{ fields: nestedFields }],
+        fieldsToMergeOn: ['External ID'],
+        typecast,
+      }),
+    body: {
+      performUpsert: { fieldsToMergeOn: ['External ID'] },
+      records: [{ fields: nestedFields }],
+    },
+  },
+] as const
+
+describe.each(requestCases)('Airtable $operation request body', ({ buildBody, body }) => {
+  it('omits typecast when unset and preserves nested values', () => {
+    expect(buildBody()).toEqual(body)
+  })
+
+  it('includes typecast true at the request-body root', () => {
+    expect(buildBody(true)).toEqual({ ...body, typecast: true })
+  })
+
+  it('includes typecast false at the request-body root', () => {
+    expect(buildBody(false)).toEqual({ ...body, typecast: false })
+  })
+})
diff --git a/apps/sim/tools/airtable/create_records.ts b/apps/sim/tools/airtable/create_records.ts
index cbb4b305351..e6273b845df 100644
--- a/apps/sim/tools/airtable/create_records.ts
+++ b/apps/sim/tools/airtable/create_records.ts
@@ -38,6 +38,12 @@ export const airtableCreateRecordsTool: ToolConfig<AirtableCreateParams, Airtabl
       description: 'Array of records to create, each with a `fields` object',
       // Example: [{ fields: { "Field 1": "Value1", "Field 2": "Value2" } }]
     },
+    typecast: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When true, Airtable automatically converts string values to the field type',
+    },
   },
 
   request: {
@@ -48,7 +54,10 @@ export const airtableCreateRecordsTool: ToolConfig<AirtableCreateParams, Airtabl
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
     }),
-    body: (params) => ({ records: params.records }),
+    body: (params) => ({
+      records: params.records,
+      ...(params.typecast != null ? { typecast: params.typecast } : {}),
+    }),
   },
 
   transformResponse: async (response) => {
diff --git a/apps/sim/tools/airtable/types.ts b/apps/sim/tools/airtable/types.ts
index 499b4c898ed..10246ed1292 100644
--- a/apps/sim/tools/airtable/types.ts
+++ b/apps/sim/tools/airtable/types.ts
@@ -1,3 +1,4 @@
+import type { AirtableGetBaseSchemaResponse } from '@/tools/airtable/get_base_schema'
 import type { ToolResponse } from '@/tools/types'
 
 // Common types
@@ -42,18 +43,16 @@ export interface AirtableTable {
   fields: AirtableField[]
 }
 
-interface AirtableView {
-  id: string
-  name: string
-  type: string
-}
-
 interface AirtableBaseParams {
   accessToken: string
   baseId: string
   tableId: string
 }
 
+interface AirtableTypecastParams {
+  typecast?: boolean
+}
+
 // List Bases Types
 export interface AirtableListBasesParams {
   accessToken: string
@@ -117,7 +116,7 @@ export interface AirtableGetResponse extends ToolResponse {
 }
 
 // Create Records Types
-export interface AirtableCreateParams extends AirtableBaseParams {
+export interface AirtableCreateParams extends AirtableBaseParams, AirtableTypecastParams {
   records: Array<{ fields: Record<string, any> }>
 }
 
@@ -131,7 +130,7 @@ export interface AirtableCreateResponse extends ToolResponse {
 }
 
 // Update Record Types (Single)
-export interface AirtableUpdateParams extends AirtableBaseParams {
+export interface AirtableUpdateParams extends AirtableBaseParams, AirtableTypecastParams {
   recordId: string
   fields: Record<string, any>
 }
@@ -147,7 +146,7 @@ export interface AirtableUpdateResponse extends ToolResponse {
 }
 
 // Update Multiple Records Types
-export interface AirtableUpdateMultipleParams extends AirtableBaseParams {
+export interface AirtableUpdateMultipleParams extends AirtableBaseParams, AirtableTypecastParams {
   records: Array<{ id: string; fields: Record<string, any> }>
 }
 
@@ -182,10 +181,9 @@ export interface AirtableDeleteResponse extends ToolResponse {
 }
 
 // Upsert Records Types
-export interface AirtableUpsertParams extends AirtableBaseParams {
+export interface AirtableUpsertParams extends AirtableBaseParams, AirtableTypecastParams {
   records: Array<{ fields: Record<string, any> }>
   fieldsToMergeOn: string[]
-  typecast?: boolean
 }
 
 export interface AirtableUpsertResponse extends ToolResponse {
@@ -211,18 +209,4 @@ export type AirtableResponse =
   | AirtableUpdateMultipleResponse
   | AirtableDeleteResponse
   | AirtableUpsertResponse
-  | AirtableListBasesResponse
   | AirtableGetBaseSchemaResponse
-
-interface AirtableGetBaseSchemaResponse extends ToolResponse {
-  output: {
-    tables: Array<{
-      id: string
-      name: string
-      description?: string
-      fields: Array<{ id: string; name: string; type: string; description?: string }>
-      views: Array<{ id: string; name: string; type: string }>
-    }>
-    metadata: { totalTables: number }
-  }
-}
diff --git a/apps/sim/tools/airtable/update_multiple_records.ts b/apps/sim/tools/airtable/update_multiple_records.ts
index f7f244a0b97..d446db94bfc 100644
--- a/apps/sim/tools/airtable/update_multiple_records.ts
+++ b/apps/sim/tools/airtable/update_multiple_records.ts
@@ -43,6 +43,12 @@ export const airtableUpdateMultipleRecordsTool: ToolConfig<
       visibility: 'user-or-llm',
       description: 'Array of records to update, each with an `id` and a `fields` object',
     },
+    typecast: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When true, Airtable automatically converts string values to the field type',
+    },
   },
 
   request: {
@@ -53,7 +59,10 @@ export const airtableUpdateMultipleRecordsTool: ToolConfig<
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
     }),
-    body: (params) => ({ records: params.records }),
+    body: (params) => ({
+      records: params.records,
+      ...(params.typecast != null ? { typecast: params.typecast } : {}),
+    }),
   },
 
   transformResponse: async (response) => {
diff --git a/apps/sim/tools/airtable/update_record.ts b/apps/sim/tools/airtable/update_record.ts
index b3d37510663..fd3d105d21b 100644
--- a/apps/sim/tools/airtable/update_record.ts
+++ b/apps/sim/tools/airtable/update_record.ts
@@ -43,6 +43,12 @@ export const airtableUpdateRecordTool: ToolConfig<AirtableUpdateParams, Airtable
       visibility: 'user-or-llm',
       description: 'An object containing the field names and their new values',
     },
+    typecast: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'When true, Airtable automatically converts string values to the field type',
+    },
   },
 
   request: {
@@ -53,7 +59,10 @@ export const airtableUpdateRecordTool: ToolConfig<AirtableUpdateParams, Airtable
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
     }),
-    body: (params) => ({ fields: params.fields }),
+    body: (params) => ({
+      fields: params.fields,
+      ...(params.typecast != null ? { typecast: params.typecast } : {}),
+    }),
   },
 
   transformResponse: async (response) => {
diff --git a/packages/db/migrations/0261_tranquil_donald_blake.sql b/packages/db/migrations/0261_tranquil_donald_blake.sql
new file mode 100644
index 00000000000..3ca59ff2bca
--- /dev/null
+++ b/packages/db/migrations/0261_tranquil_donald_blake.sql
@@ -0,0 +1,87 @@
+-- Replay-safety: this file ends in CONCURRENTLY index ops below an embedded COMMIT,
+-- so a failure there leaves the migration unjournaled and replays the whole file
+-- from the top — every statement here is idempotent (IF NOT EXISTS / duplicate_object),
+-- and each CONCURRENTLY build drops any INVALID leftover before rebuilding.
+CREATE TABLE IF NOT EXISTS "webhook_path_claim" (
+	"path" text PRIMARY KEY NOT NULL,
+	"workflow_id" text NOT NULL,
+	"generation" integer NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "webhook_path_claim_generation_check" CHECK ("webhook_path_claim"."generation" >= 0)
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "workflow_deployment_operation" (
+	"id" text PRIMARY KEY NOT NULL,
+	"workflow_id" text NOT NULL,
+	"deployment_version_id" text NOT NULL,
+	"version" integer NOT NULL,
+	"previous_active_version_id" text,
+	"action" text NOT NULL,
+	"protocol_version" integer NOT NULL,
+	"generation" integer NOT NULL,
+	"status" text DEFAULT 'preparing' NOT NULL,
+	"component_readiness" jsonb DEFAULT '{}'::jsonb NOT NULL,
+	"error_code" text,
+	"error_message" text,
+	"idempotency_key" text,
+	"request_hash" text NOT NULL,
+	"actor_id" text NOT NULL,
+	"completed_at" timestamp,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	CONSTRAINT "workflow_deployment_operation_action_check" CHECK ("workflow_deployment_operation"."action" IN ('deploy', 'activate')),
+	CONSTRAINT "workflow_deployment_operation_status_check" CHECK ("workflow_deployment_operation"."status" IN ('preparing', 'activating', 'active', 'failed', 'superseded')),
+	CONSTRAINT "workflow_deployment_operation_generation_check" CHECK ("workflow_deployment_operation"."generation" > 0),
+	CONSTRAINT "workflow_deployment_operation_protocol_version_check" CHECK ("workflow_deployment_operation"."protocol_version" > 0)
+);
+--> statement-breakpoint
+ALTER TABLE "webhook" ADD COLUMN IF NOT EXISTS "registration_status" text;--> statement-breakpoint
+ALTER TABLE "webhook" ADD COLUMN IF NOT EXISTS "registration_generation" integer;--> statement-breakpoint
+ALTER TABLE "webhook" ADD COLUMN IF NOT EXISTS "config_fingerprint" text;--> statement-breakpoint
+ALTER TABLE "webhook" ADD COLUMN IF NOT EXISTS "prepared_at" timestamp;--> statement-breakpoint
+ALTER TABLE "workflow_schedule" ADD COLUMN IF NOT EXISTS "deployment_operation_id" text;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "webhook_path_claim" ADD CONSTRAINT "webhook_path_claim_workflow_id_workflow_id_fk" FOREIGN KEY ("workflow_id") REFERENCES "public"."workflow"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION WHEN duplicate_object THEN null;
+END $$;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "workflow_deployment_operation" ADD CONSTRAINT "workflow_deployment_operation_workflow_id_workflow_id_fk" FOREIGN KEY ("workflow_id") REFERENCES "public"."workflow"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION WHEN duplicate_object THEN null;
+END $$;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "workflow_deployment_operation" ADD CONSTRAINT "workflow_deployment_operation_deployment_version_id_workflow_deployment_version_id_fk" FOREIGN KEY ("deployment_version_id") REFERENCES "public"."workflow_deployment_version"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION WHEN duplicate_object THEN null;
+END $$;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "workflow_deployment_operation" ADD CONSTRAINT "workflow_deployment_operation_previous_active_version_id_workflow_deployment_version_id_fk" FOREIGN KEY ("previous_active_version_id") REFERENCES "public"."workflow_deployment_version"("id") ON DELETE set null ON UPDATE no action;
+EXCEPTION WHEN duplicate_object THEN null;
+END $$;--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "webhook_path_claim_workflow_idx" ON "webhook_path_claim" USING btree ("workflow_id");--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "workflow_deployment_operation_workflow_generation_unique" ON "workflow_deployment_operation" USING btree ("workflow_id","generation");--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "workflow_deployment_operation_workflow_idempotency_unique" ON "workflow_deployment_operation" USING btree ("workflow_id","idempotency_key") WHERE "workflow_deployment_operation"."idempotency_key" IS NOT NULL;--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "workflow_deployment_operation_workflow_in_flight_unique" ON "workflow_deployment_operation" USING btree ("workflow_id") WHERE "workflow_deployment_operation"."status" IN ('preparing', 'activating');--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "workflow_deployment_operation_workflow_status_idx" ON "workflow_deployment_operation" USING btree ("workflow_id","status");--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "workflow_deployment_operation_deployment_version_idx" ON "workflow_deployment_operation" USING btree ("deployment_version_id");--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "workflow_deployment_operation_workflow_version_generation_idx" ON "workflow_deployment_operation" USING btree ("workflow_id","deployment_version_id","generation" DESC NULLS LAST);--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "workflow_schedule" ADD CONSTRAINT "workflow_schedule_deployment_operation_id_workflow_deployment_operation_id_fk" FOREIGN KEY ("deployment_operation_id") REFERENCES "public"."workflow_deployment_operation"("id") ON DELETE set null ON UPDATE no action NOT VALID;
+EXCEPTION WHEN duplicate_object THEN null;
+END $$;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "webhook" ADD CONSTRAINT "webhook_registration_status_check" CHECK ("webhook"."registration_status" IS NULL OR "webhook"."registration_status" IN ('active', 'candidate', 'retired', 'orphaned')) NOT VALID;
+EXCEPTION WHEN duplicate_object THEN null;
+END $$;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "webhook" ADD CONSTRAINT "webhook_registration_generation_check" CHECK ("webhook"."registration_generation" IS NULL OR "webhook"."registration_generation" >= 0) NOT VALID;
+EXCEPTION WHEN duplicate_object THEN null;
+END $$;--> statement-breakpoint
+COMMIT;--> statement-breakpoint
+SET lock_timeout = 0;--> statement-breakpoint
+DROP INDEX CONCURRENTLY IF EXISTS "webhook_active_registration_unique";--> statement-breakpoint
+CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS "webhook_active_registration_unique" ON "webhook" USING btree ("workflow_id","block_id") WHERE "webhook"."registration_status" = 'active' AND "webhook"."block_id" IS NOT NULL AND "webhook"."archived_at" IS NULL;--> statement-breakpoint
+DROP INDEX CONCURRENTLY IF EXISTS "webhook_candidate_registration_unique";--> statement-breakpoint
+CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS "webhook_candidate_registration_unique" ON "webhook" USING btree ("workflow_id","block_id") WHERE "webhook"."registration_status" = 'candidate' AND "webhook"."block_id" IS NOT NULL;--> statement-breakpoint
+DROP INDEX CONCURRENTLY IF EXISTS "webhook_registration_status_generation_idx";--> statement-breakpoint
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "webhook_registration_status_generation_idx" ON "webhook" USING btree ("workflow_id","registration_status","registration_generation");--> statement-breakpoint
+SET lock_timeout = '5s';
diff --git a/packages/db/migrations/meta/0261_snapshot.json b/packages/db/migrations/meta/0261_snapshot.json
new file mode 100644
index 00000000000..1f8635acb22
--- /dev/null
+++ b/packages/db/migrations/meta/0261_snapshot.json
@@ -0,0 +1,17352 @@
+{
+  "id": "be74722a-6818-45a9-8310-eb027918b9c4",
+  "prevId": "d708558f-4e3a-4d38-96e5-ca0d65c83f45",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.academy_certificate": {
+      "name": "academy_certificate",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "course_id": {
+          "name": "course_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "academy_cert_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "issued_at": {
+          "name": "issued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "certificate_number": {
+          "name": "certificate_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "academy_certificate_user_id_idx": {
+          "name": "academy_certificate_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_course_id_idx": {
+          "name": "academy_certificate_course_id_idx",
+          "columns": [
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_user_course_unique": {
+          "name": "academy_certificate_user_course_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "course_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_number_idx": {
+          "name": "academy_certificate_number_idx",
+          "columns": [
+            {
+              "expression": "certificate_number",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "academy_certificate_status_idx": {
+          "name": "academy_certificate_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "academy_certificate_user_id_user_id_fk": {
+          "name": "academy_certificate_user_id_user_id_fk",
+          "tableFrom": "academy_certificate",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "academy_certificate_certificate_number_unique": {
+          "name": "academy_certificate_certificate_number_unique",
+          "nullsNotDistinct": false,
+          "columns": ["certificate_number"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "account_user_id_idx": {
+          "name": "account_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_account_on_account_id_provider_id": {
+          "name": "idx_account_on_account_id_provider_id",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "account_user_id_user_id_fk": {
+          "name": "account_user_id_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_key": {
+      "name": "api_key",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key_hash": {
+          "name": "key_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'personal'"
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "api_key_workspace_type_idx": {
+          "name": "api_key_workspace_type_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "api_key_user_type_idx": {
+          "name": "api_key_user_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "api_key_key_hash_idx": {
+          "name": "api_key_key_hash_idx",
+          "columns": [
+            {
+              "expression": "key_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "api_key_user_id_user_id_fk": {
+          "name": "api_key_user_id_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_workspace_id_workspace_id_fk": {
+          "name": "api_key_workspace_id_workspace_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "api_key_created_by_user_id_fk": {
+          "name": "api_key_created_by_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_key_key_unique": {
+          "name": "api_key_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {
+        "workspace_type_check": {
+          "name": "workspace_type_check",
+          "value": "(type = 'workspace' AND workspace_id IS NOT NULL) OR (type = 'personal' AND workspace_id IS NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.async_jobs": {
+      "name": "async_jobs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_at": {
+          "name": "run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 3
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "output": {
+          "name": "output",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "async_jobs_status_started_at_idx": {
+          "name": "async_jobs_status_started_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "async_jobs_status_completed_at_idx": {
+          "name": "async_jobs_status_completed_at_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "async_jobs_schedule_pending_run_at_idx": {
+          "name": "async_jobs_schedule_pending_run_at_idx",
+          "columns": [
+            {
+              "expression": "run_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"async_jobs\".\"type\" = 'schedule-execution' AND \"async_jobs\".\"status\" = 'pending'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "async_jobs_schedule_processing_started_at_idx": {
+          "name": "async_jobs_schedule_processing_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"async_jobs\".\"type\" = 'schedule-execution' AND \"async_jobs\".\"status\" = 'processing'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.audit_log": {
+      "name": "audit_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_id": {
+          "name": "actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_type": {
+          "name": "resource_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_id": {
+          "name": "resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_name": {
+          "name": "actor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_email": {
+          "name": "actor_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resource_name": {
+          "name": "resource_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "audit_log_workspace_created_idx": {
+          "name": "audit_log_workspace_created_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_workspace_created_at_id_idx": {
+          "name": "audit_log_workspace_created_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"created_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_actor_created_idx": {
+          "name": "audit_log_actor_created_idx",
+          "columns": [
+            {
+              "expression": "actor_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_resource_idx": {
+          "name": "audit_log_resource_idx",
+          "columns": [
+            {
+              "expression": "resource_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "audit_log_action_idx": {
+          "name": "audit_log_action_idx",
+          "columns": [
+            {
+              "expression": "action",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "audit_log_workspace_id_workspace_id_fk": {
+          "name": "audit_log_workspace_id_workspace_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "audit_log_actor_id_user_id_fk": {
+          "name": "audit_log_actor_id_user_id_fk",
+          "tableFrom": "audit_log",
+          "tableTo": "user",
+          "columnsFrom": ["actor_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.background_work_status": {
+      "name": "background_work_status",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "kind": {
+          "name": "kind",
+          "type": "background_work_kind",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "background_work_status_value",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message": {
+          "name": "message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "background_work_status_workspace_status_idx": {
+          "name": "background_work_status_workspace_status_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "background_work_status_workflow_status_idx": {
+          "name": "background_work_status_workflow_status_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "background_work_status_meta_child_ws_idx": {
+          "name": "background_work_status_meta_child_ws_idx",
+          "columns": [
+            {
+              "expression": "(\"metadata\" ->> 'childWorkspaceId')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "background_work_status_meta_other_ws_idx": {
+          "name": "background_work_status_meta_other_ws_idx",
+          "columns": [
+            {
+              "expression": "(\"metadata\" ->> 'otherWorkspaceId')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "background_work_status_workspace_id_workspace_id_fk": {
+          "name": "background_work_status_workspace_id_workspace_id_fk",
+          "tableFrom": "background_work_status",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "background_work_status_workflow_id_workflow_id_fk": {
+          "name": "background_work_status_workflow_id_workflow_id_fk",
+          "tableFrom": "background_work_status",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chat": {
+      "name": "chat",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "output_configs": {
+          "name": "output_configs",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "identifier_idx": {
+          "name": "identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"chat\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "chat_archived_at_partial_idx": {
+          "name": "chat_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"chat\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_chat_on_workflow_id_archived_at": {
+          "name": "idx_chat_on_workflow_id_archived_at",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "chat_workflow_id_workflow_id_fk": {
+          "name": "chat_workflow_id_workflow_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "chat_user_id_user_id_fk": {
+          "name": "chat_user_id_user_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_async_tool_calls": {
+      "name": "copilot_async_tool_calls",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "checkpoint_id": {
+          "name": "checkpoint_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tool_call_id": {
+          "name": "tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "args": {
+          "name": "args",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_async_tool_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "result": {
+          "name": "result",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_async_tool_calls_run_id_idx": {
+          "name": "copilot_async_tool_calls_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_checkpoint_id_idx": {
+          "name": "copilot_async_tool_calls_checkpoint_id_idx",
+          "columns": [
+            {
+              "expression": "checkpoint_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_idx": {
+          "name": "copilot_async_tool_calls_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_status_idx": {
+          "name": "copilot_async_tool_calls_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_run_status_idx": {
+          "name": "copilot_async_tool_calls_run_status_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_async_tool_calls_tool_call_id_unique": {
+          "name": "copilot_async_tool_calls_tool_call_id_unique",
+          "columns": [
+            {
+              "expression": "tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_async_tool_calls_run_id_copilot_runs_id_fk": {
+          "name": "copilot_async_tool_calls_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk": {
+          "name": "copilot_async_tool_calls_checkpoint_id_copilot_run_checkpoints_id_fk",
+          "tableFrom": "copilot_async_tool_calls",
+          "tableTo": "copilot_run_checkpoints",
+          "columnsFrom": ["checkpoint_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_chats": {
+      "name": "copilot_chats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "chat_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'copilot'"
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'claude-3-7-sonnet-latest'"
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "preview_yaml": {
+          "name": "preview_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan_artifact": {
+          "name": "plan_artifact",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "resources": {
+          "name": "resources",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "last_seen_at": {
+          "name": "last_seen_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pinned": {
+          "name": "pinned",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_chats_user_id_idx": {
+          "name": "copilot_chats_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_workflow_id_idx": {
+          "name": "copilot_chats_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workflow_idx": {
+          "name": "copilot_chats_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_user_workspace_idx": {
+          "name": "copilot_chats_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_created_at_idx": {
+          "name": "copilot_chats_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_updated_at_idx": {
+          "name": "copilot_chats_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_chats_workspace_created_at_id_idx": {
+          "name": "copilot_chats_workspace_created_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"created_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_chats_user_id_user_id_fk": {
+          "name": "copilot_chats_user_id_user_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workflow_id_workflow_id_fk": {
+          "name": "copilot_chats_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_chats_workspace_id_workspace_id_fk": {
+          "name": "copilot_chats_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_chats",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_feedback": {
+      "name": "copilot_feedback",
+      "schema": "",
+      "columns": {
+        "feedback_id": {
+          "name": "feedback_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_query": {
+          "name": "user_query",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent_response": {
+          "name": "agent_response",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_positive": {
+          "name": "is_positive",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "feedback": {
+          "name": "feedback",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_yaml": {
+          "name": "workflow_yaml",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_feedback_user_id_idx": {
+          "name": "copilot_feedback_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_chat_id_idx": {
+          "name": "copilot_feedback_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_user_chat_idx": {
+          "name": "copilot_feedback_user_chat_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_is_positive_idx": {
+          "name": "copilot_feedback_is_positive_idx",
+          "columns": [
+            {
+              "expression": "is_positive",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_feedback_created_at_idx": {
+          "name": "copilot_feedback_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_feedback_user_id_user_id_fk": {
+          "name": "copilot_feedback_user_id_user_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_feedback_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_feedback_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_feedback",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_messages": {
+      "name": "copilot_messages",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message_id": {
+          "name": "message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stream_id": {
+          "name": "stream_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parent_message_id": {
+          "name": "parent_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tokens_in": {
+          "name": "tokens_in",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tokens_out": {
+          "name": "tokens_out",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "seq": {
+          "name": "seq",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_messages_chat_message_unique": {
+          "name": "copilot_messages_chat_message_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_messages_chat_created_at_idx": {
+          "name": "copilot_messages_chat_created_at_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"copilot_messages\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_messages_chat_seq_idx": {
+          "name": "copilot_messages_chat_seq_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "seq",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"copilot_messages\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_messages_chat_stream_idx": {
+          "name": "copilot_messages_chat_stream_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "stream_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"copilot_messages\".\"stream_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_messages_user_created_at_idx": {
+          "name": "copilot_messages_user_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"copilot_messages\".\"role\" = 'user' AND \"copilot_messages\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_messages_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_messages_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_messages",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_run_checkpoints": {
+      "name": "copilot_run_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pending_tool_call_id": {
+          "name": "pending_tool_call_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "conversation_snapshot": {
+          "name": "conversation_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "agent_state": {
+          "name": "agent_state",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "provider_request": {
+          "name": "provider_request",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_run_checkpoints_run_id_idx": {
+          "name": "copilot_run_checkpoints_run_id_idx",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_pending_tool_call_id_idx": {
+          "name": "copilot_run_checkpoints_pending_tool_call_id_idx",
+          "columns": [
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_run_checkpoints_run_pending_tool_unique": {
+          "name": "copilot_run_checkpoints_run_pending_tool_unique",
+          "columns": [
+            {
+              "expression": "run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "pending_tool_call_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_run_checkpoints_run_id_copilot_runs_id_fk": {
+          "name": "copilot_run_checkpoints_run_id_copilot_runs_id_fk",
+          "tableFrom": "copilot_run_checkpoints",
+          "tableTo": "copilot_runs",
+          "columnsFrom": ["run_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_runs": {
+      "name": "copilot_runs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_run_id": {
+          "name": "parent_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stream_id": {
+          "name": "stream_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "agent": {
+          "name": "agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "copilot_run_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "request_context": {
+          "name": "request_context",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "copilot_runs_execution_id_idx": {
+          "name": "copilot_runs_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_parent_run_id_idx": {
+          "name": "copilot_runs_parent_run_id_idx",
+          "columns": [
+            {
+              "expression": "parent_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_id_idx": {
+          "name": "copilot_runs_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_user_id_idx": {
+          "name": "copilot_runs_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workflow_id_idx": {
+          "name": "copilot_runs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workspace_id_idx": {
+          "name": "copilot_runs_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_status_idx": {
+          "name": "copilot_runs_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_chat_execution_idx": {
+          "name": "copilot_runs_chat_execution_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_execution_started_at_idx": {
+          "name": "copilot_runs_execution_started_at_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_workspace_completed_at_id_idx": {
+          "name": "copilot_runs_workspace_completed_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"completed_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_runs_stream_id_unique": {
+          "name": "copilot_runs_stream_id_unique",
+          "columns": [
+            {
+              "expression": "stream_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_runs_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_runs_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_user_id_user_id_fk": {
+          "name": "copilot_runs_user_id_user_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workflow_id_workflow_id_fk": {
+          "name": "copilot_runs_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_runs_workspace_id_workspace_id_fk": {
+          "name": "copilot_runs_workspace_id_workspace_id_fk",
+          "tableFrom": "copilot_runs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.copilot_workflow_read_hashes": {
+      "name": "copilot_workflow_read_hashes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hash": {
+          "name": "hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "copilot_workflow_read_hashes_chat_id_idx": {
+          "name": "copilot_workflow_read_hashes_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_workflow_id_idx": {
+          "name": "copilot_workflow_read_hashes_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "copilot_workflow_read_hashes_chat_workflow_unique": {
+          "name": "copilot_workflow_read_hashes_chat_workflow_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk": {
+          "name": "copilot_workflow_read_hashes_chat_id_copilot_chats_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "copilot_workflow_read_hashes_workflow_id_workflow_id_fk": {
+          "name": "copilot_workflow_read_hashes_workflow_id_workflow_id_fk",
+          "tableFrom": "copilot_workflow_read_hashes",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.credential": {
+      "name": "credential",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "credential_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_key": {
+          "name": "env_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "env_owner_user_id": {
+          "name": "env_owner_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_service_account_key": {
+          "name": "encrypted_service_account_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_workspace_id_idx": {
+          "name": "credential_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_type_idx": {
+          "name": "credential_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_provider_id_idx": {
+          "name": "credential_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_account_id_idx": {
+          "name": "credential_account_id_idx",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_env_owner_user_id_idx": {
+          "name": "credential_env_owner_user_id_idx",
+          "columns": [
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_account_unique": {
+          "name": "credential_workspace_account_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "account_id IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_env_unique": {
+          "name": "credential_workspace_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_workspace'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_workspace_personal_env_unique": {
+          "name": "credential_workspace_personal_env_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "env_owner_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "type = 'env_personal'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_workspace_id_workspace_id_fk": {
+          "name": "credential_workspace_id_workspace_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_account_id_account_id_fk": {
+          "name": "credential_account_id_account_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "account",
+          "columnsFrom": ["account_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_env_owner_user_id_user_id_fk": {
+          "name": "credential_env_owner_user_id_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["env_owner_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_created_by_user_id_fk": {
+          "name": "credential_created_by_user_id_fk",
+          "tableFrom": "credential",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "credential_oauth_source_check": {
+          "name": "credential_oauth_source_check",
+          "value": "(type <> 'oauth') OR (account_id IS NOT NULL AND provider_id IS NOT NULL)"
+        },
+        "credential_workspace_env_source_check": {
+          "name": "credential_workspace_env_source_check",
+          "value": "(type <> 'env_workspace') OR (env_key IS NOT NULL AND env_owner_user_id IS NULL)"
+        },
+        "credential_personal_env_source_check": {
+          "name": "credential_personal_env_source_check",
+          "value": "(type <> 'env_personal') OR (env_key IS NOT NULL AND env_owner_user_id IS NOT NULL)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.credential_member": {
+      "name": "credential_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "credential_member_role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "status": {
+          "name": "status",
+          "type": "credential_member_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "invited_by": {
+          "name": "invited_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "credential_member_user_id_idx": {
+          "name": "credential_member_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_role_idx": {
+          "name": "credential_member_role_idx",
+          "columns": [
+            {
+              "expression": "role",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_status_idx": {
+          "name": "credential_member_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "credential_member_unique": {
+          "name": "credential_member_unique",
+          "columns": [
+            {
+              "expression": "credential_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "credential_member_credential_id_credential_id_fk": {
+          "name": "credential_member_credential_id_credential_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_user_id_user_id_fk": {
+          "name": "credential_member_user_id_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "credential_member_invited_by_user_id_fk": {
+          "name": "credential_member_invited_by_user_id_fk",
+          "tableFrom": "credential_member",
+          "tableTo": "user",
+          "columnsFrom": ["invited_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.custom_block": {
+      "name": "custom_block",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "icon_url": {
+          "name": "icon_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "inputs": {
+          "name": "inputs",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "outputs": {
+          "name": "outputs",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "custom_block_organization_id_idx": {
+          "name": "custom_block_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "custom_block_workflow_id_idx": {
+          "name": "custom_block_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "custom_block_organization_type_unique": {
+          "name": "custom_block_organization_type_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "custom_block_organization_id_organization_id_fk": {
+          "name": "custom_block_organization_id_organization_id_fk",
+          "tableFrom": "custom_block",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "custom_block_workflow_id_workflow_id_fk": {
+          "name": "custom_block_workflow_id_workflow_id_fk",
+          "tableFrom": "custom_block",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "custom_block_created_by_user_id_fk": {
+          "name": "custom_block_created_by_user_id_fk",
+          "tableFrom": "custom_block",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.custom_tools": {
+      "name": "custom_tools",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schema": {
+          "name": "schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "custom_tools_workspace_id_idx": {
+          "name": "custom_tools_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "custom_tools_workspace_title_unique": {
+          "name": "custom_tools_workspace_title_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "title",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "custom_tools_workspace_id_workspace_id_fk": {
+          "name": "custom_tools_workspace_id_workspace_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "custom_tools_user_id_user_id_fk": {
+          "name": "custom_tools_user_id_user_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.data_drain_runs": {
+      "name": "data_drain_runs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "drain_id": {
+          "name": "drain_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "data_drain_run_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "data_drain_run_trigger",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "finished_at": {
+          "name": "finished_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rows_exported": {
+          "name": "rows_exported",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "bytes_written": {
+          "name": "bytes_written",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "cursor_before": {
+          "name": "cursor_before",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cursor_after": {
+          "name": "cursor_after",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "locators": {
+          "name": "locators",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        }
+      },
+      "indexes": {
+        "data_drain_runs_drain_started_idx": {
+          "name": "data_drain_runs_drain_started_idx",
+          "columns": [
+            {
+              "expression": "drain_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "data_drain_runs_drain_id_data_drains_id_fk": {
+          "name": "data_drain_runs_drain_id_data_drains_id_fk",
+          "tableFrom": "data_drain_runs",
+          "tableTo": "data_drains",
+          "columnsFrom": ["drain_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.data_drains": {
+      "name": "data_drains",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "data_drain_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_type": {
+          "name": "destination_type",
+          "type": "data_drain_destination",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_config": {
+          "name": "destination_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "destination_credentials": {
+          "name": "destination_credentials",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schedule_cadence": {
+          "name": "schedule_cadence",
+          "type": "data_drain_cadence",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "cursor": {
+          "name": "cursor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_success_at": {
+          "name": "last_success_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "data_drains_org_idx": {
+          "name": "data_drains_org_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "data_drains_due_idx": {
+          "name": "data_drains_due_idx",
+          "columns": [
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "last_run_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "data_drains_org_name_unique": {
+          "name": "data_drains_org_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "data_drains_organization_id_organization_id_fk": {
+          "name": "data_drains_organization_id_organization_id_fk",
+          "tableFrom": "data_drains",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "data_drains_created_by_user_id_fk": {
+          "name": "data_drains_created_by_user_id_fk",
+          "tableFrom": "data_drains",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.docs_embeddings": {
+      "name": "docs_embeddings",
+      "schema": "",
+      "columns": {
+        "chunk_id": {
+          "name": "chunk_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "chunk_text": {
+          "name": "chunk_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_document": {
+          "name": "source_document",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_link": {
+          "name": "source_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_text": {
+          "name": "header_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "header_level": {
+          "name": "header_level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "chunk_text_tsv": {
+          "name": "chunk_text_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"docs_embeddings\".\"chunk_text\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "docs_emb_source_document_idx": {
+          "name": "docs_emb_source_document_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_header_level_idx": {
+          "name": "docs_emb_header_level_idx",
+          "columns": [
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_source_header_idx": {
+          "name": "docs_emb_source_header_idx",
+          "columns": [
+            {
+              "expression": "source_document",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "header_level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_model_idx": {
+          "name": "docs_emb_model_idx",
+          "columns": [
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_emb_created_at_idx": {
+          "name": "docs_emb_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "docs_embedding_vector_hnsw_idx": {
+          "name": "docs_embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "docs_emb_metadata_gin_idx": {
+          "name": "docs_emb_metadata_gin_idx",
+          "columns": [
+            {
+              "expression": "metadata",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "docs_emb_chunk_text_fts_idx": {
+          "name": "docs_emb_chunk_text_fts_idx",
+          "columns": [
+            {
+              "expression": "chunk_text_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "docs_embedding_not_null_check": {
+          "name": "docs_embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        },
+        "docs_header_level_check": {
+          "name": "docs_header_level_check",
+          "value": "\"header_level\" >= 1 AND \"header_level\" <= 6"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.document": {
+      "name": "document",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_url": {
+          "name": "file_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "storage_key": {
+          "name": "storage_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "file_size": {
+          "name": "file_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mime_type": {
+          "name": "mime_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_count": {
+          "name": "chunk_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "character_count": {
+          "name": "character_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "processing_status": {
+          "name": "processing_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_completed_at": {
+          "name": "processing_completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_error": {
+          "name": "processing_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_excluded": {
+          "name": "user_excluded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "external_id": {
+          "name": "external_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "content_hash": {
+          "name": "content_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_url": {
+          "name": "source_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_by": {
+          "name": "uploaded_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "doc_kb_id_idx": {
+          "name": "doc_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_filename_idx": {
+          "name": "doc_filename_idx",
+          "columns": [
+            {
+              "expression": "filename",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_processing_status_idx": {
+          "name": "doc_processing_status_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "processing_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_external_id_idx": {
+          "name": "doc_connector_external_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "external_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"document\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_connector_id_idx": {
+          "name": "doc_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_storage_key_idx": {
+          "name": "doc_storage_key_idx",
+          "columns": [
+            {
+              "expression": "storage_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"document\".\"storage_key\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_archived_at_partial_idx": {
+          "name": "doc_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"document\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_deleted_at_partial_idx": {
+          "name": "doc_deleted_at_partial_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"document\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag1_idx": {
+          "name": "doc_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag2_idx": {
+          "name": "doc_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag3_idx": {
+          "name": "doc_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag4_idx": {
+          "name": "doc_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag5_idx": {
+          "name": "doc_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag6_idx": {
+          "name": "doc_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_tag7_idx": {
+          "name": "doc_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number1_idx": {
+          "name": "doc_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number2_idx": {
+          "name": "doc_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number3_idx": {
+          "name": "doc_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number4_idx": {
+          "name": "doc_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_number5_idx": {
+          "name": "doc_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date1_idx": {
+          "name": "doc_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_date2_idx": {
+          "name": "doc_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean1_idx": {
+          "name": "doc_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean2_idx": {
+          "name": "doc_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_boolean3_idx": {
+          "name": "doc_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "document_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "document_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "document_connector_id_knowledge_connector_id_fk": {
+          "name": "document_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "document_uploaded_by_user_id_fk": {
+          "name": "document_uploaded_by_user_id_fk",
+          "tableFrom": "document",
+          "tableTo": "user",
+          "columnsFrom": ["uploaded_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.embedding": {
+      "name": "embedding",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_id": {
+          "name": "document_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_index": {
+          "name": "chunk_index",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_hash": {
+          "name": "chunk_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content_length": {
+          "name": "content_length",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "start_offset": {
+          "name": "start_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "end_offset": {
+          "name": "end_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag1": {
+          "name": "tag1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag2": {
+          "name": "tag2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag3": {
+          "name": "tag3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag4": {
+          "name": "tag4",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag5": {
+          "name": "tag5",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag6": {
+          "name": "tag6",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tag7": {
+          "name": "tag7",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number1": {
+          "name": "number1",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number2": {
+          "name": "number2",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number3": {
+          "name": "number3",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number4": {
+          "name": "number4",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number5": {
+          "name": "number5",
+          "type": "double precision",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date1": {
+          "name": "date1",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "date2": {
+          "name": "date2",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean1": {
+          "name": "boolean1",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean2": {
+          "name": "boolean2",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boolean3": {
+          "name": "boolean3",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "content_tsv": {
+          "name": "content_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"embedding\".\"content\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "emb_kb_id_idx": {
+          "name": "emb_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_id_idx": {
+          "name": "emb_doc_id_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_chunk_idx": {
+          "name": "emb_doc_chunk_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chunk_index",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_model_idx": {
+          "name": "emb_kb_model_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_enabled_idx": {
+          "name": "emb_kb_enabled_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_enabled_idx": {
+          "name": "emb_doc_enabled_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "embedding_vector_hnsw_idx": {
+          "name": "embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "emb_tag1_idx": {
+          "name": "emb_tag1_idx",
+          "columns": [
+            {
+              "expression": "tag1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag2_idx": {
+          "name": "emb_tag2_idx",
+          "columns": [
+            {
+              "expression": "tag2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag3_idx": {
+          "name": "emb_tag3_idx",
+          "columns": [
+            {
+              "expression": "tag3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag4_idx": {
+          "name": "emb_tag4_idx",
+          "columns": [
+            {
+              "expression": "tag4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag5_idx": {
+          "name": "emb_tag5_idx",
+          "columns": [
+            {
+              "expression": "tag5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag6_idx": {
+          "name": "emb_tag6_idx",
+          "columns": [
+            {
+              "expression": "tag6",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_tag7_idx": {
+          "name": "emb_tag7_idx",
+          "columns": [
+            {
+              "expression": "tag7",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number1_idx": {
+          "name": "emb_number1_idx",
+          "columns": [
+            {
+              "expression": "number1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number2_idx": {
+          "name": "emb_number2_idx",
+          "columns": [
+            {
+              "expression": "number2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number3_idx": {
+          "name": "emb_number3_idx",
+          "columns": [
+            {
+              "expression": "number3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number4_idx": {
+          "name": "emb_number4_idx",
+          "columns": [
+            {
+              "expression": "number4",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_number5_idx": {
+          "name": "emb_number5_idx",
+          "columns": [
+            {
+              "expression": "number5",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date1_idx": {
+          "name": "emb_date1_idx",
+          "columns": [
+            {
+              "expression": "date1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_date2_idx": {
+          "name": "emb_date2_idx",
+          "columns": [
+            {
+              "expression": "date2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean1_idx": {
+          "name": "emb_boolean1_idx",
+          "columns": [
+            {
+              "expression": "boolean1",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean2_idx": {
+          "name": "emb_boolean2_idx",
+          "columns": [
+            {
+              "expression": "boolean2",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_boolean3_idx": {
+          "name": "emb_boolean3_idx",
+          "columns": [
+            {
+              "expression": "boolean3",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_content_fts_idx": {
+          "name": "emb_content_fts_idx",
+          "columns": [
+            {
+              "expression": "content_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "embedding_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "embedding_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "embedding_document_id_document_id_fk": {
+          "name": "embedding_document_id_document_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "document",
+          "columnsFrom": ["document_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "embedding_not_null_check": {
+          "name": "embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.environment": {
+      "name": "environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_user_id_user_id_fk": {
+          "name": "environment_user_id_user_id_fk",
+          "tableFrom": "environment",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "environment_user_id_unique": {
+          "name": "environment_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.execution_large_value_dependencies": {
+      "name": "execution_large_value_dependencies",
+      "schema": "",
+      "columns": {
+        "parent_key": {
+          "name": "parent_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "child_key": {
+          "name": "child_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "execution_large_value_dependencies_workspace_parent_key_idx": {
+          "name": "execution_large_value_dependencies_workspace_parent_key_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "execution_large_value_dependencies_workspace_child_key_idx": {
+          "name": "execution_large_value_dependencies_workspace_child_key_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "child_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "execution_large_value_dependencies_workspace_id_workspace_id_fk": {
+          "name": "execution_large_value_dependencies_workspace_id_workspace_id_fk",
+          "tableFrom": "execution_large_value_dependencies",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "execution_large_value_dependencies_parent_key_child_key_pk": {
+          "name": "execution_large_value_dependencies_parent_key_child_key_pk",
+          "columns": ["parent_key", "child_key"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.execution_large_value_references": {
+      "name": "execution_large_value_references",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "execution_large_value_reference_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "execution_large_value_references_workspace_execution_source_idx": {
+          "name": "execution_large_value_references_workspace_execution_source_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "source",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "execution_large_value_references_workspace_id_workspace_id_fk": {
+          "name": "execution_large_value_references_workspace_id_workspace_id_fk",
+          "tableFrom": "execution_large_value_references",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "execution_large_value_references_workflow_id_workflow_id_fk": {
+          "name": "execution_large_value_references_workflow_id_workflow_id_fk",
+          "tableFrom": "execution_large_value_references",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "execution_large_value_references_key_execution_id_source_pk": {
+          "name": "execution_large_value_references_key_execution_id_source_pk",
+          "columns": ["key", "execution_id", "source"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.execution_large_values": {
+      "name": "execution_large_values",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "owner_execution_id": {
+          "name": "owner_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "execution_large_values_owner_execution_id_idx": {
+          "name": "execution_large_values_owner_execution_id_idx",
+          "columns": [
+            {
+              "expression": "owner_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "execution_large_values_cleanup_idx": {
+          "name": "execution_large_values_cleanup_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"execution_large_values\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "execution_large_values_tombstone_cleanup_idx": {
+          "name": "execution_large_values_tombstone_cleanup_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"execution_large_values\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "execution_large_values_workspace_id_workspace_id_fk": {
+          "name": "execution_large_values_workspace_id_workspace_id_fk",
+          "tableFrom": "execution_large_values",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "execution_large_values_workflow_id_workflow_id_fk": {
+          "name": "execution_large_values_workflow_id_workflow_id_fk",
+          "tableFrom": "execution_large_values",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.idempotency_key": {
+      "name": "idempotency_key",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "result": {
+          "name": "result",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idempotency_key_created_at_idx": {
+          "name": "idempotency_key_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation": {
+      "name": "invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "kind": {
+          "name": "kind",
+          "type": "invitation_kind",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'organization'"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "membership_intent": {
+          "name": "membership_intent",
+          "type": "invitation_membership_intent",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'internal'"
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "invitation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "invitation_email_idx": {
+          "name": "invitation_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_organization_id_idx": {
+          "name": "invitation_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_status_idx": {
+          "name": "invitation_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_pending_email_org_unique": {
+          "name": "invitation_pending_email_org_unique",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"invitation\".\"status\" = 'pending' AND \"invitation\".\"organization_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_inviter_id_user_id_fk": {
+          "name": "invitation_inviter_id_user_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "user",
+          "columnsFrom": ["inviter_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_organization_id_organization_id_fk": {
+          "name": "invitation_organization_id_organization_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "invitation_token_unique": {
+          "name": "invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation_workspace_grant": {
+      "name": "invitation_workspace_grant",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "invitation_id": {
+          "name": "invitation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission": {
+          "name": "permission",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "invitation_workspace_grant_unique": {
+          "name": "invitation_workspace_grant_unique",
+          "columns": [
+            {
+              "expression": "invitation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "invitation_workspace_grant_workspace_id_idx": {
+          "name": "invitation_workspace_grant_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "invitation_workspace_grant_invitation_id_invitation_id_fk": {
+          "name": "invitation_workspace_grant_invitation_id_invitation_id_fk",
+          "tableFrom": "invitation_workspace_grant",
+          "tableTo": "invitation",
+          "columnsFrom": ["invitation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_workspace_grant_workspace_id_workspace_id_fk": {
+          "name": "invitation_workspace_grant_workspace_id_workspace_id_fk",
+          "tableFrom": "invitation_workspace_grant",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.job_execution_logs": {
+      "name": "job_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "schedule_id": {
+          "name": "schedule_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "job_execution_logs_schedule_id_idx": {
+          "name": "job_execution_logs_schedule_id_idx",
+          "columns": [
+            {
+              "expression": "schedule_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_workspace_started_at_idx": {
+          "name": "job_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_workspace_ended_at_id_idx": {
+          "name": "job_execution_logs_workspace_ended_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"ended_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_execution_id_unique": {
+          "name": "job_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "job_execution_logs_trigger_idx": {
+          "name": "job_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "job_execution_logs_schedule_id_workflow_schedule_id_fk": {
+          "name": "job_execution_logs_schedule_id_workflow_schedule_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workflow_schedule",
+          "columnsFrom": ["schedule_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "job_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "job_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "job_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base": {
+      "name": "knowledge_base",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "embedding_dimension": {
+          "name": "embedding_dimension",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1536
+        },
+        "chunking_config": {
+          "name": "chunking_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{\"maxSize\": 1024, \"minSize\": 1, \"overlap\": 200}'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_user_id_idx": {
+          "name": "kb_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_id_idx": {
+          "name": "kb_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_user_workspace_idx": {
+          "name": "kb_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_deleted_at_idx": {
+          "name": "kb_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_deleted_partial_idx": {
+          "name": "kb_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_base\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_name_active_unique": {
+          "name": "kb_workspace_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"knowledge_base\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_user_id_user_id_fk": {
+          "name": "knowledge_base_user_id_user_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "knowledge_base_workspace_id_workspace_id_fk": {
+          "name": "knowledge_base_workspace_id_workspace_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base_tag_definitions": {
+      "name": "knowledge_base_tag_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tag_slot": {
+          "name": "tag_slot",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "field_type": {
+          "name": "field_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_tag_definitions_kb_slot_idx": {
+          "name": "kb_tag_definitions_kb_slot_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "tag_slot",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_display_name_idx": {
+          "name": "kb_tag_definitions_kb_display_name_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_tag_definitions_kb_id_idx": {
+          "name": "kb_tag_definitions_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_base_tag_definitions_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_base_tag_definitions",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector": {
+      "name": "knowledge_connector",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "connector_type": {
+          "name": "connector_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_config": {
+          "name": "source_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sync_mode": {
+          "name": "sync_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'full'"
+        },
+        "sync_interval_minutes": {
+          "name": "sync_interval_minutes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1440
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_sync_at": {
+          "name": "last_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_error": {
+          "name": "last_sync_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_sync_doc_count": {
+          "name": "last_sync_doc_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_sync_at": {
+          "name": "next_sync_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "consecutive_failures": {
+          "name": "consecutive_failures",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kc_knowledge_base_id_idx": {
+          "name": "kc_knowledge_base_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_status_next_sync_idx": {
+          "name": "kc_status_next_sync_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_sync_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_archived_at_partial_idx": {
+          "name": "kc_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_connector\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kc_deleted_at_partial_idx": {
+          "name": "kc_deleted_at_partial_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"knowledge_connector\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "knowledge_connector_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "knowledge_connector",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_connector_sync_log": {
+      "name": "knowledge_connector_sync_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "connector_id": {
+          "name": "connector_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "docs_added": {
+          "name": "docs_added",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_updated": {
+          "name": "docs_updated",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_deleted": {
+          "name": "docs_deleted",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_unchanged": {
+          "name": "docs_unchanged",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "docs_failed": {
+          "name": "docs_failed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "kcsl_connector_id_idx": {
+          "name": "kcsl_connector_id_idx",
+          "columns": [
+            {
+              "expression": "connector_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk": {
+          "name": "knowledge_connector_sync_log_connector_id_knowledge_connector_id_fk",
+          "tableFrom": "knowledge_connector_sync_log",
+          "tableTo": "knowledge_connector",
+          "columnsFrom": ["connector_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mcp_server_oauth": {
+      "name": "mcp_server_oauth",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "mcp_server_id": {
+          "name": "mcp_server_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "client_information": {
+          "name": "client_information",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tokens": {
+          "name": "tokens",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "code_verifier": {
+          "name": "code_verifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state_created_at": {
+          "name": "state_created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_refreshed_at": {
+          "name": "last_refreshed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mcp_server_oauth_server_unique": {
+          "name": "mcp_server_oauth_server_unique",
+          "columns": [
+            {
+              "expression": "mcp_server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "mcp_server_oauth_state_idx": {
+          "name": "mcp_server_oauth_state_idx",
+          "columns": [
+            {
+              "expression": "state",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mcp_server_oauth_mcp_server_id_mcp_servers_id_fk": {
+          "name": "mcp_server_oauth_mcp_server_id_mcp_servers_id_fk",
+          "tableFrom": "mcp_server_oauth",
+          "tableTo": "mcp_servers",
+          "columnsFrom": ["mcp_server_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mcp_server_oauth_user_id_user_id_fk": {
+          "name": "mcp_server_oauth_user_id_user_id_fk",
+          "tableFrom": "mcp_server_oauth",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "mcp_server_oauth_workspace_id_workspace_id_fk": {
+          "name": "mcp_server_oauth_workspace_id_workspace_id_fk",
+          "tableFrom": "mcp_server_oauth",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mcp_servers": {
+      "name": "mcp_servers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "transport": {
+          "name": "transport",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'headers'"
+        },
+        "oauth_client_id": {
+          "name": "oauth_client_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "oauth_client_secret": {
+          "name": "oauth_client_secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "headers": {
+          "name": "headers",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "timeout": {
+          "name": "timeout",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 30000
+        },
+        "retries": {
+          "name": "retries",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 3
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_connected": {
+          "name": "last_connected",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "connection_status": {
+          "name": "connection_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'disconnected'"
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_config": {
+          "name": "status_config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "tool_count": {
+          "name": "tool_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_tools_refresh": {
+          "name": "last_tools_refresh",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_requests": {
+          "name": "total_requests",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mcp_servers_workspace_enabled_idx": {
+          "name": "mcp_servers_workspace_enabled_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "mcp_servers_workspace_deleted_partial_idx": {
+          "name": "mcp_servers_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"mcp_servers\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mcp_servers_workspace_id_workspace_id_fk": {
+          "name": "mcp_servers_workspace_id_workspace_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mcp_servers_created_by_user_id_fk": {
+          "name": "mcp_servers_created_by_user_id_fk",
+          "tableFrom": "mcp_servers",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.member": {
+      "name": "member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "member_user_id_unique": {
+          "name": "member_user_id_unique",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "member_organization_id_idx": {
+          "name": "member_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "member_user_id_user_id_fk": {
+          "name": "member_user_id_user_id_fk",
+          "tableFrom": "member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "member_organization_id_organization_id_fk": {
+          "name": "member_organization_id_organization_id_fk",
+          "tableFrom": "member",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.memory": {
+      "name": "memory",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "memory_key_idx": {
+          "name": "memory_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_idx": {
+          "name": "memory_workspace_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_key_idx": {
+          "name": "memory_workspace_key_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workspace_deleted_partial_idx": {
+          "name": "memory_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"memory\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "memory_workspace_id_workspace_id_fk": {
+          "name": "memory_workspace_id_workspace_id_fk",
+          "tableFrom": "memory",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_allowed_sender": {
+      "name": "mothership_inbox_allowed_sender",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "label": {
+          "name": "label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "added_by": {
+          "name": "added_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "inbox_sender_ws_email_idx": {
+          "name": "inbox_sender_ws_email_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_allowed_sender_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_allowed_sender_added_by_user_id_fk": {
+          "name": "mothership_inbox_allowed_sender_added_by_user_id_fk",
+          "tableFrom": "mothership_inbox_allowed_sender",
+          "tableTo": "user",
+          "columnsFrom": ["added_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_task": {
+      "name": "mothership_inbox_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_email": {
+          "name": "from_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "from_name": {
+          "name": "from_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subject": {
+          "name": "subject",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body_preview": {
+          "name": "body_preview",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_text": {
+          "name": "body_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "body_html": {
+          "name": "body_html",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_message_id": {
+          "name": "email_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "in_reply_to": {
+          "name": "in_reply_to",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "response_message_id": {
+          "name": "response_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "agentmail_message_id": {
+          "name": "agentmail_message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'received'"
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_job_id": {
+          "name": "trigger_job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "result_summary": {
+          "name": "result_summary",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejection_reason": {
+          "name": "rejection_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_attachments": {
+          "name": "has_attachments",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "cc_recipients": {
+          "name": "cc_recipients",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "inbox_task_ws_created_at_idx": {
+          "name": "inbox_task_ws_created_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_ws_status_idx": {
+          "name": "inbox_task_ws_status_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_response_msg_id_idx": {
+          "name": "inbox_task_response_msg_id_idx",
+          "columns": [
+            {
+              "expression": "response_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inbox_task_email_msg_id_idx": {
+          "name": "inbox_task_email_msg_id_idx",
+          "columns": [
+            {
+              "expression": "email_message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_inbox_task_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_task_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "mothership_inbox_task_chat_id_copilot_chats_id_fk": {
+          "name": "mothership_inbox_task_chat_id_copilot_chats_id_fk",
+          "tableFrom": "mothership_inbox_task",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_inbox_webhook": {
+      "name": "mothership_inbox_webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "webhook_id": {
+          "name": "webhook_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "mothership_inbox_webhook_workspace_id_workspace_id_fk": {
+          "name": "mothership_inbox_webhook_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_inbox_webhook",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "mothership_inbox_webhook_workspace_id_unique": {
+          "name": "mothership_inbox_webhook_workspace_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["workspace_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.mothership_settings": {
+      "name": "mothership_settings",
+      "schema": "",
+      "columns": {
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "mcp_tool_refs": {
+          "name": "mcp_tool_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "custom_tool_refs": {
+          "name": "custom_tool_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "skill_refs": {
+          "name": "skill_refs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "mothership_settings_workspace_id_idx": {
+          "name": "mothership_settings_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "mothership_settings_workspace_id_workspace_id_fk": {
+          "name": "mothership_settings_workspace_id_workspace_id_fk",
+          "tableFrom": "mothership_settings",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organization": {
+      "name": "organization",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "whitelabel_settings": {
+          "name": "whitelabel_settings",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "data_retention_settings": {
+          "name": "data_retention_settings",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_usage_limit": {
+          "name": "org_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "limit_notifications": {
+          "name": "limit_notifications",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "departed_member_usage": {
+          "name": "departed_member_usage",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organization_member_usage_limit": {
+      "name": "organization_member_usage_limit",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "usage_limit": {
+          "name": "usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "set_by": {
+          "name": "set_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "org_member_usage_limit_org_user_unique": {
+          "name": "org_member_usage_limit_org_user_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "org_member_usage_limit_organization_id_idx": {
+          "name": "org_member_usage_limit_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "organization_member_usage_limit_organization_id_organization_id_fk": {
+          "name": "organization_member_usage_limit_organization_id_organization_id_fk",
+          "tableFrom": "organization_member_usage_limit",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "organization_member_usage_limit_user_id_user_id_fk": {
+          "name": "organization_member_usage_limit_user_id_user_id_fk",
+          "tableFrom": "organization_member_usage_limit",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "organization_member_usage_limit_set_by_user_id_fk": {
+          "name": "organization_member_usage_limit_set_by_user_id_fk",
+          "tableFrom": "organization_member_usage_limit",
+          "tableTo": "user",
+          "columnsFrom": ["set_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.outbox_event": {
+      "name": "outbox_event",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10
+        },
+        "available_at": {
+          "name": "available_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "locked_at": {
+          "name": "locked_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error": {
+          "name": "last_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "outbox_event_status_available_idx": {
+          "name": "outbox_event_status_available_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "available_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "outbox_event_locked_at_idx": {
+          "name": "outbox_event_locked_at_idx",
+          "columns": [
+            {
+              "expression": "locked_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "outbox_event_type_created_idx": {
+          "name": "outbox_event_type_created_idx",
+          "columns": [
+            {
+              "expression": "event_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.paused_executions": {
+      "name": "paused_executions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_snapshot": {
+          "name": "execution_snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "pause_points": {
+          "name": "pause_points",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_pause_count": {
+          "name": "total_pause_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resumed_count": {
+          "name": "resumed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "automatic_resume_retry_count": {
+          "name": "automatic_resume_retry_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'paused'"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "paused_at": {
+          "name": "paused_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_resume_at": {
+          "name": "next_resume_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "paused_executions_workflow_id_idx": {
+          "name": "paused_executions_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_status_idx": {
+          "name": "paused_executions_status_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_execution_id_unique": {
+          "name": "paused_executions_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "paused_executions_next_resume_at_idx": {
+          "name": "paused_executions_next_resume_at_idx",
+          "columns": [
+            {
+              "expression": "next_resume_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "status = 'paused' AND next_resume_at IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "paused_executions_workflow_id_workflow_id_fk": {
+          "name": "paused_executions_workflow_id_workflow_id_fk",
+          "tableFrom": "paused_executions",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.pending_credential_draft": {
+      "name": "pending_credential_draft",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credential_id": {
+          "name": "credential_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "pending_draft_user_provider_ws": {
+          "name": "pending_draft_user_provider_ws",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "pending_credential_draft_user_id_user_id_fk": {
+          "name": "pending_credential_draft_user_id_user_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_workspace_id_workspace_id_fk": {
+          "name": "pending_credential_draft_workspace_id_workspace_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pending_credential_draft_credential_id_credential_id_fk": {
+          "name": "pending_credential_draft_credential_id_credential_id_fk",
+          "tableFrom": "pending_credential_draft",
+          "tableTo": "credential",
+          "columnsFrom": ["credential_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group": {
+      "name": "permission_group",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "permission_group_created_by_idx": {
+          "name": "permission_group_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_organization_name_unique": {
+          "name": "permission_group_organization_name_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_organization_default_unique": {
+          "name": "permission_group_organization_default_unique",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "is_default = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_organization_id_organization_id_fk": {
+          "name": "permission_group_organization_id_organization_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_created_by_user_id_fk": {
+          "name": "permission_group_created_by_user_id_fk",
+          "tableFrom": "permission_group",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group_member": {
+      "name": "permission_group_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "permission_group_id": {
+          "name": "permission_group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "assigned_by": {
+          "name": "assigned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "assigned_at": {
+          "name": "assigned_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permission_group_member_group_id_idx": {
+          "name": "permission_group_member_group_id_idx",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_member_group_user_unique": {
+          "name": "permission_group_member_group_user_unique",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_member_organization_user_idx": {
+          "name": "permission_group_member_organization_user_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_member_permission_group_id_permission_group_id_fk": {
+          "name": "permission_group_member_permission_group_id_permission_group_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "permission_group",
+          "columnsFrom": ["permission_group_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_organization_id_organization_id_fk": {
+          "name": "permission_group_member_organization_id_organization_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_user_id_user_id_fk": {
+          "name": "permission_group_member_user_id_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_member_assigned_by_user_id_fk": {
+          "name": "permission_group_member_assigned_by_user_id_fk",
+          "tableFrom": "permission_group_member",
+          "tableTo": "user",
+          "columnsFrom": ["assigned_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permission_group_workspace": {
+      "name": "permission_group_workspace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "permission_group_id": {
+          "name": "permission_group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permission_group_workspace_workspace_id_idx": {
+          "name": "permission_group_workspace_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permission_group_workspace_group_workspace_unique": {
+          "name": "permission_group_workspace_group_workspace_unique",
+          "columns": [
+            {
+              "expression": "permission_group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permission_group_workspace_permission_group_id_permission_group_id_fk": {
+          "name": "permission_group_workspace_permission_group_id_permission_group_id_fk",
+          "tableFrom": "permission_group_workspace",
+          "tableTo": "permission_group",
+          "columnsFrom": ["permission_group_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_workspace_workspace_id_workspace_id_fk": {
+          "name": "permission_group_workspace_workspace_id_workspace_id_fk",
+          "tableFrom": "permission_group_workspace",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "permission_group_workspace_organization_id_organization_id_fk": {
+          "name": "permission_group_workspace_organization_id_organization_id_fk",
+          "tableFrom": "permission_group_workspace",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.permissions": {
+      "name": "permissions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_type": {
+          "name": "entity_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entity_id": {
+          "name": "entity_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permission_type": {
+          "name": "permission_type",
+          "type": "permission_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "permissions_user_id_idx": {
+          "name": "permissions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_entity_idx": {
+          "name": "permissions_entity_idx",
+          "columns": [
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_type_idx": {
+          "name": "permissions_user_entity_type_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_permission_idx": {
+          "name": "permissions_user_entity_permission_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "permission_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_user_entity_idx": {
+          "name": "permissions_user_entity_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "permissions_unique_constraint": {
+          "name": "permissions_unique_constraint",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "permissions_user_id_user_id_fk": {
+          "name": "permissions_user_id_user_id_fk",
+          "tableFrom": "permissions",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.public_share": {
+      "name": "public_share",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "resource_type": {
+          "name": "resource_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_id": {
+          "name": "resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "public_share_token_unique": {
+          "name": "public_share_token_unique",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "public_share_resource_unique": {
+          "name": "public_share_resource_unique",
+          "columns": [
+            {
+              "expression": "resource_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "public_share_resource_id_idx": {
+          "name": "public_share_resource_id_idx",
+          "columns": [
+            {
+              "expression": "resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "public_share_workspace_id_idx": {
+          "name": "public_share_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "public_share_workspace_id_workspace_id_fk": {
+          "name": "public_share_workspace_id_workspace_id_fk",
+          "tableFrom": "public_share",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "public_share_created_by_user_id_fk": {
+          "name": "public_share_created_by_user_id_fk",
+          "tableFrom": "public_share",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.rate_limit_bucket": {
+      "name": "rate_limit_bucket",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "tokens": {
+          "name": "tokens",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_refill_at": {
+          "name": "last_refill_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.resume_queue": {
+      "name": "resume_queue",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "paused_execution_id": {
+          "name": "paused_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_execution_id": {
+          "name": "parent_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "new_execution_id": {
+          "name": "new_execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "context_id": {
+          "name": "context_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resume_input": {
+          "name": "resume_input",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "queued_at": {
+          "name": "queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "failure_reason": {
+          "name": "failure_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "resume_queue_parent_status_idx": {
+          "name": "resume_queue_parent_status_idx",
+          "columns": [
+            {
+              "expression": "parent_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "queued_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "resume_queue_new_execution_idx": {
+          "name": "resume_queue_new_execution_idx",
+          "columns": [
+            {
+              "expression": "new_execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "resume_queue_paused_execution_id_paused_executions_id_fk": {
+          "name": "resume_queue_paused_execution_id_paused_executions_id_fk",
+          "tableFrom": "resume_queue",
+          "tableTo": "paused_executions",
+          "columnsFrom": ["paused_execution_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "impersonated_by": {
+          "name": "impersonated_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "session_user_id_idx": {
+          "name": "session_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "session_token_idx": {
+          "name": "session_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "session_active_organization_id_organization_id_fk": {
+          "name": "session_active_organization_id_organization_id_fk",
+          "tableFrom": "session",
+          "tableTo": "organization",
+          "columnsFrom": ["active_organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "session_token_unique": {
+          "name": "session_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.settings": {
+      "name": "settings",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "theme": {
+          "name": "theme",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'system'"
+        },
+        "auto_connect": {
+          "name": "auto_connect",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "telemetry_enabled": {
+          "name": "telemetry_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "email_preferences": {
+          "name": "email_preferences",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "billing_usage_notifications_enabled": {
+          "name": "billing_usage_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "show_training_controls": {
+          "name": "show_training_controls",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "super_user_mode_enabled": {
+          "name": "super_user_mode_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "mothership_environment": {
+          "name": "mothership_environment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'default'"
+        },
+        "error_notifications_enabled": {
+          "name": "error_notifications_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "snap_to_grid_size": {
+          "name": "snap_to_grid_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "show_action_bar": {
+          "name": "show_action_bar",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "timezone": {
+          "name": "timezone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "copilot_enabled_models": {
+          "name": "copilot_enabled_models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "copilot_auto_allowed_tools": {
+          "name": "copilot_auto_allowed_tools",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "last_active_workspace_id": {
+          "name": "last_active_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "settings_user_id_user_id_fk": {
+          "name": "settings_user_id_user_id_fk",
+          "tableFrom": "settings",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "settings_user_id_unique": {
+          "name": "settings_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sim_trigger_state": {
+      "name": "sim_trigger_state",
+      "schema": "",
+      "columns": {
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scope_key": {
+          "name": "scope_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "last_fired_at": {
+          "name": "last_fired_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "sim_trigger_state_workflow_id_workflow_id_fk": {
+          "name": "sim_trigger_state_workflow_id_workflow_id_fk",
+          "tableFrom": "sim_trigger_state",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "sim_trigger_state_workflow_id_block_id_scope_key_pk": {
+          "name": "sim_trigger_state_workflow_id_block_id_scope_key_pk",
+          "columns": ["workflow_id", "block_id", "scope_key"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.skill": {
+      "name": "skill",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "skill_workspace_name_unique": {
+          "name": "skill_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "skill_workspace_id_workspace_id_fk": {
+          "name": "skill_workspace_id_workspace_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "skill_user_id_user_id_fk": {
+          "name": "skill_user_id_user_id_fk",
+          "tableFrom": "skill",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sso_provider": {
+      "name": "sso_provider",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "domain": {
+          "name": "domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "oidc_config": {
+          "name": "oidc_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "saml_config": {
+          "name": "saml_config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "sso_provider_provider_id_idx": {
+          "name": "sso_provider_provider_id_idx",
+          "columns": [
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_domain_idx": {
+          "name": "sso_provider_domain_idx",
+          "columns": [
+            {
+              "expression": "domain",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_user_id_idx": {
+          "name": "sso_provider_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "sso_provider_organization_id_idx": {
+          "name": "sso_provider_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "sso_provider_user_id_user_id_fk": {
+          "name": "sso_provider_user_id_user_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "sso_provider_organization_id_organization_id_fk": {
+          "name": "sso_provider_organization_id_organization_id_fk",
+          "tableFrom": "sso_provider",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.subscription": {
+      "name": "subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan": {
+          "name": "plan",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_subscription_id": {
+          "name": "stripe_subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_start": {
+          "name": "period_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_end": {
+          "name": "period_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at_period_end": {
+          "name": "cancel_at_period_end",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at": {
+          "name": "cancel_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "canceled_at": {
+          "name": "canceled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "seats": {
+          "name": "seats",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_start": {
+          "name": "trial_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_end": {
+          "name": "trial_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "billing_interval": {
+          "name": "billing_interval",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_schedule_id": {
+          "name": "stripe_schedule_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "subscription_reference_status_idx": {
+          "name": "subscription_reference_status_idx",
+          "columns": [
+            {
+              "expression": "reference_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "check_enterprise_metadata": {
+          "name": "check_enterprise_metadata",
+          "value": "plan != 'enterprise' OR metadata IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.table_jobs": {
+      "name": "table_jobs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rows_processed": {
+          "name": "rows_processed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "table_jobs_one_active_per_table": {
+          "name": "table_jobs_one_active_per_table",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"table_jobs\".\"status\" = 'running' AND \"table_jobs\".\"type\" <> 'export'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_jobs_watchdog_idx": {
+          "name": "table_jobs_watchdog_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_jobs_table_started_idx": {
+          "name": "table_jobs_table_started_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "table_jobs_table_id_user_table_definitions_id_fk": {
+          "name": "table_jobs_table_id_user_table_definitions_id_fk",
+          "tableFrom": "table_jobs",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_jobs_workspace_id_workspace_id_fk": {
+          "name": "table_jobs_workspace_id_workspace_id_fk",
+          "tableFrom": "table_jobs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.table_row_executions": {
+      "name": "table_row_executions",
+      "schema": "",
+      "columns": {
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "row_id": {
+          "name": "row_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_id": {
+          "name": "job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "error": {
+          "name": "error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "running_block_ids": {
+          "name": "running_block_ids",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "block_errors": {
+          "name": "block_errors",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "cancelled_at": {
+          "name": "cancelled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enrichment_details": {
+          "name": "enrichment_details",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "table_row_executions_table_status_idx": {
+          "name": "table_row_executions_table_status_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"table_row_executions\".\"status\" IN ('queued', 'running', 'pending')",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_row_executions_execution_id_idx": {
+          "name": "table_row_executions_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"table_row_executions\".\"execution_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_row_executions_table_group_idx": {
+          "name": "table_row_executions_table_group_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "group_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "table_row_executions_table_id_user_table_definitions_id_fk": {
+          "name": "table_row_executions_table_id_user_table_definitions_id_fk",
+          "tableFrom": "table_row_executions",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_row_executions_row_id_user_table_rows_id_fk": {
+          "name": "table_row_executions_row_id_user_table_rows_id_fk",
+          "tableFrom": "table_row_executions",
+          "tableTo": "user_table_rows",
+          "columnsFrom": ["row_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "table_row_executions_row_id_group_id_pk": {
+          "name": "table_row_executions_row_id_group_id_pk",
+          "columns": ["row_id", "group_id"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.table_run_dispatches": {
+      "name": "table_run_dispatches",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mode": {
+          "name": "mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scope": {
+          "name": "scope",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "cursor": {
+          "name": "cursor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "limit": {
+          "name": "limit",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processed_count": {
+          "name": "processed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "is_manual_run": {
+          "name": "is_manual_run",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "triggered_by_user_id": {
+          "name": "triggered_by_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "requested_at": {
+          "name": "requested_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancelled_at": {
+          "name": "cancelled_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "table_run_dispatches_active_idx": {
+          "name": "table_run_dispatches_active_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "table_run_dispatches_watchdog_idx": {
+          "name": "table_run_dispatches_watchdog_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "requested_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "table_run_dispatches_table_id_user_table_definitions_id_fk": {
+          "name": "table_run_dispatches_table_id_user_table_definitions_id_fk",
+          "tableFrom": "table_run_dispatches",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_run_dispatches_workspace_id_workspace_id_fk": {
+          "name": "table_run_dispatches_workspace_id_workspace_id_fk",
+          "tableFrom": "table_run_dispatches",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "table_run_dispatches_triggered_by_user_id_user_id_fk": {
+          "name": "table_run_dispatches_triggered_by_user_id_user_id_fk",
+          "tableFrom": "table_run_dispatches",
+          "tableTo": "user",
+          "columnsFrom": ["triggered_by_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.usage_log": {
+      "name": "usage_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "category": {
+          "name": "category",
+          "type": "usage_log_category",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "usage_log_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_key": {
+          "name": "event_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "billing_entity_type": {
+          "name": "billing_entity_type",
+          "type": "billing_entity_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "billing_entity_id": {
+          "name": "billing_entity_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "billing_period_start": {
+          "name": "billing_period_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "billing_period_end": {
+          "name": "billing_period_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "usage_log_user_created_at_idx": {
+          "name": "usage_log_user_created_at_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_source_idx": {
+          "name": "usage_log_source_idx",
+          "columns": [
+            {
+              "expression": "source",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workspace_id_idx": {
+          "name": "usage_log_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workflow_id_idx": {
+          "name": "usage_log_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_event_key_unique": {
+          "name": "usage_log_event_key_unique",
+          "columns": [
+            {
+              "expression": "event_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"usage_log\".\"event_key\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_billing_entity_period_idx": {
+          "name": "usage_log_billing_entity_period_idx",
+          "columns": [
+            {
+              "expression": "billing_entity_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "billing_entity_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "billing_period_start",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "billing_period_end",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"usage_log\".\"billing_entity_type\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_workspace_created_at_idx": {
+          "name": "usage_log_workspace_created_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "usage_log_execution_id_idx": {
+          "name": "usage_log_execution_id_idx",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "usage_log_user_id_user_id_fk": {
+          "name": "usage_log_user_id_user_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "usage_log_workspace_id_workspace_id_fk": {
+          "name": "usage_log_workspace_id_workspace_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "usage_log_workflow_id_workflow_id_fk": {
+          "name": "usage_log_workflow_id_workflow_id_fk",
+          "tableFrom": "usage_log",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "usage_log_billing_scope_all_or_none": {
+          "name": "usage_log_billing_scope_all_or_none",
+          "value": "(\n        (\"usage_log\".\"billing_entity_type\" IS NULL AND \"usage_log\".\"billing_entity_id\" IS NULL AND \"usage_log\".\"billing_period_start\" IS NULL AND \"usage_log\".\"billing_period_end\" IS NULL)\n        OR\n        (\"usage_log\".\"billing_entity_type\" IS NOT NULL AND \"usage_log\".\"billing_entity_id\" IS NOT NULL AND \"usage_log\".\"billing_period_start\" IS NOT NULL AND \"usage_log\".\"billing_period_end\" IS NOT NULL AND \"usage_log\".\"billing_period_start\" < \"usage_log\".\"billing_period_end\")\n      )"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "normalized_email": {
+          "name": "normalized_email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'user'"
+        },
+        "banned": {
+          "name": "banned",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "ban_reason": {
+          "name": "ban_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ban_expires": {
+          "name": "ban_expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        },
+        "user_normalized_email_unique": {
+          "name": "user_normalized_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["normalized_email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_stats": {
+      "name": "user_stats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_manual_executions": {
+          "name": "total_manual_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_api_calls": {
+          "name": "total_api_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_webhook_triggers": {
+          "name": "total_webhook_triggers",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_scheduled_executions": {
+          "name": "total_scheduled_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_chat_executions": {
+          "name": "total_chat_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_executions": {
+          "name": "total_mcp_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_tokens_used": {
+          "name": "total_tokens_used",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_usage_limit": {
+          "name": "current_usage_limit",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'5'"
+        },
+        "usage_limit_updated_at": {
+          "name": "usage_limit_updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "current_period_cost": {
+          "name": "current_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_cost": {
+          "name": "last_period_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "billed_overage_this_period": {
+          "name": "billed_overage_this_period",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "pro_period_cost_snapshot": {
+          "name": "pro_period_cost_snapshot",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "pro_period_cost_snapshot_at": {
+          "name": "pro_period_cost_snapshot_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "credit_balance": {
+          "name": "credit_balance",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "total_copilot_cost": {
+          "name": "total_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_copilot_cost": {
+          "name": "current_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_period_copilot_cost": {
+          "name": "last_period_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'0'"
+        },
+        "total_copilot_tokens": {
+          "name": "total_copilot_tokens",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_copilot_calls": {
+          "name": "total_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_calls": {
+          "name": "total_mcp_copilot_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_mcp_copilot_cost": {
+          "name": "total_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "current_period_mcp_copilot_cost": {
+          "name": "current_period_mcp_copilot_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_active": {
+          "name": "last_active",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "billing_blocked": {
+          "name": "billing_blocked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "billing_blocked_reason": {
+          "name": "billing_blocked_reason",
+          "type": "billing_blocked_reason",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "limit_notifications": {
+          "name": "limit_notifications",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_stats_user_id_user_id_fk": {
+          "name": "user_stats_user_id_user_id_fk",
+          "tableFrom": "user_stats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_stats_user_id_unique": {
+          "name": "user_stats_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_definitions": {
+      "name": "user_table_definitions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "schema": {
+          "name": "schema",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_rows": {
+          "name": "max_rows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10000
+        },
+        "row_count": {
+          "name": "row_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "rows_version": {
+          "name": "rows_version",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "user_table_def_workspace_id_idx": {
+          "name": "user_table_def_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_workspace_name_unique": {
+          "name": "user_table_def_workspace_name_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"user_table_definitions\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_archived_at_idx": {
+          "name": "user_table_def_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_def_workspace_archived_partial_idx": {
+          "name": "user_table_def_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"user_table_definitions\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_definitions_workspace_id_workspace_id_fk": {
+          "name": "user_table_definitions_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_definitions_created_by_user_id_fk": {
+          "name": "user_table_definitions_created_by_user_id_fk",
+          "tableFrom": "user_table_definitions",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_table_rows": {
+      "name": "user_table_rows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "table_id": {
+          "name": "table_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position": {
+          "name": "position",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "order_key": {
+          "name": "order_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "user_table_rows_tenant_data_gin_idx": {
+          "name": "user_table_rows_tenant_data_gin_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "\"data\" jsonb_path_ops",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "user_table_rows_workspace_table_idx": {
+          "name": "user_table_rows_workspace_table_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_table_position_idx": {
+          "name": "user_table_rows_table_position_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "position",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_table_order_key_idx": {
+          "name": "user_table_rows_table_order_key_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "order_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "user_table_rows_table_id_id_idx": {
+          "name": "user_table_rows_table_id_id_idx",
+          "columns": [
+            {
+              "expression": "table_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "user_table_rows_table_id_user_table_definitions_id_fk": {
+          "name": "user_table_rows_table_id_user_table_definitions_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user_table_definitions",
+          "columnsFrom": ["table_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_workspace_id_workspace_id_fk": {
+          "name": "user_table_rows_workspace_id_workspace_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "user_table_rows_created_by_user_id_fk": {
+          "name": "user_table_rows_created_by_user_id_fk",
+          "tableFrom": "user_table_rows",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.verification": {
+      "name": "verification",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "verification_identifier_idx": {
+          "name": "verification_identifier_idx",
+          "columns": [
+            {
+              "expression": "identifier",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "verification_expires_at_idx": {
+          "name": "verification_expires_at_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.waitlist": {
+      "name": "waitlist",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "waitlist_email_unique": {
+          "name": "waitlist_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.webhook": {
+      "name": "webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "registration_status": {
+          "name": "registration_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "registration_generation": {
+          "name": "registration_generation",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "config_fingerprint": {
+          "name": "config_fingerprint",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "prepared_at": {
+          "name": "prepared_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "routing_key": {
+          "name": "routing_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_config": {
+          "name": "provider_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "path_deployment_unique": {
+          "name": "path_deployment_unique",
+          "columns": [
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"webhook\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_workflow_deployment_idx": {
+          "name": "webhook_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_routing_key_active_idx": {
+          "name": "webhook_routing_key_active_idx",
+          "columns": [
+            {
+              "expression": "routing_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"webhook\".\"archived_at\" IS NULL AND \"webhook\".\"routing_key\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_archived_at_partial_idx": {
+          "name": "webhook_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"webhook\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_webhook_on_provider_is_active_workflow_id_deploym_bdeed5468": {
+          "name": "idx_webhook_on_provider_is_active_workflow_id_deploym_bdeed5468",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_tiktok_credential_id_idx": {
+          "name": "webhook_tiktok_credential_id_idx",
+          "columns": [
+            {
+              "expression": "((\"provider_config\")::jsonb ->> 'credentialId')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"webhook\".\"provider\" = 'tiktok' AND \"webhook\".\"is_active\" = true AND \"webhook\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_webhook_on_workflow_id_block_id_updated_at_desc": {
+          "name": "idx_webhook_on_workflow_id_block_id_updated_at_desc",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_active_registration_unique": {
+          "name": "webhook_active_registration_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"webhook\".\"registration_status\" = 'active' AND \"webhook\".\"block_id\" IS NOT NULL AND \"webhook\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_candidate_registration_unique": {
+          "name": "webhook_candidate_registration_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"webhook\".\"registration_status\" = 'candidate' AND \"webhook\".\"block_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "webhook_registration_status_generation_idx": {
+          "name": "webhook_registration_status_generation_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "registration_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "registration_generation",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "webhook_workflow_id_workflow_id_fk": {
+          "name": "webhook_workflow_id_workflow_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "webhook_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "webhook_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "webhook_registration_status_check": {
+          "name": "webhook_registration_status_check",
+          "value": "\"webhook\".\"registration_status\" IS NULL OR \"webhook\".\"registration_status\" IN ('active', 'candidate', 'retired', 'orphaned')"
+        },
+        "webhook_registration_generation_check": {
+          "name": "webhook_registration_generation_check",
+          "value": "\"webhook\".\"registration_generation\" IS NULL OR \"webhook\".\"registration_generation\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.webhook_path_claim": {
+      "name": "webhook_path_claim",
+      "schema": "",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "generation": {
+          "name": "generation",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "webhook_path_claim_workflow_idx": {
+          "name": "webhook_path_claim_workflow_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "webhook_path_claim_workflow_id_workflow_id_fk": {
+          "name": "webhook_path_claim_workflow_id_workflow_id_fk",
+          "tableFrom": "webhook_path_claim",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "webhook_path_claim_generation_check": {
+          "name": "webhook_path_claim_generation_check",
+          "value": "\"webhook_path_claim\".\"generation\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.workflow": {
+      "name": "workflow",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_synced": {
+          "name": "last_synced",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_deployed": {
+          "name": "is_deployed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deployed_at": {
+          "name": "deployed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public_api": {
+          "name": "is_public_api",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_user_id_idx": {
+          "name": "workflow_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_id_idx": {
+          "name": "workflow_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_user_workspace_idx": {
+          "name": "workflow_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_folder_name_active_unique": {
+          "name": "workflow_workspace_folder_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"folder_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_sort_idx": {
+          "name": "workflow_folder_sort_idx",
+          "columns": [
+            {
+              "expression": "folder_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_archived_at_idx": {
+          "name": "workflow_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_workspace_archived_partial_idx": {
+          "name": "workflow_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_user_id_user_id_fk": {
+          "name": "workflow_user_id_user_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_workspace_id_workspace_id_fk": {
+          "name": "workflow_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_id_workflow_folder_id_fk": {
+          "name": "workflow_folder_id_workflow_folder_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workflow_folder",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_blocks": {
+      "name": "workflow_blocks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_x": {
+          "name": "position_x",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "position_y": {
+          "name": "position_y",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "horizontal_handles": {
+          "name": "horizontal_handles",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "is_wide": {
+          "name": "is_wide",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "advanced_mode": {
+          "name": "advanced_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "trigger_mode": {
+          "name": "trigger_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "height": {
+          "name": "height",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "sub_blocks": {
+          "name": "sub_blocks",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "outputs": {
+          "name": "outputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_blocks_workflow_id_idx": {
+          "name": "workflow_blocks_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_blocks_type_idx": {
+          "name": "workflow_blocks_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_blocks_workflow_id_workflow_id_fk": {
+          "name": "workflow_blocks_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_blocks",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_checkpoints": {
+      "name": "workflow_checkpoints",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message_id": {
+          "name": "message_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_state": {
+          "name": "workflow_state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_checkpoints_user_id_idx": {
+          "name": "workflow_checkpoints_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_id_idx": {
+          "name": "workflow_checkpoints_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_id_idx": {
+          "name": "workflow_checkpoints_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_message_id_idx": {
+          "name": "workflow_checkpoints_message_id_idx",
+          "columns": [
+            {
+              "expression": "message_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_user_workflow_idx": {
+          "name": "workflow_checkpoints_user_workflow_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_workflow_chat_idx": {
+          "name": "workflow_checkpoints_workflow_chat_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_created_at_idx": {
+          "name": "workflow_checkpoints_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_checkpoints_chat_created_at_idx": {
+          "name": "workflow_checkpoints_chat_created_at_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_checkpoints_user_id_user_id_fk": {
+          "name": "workflow_checkpoints_user_id_user_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_workflow_id_workflow_id_fk": {
+          "name": "workflow_checkpoints_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_checkpoints_chat_id_copilot_chats_id_fk": {
+          "name": "workflow_checkpoints_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workflow_checkpoints",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_deployment_operation": {
+      "name": "workflow_deployment_operation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "previous_active_version_id": {
+          "name": "previous_active_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "protocol_version": {
+          "name": "protocol_version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "generation": {
+          "name": "generation",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'preparing'"
+        },
+        "component_readiness": {
+          "name": "component_readiness",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "error_code": {
+          "name": "error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "request_hash": {
+          "name": "request_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "actor_id": {
+          "name": "actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_deployment_operation_workflow_generation_unique": {
+          "name": "workflow_deployment_operation_workflow_generation_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "generation",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_operation_workflow_idempotency_unique": {
+          "name": "workflow_deployment_operation_workflow_idempotency_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_deployment_operation\".\"idempotency_key\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_operation_workflow_in_flight_unique": {
+          "name": "workflow_deployment_operation_workflow_in_flight_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_deployment_operation\".\"status\" IN ('preparing', 'activating')",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_operation_workflow_status_idx": {
+          "name": "workflow_deployment_operation_workflow_status_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_operation_deployment_version_idx": {
+          "name": "workflow_deployment_operation_deployment_version_idx",
+          "columns": [
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_operation_workflow_version_generation_idx": {
+          "name": "workflow_deployment_operation_workflow_version_generation_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "generation",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_deployment_operation_workflow_id_workflow_id_fk": {
+          "name": "workflow_deployment_operation_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_deployment_operation",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_deployment_operation_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_deployment_operation_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_deployment_operation",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_deployment_operation_previous_active_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_deployment_operation_previous_active_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_deployment_operation",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["previous_active_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "workflow_deployment_operation_action_check": {
+          "name": "workflow_deployment_operation_action_check",
+          "value": "\"workflow_deployment_operation\".\"action\" IN ('deploy', 'activate')"
+        },
+        "workflow_deployment_operation_status_check": {
+          "name": "workflow_deployment_operation_status_check",
+          "value": "\"workflow_deployment_operation\".\"status\" IN ('preparing', 'activating', 'active', 'failed', 'superseded')"
+        },
+        "workflow_deployment_operation_generation_check": {
+          "name": "workflow_deployment_operation_generation_check",
+          "value": "\"workflow_deployment_operation\".\"generation\" > 0"
+        },
+        "workflow_deployment_operation_protocol_version_check": {
+          "name": "workflow_deployment_operation_protocol_version_check",
+          "value": "\"workflow_deployment_operation\".\"protocol_version\" > 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.workflow_deployment_version": {
+      "name": "workflow_deployment_version",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_deployment_version_workflow_version_unique": {
+          "name": "workflow_deployment_version_workflow_version_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_workflow_active_idx": {
+          "name": "workflow_deployment_version_workflow_active_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_deployment_version_created_at_idx": {
+          "name": "workflow_deployment_version_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_deployment_version_workflow_id_workflow_id_fk": {
+          "name": "workflow_deployment_version_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_deployment_version",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_edges": {
+      "name": "workflow_edges",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_block_id": {
+          "name": "source_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_block_id": {
+          "name": "target_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_handle": {
+          "name": "source_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "target_handle": {
+          "name": "target_handle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_edges_workflow_id_idx": {
+          "name": "workflow_edges_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_source_idx": {
+          "name": "workflow_edges_workflow_source_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "source_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_edges_workflow_target_idx": {
+          "name": "workflow_edges_workflow_target_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_edges_workflow_id_workflow_id_fk": {
+          "name": "workflow_edges_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_source_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_source_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["source_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_edges_target_block_id_workflow_blocks_id_fk": {
+          "name": "workflow_edges_target_block_id_workflow_blocks_id_fk",
+          "tableFrom": "workflow_edges",
+          "tableTo": "workflow_blocks",
+          "columnsFrom": ["target_block_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_logs": {
+      "name": "workflow_execution_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_snapshot_id": {
+          "name": "state_snapshot_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'running'"
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_duration_ms": {
+          "name": "total_duration_ms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "execution_data": {
+          "name": "execution_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "cost": {
+          "name": "cost",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_total": {
+          "name": "cost_total",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "models_used": {
+          "name": "models_used",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "files": {
+          "name": "files",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_execution_logs_workflow_id_idx": {
+          "name": "workflow_execution_logs_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_state_snapshot_id_idx": {
+          "name": "workflow_execution_logs_state_snapshot_id_idx",
+          "columns": [
+            {
+              "expression": "state_snapshot_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_deployment_version_id_idx": {
+          "name": "workflow_execution_logs_deployment_version_id_idx",
+          "columns": [
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_trigger_idx": {
+          "name": "workflow_execution_logs_trigger_idx",
+          "columns": [
+            {
+              "expression": "trigger",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_level_idx": {
+          "name": "workflow_execution_logs_level_idx",
+          "columns": [
+            {
+              "expression": "level",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_started_at_idx": {
+          "name": "workflow_execution_logs_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_execution_id_unique": {
+          "name": "workflow_execution_logs_execution_id_unique",
+          "columns": [
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workflow_started_at_idx": {
+          "name": "workflow_execution_logs_workflow_started_at_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_started_at_idx": {
+          "name": "workflow_execution_logs_workspace_started_at_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_started_at_id_desc_idx": {
+          "name": "workflow_execution_logs_workspace_started_at_id_desc_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "\"started_at\" DESC NULLS LAST",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "\"id\" DESC",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_cost_total_idx": {
+          "name": "workflow_execution_logs_workspace_cost_total_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "cost_total",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_models_used_idx": {
+          "name": "workflow_execution_logs_models_used_idx",
+          "columns": [
+            {
+              "expression": "models_used",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "workflow_execution_logs_workspace_ended_at_id_idx": {
+          "name": "workflow_execution_logs_workspace_ended_at_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "date_trunc('milliseconds', \"ended_at\")",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_running_started_at_idx": {
+          "name": "workflow_execution_logs_running_started_at_idx",
+          "columns": [
+            {
+              "expression": "started_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "status = 'running'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_execution_logs_completed_ended_at_idx": {
+          "name": "workflow_execution_logs_completed_ended_at_idx",
+          "columns": [
+            {
+              "expression": "ended_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "execution_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_execution_logs\".\"status\" = 'completed' AND \"workflow_execution_logs\".\"level\" = 'info' AND \"workflow_execution_logs\".\"ended_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_logs_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_logs_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_workspace_id_workspace_id_fk": {
+          "name": "workflow_execution_logs_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk": {
+          "name": "workflow_execution_logs_state_snapshot_id_workflow_execution_snapshots_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_execution_snapshots",
+          "columnsFrom": ["state_snapshot_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_execution_logs_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_execution_logs",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_execution_snapshots": {
+      "name": "workflow_execution_snapshots",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state_hash": {
+          "name": "state_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state_data": {
+          "name": "state_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_snapshots_workflow_id_idx": {
+          "name": "workflow_snapshots_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_hash_idx": {
+          "name": "workflow_snapshots_hash_idx",
+          "columns": [
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_workflow_hash_idx": {
+          "name": "workflow_snapshots_workflow_hash_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "state_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_snapshots_created_at_idx": {
+          "name": "workflow_snapshots_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_execution_snapshots_workflow_id_workflow_id_fk": {
+          "name": "workflow_execution_snapshots_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_execution_snapshots",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_folder": {
+      "name": "workflow_folder",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'#6B7280'"
+        },
+        "is_expanded": {
+          "name": "is_expanded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "locked": {
+          "name": "locked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "workflow_folder_user_idx": {
+          "name": "workflow_folder_user_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_parent_idx": {
+          "name": "workflow_folder_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_parent_sort_idx": {
+          "name": "workflow_folder_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_archived_at_idx": {
+          "name": "workflow_folder_archived_at_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_archived_partial_idx": {
+          "name": "workflow_folder_workspace_archived_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_folder\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_folder_user_id_user_id_fk": {
+          "name": "workflow_folder_user_id_user_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_workspace_id_workspace_id_fk": {
+          "name": "workflow_folder_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_server": {
+      "name": "workflow_mcp_server",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_public": {
+          "name": "is_public",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_server_workspace_id_idx": {
+          "name": "workflow_mcp_server_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_created_by_idx": {
+          "name": "workflow_mcp_server_created_by_idx",
+          "columns": [
+            {
+              "expression": "created_by",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_deleted_at_idx": {
+          "name": "workflow_mcp_server_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_server_workspace_deleted_partial_idx": {
+          "name": "workflow_mcp_server_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_mcp_server\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_server_workspace_id_workspace_id_fk": {
+          "name": "workflow_mcp_server_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_server_created_by_user_id_fk": {
+          "name": "workflow_mcp_server_created_by_user_id_fk",
+          "tableFrom": "workflow_mcp_server",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_mcp_tool": {
+      "name": "workflow_mcp_tool",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "server_id": {
+          "name": "server_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_name": {
+          "name": "tool_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tool_description": {
+          "name": "tool_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parameter_schema": {
+          "name": "parameter_schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "parameter_description_overrides": {
+          "name": "parameter_description_overrides",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::json"
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_mcp_tool_server_id_idx": {
+          "name": "workflow_mcp_tool_server_id_idx",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_workflow_id_idx": {
+          "name": "workflow_mcp_tool_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_server_workflow_unique": {
+          "name": "workflow_mcp_tool_server_workflow_unique",
+          "columns": [
+            {
+              "expression": "server_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_mcp_tool\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_mcp_tool_archived_at_partial_idx": {
+          "name": "workflow_mcp_tool_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_mcp_tool\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk": {
+          "name": "workflow_mcp_tool_server_id_workflow_mcp_server_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow_mcp_server",
+          "columnsFrom": ["server_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_mcp_tool_workflow_id_workflow_id_fk": {
+          "name": "workflow_mcp_tool_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_mcp_tool",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_schedule": {
+      "name": "workflow_schedule",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deployment_version_id": {
+          "name": "deployment_version_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deployment_operation_id": {
+          "name": "deployment_operation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_id": {
+          "name": "block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cron_expression": {
+          "name": "cron_expression",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_ran_at": {
+          "name": "last_ran_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_queued_at": {
+          "name": "last_queued_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "timezone": {
+          "name": "timezone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'UTC'"
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "infra_retry_count": {
+          "name": "infra_retry_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_type": {
+          "name": "source_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'workflow'"
+        },
+        "job_title": {
+          "name": "job_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "prompt": {
+          "name": "prompt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lifecycle": {
+          "name": "lifecycle",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'persistent'"
+        },
+        "success_condition": {
+          "name": "success_condition",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "max_runs": {
+          "name": "max_runs",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "source_chat_id": {
+          "name": "source_chat_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_task_name": {
+          "name": "source_task_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_user_id": {
+          "name": "source_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_workspace_id": {
+          "name": "source_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_history": {
+          "name": "job_history",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contexts": {
+          "name": "contexts",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "excluded_dates": {
+          "name": "excluded_dates",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ends_at": {
+          "name": "ends_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_schedule_workflow_block_deployment_unique": {
+          "name": "workflow_schedule_workflow_block_deployment_unique",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_workflow_deployment_idx": {
+          "name": "workflow_schedule_workflow_deployment_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_archived_at_partial_idx": {
+          "name": "workflow_schedule_archived_at_partial_idx",
+          "columns": [
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_workflow_schedule_on_source_workspace_id_source_t_c07f3bba6": {
+          "name": "idx_workflow_schedule_on_source_workspace_id_source_t_c07f3bba6",
+          "columns": [
+            {
+              "expression": "source_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "source_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "archived_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_due_workflow_idx": {
+          "name": "workflow_schedule_due_workflow_idx",
+          "columns": [
+            {
+              "expression": "next_run_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "last_queued_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deployment_version_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NULL AND \"workflow_schedule\".\"status\" NOT IN ('disabled', 'completed') AND (\"workflow_schedule\".\"source_type\" = 'workflow' OR \"workflow_schedule\".\"source_type\" IS NULL)",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_schedule_due_job_idx": {
+          "name": "workflow_schedule_due_job_idx",
+          "columns": [
+            {
+              "expression": "next_run_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "last_queued_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workflow_schedule\".\"archived_at\" IS NULL AND \"workflow_schedule\".\"status\" NOT IN ('disabled', 'completed') AND \"workflow_schedule\".\"source_type\" = 'job'",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_schedule_workflow_id_workflow_id_fk": {
+          "name": "workflow_schedule_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk": {
+          "name": "workflow_schedule_deployment_version_id_workflow_deployment_version_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow_deployment_version",
+          "columnsFrom": ["deployment_version_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_deployment_operation_id_workflow_deployment_operation_id_fk": {
+          "name": "workflow_schedule_deployment_operation_id_workflow_deployment_operation_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow_deployment_operation",
+          "columnsFrom": ["deployment_operation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_user_id_user_id_fk": {
+          "name": "workflow_schedule_source_user_id_user_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "user",
+          "columnsFrom": ["source_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_schedule_source_workspace_id_workspace_id_fk": {
+          "name": "workflow_schedule_source_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workspace",
+          "columnsFrom": ["source_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_subflows": {
+      "name": "workflow_subflows",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_subflows_workflow_id_idx": {
+          "name": "workflow_subflows_workflow_id_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_subflows_workflow_type_idx": {
+          "name": "workflow_subflows_workflow_type_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_subflows_workflow_id_workflow_id_fk": {
+          "name": "workflow_subflows_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_subflows",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace": {
+      "name": "workspace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#33C482'"
+        },
+        "logo_url": {
+          "name": "logo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workspace_mode": {
+          "name": "workspace_mode",
+          "type": "workspace_mode",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'grandfathered_shared'"
+        },
+        "billed_account_user_id": {
+          "name": "billed_account_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "storage_used_bytes": {
+          "name": "storage_used_bytes",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "allow_personal_api_keys": {
+          "name": "allow_personal_api_keys",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "inbox_enabled": {
+          "name": "inbox_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "inbox_address": {
+          "name": "inbox_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "inbox_provider_id": {
+          "name": "inbox_provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "organization_assigned_at": {
+          "name": "organization_assigned_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "forked_from_workspace_id": {
+          "name": "forked_from_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_owner_id_idx": {
+          "name": "workspace_owner_id_idx",
+          "columns": [
+            {
+              "expression": "owner_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_organization_id_idx": {
+          "name": "workspace_organization_id_idx",
+          "columns": [
+            {
+              "expression": "organization_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_mode_idx": {
+          "name": "workspace_mode_idx",
+          "columns": [
+            {
+              "expression": "workspace_mode",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_forked_from_workspace_id_idx": {
+          "name": "workspace_forked_from_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "forked_from_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_owner_id_user_id_fk": {
+          "name": "workspace_owner_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["owner_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_organization_id_organization_id_fk": {
+          "name": "workspace_organization_id_organization_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workspace_billed_account_user_id_user_id_fk": {
+          "name": "workspace_billed_account_user_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["billed_account_user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "workspace_forked_from_workspace_id_workspace_id_fk": {
+          "name": "workspace_forked_from_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "workspace",
+          "columnsFrom": ["forked_from_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "workspace_storage_used_bytes_non_negative": {
+          "name": "workspace_storage_used_bytes_non_negative",
+          "value": "\"workspace\".\"storage_used_bytes\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.workspace_byok_keys": {
+      "name": "workspace_byok_keys",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "encrypted_api_key": {
+          "name": "encrypted_api_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_byok_workspace_provider_idx": {
+          "name": "workspace_byok_workspace_provider_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_byok_keys_workspace_id_workspace_id_fk": {
+          "name": "workspace_byok_keys_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_byok_keys_created_by_user_id_fk": {
+          "name": "workspace_byok_keys_created_by_user_id_fk",
+          "tableFrom": "workspace_byok_keys",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_environment": {
+      "name": "workspace_environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_environment_workspace_unique": {
+          "name": "workspace_environment_workspace_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_environment_workspace_id_workspace_id_fk": {
+          "name": "workspace_environment_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_environment",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_file": {
+      "name": "workspace_file",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_by": {
+          "name": "uploaded_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_file_workspace_id_idx": {
+          "name": "workspace_file_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_key_idx": {
+          "name": "workspace_file_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_deleted_at_idx": {
+          "name": "workspace_file_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_workspace_deleted_partial_idx": {
+          "name": "workspace_file_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_file\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_file_workspace_id_workspace_id_fk": {
+          "name": "workspace_file_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_uploaded_by_user_id_fk": {
+          "name": "workspace_file_uploaded_by_user_id_fk",
+          "tableFrom": "workspace_file",
+          "tableTo": "user",
+          "columnsFrom": ["uploaded_by"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_file_key_unique": {
+          "name": "workspace_file_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_file_folders": {
+      "name": "workspace_file_folders",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_file_folders_workspace_parent_idx": {
+          "name": "workspace_file_folders_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_parent_sort_idx": {
+          "name": "workspace_file_folders_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_deleted_at_idx": {
+          "name": "workspace_file_folders_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_workspace_deleted_partial_idx": {
+          "name": "workspace_file_folders_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_file_folders\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_file_folders_workspace_parent_name_active_unique": {
+          "name": "workspace_file_folders_workspace_parent_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"parent_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_file_folders\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_file_folders_user_id_user_id_fk": {
+          "name": "workspace_file_folders_user_id_user_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_folders_workspace_id_workspace_id_fk": {
+          "name": "workspace_file_folders_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_file_folders_parent_id_workspace_file_folders_id_fk": {
+          "name": "workspace_file_folders_parent_id_workspace_file_folders_id_fk",
+          "tableFrom": "workspace_file_folders",
+          "tableTo": "workspace_file_folders",
+          "columnsFrom": ["parent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_files": {
+      "name": "workspace_files",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chat_id": {
+          "name": "chat_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_name": {
+          "name": "original_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_files_key_active_unique": {
+          "name": "workspace_files_key_active_unique",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_folder_name_active_unique": {
+          "name": "workspace_files_workspace_folder_name_active_unique",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "coalesce(\"folder_id\", '')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "original_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"deleted_at\" IS NULL AND \"workspace_files\".\"context\" = 'workspace' AND \"workspace_files\".\"workspace_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_chat_display_name_unique": {
+          "name": "workspace_files_chat_display_name_unique",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"workspace_files\".\"context\" = 'mothership' AND \"workspace_files\".\"chat_id\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_key_idx": {
+          "name": "workspace_files_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_user_id_idx": {
+          "name": "workspace_files_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_id_idx": {
+          "name": "workspace_files_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_folder_id_idx": {
+          "name": "workspace_files_folder_id_idx",
+          "columns": [
+            {
+              "expression": "folder_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_context_idx": {
+          "name": "workspace_files_context_idx",
+          "columns": [
+            {
+              "expression": "context",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_chat_id_idx": {
+          "name": "workspace_files_chat_id_idx",
+          "columns": [
+            {
+              "expression": "chat_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_deleted_at_idx": {
+          "name": "workspace_files_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_files_workspace_deleted_partial_idx": {
+          "name": "workspace_files_workspace_deleted_partial_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"workspace_files\".\"deleted_at\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_files_user_id_user_id_fk": {
+          "name": "workspace_files_user_id_user_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_workspace_id_workspace_id_fk": {
+          "name": "workspace_files_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_files_folder_id_workspace_file_folders_id_fk": {
+          "name": "workspace_files_folder_id_workspace_file_folders_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "workspace_file_folders",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workspace_files_chat_id_copilot_chats_id_fk": {
+          "name": "workspace_files_chat_id_copilot_chats_id_fk",
+          "tableFrom": "workspace_files",
+          "tableTo": "copilot_chats",
+          "columnsFrom": ["chat_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_fork_block_map": {
+      "name": "workspace_fork_block_map",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "child_workspace_id": {
+          "name": "child_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_workflow_id": {
+          "name": "parent_workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_block_id": {
+          "name": "parent_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "child_workflow_id": {
+          "name": "child_workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "child_block_id": {
+          "name": "child_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_fork_block_map_child_ws_parent_unique": {
+          "name": "workspace_fork_block_map_child_ws_parent_unique",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_fork_block_map_child_ws_child_unique": {
+          "name": "workspace_fork_block_map_child_ws_child_unique",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "child_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_fork_block_map_child_ws_parent_wf_idx": {
+          "name": "workspace_fork_block_map_child_ws_parent_wf_idx",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_fork_block_map_child_ws_child_wf_idx": {
+          "name": "workspace_fork_block_map_child_ws_child_wf_idx",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "child_workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_fork_block_map_child_workspace_id_workspace_id_fk": {
+          "name": "workspace_fork_block_map_child_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_fork_block_map",
+          "tableTo": "workspace",
+          "columnsFrom": ["child_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_fork_dependent_value": {
+      "name": "workspace_fork_dependent_value",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "child_workspace_id": {
+          "name": "child_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_workflow_id": {
+          "name": "target_workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_block_id": {
+          "name": "target_block_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sub_block_key": {
+          "name": "sub_block_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_fork_dependent_value_child_ws_wf_idx": {
+          "name": "workspace_fork_dependent_value_child_ws_wf_idx",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_fork_dependent_value_field_unique": {
+          "name": "workspace_fork_dependent_value_field_unique",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_block_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sub_block_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_fork_dependent_value_child_workspace_id_workspace_id_fk": {
+          "name": "workspace_fork_dependent_value_child_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_fork_dependent_value",
+          "tableTo": "workspace",
+          "columnsFrom": ["child_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_fork_promote_run": {
+      "name": "workspace_fork_promote_run",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "child_workspace_id": {
+          "name": "child_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_workspace_id": {
+          "name": "source_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_workspace_id": {
+          "name": "target_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "direction": {
+          "name": "direction",
+          "type": "workspace_fork_promote_direction",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_fork_promote_run_child_ws_target_unique": {
+          "name": "workspace_fork_promote_run_child_ws_target_unique",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "target_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_fork_promote_run_target_ws_idx": {
+          "name": "workspace_fork_promote_run_target_ws_idx",
+          "columns": [
+            {
+              "expression": "target_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_fork_promote_run_child_workspace_id_workspace_id_fk": {
+          "name": "workspace_fork_promote_run_child_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_fork_promote_run",
+          "tableTo": "workspace",
+          "columnsFrom": ["child_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_fork_promote_run_created_by_user_id_fk": {
+          "name": "workspace_fork_promote_run_created_by_user_id_fk",
+          "tableFrom": "workspace_fork_promote_run",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_fork_resource_map": {
+      "name": "workspace_fork_resource_map",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "child_workspace_id": {
+          "name": "child_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "resource_type": {
+          "name": "resource_type",
+          "type": "workspace_fork_resource_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_resource_id": {
+          "name": "parent_resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "child_resource_id": {
+          "name": "child_resource_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workspace_fork_resource_map_child_ws_idx": {
+          "name": "workspace_fork_resource_map_child_ws_idx",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_fork_resource_map_child_ws_type_idx": {
+          "name": "workspace_fork_resource_map_child_ws_type_idx",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workspace_fork_resource_map_child_type_parent_unique": {
+          "name": "workspace_fork_resource_map_child_type_parent_unique",
+          "columns": [
+            {
+              "expression": "child_workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "resource_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_resource_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_fork_resource_map_child_workspace_id_workspace_id_fk": {
+          "name": "workspace_fork_resource_map_child_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_fork_resource_map",
+          "tableTo": "workspace",
+          "columnsFrom": ["child_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_fork_resource_map_created_by_user_id_fk": {
+          "name": "workspace_fork_resource_map_created_by_user_id_fk",
+          "tableFrom": "workspace_fork_resource_map",
+          "tableTo": "user",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.academy_cert_status": {
+      "name": "academy_cert_status",
+      "schema": "public",
+      "values": ["active", "revoked", "expired"]
+    },
+    "public.background_work_kind": {
+      "name": "background_work_kind",
+      "schema": "public",
+      "values": ["deployment_side_effects", "fork_content_copy", "fork_sync", "fork_rollback"]
+    },
+    "public.background_work_status_value": {
+      "name": "background_work_status_value",
+      "schema": "public",
+      "values": ["pending", "processing", "completed", "completed_with_warnings", "failed"]
+    },
+    "public.billing_blocked_reason": {
+      "name": "billing_blocked_reason",
+      "schema": "public",
+      "values": ["payment_failed", "dispute"]
+    },
+    "public.billing_entity_type": {
+      "name": "billing_entity_type",
+      "schema": "public",
+      "values": ["user", "organization"]
+    },
+    "public.chat_type": {
+      "name": "chat_type",
+      "schema": "public",
+      "values": ["mothership", "copilot"]
+    },
+    "public.copilot_async_tool_status": {
+      "name": "copilot_async_tool_status",
+      "schema": "public",
+      "values": ["pending", "running", "completed", "failed", "cancelled", "delivered"]
+    },
+    "public.copilot_run_status": {
+      "name": "copilot_run_status",
+      "schema": "public",
+      "values": ["active", "paused_waiting_for_tool", "resuming", "complete", "error", "cancelled"]
+    },
+    "public.credential_member_role": {
+      "name": "credential_member_role",
+      "schema": "public",
+      "values": ["admin", "member"]
+    },
+    "public.credential_member_status": {
+      "name": "credential_member_status",
+      "schema": "public",
+      "values": ["active", "pending", "revoked"]
+    },
+    "public.credential_type": {
+      "name": "credential_type",
+      "schema": "public",
+      "values": ["oauth", "env_workspace", "env_personal", "service_account"]
+    },
+    "public.data_drain_cadence": {
+      "name": "data_drain_cadence",
+      "schema": "public",
+      "values": ["hourly", "daily"]
+    },
+    "public.data_drain_destination": {
+      "name": "data_drain_destination",
+      "schema": "public",
+      "values": ["s3", "gcs", "azure_blob", "datadog", "bigquery", "snowflake", "webhook"]
+    },
+    "public.data_drain_run_status": {
+      "name": "data_drain_run_status",
+      "schema": "public",
+      "values": ["running", "success", "failed"]
+    },
+    "public.data_drain_run_trigger": {
+      "name": "data_drain_run_trigger",
+      "schema": "public",
+      "values": ["cron", "manual"]
+    },
+    "public.data_drain_source": {
+      "name": "data_drain_source",
+      "schema": "public",
+      "values": ["workflow_logs", "job_logs", "audit_logs", "copilot_chats", "copilot_runs"]
+    },
+    "public.execution_large_value_reference_source": {
+      "name": "execution_large_value_reference_source",
+      "schema": "public",
+      "values": ["execution_log", "paused_snapshot"]
+    },
+    "public.invitation_kind": {
+      "name": "invitation_kind",
+      "schema": "public",
+      "values": ["organization", "workspace"]
+    },
+    "public.invitation_membership_intent": {
+      "name": "invitation_membership_intent",
+      "schema": "public",
+      "values": ["internal", "external"]
+    },
+    "public.invitation_status": {
+      "name": "invitation_status",
+      "schema": "public",
+      "values": ["pending", "accepted", "rejected", "cancelled", "expired"]
+    },
+    "public.permission_type": {
+      "name": "permission_type",
+      "schema": "public",
+      "values": ["admin", "write", "read"]
+    },
+    "public.usage_log_category": {
+      "name": "usage_log_category",
+      "schema": "public",
+      "values": ["model", "fixed", "tool"]
+    },
+    "public.usage_log_source": {
+      "name": "usage_log_source",
+      "schema": "public",
+      "values": [
+        "workflow",
+        "wand",
+        "copilot",
+        "workspace-chat",
+        "mcp_copilot",
+        "mothership_block",
+        "knowledge-base",
+        "voice-input",
+        "enrichment"
+      ]
+    },
+    "public.workspace_fork_promote_direction": {
+      "name": "workspace_fork_promote_direction",
+      "schema": "public",
+      "values": ["push", "pull"]
+    },
+    "public.workspace_fork_resource_type": {
+      "name": "workspace_fork_resource_type",
+      "schema": "public",
+      "values": [
+        "workflow",
+        "oauth_credential",
+        "service_account_credential",
+        "env_var",
+        "table",
+        "knowledge_base",
+        "knowledge_document",
+        "file",
+        "mcp_server",
+        "workflow_mcp_server",
+        "custom_tool",
+        "skill"
+      ]
+    },
+    "public.workspace_mode": {
+      "name": "workspace_mode",
+      "schema": "public",
+      "values": ["personal", "organization", "grandfathered_shared"]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/packages/db/migrations/meta/_journal.json b/packages/db/migrations/meta/_journal.json
index 1cad973fa4f..a15b0dbdbe7 100644
--- a/packages/db/migrations/meta/_journal.json
+++ b/packages/db/migrations/meta/_journal.json
@@ -1821,6 +1821,13 @@
       "when": 1783810442774,
       "tag": "0260_unknown_sinister_six",
       "breakpoints": true
+    },
+    {
+      "idx": 261,
+      "version": "7",
+      "when": 1784043925919,
+      "tag": "0261_tranquil_donald_blake",
+      "breakpoints": true
     }
   ]
 }
diff --git a/packages/db/schema.ts b/packages/db/schema.ts
index 089cdf4c997..1975ba3ab8f 100644
--- a/packages/db/schema.ts
+++ b/packages/db/schema.ts
@@ -633,6 +633,10 @@ export const workflowSchedule = pgTable(
       () => workflowDeploymentVersion.id,
       { onDelete: 'cascade' }
     ),
+    deploymentOperationId: text('deployment_operation_id').references(
+      (): AnyPgColumn => workflowDeploymentOperation.id,
+      { onDelete: 'set null' }
+    ),
     blockId: text('block_id'),
     cronExpression: text('cron_expression'),
     nextRunAt: timestamp('next_run_at'),
@@ -748,6 +752,10 @@ export const webhook = pgTable(
       () => workflowDeploymentVersion.id,
       { onDelete: 'cascade' }
     ),
+    registrationStatus: text('registration_status'),
+    registrationGeneration: integer('registration_generation'),
+    configFingerprint: text('config_fingerprint'),
+    preparedAt: timestamp('prepared_at'),
     blockId: text('block_id'),
     /**
      * URL-addressable webhook path. NULL for shared-app providers (e.g. the
@@ -801,10 +809,51 @@ export const webhook = pgTable(
         table.blockId,
         table.updatedAt.desc()
       ),
+      activeRegistrationUnique: uniqueIndex('webhook_active_registration_unique')
+        .on(table.workflowId, table.blockId)
+        .where(
+          sql`${table.registrationStatus} = 'active' AND ${table.blockId} IS NOT NULL AND ${table.archivedAt} IS NULL`
+        ),
+      candidateRegistrationUnique: uniqueIndex('webhook_candidate_registration_unique')
+        .on(table.workflowId, table.blockId)
+        .where(sql`${table.registrationStatus} = 'candidate' AND ${table.blockId} IS NOT NULL`),
+      registrationGenerationIdx: index('webhook_registration_status_generation_idx').on(
+        table.workflowId,
+        table.registrationStatus,
+        table.registrationGeneration
+      ),
+      registrationStatusCheck: check(
+        'webhook_registration_status_check',
+        sql`${table.registrationStatus} IS NULL OR ${table.registrationStatus} IN ('active', 'candidate', 'retired', 'orphaned')`
+      ),
+      registrationGenerationCheck: check(
+        'webhook_registration_generation_check',
+        sql`${table.registrationGeneration} IS NULL OR ${table.registrationGeneration} >= 0`
+      ),
     }
   }
 )
 
+/**
+ * Owns a normalized path independently from registration generations.
+ */
+export const webhookPathClaim = pgTable(
+  'webhook_path_claim',
+  {
+    path: text('path').primaryKey(),
+    workflowId: text('workflow_id')
+      .notNull()
+      .references(() => workflow.id, { onDelete: 'cascade' }),
+    generation: integer('generation').notNull(),
+    createdAt: timestamp('created_at').notNull().defaultNow(),
+    updatedAt: timestamp('updated_at').notNull().defaultNow(),
+  },
+  (table) => ({
+    workflowIdx: index('webhook_path_claim_workflow_idx').on(table.workflowId),
+    generationCheck: check('webhook_path_claim_generation_check', sql`${table.generation} >= 0`),
+  })
+)
+
 /**
  * Cooldown state for Sim workspace-event trigger subscriptions.
  *
@@ -2645,6 +2694,82 @@ export const workflowDeploymentVersion = pgTable(
   })
 )
 
+/**
+ * Tracks mutable deployment attempts separately from immutable version snapshots.
+ */
+export const workflowDeploymentOperation = pgTable(
+  'workflow_deployment_operation',
+  {
+    id: text('id').primaryKey(),
+    workflowId: text('workflow_id')
+      .notNull()
+      .references(() => workflow.id, { onDelete: 'cascade' }),
+    deploymentVersionId: text('deployment_version_id')
+      .notNull()
+      .references(() => workflowDeploymentVersion.id, { onDelete: 'cascade' }),
+    version: integer('version').notNull(),
+    previousActiveVersionId: text('previous_active_version_id').references(
+      () => workflowDeploymentVersion.id,
+      { onDelete: 'set null' }
+    ),
+    action: text('action').notNull(),
+    protocolVersion: integer('protocol_version').notNull(),
+    generation: integer('generation').notNull(),
+    status: text('status').notNull().default('preparing'),
+    componentReadiness: jsonb('component_readiness')
+      .$type<Record<string, unknown>>()
+      .notNull()
+      .default(sql`'{}'::jsonb`),
+    errorCode: text('error_code'),
+    errorMessage: text('error_message'),
+    idempotencyKey: text('idempotency_key'),
+    requestHash: text('request_hash').notNull(),
+    actorId: text('actor_id').notNull(),
+    completedAt: timestamp('completed_at'),
+    createdAt: timestamp('created_at').notNull().defaultNow(),
+    updatedAt: timestamp('updated_at').notNull().defaultNow(),
+  },
+  (table) => ({
+    workflowGenerationUnique: uniqueIndex(
+      'workflow_deployment_operation_workflow_generation_unique'
+    ).on(table.workflowId, table.generation),
+    workflowIdempotencyUnique: uniqueIndex(
+      'workflow_deployment_operation_workflow_idempotency_unique'
+    )
+      .on(table.workflowId, table.idempotencyKey)
+      .where(sql`${table.idempotencyKey} IS NOT NULL`),
+    workflowInFlightUnique: uniqueIndex('workflow_deployment_operation_workflow_in_flight_unique')
+      .on(table.workflowId)
+      .where(sql`${table.status} IN ('preparing', 'activating')`),
+    workflowStatusIdx: index('workflow_deployment_operation_workflow_status_idx').on(
+      table.workflowId,
+      table.status
+    ),
+    deploymentVersionIdx: index('workflow_deployment_operation_deployment_version_idx').on(
+      table.deploymentVersionId
+    ),
+    workflowVersionGenerationIdx: index(
+      'workflow_deployment_operation_workflow_version_generation_idx'
+    ).on(table.workflowId, table.deploymentVersionId, table.generation.desc()),
+    actionCheck: check(
+      'workflow_deployment_operation_action_check',
+      sql`${table.action} IN ('deploy', 'activate')`
+    ),
+    statusCheck: check(
+      'workflow_deployment_operation_status_check',
+      sql`${table.status} IN ('preparing', 'activating', 'active', 'failed', 'superseded')`
+    ),
+    generationCheck: check(
+      'workflow_deployment_operation_generation_check',
+      sql`${table.generation} > 0`
+    ),
+    protocolVersionCheck: check(
+      'workflow_deployment_operation_protocol_version_check',
+      sql`${table.protocolVersion} > 0`
+    ),
+  })
+)
+
 // Idempotency keys for preventing duplicate processing across all webhooks and triggers
 export const idempotencyKey = pgTable(
   'idempotency_key',
diff --git a/packages/testing/src/mocks/schema.mock.ts b/packages/testing/src/mocks/schema.mock.ts
index f3470bf55a5..8bd29692bd7 100644
--- a/packages/testing/src/mocks/schema.mock.ts
+++ b/packages/testing/src/mocks/schema.mock.ts
@@ -265,6 +265,7 @@ export const schemaMock = {
     id: 'id',
     workflowId: 'workflowId',
     deploymentVersionId: 'deploymentVersionId',
+    deploymentOperationId: 'deploymentOperationId',
     blockId: 'blockId',
     cronExpression: 'cronExpression',
     nextRunAt: 'nextRunAt',
@@ -310,6 +311,10 @@ export const schemaMock = {
     id: 'id',
     workflowId: 'workflowId',
     deploymentVersionId: 'deploymentVersionId',
+    registrationStatus: 'registrationStatus',
+    registrationGeneration: 'registrationGeneration',
+    configFingerprint: 'configFingerprint',
+    preparedAt: 'preparedAt',
     blockId: 'blockId',
     path: 'path',
     provider: 'provider',
@@ -321,6 +326,13 @@ export const schemaMock = {
     createdAt: 'createdAt',
     updatedAt: 'updatedAt',
   },
+  webhookPathClaim: {
+    path: 'path',
+    workflowId: 'workflowId',
+    generation: 'generation',
+    createdAt: 'createdAt',
+    updatedAt: 'updatedAt',
+  },
   simTriggerState: {
     workflowId: 'workflowId',
     blockId: 'blockId',
@@ -821,6 +833,26 @@ export const schemaMock = {
     createdAt: 'createdAt',
     createdBy: 'createdBy',
   },
+  workflowDeploymentOperation: {
+    id: 'id',
+    workflowId: 'workflowId',
+    deploymentVersionId: 'deploymentVersionId',
+    version: 'version',
+    previousActiveVersionId: 'previousActiveVersionId',
+    action: 'action',
+    protocolVersion: 'protocolVersion',
+    generation: 'generation',
+    status: 'status',
+    componentReadiness: 'componentReadiness',
+    errorCode: 'errorCode',
+    errorMessage: 'errorMessage',
+    idempotencyKey: 'idempotencyKey',
+    requestHash: 'requestHash',
+    actorId: 'actorId',
+    completedAt: 'completedAt',
+    createdAt: 'createdAt',
+    updatedAt: 'updatedAt',
+  },
   idempotencyKey: {
     key: 'key',
     result: 'result',

From ff0aed014681fb2fec73e2b34e443ae1dbbfc1d5 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Tue, 14 Jul 2026 16:57:33 -0700
Subject: [PATCH 2/6] ui/ux

---
 .../app/api/tools/deployments/routes.test.ts  |  20 ++
 .../general/components/versions.tsx           |  31 ++-
 .../components/deploy-modal/deploy-modal.tsx  | 177 ++++++------------
 apps/sim/hooks/queries/deployments.ts         |   2 +-
 .../tools/handlers/deployment/deploy.ts       |   2 +
 .../tools/handlers/deployment/manage.test.ts  |  21 ++-
 .../tools/handlers/deployment/manage.ts       |   2 +
 apps/sim/lib/core/outbox/service.ts           |  14 +-
 .../lib/webhooks/registration-service.test.ts |  72 +++++++
 apps/sim/lib/webhooks/registration-service.ts |  30 ++-
 .../lib/webhooks/registration-store.test.ts   |  51 ++++-
 apps/sim/lib/webhooks/registration-store.ts   |  53 +++++-
 .../workflows/deployment-lifecycle.test.ts    |  10 +
 .../sim/lib/workflows/deployment-lifecycle.ts |  28 ++-
 .../lib/workflows/deployment-outbox.test.ts   |  13 +-
 apps/sim/lib/workflows/deployment-outbox.ts   |  39 +++-
 .../sim/lib/workflows/orchestration/deploy.ts |   8 +-
 .../persistence/deployment-operations.ts      |  34 ++++
 apps/sim/lib/workflows/persistence/utils.ts   |  39 ++--
 .../src/mocks/workflows-orchestration.mock.ts |   2 +
 20 files changed, 464 insertions(+), 184 deletions(-)

diff --git a/apps/sim/app/api/tools/deployments/routes.test.ts b/apps/sim/app/api/tools/deployments/routes.test.ts
index 63698c3a8b2..f0313a779b3 100644
--- a/apps/sim/app/api/tools/deployments/routes.test.ts
+++ b/apps/sim/app/api/tools/deployments/routes.test.ts
@@ -90,6 +90,11 @@ describe('POST /api/tools/deployments/deploy', () => {
       success: true,
       deployedAt: new Date('2026-06-12T00:00:00Z'),
       version: 4,
+      activeDeployment: {
+        deploymentVersionId: 'dv-4',
+        version: 4,
+        deployedAt: '2026-06-12T00:00:00.000Z',
+      },
     })
   })
 
@@ -157,6 +162,11 @@ describe('POST /api/tools/deployments/deploy', () => {
         isDeployed: true,
         deployedAt: '2026-06-12T00:00:00.000Z',
         version: 4,
+        activeDeployment: {
+          deploymentVersionId: 'dv-4',
+          version: 4,
+          deployedAt: '2026-06-12T00:00:00.000Z',
+        },
         warnings: [],
       },
     })
@@ -236,6 +246,11 @@ describe('POST /api/tools/deployments/promote', () => {
     mockPerformActivateVersion.mockResolvedValue({
       success: true,
       deployedAt: new Date('2026-06-12T00:00:00Z'),
+      activeDeployment: {
+        deploymentVersionId: 'dv-3',
+        version: 3,
+        deployedAt: '2026-06-12T00:00:00.000Z',
+      },
     })
   })
 
@@ -255,6 +270,11 @@ describe('POST /api/tools/deployments/promote', () => {
       isDeployed: true,
       deployedAt: '2026-06-12T00:00:00.000Z',
       version: 3,
+      activeDeployment: {
+        deploymentVersionId: 'dv-3',
+        version: 3,
+        deployedAt: '2026-06-12T00:00:00.000Z',
+      },
       warnings: [],
     })
   })
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx
index 8d6c7306ab8..868bca830f8 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/general/components/versions.tsx
@@ -211,6 +211,16 @@ export function Versions({
             !v.isActive && v.latestOperationStatus !== 'active' ? v.latestOperationStatus : null
           const isOperationPending =
             operationStatus === 'preparing' || operationStatus === 'activating'
+          /** Exactly one parenthetical per row; selection already highlights the row. */
+          const rowLabel = v.isActive
+            ? 'live'
+            : isOperationPending
+              ? 'pending'
+              : operationStatus === 'failed'
+                ? 'failed'
+                : isSelected
+                  ? 'selected'
+                  : null
 
           return (
             <div
@@ -287,25 +297,8 @@ export function Versions({
                         v{v.version}
                       </span>
                       {v.name && <span className='truncate'>{v.name}</span>}
-                      {v.isActive && (
-                        <span className='shrink-0 text-[var(--text-tertiary)]'>(live)</span>
-                      )}
-                      {operationStatus && (
-                        <span
-                          className={cn(
-                            'shrink-0',
-                            isOperationPending
-                              ? 'text-amber-600 dark:text-amber-400'
-                              : operationStatus === 'failed'
-                                ? 'text-red-600 dark:text-red-400'
-                                : 'text-[var(--text-tertiary)]'
-                          )}
-                        >
-                          ({operationStatus})
-                        </span>
-                      )}
-                      {isSelected && (
-                        <span className='shrink-0 text-[var(--text-tertiary)]'>(selected)</span>
+                      {rowLabel && (
+                        <span className='shrink-0 text-[var(--text-tertiary)]'>({rowLabel})</span>
                       )}
                     </span>
                   )}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
index 06aa02bd7ab..be3699b304a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
@@ -132,7 +132,6 @@ export function DeployModal({
   const [activeTab, setActiveTab] = useState<TabView>('general')
   const [chatSubmitting, setChatSubmitting] = useState(false)
   const [deployError, setDeployError] = useState<string | null>(null)
-  const [deployWarnings, setDeployWarnings] = useState<string[]>([])
   const [isFinalizingDeploy, setIsFinalizingDeploy] = useState(false)
   const [isActivatingVersion, setIsActivatingVersion] = useState(false)
   const [isChatFormValid, setIsChatFormValid] = useState(false)
@@ -203,41 +202,25 @@ export function DeployModal({
 
   const versions = versionsData?.versions ?? []
   const deploymentAttemptStatus = deploymentInfoData?.latestDeploymentAttempt?.status
-  const hasTerminalDeploymentAttempt =
-    deploymentAttemptStatus === 'active' ||
-    deploymentAttemptStatus === 'failed' ||
-    deploymentAttemptStatus === 'superseded'
-  const isAttemptFailed = deploymentAttemptStatus === 'failed'
-  const attemptErrorMessage = isAttemptFailed
-    ? (deploymentInfoData?.latestDeploymentAttempt?.error?.message ??
-      'Deployment preparation failed')
-    : null
-  const displayedDeployWarnings = isAttemptFailed
-    ? []
-    : hasTerminalDeploymentAttempt || deployWarnings.length === 0
-      ? (deploymentInfoData?.warnings ?? [])
-      : deployWarnings
+  const attemptErrorMessage =
+    deploymentInfoData?.latestDeploymentAttempt?.error?.message ??
+    (deploymentAttemptStatus === 'failed' ? 'Deployment preparation failed' : null)
 
   const isWorkflowStillActive = (targetWorkflowId: string) => {
     return useWorkflowRegistry.getState().activeWorkflowId === targetWorkflowId
   }
 
-  const syncDraftAfterDeploy = async (): Promise<string | null> => {
-    if (!workflowId) return null
+  const syncDraftAfterDeploy = async (): Promise<void> => {
+    if (!workflowId) return
 
     try {
-      const syncedActiveWorkflow = await syncLocalDraftFromServer(workflowId)
-      if (!syncedActiveWorkflow && isWorkflowStillActive(workflowId)) {
-        return 'Deployment succeeded, but local sync is still catching up. Refresh if the status looks stale.'
-      }
-      return null
+      await syncLocalDraftFromServer(workflowId)
     } catch (error) {
-      if (!isWorkflowStillActive(workflowId)) return null
+      if (!isWorkflowStillActive(workflowId)) return
       logger.warn('Workflow deployed, but local draft sync failed', {
         workflowId,
         error: toError(error).message,
       })
-      return 'Deployment succeeded, but local sync failed. Refresh if the status looks stale.'
     }
   }
 
@@ -288,7 +271,6 @@ export function DeployModal({
     if (open && workflowId) {
       setActiveTab('general')
       setDeployError(null)
-      setDeployWarnings([])
       setChatSuccess(false)
 
       const currentOutputs = selectedStreamingOutputsRef.current
@@ -344,7 +326,6 @@ export function DeployModal({
     deployActionIdRef.current = actionId
     setIsFinalizingDeploy(true)
     setDeployError(null)
-    setDeployWarnings([])
 
     try {
       if (!(await deployReadiness.waitUntilReady())) {
@@ -356,10 +337,9 @@ export function DeployModal({
 
       try {
         const result = await deployMutation.mutateAsync({ workflowId })
-        const syncWarning =
-          result.latestDeploymentAttempt?.status === 'active' ? await syncDraftAfterDeploy() : null
-        if (!isWorkflowStillActive(workflowId) || deployActionIdRef.current !== actionId) return
-        setDeployWarnings([...(result.warnings || []), ...(syncWarning ? [syncWarning] : [])])
+        if (result.latestDeploymentAttempt?.status === 'active') {
+          await syncDraftAfterDeploy()
+        }
       } finally {
         if (deployActionIdRef.current === actionId) {
           setIsFinalizingDeploy(false)
@@ -385,18 +365,14 @@ export function DeployModal({
 
     activateVersionInFlightRef.current = true
     setIsActivatingVersion(true)
-    setDeployWarnings([])
+    setDeployError(null)
 
     try {
-      const result = await activateVersionMutation.mutateAsync({ workflowId, version })
-      if (!isWorkflowStillActive(workflowId)) return
-      if (result.warnings && result.warnings.length > 0) {
-        setDeployWarnings(result.warnings)
-      }
+      await activateVersionMutation.mutateAsync({ workflowId, version })
     } catch (error) {
       if (!isWorkflowStillActive(workflowId)) return
       logger.error('Error promoting version:', { error })
-      throw error
+      setDeployError(toError(error).message || `Failed to promote v${version} to live`)
     } finally {
       activateVersionInFlightRef.current = false
       setIsActivatingVersion(false)
@@ -411,16 +387,10 @@ export function DeployModal({
       return
     }
 
-    setDeployWarnings([])
-
     try {
-      const result = await undeployMutation.mutateAsync({ workflowId: targetWorkflowId })
+      await undeployMutation.mutateAsync({ workflowId: targetWorkflowId })
       if (!isWorkflowStillActive(targetWorkflowId)) return
       setUndeployTargetWorkflowId(null)
-      if (result.warnings && result.warnings.length > 0) {
-        setDeployWarnings(result.warnings)
-        return
-      }
       onOpenChange(false)
     } catch (error: unknown) {
       if (!isWorkflowStillActive(targetWorkflowId)) return
@@ -436,7 +406,6 @@ export function DeployModal({
     deployActionIdRef.current = actionId
     setIsFinalizingDeploy(true)
     setDeployError(null)
-    setDeployWarnings([])
 
     try {
       if (!(await deployReadiness.waitUntilReady())) {
@@ -462,9 +431,9 @@ export function DeployModal({
 
       try {
         const result = await deployMutation.mutateAsync({ workflowId })
-        const syncWarning = await syncDraftAfterDeploy()
-        if (!isWorkflowStillActive(workflowId) || deployActionIdRef.current !== actionId) return
-        setDeployWarnings([...(result.warnings || []), ...(syncWarning ? [syncWarning] : [])])
+        if (result.latestDeploymentAttempt?.status === 'active') {
+          await syncDraftAfterDeploy()
+        }
       } finally {
         if (deployActionIdRef.current === actionId) {
           setIsFinalizingDeploy(false)
@@ -490,7 +459,6 @@ export function DeployModal({
     if (workflowId) releaseDeployAction(workflowId)
     setChatSubmitting(false)
     setDeployError(null)
-    setDeployWarnings([])
     onOpenChange(false)
   }
 
@@ -562,47 +530,11 @@ export function DeployModal({
                 Configure and manage workflow deployment settings including API, MCP, and chat
                 options.
               </ModalDescription>
-              {(deployError || attemptErrorMessage || displayedDeployWarnings.length > 0) && (
-                <div className='mb-3 flex flex-col gap-2' aria-live='polite'>
-                  {deployError && (
-                    <Badge variant='red' size='lg' dot className='max-w-full truncate' role='alert'>
-                      {deployError}
-                    </Badge>
-                  )}
-                  {!deployError && attemptErrorMessage && (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Badge
-                          variant='red'
-                          size='lg'
-                          dot
-                          className='max-w-full cursor-default truncate'
-                          role='alert'
-                        >
-                          {attemptErrorMessage}
-                        </Badge>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content side='bottom' className='max-w-[360px]'>
-                        <p className='text-caption'>{attemptErrorMessage}</p>
-                        <p className='text-caption'>
-                          {isDeployed
-                            ? 'The previously deployed version is still live.'
-                            : 'The workflow remains undeployed.'}
-                        </p>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  )}
-                  {displayedDeployWarnings.map((warning) => (
-                    <Badge
-                      key={warning}
-                      variant='amber'
-                      size='lg'
-                      dot
-                      className='max-w-full truncate'
-                    >
-                      {warning}
-                    </Badge>
-                  ))}
+              {deployError && (
+                <div className='mb-3' role='alert'>
+                  <Badge variant='red' size='lg' dot className='max-w-full truncate'>
+                    {deployError}
+                  </Badge>
                 </div>
               )}
               <ModalTabsContent value='general'>
@@ -833,9 +765,10 @@ interface StatusBadgeProps {
 }
 
 /**
- * Lifecycle-aware deployment status badge. Pending attempts render amber,
- * failed attempts render red with the failure reason in a tooltip, and a
- * settled live deployment falls back to the Live/Update states.
+ * Lifecycle-aware deployment status badge. Pending attempts render amber
+ * (labelled Retrying once an attempt has recorded a transient error), failed
+ * attempts render red with the failure reason in a tooltip, and a settled
+ * live deployment falls back to the Live/Update states.
  */
 function StatusBadge({
   isDeployed,
@@ -844,17 +777,25 @@ function StatusBadge({
   attemptErrorMessage,
 }: StatusBadgeProps) {
   if (attemptStatus === 'preparing' || attemptStatus === 'activating') {
+    const isRetrying = Boolean(attemptErrorMessage)
     return (
       <Tooltip.Root>
         <Tooltip.Trigger asChild>
           <Badge variant='amber' size='lg' dot className='cursor-default'>
-            Pending
+            {isRetrying ? 'Retrying' : 'Pending'}
           </Badge>
         </Tooltip.Trigger>
         <Tooltip.Content side='top' className='max-w-[320px]'>
-          {isDeployed
-            ? 'A new version is being prepared. The current version stays live until cutover completes.'
-            : 'Triggers and schedules are being registered. The workflow goes live once activation completes.'}
+          {isRetrying && <p className='text-caption'>{attemptErrorMessage}</p>}
+          <p className='text-caption'>
+            {isRetrying
+              ? isDeployed
+                ? 'Retrying automatically. The current version stays live until cutover completes.'
+                : 'Retrying automatically. The workflow goes live once activation completes.'
+              : isDeployed
+                ? 'A new version is being prepared. The current version stays live until cutover completes.'
+                : 'Triggers and schedules are being registered. The workflow goes live once activation completes.'}
+          </p>
         </Tooltip.Content>
       </Tooltip.Root>
     )
@@ -922,22 +863,30 @@ function GeneralFooter({
     deployReadiness.isBlocked && !deployReadiness.isSyncing && !isSubmitting && !isUndeploying
       ? deployReadiness.tooltip
       : null
+  const status = (
+    <div className='flex min-w-0 flex-col gap-1'>
+      <StatusBadge
+        isDeployed={Boolean(isDeployed)}
+        needsRedeployment={needsRedeployment}
+        attemptStatus={attemptStatus}
+        attemptErrorMessage={attemptErrorMessage}
+      />
+      {blockedMessage && (
+        <div
+          className='max-w-[300px] truncate text-[var(--text-muted)] text-xs'
+          title={blockedMessage}
+        >
+          {blockedMessage}
+        </div>
+      )}
+    </div>
+  )
   const deployActionLoading = isSubmitting || isDeploymentSettling
 
   if (!isDeployed) {
     return (
       <ModalFooter className='items-center justify-between'>
-        <div className='flex min-w-0 flex-col gap-1'>
-          <StatusBadge
-            isDeployed={false}
-            needsRedeployment={needsRedeployment}
-            attemptStatus={attemptStatus}
-            attemptErrorMessage={attemptErrorMessage}
-          />
-          {blockedMessage && (
-            <div className='max-w-[260px] text-[var(--text-muted)] text-xs'>{blockedMessage}</div>
-          )}
-        </div>
+        {status}
         <div className='flex items-center gap-2'>
           <Button variant='tertiary' onClick={onDeploy} disabled={isDeployBlocked}>
             {deployActionLoading && <Loader className='mr-1.5 size-3.5' animate />}
@@ -950,17 +899,7 @@ function GeneralFooter({
 
   return (
     <ModalFooter className='items-center justify-between'>
-      <div className='flex min-w-0 flex-col gap-1'>
-        <StatusBadge
-          isDeployed
-          needsRedeployment={needsRedeployment}
-          attemptStatus={attemptStatus}
-          attemptErrorMessage={attemptErrorMessage}
-        />
-        {blockedMessage && (
-          <div className='max-w-[300px] text-[var(--text-muted)] text-xs'>{blockedMessage}</div>
-        )}
-      </div>
+      {status}
       <div className='flex items-center gap-2'>
         <Button variant='default' onClick={onUndeploy} disabled={isUndeploying || isSubmitting}>
           {isUndeploying ? 'Undeploying...' : 'Undeploy'}
diff --git a/apps/sim/hooks/queries/deployments.ts b/apps/sim/hooks/queries/deployments.ts
index 0ad74ab581e..886e12983cc 100644
--- a/apps/sim/hooks/queries/deployments.ts
+++ b/apps/sim/hooks/queries/deployments.ts
@@ -32,7 +32,7 @@ const logger = createLogger('DeploymentQueries')
 export type { ChatDetail, DeploymentVersionsResponse }
 
 export const DEPLOYMENT_INFO_STALE_TIME = 30 * 1000
-export const DEPLOYMENT_STATUS_REFETCH_INTERVAL = 2 * 1000
+export const DEPLOYMENT_STATUS_REFETCH_INTERVAL = 5 * 1000
 export const DEPLOYED_WORKFLOW_STATE_STALE_TIME = 30 * 1000
 export const DEPLOYMENT_VERSIONS_STALE_TIME = 30 * 1000
 export const CHAT_DEPLOYMENT_STATUS_STALE_TIME = 30 * 1000
diff --git a/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts b/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts
index 1ca4554aa2e..58cb5c880ea 100644
--- a/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts
+++ b/apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts
@@ -206,6 +206,7 @@ export async function executeDeployApi(
         version: result.version,
         lifecycleStatus: result.latestDeploymentAttempt?.status ?? null,
         readiness: result.latestDeploymentAttempt?.readiness ?? null,
+        error: result.latestDeploymentAttempt?.error ?? null,
         warnings: result.warnings ?? [],
         apiEndpoint,
         baseUrl,
@@ -815,6 +816,7 @@ export async function executeRedeploy(
         version: result.version,
         lifecycleStatus: result.latestDeploymentAttempt?.status ?? null,
         readiness: result.latestDeploymentAttempt?.readiness ?? null,
+        error: result.latestDeploymentAttempt?.error ?? null,
         warnings: result.warnings ?? [],
         apiEndpoint,
         baseUrl,
diff --git a/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts b/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts
index c43c7d37142..fb26de1154a 100644
--- a/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts
+++ b/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts
@@ -13,6 +13,8 @@ const { ensureWorkflowAccessMock, checkNeedsRedeploymentMock } = vi.hoisted(() =
 
 const performRevertToVersionMock = workflowsOrchestrationMockFns.mockPerformRevertToVersion
 const performActivateVersionMock = workflowsOrchestrationMockFns.mockPerformActivateVersion
+const getWorkflowDeploymentSummaryMock =
+  workflowsOrchestrationMockFns.mockGetWorkflowDeploymentSummary
 
 const { resolveWorkflowStateRefMock, generateWorkflowDiffSummaryMock, listWorkflowVersionsMock } =
   vi.hoisted(() => ({
@@ -182,6 +184,17 @@ describe('executePromoteToLive', () => {
     performActivateVersionMock.mockResolvedValue({
       success: true,
       deployedAt: new Date('2026-05-30T00:00:00.000Z'),
+      latestDeploymentAttempt: {
+        id: 'op-1',
+        deploymentVersionId: 'dv-3',
+        version: 3,
+        action: 'activate',
+        status: 'active',
+        readiness: { webhooks: 'ready', schedules: 'ready', mcp: 'ready' },
+        requestedAt: '2026-05-30T00:00:00.000Z',
+        activatedAt: '2026-05-30T00:00:00.000Z',
+        error: null,
+      },
     })
 
     const result = await executePromoteToLive({ workflowId: 'wf-1', version: 3 }, {
@@ -194,13 +207,14 @@ describe('executePromoteToLive', () => {
       workflowId: 'wf-1',
       version: 3,
       userId: 'user-1',
-      workflow: { id: 'wf-1', workspaceId: 'ws-1', name: 'Test Workflow' },
     })
     expect(result.success).toBe(true)
     expect(result.output).toMatchObject({
       workflowId: 'wf-1',
       version: 3,
       message: 'Promoted version 3 to live',
+      lifecycleStatus: 'active',
+      error: null,
     })
   })
 
@@ -322,6 +336,11 @@ describe('executeCheckDeploymentStatus', () => {
       workflow: { id: 'wf-1', workspaceId: 'ws-1', name: 'Test Workflow' },
     })
     checkNeedsRedeploymentMock.mockResolvedValue(false)
+    getWorkflowDeploymentSummaryMock.mockResolvedValue({
+      activeDeployment: null,
+      latestDeploymentAttempt: null,
+      warnings: [],
+    })
   })
 
   it('uses the shared redeployment freshness helper for deployed APIs', async () => {
diff --git a/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts b/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
index 07beecd8e10..3968140d695 100644
--- a/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
+++ b/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
@@ -370,6 +370,7 @@ export async function executeGetDeploymentLog(
       name: r.name ?? undefined,
       description: r.description ?? undefined,
       isActive: r.isActive,
+      latestOperationStatus: r.latestOperationStatus ?? undefined,
       createdAt: r.createdAt.toISOString(),
       createdBy: r.createdBy ?? undefined,
     }))
@@ -565,6 +566,7 @@ export async function executePromoteToLive(
         deployedAt: result.deployedAt ? new Date(result.deployedAt).toISOString() : undefined,
         lifecycleStatus: result.latestDeploymentAttempt?.status ?? null,
         readiness: result.latestDeploymentAttempt?.readiness ?? null,
+        error: result.latestDeploymentAttempt?.error ?? null,
         warnings: result.warnings,
       },
     }
diff --git a/apps/sim/lib/core/outbox/service.ts b/apps/sim/lib/core/outbox/service.ts
index 5e628726516..d519a4b4c78 100644
--- a/apps/sim/lib/core/outbox/service.ts
+++ b/apps/sim/lib/core/outbox/service.ts
@@ -3,11 +3,23 @@ import { outboxEvent } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
+import { truncate } from '@sim/utils/string'
 import { and, asc, eq, inArray, lte, sql } from 'drizzle-orm'
 
 const logger = createLogger('OutboxService')
 
 const DEFAULT_MAX_ATTEMPTS = 10
+const MAX_PERSISTED_ERROR_LENGTH = 500
+
+/**
+ * Bounds a handler failure before persisting it to `last_error`. Driver
+ * errors ("Failed query: ...\nparams: ...") embed every bound parameter,
+ * which can include user credentials from handler payloads — the parameter
+ * tail is dropped and the rest is capped.
+ */
+function toPersistedHandlerError(error: unknown): string {
+  return truncate(toError(error).message.split(/\nparams: /)[0], MAX_PERSISTED_ERROR_LENGTH)
+}
 const STUCK_PROCESSING_THRESHOLD_MS = 10 * 60 * 1000 // 10 minutes
 const MAX_BACKOFF_MS = 60 * 60 * 1000 // 1 hour
 const BASE_BACKOFF_MS = 1000 // 1 second, doubled per attempt
@@ -404,7 +416,7 @@ async function runHandler(
 
     const nextAttempts = event.attempts + 1
     const isDead = nextAttempts >= event.maxAttempts
-    const errMsg = toError(error).message
+    const errMsg = toPersistedHandlerError(error)
 
     if (isDead) {
       const updated = await updateIfLeaseHeld(event, {
diff --git a/apps/sim/lib/webhooks/registration-service.test.ts b/apps/sim/lib/webhooks/registration-service.test.ts
index 1d3742f1808..8da7ba00d30 100644
--- a/apps/sim/lib/webhooks/registration-service.test.ts
+++ b/apps/sim/lib/webhooks/registration-service.test.ts
@@ -247,6 +247,78 @@ describe('stable webhook registration service', () => {
     expect(checkpointCandidate.mock.calls[1][0]).not.toHaveProperty('prepared')
   })
 
+  it('cleans a never-prepared ghost candidate best-effort so new deploys are not wedged', async () => {
+    const ghostOrphan = registrationRow({
+      id: 'ghost-orphan',
+      registrationStatus: 'orphaned',
+      registrationGeneration: 4,
+      preparedAt: null,
+      providerConfig: { event: 'created' },
+      isActive: false,
+      archivedAt: new Date('2026-07-14T00:00:00Z'),
+    })
+    const cleanupExternal = vi.fn()
+    const deleteAfterCleanup = vi.fn().mockResolvedValue(true)
+    const checkpointCandidate = vi.fn()
+    const store = dependencies({
+      prepareIntents: vi.fn().mockResolvedValue({
+        candidates: [],
+        orphanedCandidates: [ghostOrphan],
+      }),
+      getCleanupSnapshot: vi.fn().mockResolvedValue(ghostOrphan),
+      cleanupExternal,
+      deleteAfterCleanup,
+      checkpointCandidate,
+    })
+
+    await prepareStableWebhookRegistrations(
+      {
+        request: {} as NextRequest,
+        fence,
+        workflow: { id: fence.workflowId },
+        userId: 'user-1',
+        requestId: 'request-ghost',
+        desired: [],
+      },
+      store
+    )
+
+    expect(cleanupExternal).toHaveBeenCalledWith(ghostOrphan, expect.anything(), 'request-ghost', {
+      throwOnError: false,
+    })
+    expect(deleteAfterCleanup).toHaveBeenCalledTimes(1)
+  })
+
+  it('keeps strict external cleanup for retired rows that served traffic', async () => {
+    const retired = registrationRow({
+      registrationStatus: 'retired',
+      isActive: false,
+      archivedAt: new Date('2026-07-14T00:00:00Z'),
+    })
+    const cleanupExternal = vi.fn()
+    const deleteAfterCleanup = vi.fn().mockResolvedValue(true)
+    const store = dependencies({
+      listRetired: vi.fn().mockResolvedValueOnce([retired]).mockResolvedValue([]),
+      getCleanupSnapshot: vi.fn().mockResolvedValue(retired),
+      cleanupExternal,
+      deleteAfterCleanup,
+    })
+
+    await cleanupRetiredWebhookRegistrationsAfterActivation(
+      {
+        fence,
+        workflow: { id: fence.workflowId },
+        requestId: 'request-retired',
+      },
+      store
+    )
+
+    expect(cleanupExternal).toHaveBeenCalledWith(retired, expect.anything(), 'request-retired', {
+      throwOnError: true,
+    })
+    expect(deleteAfterCleanup).toHaveBeenCalledTimes(1)
+  })
+
   it('skips external cleanup when the row was reused by a newer generation', async () => {
     const staleRetired = registrationRow({
       registrationStatus: 'retired',
diff --git a/apps/sim/lib/webhooks/registration-service.ts b/apps/sim/lib/webhooks/registration-service.ts
index 36cce1b46d8..4a650143049 100644
--- a/apps/sim/lib/webhooks/registration-service.ts
+++ b/apps/sim/lib/webhooks/registration-service.ts
@@ -100,7 +100,18 @@ async function cleanupGenerationFencedRegistration(
   })
   if (!snapshot) return false
 
-  await dependencies.cleanupExternal(snapshot, workflow, requestId, { throwOnError: true })
+  /**
+   * Strict cleanup only for rows that verifiably held a live subscription:
+   * retired rows served traffic and prepared candidates completed provider
+   * setup. A never-prepared ghost (its create failed) has partial or no
+   * external state — strict-failing on it would wedge every future deploy
+   * behind an uncleanable leftover, so those clean up best-effort instead.
+   */
+  const holdsVerifiedSubscription =
+    snapshot.registrationStatus === 'retired' || snapshot.preparedAt !== null
+  await dependencies.cleanupExternal(snapshot, workflow, requestId, {
+    throwOnError: holdsVerifiedSubscription,
+  })
   return dependencies.deleteAfterCleanup({
     workflowId: snapshot.workflowId,
     webhookId: snapshot.id,
@@ -287,6 +298,7 @@ export async function prepareStableWebhookRegistrations(
   })
 
   const failures: Error[] = []
+  const failureReasons: string[] = []
   const blocksWithFailedOrphanCleanup = new Set<string>()
   for (const orphaned of work.orphanedCandidates) {
     try {
@@ -299,6 +311,7 @@ export async function prepareStableWebhookRegistrations(
       )
     } catch (error) {
       failures.push(toError(error))
+      failureReasons.push(`${orphaned.provider ?? 'webhook'} cleanup: ${toError(error).message}`)
       if (orphaned.blockId) blocksWithFailedOrphanCleanup.add(orphaned.blockId)
     }
   }
@@ -309,6 +322,7 @@ export async function prepareStableWebhookRegistrations(
       await prepareCandidate(input, candidate, dependencies)
     } catch (error) {
       failures.push(toError(error))
+      failureReasons.push(`${candidate.desired.provider}: ${toError(error).message}`)
       logger.warn('Webhook registration candidate preparation failed', {
         workflowId: input.fence.workflowId,
         webhookId: candidate.row.id,
@@ -319,9 +333,14 @@ export async function prepareStableWebhookRegistrations(
   }
 
   if (failures.length > 0) {
+    /**
+     * The aggregate message carries the underlying provider reasons because it
+     * is what gets persisted on the deployment operation and shown in the
+     * retrying/failed tooltips — a bare count would hide the actual cause.
+     */
     throw new AggregateError(
       failures,
-      `Failed to prepare ${failures.length} webhook registration(s)`
+      `Failed to prepare ${failures.length} webhook registration(s): ${[...new Set(failureReasons)].join('; ')}`
     )
   }
 }
@@ -344,6 +363,7 @@ export async function cleanupRetiredWebhookRegistrationsAfterActivation(
     if (retiredRows.length === 0) return
 
     const failures: Error[] = []
+    const failureReasons: string[] = []
     for (const row of retiredRows) {
       input.signal?.throwIfAborted()
       try {
@@ -356,11 +376,15 @@ export async function cleanupRetiredWebhookRegistrationsAfterActivation(
         )
       } catch (error) {
         failures.push(toError(error))
+        failureReasons.push(`${row.provider ?? 'webhook'}: ${toError(error).message}`)
       }
     }
 
     if (failures.length > 0) {
-      throw new AggregateError(failures, `Failed to clean ${failures.length} retired webhook(s)`)
+      throw new AggregateError(
+        failures,
+        `Failed to clean ${failures.length} retired webhook(s): ${[...new Set(failureReasons)].join('; ')}`
+      )
     }
   }
 }
diff --git a/apps/sim/lib/webhooks/registration-store.test.ts b/apps/sim/lib/webhooks/registration-store.test.ts
index f75f4938afa..204580b899b 100644
--- a/apps/sim/lib/webhooks/registration-store.test.ts
+++ b/apps/sim/lib/webhooks/registration-store.test.ts
@@ -237,7 +237,7 @@ describe('prepareWebhookRegistrationIntents', () => {
 
   it('claims paths and writes legacy-invisible candidates for changed registrations', async () => {
     const previousActive = activeRow()
-    const { inserts, updates } = runInTx([[{ id: 'workflow-1' }], [], [previousActive], []])
+    const { inserts, updates } = runInTx([[{ id: 'workflow-1' }], [], [previousActive], [], []])
 
     const work = await prepareWebhookRegistrationIntents({ fence: FENCE, desired: [desired] })
 
@@ -265,7 +265,7 @@ describe('prepareWebhookRegistrationIntents', () => {
 
   it('reuses fingerprint-matched active rows by bumping their generation fence', async () => {
     const reusable = activeRow({ configFingerprint: 'fp-new' })
-    const { inserts, updates } = runInTx([[{ id: 'workflow-1' }], [], [reusable], []])
+    const { inserts, updates } = runInTx([[{ id: 'workflow-1' }], [], [reusable], [], []])
 
     const work = await prepareWebhookRegistrationIntents({ fence: FENCE, desired: [desired] })
 
@@ -277,6 +277,53 @@ describe('prepareWebhookRegistrationIntents', () => {
     expect(work.candidates).toHaveLength(0)
   })
 
+  it('adopts a fingerprint-identical candidate from a superseded attempt instead of reinserting', async () => {
+    const supersededCandidate = activeRow({
+      id: 'wh-prev-candidate',
+      registrationStatus: 'candidate',
+      registrationGeneration: 2,
+      configFingerprint: 'fp-new',
+      preparedAt: null,
+      isActive: false,
+      deploymentVersionId: 'version-2',
+      archivedAt: new Date('2026-07-14T00:00:00Z'),
+    })
+    const { inserts, updates } = runInTx([
+      [{ id: 'workflow-1' }],
+      [],
+      [],
+      [supersededCandidate],
+      [],
+    ])
+
+    const work = await prepareWebhookRegistrationIntents({ fence: FENCE, desired: [desired] })
+
+    expect(inserts).toHaveLength(0)
+    expect(updates).toHaveLength(1)
+    expect(updates[0].payload).toEqual(
+      expect.objectContaining({ registrationGeneration: 3, deploymentVersionId: 'version-3' })
+    )
+    expect(work.candidates).toHaveLength(1)
+    expect(work.orphanedCandidates).toHaveLength(0)
+  })
+
+  it('re-collects stale orphans from earlier attempts so they cannot leak forever', async () => {
+    const staleOrphan = activeRow({
+      id: 'wh-stale-orphan',
+      registrationStatus: 'orphaned',
+      registrationGeneration: 2,
+      preparedAt: null,
+      isActive: false,
+      archivedAt: new Date('2026-07-13T00:00:00Z'),
+    })
+    const { inserts } = runInTx([[{ id: 'workflow-1' }], [], [], [], [staleOrphan]])
+
+    const work = await prepareWebhookRegistrationIntents({ fence: FENCE, desired: [desired] })
+
+    expect(work.orphanedCandidates).toEqual([staleOrphan])
+    expect(inserts).toHaveLength(1)
+  })
+
   it('rejects stale generations before touching rows', async () => {
     mockIsDeploymentOperationCurrent.mockResolvedValue(false)
     const { inserts, updates } = runInTx([[{ id: 'workflow-1' }]])
diff --git a/apps/sim/lib/webhooks/registration-store.ts b/apps/sim/lib/webhooks/registration-store.ts
index bc619b891a2..2754a89de94 100644
--- a/apps/sim/lib/webhooks/registration-store.ts
+++ b/apps/sim/lib/webhooks/registration-store.ts
@@ -281,8 +281,24 @@ export async function prepareWebhookRegistrationIntents(input: {
         .map((row) => [row.blockId, row])
     )
 
+    /**
+     * Orphans left by earlier attempts (their cleanup failed or the process
+     * died) are re-collected on every preparation so they cannot leak forever
+     * — cleanup itself stays generation-fenced, so racing operations at most
+     * duplicate a best-effort provider delete.
+     */
+    const staleOrphanRows = await tx
+      .select()
+      .from(webhook)
+      .where(
+        and(
+          eq(webhook.workflowId, input.fence.workflowId),
+          eq(webhook.registrationStatus, 'orphaned')
+        )
+      )
+
     const candidates: PreparedWebhookCandidate[] = []
-    const orphanedCandidates: WebhookRegistrationRow[] = []
+    const orphanedCandidates: WebhookRegistrationRow[] = [...staleOrphanRows]
     const now = new Date()
 
     for (const action of plan.actions) {
@@ -311,12 +327,35 @@ export async function prepareWebhookRegistrationIntents(input: {
 
       const desired = action.desired.desired
       const existingCandidate = candidatesByBlockId.get(action.triggerId)
-      if (
-        existingCandidate &&
-        existingCandidate.registrationGeneration === input.fence.generation &&
-        existingCandidate.configFingerprint === action.desired.fingerprint
-      ) {
-        candidates.push({ desired, row: existingCandidate })
+      if (existingCandidate && existingCandidate.configFingerprint === action.desired.fingerprint) {
+        if (existingCandidate.registrationGeneration === input.fence.generation) {
+          candidates.push({ desired, row: existingCandidate })
+          continue
+        }
+        /**
+         * A fingerprint-identical candidate from a superseded attempt is
+         * adopted rather than orphaned and reinserted: this preserves any
+         * checkpointed provider progress (an external subscription it already
+         * created keeps serving instead of being deleted and recreated) and
+         * avoids insert churn against the path uniqueness index.
+         */
+        const [adopted] = await tx
+          .update(webhook)
+          .set({
+            registrationGeneration: input.fence.generation,
+            deploymentVersionId: input.fence.deploymentVersionId,
+            updatedAt: now,
+          })
+          .where(
+            and(
+              eq(webhook.id, existingCandidate.id),
+              eq(webhook.registrationStatus, 'candidate'),
+              eq(webhook.registrationGeneration, rowRegistrationGeneration(existingCandidate))
+            )
+          )
+          .returning()
+        if (!adopted) throw new StaleWebhookRegistrationOperationError()
+        candidates.push({ desired, row: adopted })
         continue
       }
 
diff --git a/apps/sim/lib/workflows/deployment-lifecycle.test.ts b/apps/sim/lib/workflows/deployment-lifecycle.test.ts
index 6422d8c4043..76c6dd559ce 100644
--- a/apps/sim/lib/workflows/deployment-lifecycle.test.ts
+++ b/apps/sim/lib/workflows/deployment-lifecycle.test.ts
@@ -49,4 +49,14 @@ describe('deployment lifecycle', () => {
         'authorization=[redacted] password=[redacted] https://[redacted]@example.com failed next',
     })
   })
+
+  it('drops driver bound-parameter tails that can carry credentials', () => {
+    const error = new Error(
+      'Failed query: insert into "webhook" ("id", "provider_config") values ($1, $2)\nparams: wh-1,{"triggerApiKey":"super-secret-key"}'
+    )
+
+    expect(toSafeDeploymentError(error).message).toBe(
+      'Failed query: insert into "webhook" ("id", "provider_config") values ($1, $2)'
+    )
+  })
 })
diff --git a/apps/sim/lib/workflows/deployment-lifecycle.ts b/apps/sim/lib/workflows/deployment-lifecycle.ts
index 576051b6971..1ed98bf590b 100644
--- a/apps/sim/lib/workflows/deployment-lifecycle.ts
+++ b/apps/sim/lib/workflows/deployment-lifecycle.ts
@@ -126,6 +126,25 @@ export function parseDeploymentReadiness(value: unknown): DeploymentReadiness |
   return readiness
 }
 
+export const DEPLOYMENT_ERROR_CODES = {
+  webhookPathConflict: 'webhook_path_conflict',
+  invalidTriggerConfiguration: 'invalid_trigger_configuration',
+} as const
+
+const NON_RETRYABLE_DEPLOYMENT_ERROR_CODES = new Set<string>([
+  DEPLOYMENT_ERROR_CODES.webhookPathConflict,
+  DEPLOYMENT_ERROR_CODES.invalidTriggerConfiguration,
+])
+
+/**
+ * Returns true when a persisted deployment error code cannot succeed on a
+ * plain retry — the configuration must change first. Everything else
+ * (exhausted transient retries, generic failures) is worth redeploying as-is.
+ */
+export function isNonRetryableDeploymentErrorCode(code: string | null | undefined): boolean {
+  return code != null && NON_RETRYABLE_DEPLOYMENT_ERROR_CODES.has(code)
+}
+
 /**
  * A preparation failure that cannot succeed on retry (path conflicts, invalid
  * trigger configuration). The outbox handler fails the operation immediately
@@ -176,7 +195,14 @@ export function toSafeDeploymentError(error: unknown, errorCode?: string): SafeD
 }
 
 function sanitizeDeploymentErrorMessage(message: string): string {
-  const withoutControlCharacters = message.replace(/[\u0000-\u001F\u007F]+/g, ' ').trim()
+  /**
+   * Driver errors ("Failed query: ...\nparams: ...") embed every bound
+   * parameter value, which can include user credentials from provider
+   * configs — the parameter tail is dropped before anything else because the
+   * control-character pass below would otherwise fold it into one line.
+   */
+  const withoutBoundParams = message.split(/\nparams: /)[0]
+  const withoutControlCharacters = withoutBoundParams.replace(/[\u0000-\u001F\u007F]+/g, ' ').trim()
   const withoutUrlCredentials = withoutControlCharacters.replace(
     /:\/\/[^/\s:@]+:[^/\s@]+@/g,
     '://[redacted]@'
diff --git a/apps/sim/lib/workflows/deployment-outbox.test.ts b/apps/sim/lib/workflows/deployment-outbox.test.ts
index dfb524a6962..29bbc7a6a3d 100644
--- a/apps/sim/lib/workflows/deployment-outbox.test.ts
+++ b/apps/sim/lib/workflows/deployment-outbox.test.ts
@@ -11,6 +11,7 @@ const {
   mockBeginDeploymentOperationActivation,
   mockActivateDeploymentOperation,
   mockMarkDeploymentOperationFailed,
+  mockRecordDeploymentOperationRetry,
   mockIsDeploymentOperationCurrent,
   mockIsDeploymentVersionProtectedByCurrentOperation,
   mockCreateSchedulesForDeploy,
@@ -32,6 +33,7 @@ const {
   mockBeginDeploymentOperationActivation: vi.fn(),
   mockActivateDeploymentOperation: vi.fn(),
   mockMarkDeploymentOperationFailed: vi.fn(),
+  mockRecordDeploymentOperationRetry: vi.fn(),
   mockIsDeploymentOperationCurrent: vi.fn(),
   mockIsDeploymentVersionProtectedByCurrentOperation: vi.fn(),
   mockCreateSchedulesForDeploy: vi.fn(),
@@ -147,6 +149,7 @@ vi.mock('@/lib/workflows/persistence/deployment-operations', () => ({
     mockIsDeploymentVersionProtectedByCurrentOperation,
   markDeploymentComponentReadiness: mockMarkDeploymentComponentReadiness,
   markDeploymentOperationFailed: mockMarkDeploymentOperationFailed,
+  recordDeploymentOperationRetry: mockRecordDeploymentOperationRetry,
 }))
 
 vi.mock('@/lib/workflows/schedules', () => ({
@@ -215,7 +218,7 @@ function context(controller = new AbortController(), attempts = 0): OutboxEventC
     eventId: 'event-1',
     eventType: WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.PREPARE_V2,
     attempts,
-    maxAttempts: 10,
+    maxAttempts: 4,
     signal: controller.signal,
     checkpointPayload: vi.fn().mockResolvedValue(undefined),
   }
@@ -367,7 +370,7 @@ describe('versioned deployment preparation outbox', () => {
       .mockResolvedValueOnce([{ id: 'version-2', state: { blocks: {} } }])
     mockPrepareWebhooks.mockRejectedValue(new Error('provider unavailable'))
 
-    await expect(handler()(payload(), context(new AbortController(), 9))).rejects.toThrow(
+    await expect(handler()(payload(), context(new AbortController(), 3))).rejects.toThrow(
       'provider unavailable'
     )
 
@@ -394,6 +397,12 @@ describe('versioned deployment preparation outbox', () => {
     )
 
     expect(mockMarkDeploymentOperationFailed).not.toHaveBeenCalled()
+    expect(mockRecordDeploymentOperationRetry).toHaveBeenCalledWith({
+      workflowId: 'workflow-1',
+      operationId: 'operation-1',
+      generation: 2,
+      error: expect.objectContaining({ message: 'provider briefly unavailable' }),
+    })
     expect(mockActivateDeploymentOperation).not.toHaveBeenCalled()
   })
 
diff --git a/apps/sim/lib/workflows/deployment-outbox.ts b/apps/sim/lib/workflows/deployment-outbox.ts
index e57831aea67..59dbf525f88 100644
--- a/apps/sim/lib/workflows/deployment-outbox.ts
+++ b/apps/sim/lib/workflows/deployment-outbox.ts
@@ -1,6 +1,7 @@
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db, workflowDeploymentVersion, workflow as workflowTable } from '@sim/db'
 import { createLogger } from '@sim/logger'
+import { toError } from '@sim/utils/errors'
 import { and, eq, ne } from 'drizzle-orm'
 import { NextRequest } from 'next/server'
 import { env } from '@/lib/core/config/env'
@@ -29,6 +30,7 @@ import {
 import { cleanupRetiredWebhookRegistrationsAfterActivation } from '@/lib/webhooks/registration-service'
 import { activateWebhookRegistrations } from '@/lib/webhooks/registration-store'
 import {
+  DEPLOYMENT_ERROR_CODES,
   DEPLOYMENT_OPERATION_PROTOCOL_VERSION,
   type DeploymentOperationStatus,
   isDeploymentReadinessComplete,
@@ -45,6 +47,7 @@ import {
   isDeploymentVersionProtectedByCurrentOperation,
   markDeploymentComponentReadiness,
   markDeploymentOperationFailed,
+  recordDeploymentOperationRetry,
   type WorkflowDeploymentOperation,
 } from '@/lib/workflows/persistence/deployment-operations'
 import { createSchedulesForDeploy, deleteSchedulesForWorkflow } from '@/lib/workflows/schedules'
@@ -64,6 +67,14 @@ export const WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS = {
 
 export const DEPLOYMENT_READINESS_COMPONENTS = ['webhooks', 'schedules', 'mcp'] as const
 
+/**
+ * One inline attempt at deploy time plus three exponential-backoff retries.
+ * Checkpoints make retries resumable, so a persistently failing preparation
+ * reaches its terminal failed state within roughly half a minute instead of
+ * burning a long retry tail while the UI shows retrying.
+ */
+const DEPLOYMENT_PREPARATION_MAX_ATTEMPTS = 4
+
 interface DeploymentPreparationCheckpoints {
   webhooksPrepared?: boolean
   schedulesPrepared?: boolean
@@ -134,7 +145,7 @@ export async function enqueueWorkflowDeploymentPreparation(
   payload: PrepareDeploymentV2Payload
 ): Promise<string> {
   return enqueueOutboxEvent(executor, WORKFLOW_DEPLOYMENT_OUTBOX_EVENTS.PREPARE_V2, payload, {
-    maxAttempts: 10,
+    maxAttempts: DEPLOYMENT_PREPARATION_MAX_ATTEMPTS,
   })
 }
 
@@ -219,7 +230,9 @@ const defaultPrepareDeploymentWebhooks: PrepareDeploymentWebhooksHook = async (i
     if (status >= 400 && status < 500) {
       throw new NonRetryableDeploymentError(
         message,
-        status === 409 ? 'webhook_path_conflict' : 'invalid_trigger_configuration'
+        status === 409
+          ? DEPLOYMENT_ERROR_CODES.webhookPathConflict
+          : DEPLOYMENT_ERROR_CODES.invalidTriggerConfiguration
       )
     }
     throw new Error(message)
@@ -256,6 +269,28 @@ function createPrepareDeploymentHandler(
           })
           return
         }
+        throw error
+      }
+
+      try {
+        /**
+         * Transient failure with retries remaining: surface the live error on
+         * the in-flight operation so status consumers show "retrying" instead
+         * of a blank pending state. Best-effort — the outbox retry is the
+         * durable mechanism, not this record.
+         */
+        await recordDeploymentOperationRetry({
+          workflowId: payload.workflowId,
+          operationId: payload.operationId,
+          generation: payload.generation,
+          error,
+        })
+      } catch (recordError) {
+        logger.warn('Failed to record deployment retry state', {
+          workflowId: payload.workflowId,
+          operationId: payload.operationId,
+          error: toError(recordError).message,
+        })
       }
       throw error
     }
diff --git a/apps/sim/lib/workflows/orchestration/deploy.ts b/apps/sim/lib/workflows/orchestration/deploy.ts
index 16179218d05..0b0d77e9fc6 100644
--- a/apps/sim/lib/workflows/orchestration/deploy.ts
+++ b/apps/sim/lib/workflows/orchestration/deploy.ts
@@ -12,9 +12,11 @@ import { getSocketServerUrl } from '@/lib/core/utils/urls'
 import { captureServerEvent } from '@/lib/posthog/server'
 import { validateTriggerWebhookConfigForDeploy } from '@/lib/webhooks/deploy'
 import {
+  DEPLOYMENT_ERROR_CODES,
   type DeploymentComponentStatus,
   isDeploymentOperationAction,
   isDeploymentOperationStatus,
+  isNonRetryableDeploymentErrorCode,
   parseDeploymentReadiness,
 } from '@/lib/workflows/deployment-lifecycle'
 import {
@@ -225,9 +227,9 @@ function buildInlinePreparationFailure(
     success: false,
     error: latest.errorMessage || 'Deployment preparation failed',
     errorCode:
-      latest.errorCode === 'webhook_path_conflict'
+      latest.errorCode === DEPLOYMENT_ERROR_CODES.webhookPathConflict
         ? 'conflict'
-        : latest.errorCode === 'invalid_trigger_configuration'
+        : latest.errorCode === DEPLOYMENT_ERROR_CODES.invalidTriggerConfiguration
           ? 'validation'
           : 'internal',
   }
@@ -375,7 +377,7 @@ function summarizeDeploymentOperation(
         ? {
             code: operation.errorCode,
             message: operation.errorMessage,
-            retryable: false,
+            retryable: !isNonRetryableDeploymentErrorCode(operation.errorCode),
           }
         : null,
   }
diff --git a/apps/sim/lib/workflows/persistence/deployment-operations.ts b/apps/sim/lib/workflows/persistence/deployment-operations.ts
index be2161ee6c9..19a4790c913 100644
--- a/apps/sim/lib/workflows/persistence/deployment-operations.ts
+++ b/apps/sim/lib/workflows/persistence/deployment-operations.ts
@@ -345,6 +345,8 @@ export async function beginDeploymentOperationActivation(
       .update(workflowDeploymentOperation)
       .set({
         status: 'activating',
+        errorCode: null,
+        errorMessage: null,
         updatedAt: now,
       })
       .where(
@@ -361,6 +363,8 @@ export async function beginDeploymentOperationActivation(
       operation: {
         ...operation.operation,
         status: 'activating',
+        errorCode: null,
+        errorMessage: null,
         updatedAt: now,
       },
     }
@@ -399,6 +403,8 @@ export async function markDeploymentComponentReadiness(
         ${JSON.stringify(nextState)}::jsonb,
         false
       )`,
+      errorCode: null,
+      errorMessage: null,
       updatedAt: now,
     })
     .where(
@@ -597,6 +603,34 @@ export async function markDeploymentOperationFailed(
   return markDeploymentOperationTerminal(params, 'failed', safeError)
 }
 
+/**
+ * Records a transient attempt failure on an in-flight operation without
+ * changing its lifecycle status, so status surfaces can show "retrying" with
+ * the live error instead of a blank pending state. Cleared again the moment a
+ * later attempt makes progress (component readiness or activation).
+ */
+export async function recordDeploymentOperationRetry(
+  params: DeploymentOperationGeneration & { error: unknown }
+): Promise<void> {
+  const safeError = toSafeDeploymentError(params.error, 'preparation_retrying')
+  const now = new Date()
+  await db
+    .update(workflowDeploymentOperation)
+    .set({
+      errorCode: safeError.code,
+      errorMessage: safeError.message,
+      updatedAt: now,
+    })
+    .where(
+      and(
+        eq(workflowDeploymentOperation.id, params.operationId),
+        eq(workflowDeploymentOperation.workflowId, params.workflowId),
+        eq(workflowDeploymentOperation.generation, params.generation),
+        inArray(workflowDeploymentOperation.status, IN_FLIGHT_STATUSES)
+      )
+    )
+}
+
 /**
  * Supersedes every in-flight operation for a workflow. Must run inside the
  * undeploy/archive transaction so a queued preparation cannot activate a
diff --git a/apps/sim/lib/workflows/persistence/utils.ts b/apps/sim/lib/workflows/persistence/utils.ts
index 37ecd73016e..1de604a8d80 100644
--- a/apps/sim/lib/workflows/persistence/utils.ts
+++ b/apps/sim/lib/workflows/persistence/utils.ts
@@ -18,7 +18,7 @@ import { saveWorkflowToNormalizedTables as saveWorkflowToNormalizedTablesRaw } f
 import type { DbOrTx, NormalizedWorkflowData } from '@sim/workflow-persistence/types'
 import type { BlockState, Loop, Parallel, WorkflowState } from '@sim/workflow-types/workflow'
 import type { InferSelectModel } from 'drizzle-orm'
-import { and, desc, eq, inArray, isNotNull, lt, sql } from 'drizzle-orm'
+import { and, desc, eq, inArray, lt, sql } from 'drizzle-orm'
 import { LRUCache } from 'lru-cache'
 import type { Edge } from 'reactflow'
 import { releaseWebhookPathClaims } from '@/lib/webhooks/path-claims'
@@ -942,7 +942,7 @@ export async function listWorkflowVersions(workflowId: string): Promise<{
 }> {
   const { user } = await import('@sim/db')
 
-  const [rows, operations] = await Promise.all([
+  const [rows, [currentOperation]] = await Promise.all([
     db
       .select({
         id: workflowDeploymentVersion.id,
@@ -958,38 +958,31 @@ export async function listWorkflowVersions(workflowId: string): Promise<{
       .leftJoin(user, eq(workflowDeploymentVersion.createdBy, user.id))
       .where(eq(workflowDeploymentVersion.workflowId, workflowId))
       .orderBy(desc(workflowDeploymentVersion.version)),
+    /**
+     * Only the workflow's current (latest-generation) operation carries a
+     * status marker: a failed or in-flight attempt is live information until
+     * the next deploy action supersedes it, at which point it is history and
+     * the marker clears rather than sticking to old versions forever.
+     */
     db
-      .selectDistinctOn([workflowDeploymentOperation.deploymentVersionId], {
+      .select({
         deploymentVersionId: workflowDeploymentOperation.deploymentVersionId,
         status: workflowDeploymentOperation.status,
       })
       .from(workflowDeploymentOperation)
-      .where(
-        and(
-          eq(workflowDeploymentOperation.workflowId, workflowId),
-          isNotNull(workflowDeploymentOperation.deploymentVersionId)
-        )
-      )
-      .orderBy(
-        workflowDeploymentOperation.deploymentVersionId,
-        desc(workflowDeploymentOperation.generation)
-      ),
+      .where(eq(workflowDeploymentOperation.workflowId, workflowId))
+      .orderBy(desc(workflowDeploymentOperation.generation))
+      .limit(1),
   ])
-  const latestStatusByVersion = new Map<string, string>()
-  for (const operation of operations) {
-    if (
-      operation.deploymentVersionId &&
-      !latestStatusByVersion.has(operation.deploymentVersionId)
-    ) {
-      latestStatusByVersion.set(operation.deploymentVersionId, operation.status)
-    }
-  }
 
   return {
     versions: rows.map((row) => ({
       ...row,
       deployedByName: row.deployedByName ?? (row.createdBy === 'admin-api' ? 'Admin' : null),
-      latestOperationStatus: latestStatusByVersion.get(row.id) ?? null,
+      latestOperationStatus:
+        currentOperation && currentOperation.deploymentVersionId === row.id
+          ? currentOperation.status
+          : null,
     })),
   }
 }
diff --git a/packages/testing/src/mocks/workflows-orchestration.mock.ts b/packages/testing/src/mocks/workflows-orchestration.mock.ts
index f2bc234a48d..2290d8f4523 100644
--- a/packages/testing/src/mocks/workflows-orchestration.mock.ts
+++ b/packages/testing/src/mocks/workflows-orchestration.mock.ts
@@ -18,6 +18,7 @@ export const workflowsOrchestrationMockFns = {
   mockPerformChatDeploy: vi.fn(),
   mockPerformChatUndeploy: vi.fn(),
   mockNotifySocketDeploymentChanged: vi.fn(),
+  mockGetWorkflowDeploymentSummary: vi.fn(),
   mockPerformActivateVersion: vi.fn(),
   mockPerformFullDeploy: vi.fn(),
   mockPerformFullUndeploy: vi.fn(),
@@ -42,6 +43,7 @@ export const workflowsOrchestrationMock = {
   performChatDeploy: workflowsOrchestrationMockFns.mockPerformChatDeploy,
   performChatUndeploy: workflowsOrchestrationMockFns.mockPerformChatUndeploy,
   notifySocketDeploymentChanged: workflowsOrchestrationMockFns.mockNotifySocketDeploymentChanged,
+  getWorkflowDeploymentSummary: workflowsOrchestrationMockFns.mockGetWorkflowDeploymentSummary,
   performActivateVersion: workflowsOrchestrationMockFns.mockPerformActivateVersion,
   performFullDeploy: workflowsOrchestrationMockFns.mockPerformFullDeploy,
   performFullUndeploy: workflowsOrchestrationMockFns.mockPerformFullUndeploy,

From 233b307035244a078525937d92bf2acf8c50b3cc Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Tue, 14 Jul 2026 17:21:58 -0700
Subject: [PATCH 3/6] remove test file

---
 ...space-storage-accounting-migration.test.ts | 73 -------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 packages/db/workspace-storage-accounting-migration.test.ts

diff --git a/packages/db/workspace-storage-accounting-migration.test.ts b/packages/db/workspace-storage-accounting-migration.test.ts
deleted file mode 100644
index 2b86c008d9d..00000000000
--- a/packages/db/workspace-storage-accounting-migration.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @vitest-environment node
- */
-import { readFileSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
-
-const migration = readFileSync(
-  new URL('./migrations/0260_unknown_sinister_six.sql', import.meta.url),
-  'utf8'
-)
-
-function splitStatements(sql: string): string[] {
-  return sql
-    .split('--> statement-breakpoint')
-    .map((statement) => statement.replace(/^\s*--.*$/gm, '').trim())
-    .filter(Boolean)
-}
-
-describe('workspace storage accounting migration', () => {
-  it('keeps every statement idempotent so an interrupted run replays from the top', () => {
-    expect(splitStatements(migration)).toEqual([
-      'ALTER TABLE "paused_executions" ADD COLUMN IF NOT EXISTS "automatic_resume_retry_count" integer DEFAULT 0 NOT NULL;',
-      'ALTER TABLE "workspace" ADD COLUMN IF NOT EXISTS "storage_used_bytes" bigint DEFAULT 0 NOT NULL;',
-      'ALTER TABLE "workspace" ADD COLUMN IF NOT EXISTS "organization_assigned_at" timestamp;',
-      'ALTER TABLE "workspace" DROP CONSTRAINT IF EXISTS "workspace_storage_used_bytes_non_negative";',
-      'ALTER TABLE "workspace" ADD CONSTRAINT "workspace_storage_used_bytes_non_negative" CHECK ("workspace"."storage_used_bytes" >= 0) NOT VALID;',
-      'COMMIT;',
-      'SET lock_timeout = 0;',
-      'DROP INDEX CONCURRENTLY IF EXISTS "copilot_messages_user_created_at_idx";',
-      `CREATE INDEX CONCURRENTLY IF NOT EXISTS "copilot_messages_user_created_at_idx" ON "copilot_messages" USING btree ("created_at","chat_id","message_id") WHERE "copilot_messages"."role" = 'user' AND "copilot_messages"."deleted_at" IS NULL;`,
-      'DROP INDEX CONCURRENTLY IF EXISTS "outbox_event_type_created_idx";',
-      'CREATE INDEX CONCURRENTLY IF NOT EXISTS "outbox_event_type_created_idx" ON "outbox_event" USING btree ("event_type","created_at");',
-      'DROP INDEX CONCURRENTLY IF EXISTS "workflow_execution_logs_completed_ended_at_idx";',
-      `CREATE INDEX CONCURRENTLY IF NOT EXISTS "workflow_execution_logs_completed_ended_at_idx" ON "workflow_execution_logs" USING btree ("ended_at","workspace_id","execution_id") WHERE "workflow_execution_logs"."status" = 'completed' AND "workflow_execution_logs"."level" = 'info' AND "workflow_execution_logs"."ended_at" IS NOT NULL;`,
-      `SET lock_timeout = '5s';`,
-    ])
-  })
-
-  it('adds the storage ledger column with a validated-later non-negative guard', () => {
-    expect(migration).toContain(
-      'ADD COLUMN IF NOT EXISTS "storage_used_bytes" bigint DEFAULT 0 NOT NULL'
-    )
-    expect(migration).toContain('CHECK ("workspace"."storage_used_bytes" >= 0) NOT VALID')
-    expect(migration).not.toContain('CREATE TABLE "workspace_storage_usage"')
-  })
-
-  it('commits transactional DDL before every concurrent index build', () => {
-    const statements = splitStatements(migration)
-    const commitIndex = statements.indexOf('COMMIT;')
-    expect(commitIndex).toBeGreaterThan(-1)
-    for (const [index, statement] of statements.entries()) {
-      if (statement.includes('CONCURRENTLY')) {
-        expect(index).toBeGreaterThan(commitIndex)
-      }
-    }
-    expect(migration).not.toMatch(/(?<!CONCURRENTLY IF NOT EXISTS )CREATE INDEX (?!CONCURRENTLY)/)
-  })
-
-  it('does not install payer-transfer or delete triggers', () => {
-    expect(migration).not.toContain('CREATE TRIGGER')
-    expect(migration).not.toContain('RETURNS trigger')
-    expect(migration).not.toContain('transfer_workspace_storage_on_payer_change')
-    expect(migration).not.toContain('subtract_workspace_storage_on_delete')
-  })
-
-  it('journals the consolidated migration as the latest entry', () => {
-    const journal = JSON.parse(
-      readFileSync(new URL('./migrations/meta/_journal.json', import.meta.url), 'utf8')
-    ) as { entries: Array<{ idx: number; tag: string }> }
-    const lastEntry = journal.entries[journal.entries.length - 1]
-    expect(lastEntry).toMatchObject({ idx: 260, tag: '0260_unknown_sinister_six' })
-  })
-})

From bcc53f3a080085a698b2a9d1908272e6336951bf Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Tue, 14 Jul 2026 18:10:30 -0700
Subject: [PATCH 4/6] fix tests

---
 .../app/api/workflows/[id]/deploy/route.ts    |  9 ++++++++-
 .../components/deploy-modal/deploy-modal.tsx  | 12 ++++++++++-
 .../async-preprocessing-correlation.test.ts   |  1 +
 apps/sim/background/webhook-execution.test.ts |  9 +++++----
 apps/sim/background/webhook-execution.ts      | 20 ++++++++++++++++++-
 5 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/apps/sim/app/api/workflows/[id]/deploy/route.ts b/apps/sim/app/api/workflows/[id]/deploy/route.ts
index 517fe693cfe..4c7e1027161 100644
--- a/apps/sim/app/api/workflows/[id]/deploy/route.ts
+++ b/apps/sim/app/api/workflows/[id]/deploy/route.ts
@@ -48,8 +48,15 @@ export const GET = withRouteHandler(
         return createErrorResponse(error.message, error.status)
       }
 
+      /**
+       * A workflow is deployed only when an active version snapshot exists —
+       * the same definition POST and the v1 routes use. The legacy
+       * `workflow.isDeployed` flag is deliberately not consulted: when it
+       * disagrees with the version table the workflow cannot actually serve
+       * traffic, so reporting it as live would be untruthful.
+       */
       const deploymentSummary = await getWorkflowDeploymentSummary(id)
-      const isDeployed = deploymentSummary.activeDeployment !== null || workflowData.isDeployed
+      const isDeployed = deploymentSummary.activeDeployment !== null
 
       if (!isDeployed) {
         logger.info(`[${requestId}] Workflow is not deployed: ${id}`)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
index db4f96ebb31..115e1d7d59c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
@@ -17,6 +17,7 @@ import {
   ModalTabsList,
   ModalTabsTrigger,
   Tooltip,
+  toast,
 } from '@sim/emcn'
 import { createLogger } from '@sim/logger'
 import { toError } from '@sim/utils/errors'
@@ -357,13 +358,22 @@ export function DeployModal({
     }
 
     try {
-      await undeployMutation.mutateAsync({ workflowId: targetWorkflowId })
+      const result = await undeployMutation.mutateAsync({ workflowId: targetWorkflowId })
       if (!isWorkflowStillActive(targetWorkflowId)) return
       setUndeployTargetWorkflowId(null)
       onOpenChange(false)
+      /**
+       * Partial cleanup warnings (e.g. external subscription teardown left to
+       * background retries) surface as a toast so closing the modal does not
+       * silently swallow them.
+       */
+      if (result.warnings?.length) {
+        toast.warning('Workflow undeployed', { description: result.warnings.join(' ') })
+      }
     } catch (error: unknown) {
       if (!isWorkflowStillActive(targetWorkflowId)) return
       logger.error('Error undeploying workflow:', { error })
+      toast.error('Failed to undeploy workflow', { description: toError(error).message })
     }
   }
 
diff --git a/apps/sim/background/async-preprocessing-correlation.test.ts b/apps/sim/background/async-preprocessing-correlation.test.ts
index e5cf597f7b3..97b9e7900c8 100644
--- a/apps/sim/background/async-preprocessing-correlation.test.ts
+++ b/apps/sim/background/async-preprocessing-correlation.test.ts
@@ -115,6 +115,7 @@ describe('async preprocessing correlation threading', () => {
         status: 'active',
         archivedAt: null,
         lastQueuedAt: new Date('2025-01-01T00:00:00.000Z'),
+        deploymentOperationId: null,
       },
     ])
     mockLoadDeployedWorkflowState.mockResolvedValue({
diff --git a/apps/sim/background/webhook-execution.test.ts b/apps/sim/background/webhook-execution.test.ts
index 29997641303..a075943ea40 100644
--- a/apps/sim/background/webhook-execution.test.ts
+++ b/apps/sim/background/webhook-execution.test.ts
@@ -293,7 +293,7 @@ describe('executeWebhookJob fault vs error handling', () => {
     )
   })
 
-  it('does not start queued webhook work after the workflow is undeployed', async () => {
+  it('acknowledges and skips queued webhook work after the workflow is undeployed', async () => {
     executionPreprocessingMockFns.mockPreprocessExecution.mockResolvedValueOnce({
       success: true,
       actorUserId: 'user-1',
@@ -308,10 +308,11 @@ describe('executeWebhookJob fault vs error handling', () => {
       executionTimeout: { async: 120_000 },
     })
 
-    await expect(executeWebhookJob(payload)).rejects.toThrow(
-      'Workflow workflow-1 is no longer deployed'
-    )
+    const result = await executeWebhookJob(payload)
+
+    expect(result).toMatchObject({ skipped: true, success: false, workflowId: 'workflow-1' })
     expect(mockExecuteWorkflowCore).not.toHaveBeenCalled()
+    expect(mockReleaseExecutionSlot).toHaveBeenCalled()
   })
 
   it('releases the reservation when idempotency returns a cached result', async () => {
diff --git a/apps/sim/background/webhook-execution.ts b/apps/sim/background/webhook-execution.ts
index 11e06c38e6c..2ffb0dcaab8 100644
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -413,7 +413,25 @@ async function executeWebhookJobInternal(
     throw new Error(`Workflow ${payload.workflowId} not found during preprocessing`)
   }
   if (!workflowRecord.isDeployed || workflowRecord.archivedAt) {
-    throw new Error(`Workflow ${payload.workflowId} is no longer deployed`)
+    /**
+     * A queued delivery racing an undeploy/archive is an expected terminal
+     * condition, not a job fault: acknowledge and skip so workers do not
+     * record a failed job (or burn retries) for work that must never run.
+     */
+    logger.info(`[${requestId}] Skipping webhook execution for undeployed workflow`, {
+      workflowId: payload.workflowId,
+      archived: Boolean(workflowRecord.archivedAt),
+    })
+    await releaseExecutionSlot(executionId)
+    return {
+      success: false,
+      skipped: true,
+      workflowId: payload.workflowId,
+      executionId,
+      output: {},
+      executedAt: new Date().toISOString(),
+      provider: payload.provider,
+    }
   }
 
   const workspaceId = workflowRecord.workspaceId

From 341b7e3d6e739bfc5cc26deb4bcb5b697983159b Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Tue, 14 Jul 2026 20:11:17 -0700
Subject: [PATCH 5/6] address comments

---
 apps/sim/app/api/chat/manage/[id]/route.test.ts |  6 +++++-
 apps/sim/app/api/chat/manage/[id]/route.ts      | 13 +++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/apps/sim/app/api/chat/manage/[id]/route.test.ts b/apps/sim/app/api/chat/manage/[id]/route.test.ts
index 38b24348167..b564490200f 100644
--- a/apps/sim/app/api/chat/manage/[id]/route.test.ts
+++ b/apps/sim/app/api/chat/manage/[id]/route.test.ts
@@ -72,7 +72,11 @@ describe('Chat Edit API Route', () => {
     })
 
     mockEncryptSecret.mockResolvedValue({ encrypted: 'encrypted-password' })
-    mockPerformFullDeploy.mockResolvedValue({ success: true, version: 1 })
+    mockPerformFullDeploy.mockResolvedValue({
+      success: true,
+      version: 1,
+      latestDeploymentAttempt: { status: 'active' },
+    })
     mockNotifySocketDeploymentChanged.mockResolvedValue(undefined)
   })
 
diff --git a/apps/sim/app/api/chat/manage/[id]/route.ts b/apps/sim/app/api/chat/manage/[id]/route.ts
index 3dffe9ccb37..e505ef84e4f 100644
--- a/apps/sim/app/api/chat/manage/[id]/route.ts
+++ b/apps/sim/app/api/chat/manage/[id]/route.ts
@@ -152,6 +152,19 @@ export const PATCH = withRouteHandler(
               : 500
         return createErrorResponse(deployResult.error || 'Failed to redeploy workflow', status)
       }
+      /**
+       * Deploys settle asynchronously: `success` only admits the attempt. The
+       * chat record must not advance until cutover finished, otherwise a later
+       * preparation failure strands the chat on the previous version with no
+       * error. Mirrors the gate in performChatDeploy.
+       */
+      if (deployResult.latestDeploymentAttempt?.status !== 'active') {
+        return createErrorResponse(
+          deployResult.warnings?.[0] ??
+            'Workflow deployment is still preparing. Retry the chat update after it becomes active.',
+          409
+        )
+      }
       logger.info(
         `Redeployed workflow ${existingChat[0].workflowId} for chat update (v${deployResult.version})`
       )

From 7ffd7814279dd61757ede9eef23f0aeffebe0c50 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Wed, 15 Jul 2026 02:21:34 -0700
Subject: [PATCH 6/6] address comments

---
 .../api/mcp/serve/[serverId]/route.test.ts    | 34 ++++++------
 .../sim/app/api/mcp/serve/[serverId]/route.ts |  9 ++-
 .../workspace-forking/lib/promote/rollback.ts |  7 ++-
 .../tools/handlers/deployment/manage.test.ts  | 15 +++--
 .../tools/handlers/deployment/manage.ts       |  9 ++-
 .../persistence/deployment-operations.test.ts | 55 +++++++++++++++++++
 .../persistence/deployment-operations.ts      | 15 ++++-
 7 files changed, 116 insertions(+), 28 deletions(-)

diff --git a/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts b/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
index 96cea701fcb..a67cb62ba37 100644
--- a/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
+++ b/apps/sim/app/api/mcp/serve/[serverId]/route.test.ts
@@ -251,9 +251,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([
-        { isDeployed: true, workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' },
-      ])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
 
     hybridAuthMockFns.mockCheckHybridAuth.mockResolvedValueOnce({
       success: true,
@@ -309,7 +307,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
 
     hybridAuthMockFns.mockCheckHybridAuth.mockResolvedValueOnce({
       success: true,
@@ -363,7 +361,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     mockGenerateInternalToken.mockResolvedValueOnce('internal-token-owner-1')
     fetchMock.mockResolvedValueOnce(
       new Response(JSON.stringify({ output: { ok: true } }), {
@@ -413,7 +411,9 @@ describe('MCP Serve Route', () => {
           },
         ])
         .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-        .mockResolvedValueOnce([{ isDeployed: true, workspaceId: workflowWorkspaceId }])
+        .mockResolvedValueOnce([
+          { workspaceId: workflowWorkspaceId, deploymentVersionId: 'deployment-1' },
+        ])
 
       const req = new NextRequest('http://localhost:3000/api/mcp/serve/server-1', {
         method: 'POST',
@@ -444,7 +444,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     mockResolveBillingAttribution.mockResolvedValueOnce(
       createBillingAttribution('different-actor', 'ws-1')
     )
@@ -567,7 +567,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockResolvedValueOnce(
       new Response(
         new ReadableStream<Uint8Array>({
@@ -611,7 +611,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockResolvedValueOnce(
       new Response(
         new ReadableStream<Uint8Array>({
@@ -658,9 +658,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([
-        { isDeployed: true, workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' },
-      ])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockResolvedValueOnce(
       new Response(
         JSON.stringify({
@@ -710,7 +708,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockResolvedValueOnce(
       new Response(
         JSON.stringify({
@@ -754,7 +752,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockResolvedValueOnce(new Response('gateway timeout', { status: 408 }))
 
     const req = new NextRequest('http://localhost:3000/api/mcp/serve/server-1', {
@@ -787,7 +785,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockResolvedValueOnce(
       new Response(JSON.stringify({ success: true, output: false }), {
         status: 200,
@@ -824,7 +822,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockResolvedValueOnce(
       new Response(JSON.stringify({ success: true }), {
         status: 200,
@@ -861,7 +859,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     hybridAuthMockFns.mockCheckHybridAuth.mockResolvedValueOnce({
       success: true,
       userId: 'user-1',
@@ -941,7 +939,7 @@ describe('MCP Serve Route', () => {
         },
       ])
       .mockResolvedValueOnce([{ toolName: 'tool_a', workflowId: 'wf-1' }])
-      .mockResolvedValueOnce([{ isDeployed: true, workspaceId: 'ws-1' }])
+      .mockResolvedValueOnce([{ workspaceId: 'ws-1', deploymentVersionId: 'deployment-1' }])
     fetchMock.mockImplementationOnce((_url, init: RequestInit) => {
       const signal = init.signal as AbortSignal
       return new Promise<Response>((_resolve, reject) => {
diff --git a/apps/sim/app/api/mcp/serve/[serverId]/route.ts b/apps/sim/app/api/mcp/serve/[serverId]/route.ts
index 87be50a4a46..e342f35e343 100644
--- a/apps/sim/app/api/mcp/serve/[serverId]/route.ts
+++ b/apps/sim/app/api/mcp/serve/[serverId]/route.ts
@@ -758,7 +758,6 @@ async function handleToolsCall(
 
     const [wf] = await db
       .select({
-        isDeployed: workflow.isDeployed,
         workspaceId: workflow.workspaceId,
         deploymentVersionId: workflowDeploymentVersion.id,
       })
@@ -775,7 +774,13 @@ async function handleToolsCall(
     const abortedAfterWorkflowLookup = callerAbortedJsonRpcResponse(id, abortSignal)
     if (abortedAfterWorkflowLookup) return abortedAfterWorkflowLookup
 
-    if (!wf?.isDeployed) {
+    /**
+     * Deployed means an active version snapshot exists — the legacy
+     * `workflow.isDeployed` flag is not consulted because when the two
+     * disagree the workflow cannot serve traffic anyway. Same definition as
+     * the deploy status GET route.
+     */
+    if (!wf?.deploymentVersionId) {
       return NextResponse.json(
         createError(id, ErrorCode.InternalError, 'Workflow is not deployed'),
         {
diff --git a/apps/sim/ee/workspace-forking/lib/promote/rollback.ts b/apps/sim/ee/workspace-forking/lib/promote/rollback.ts
index 8d1ed317c33..2358b34b6c0 100644
--- a/apps/sim/ee/workspace-forking/lib/promote/rollback.ts
+++ b/apps/sim/ee/workspace-forking/lib/promote/rollback.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import { chat, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, inArray, isNull } from 'drizzle-orm'
+import { generateRequestId } from '@/lib/core/utils/request'
 import {
   enqueueWorkflowUndeploySideEffects,
   processWorkflowDeploymentOutboxEvent,
@@ -62,7 +63,11 @@ type RollbackOp =
  */
 export async function rollbackFork(params: RollbackForkParams): Promise<RollbackForkResult> {
   const { targetWorkspaceId, otherWorkspaceId, userId } = params
-  const requestId = params.requestId ?? 'unknown'
+  /**
+   * The request id seeds reactivation idempotency keys; a generated fallback
+   * keeps distinct rollback invocations from colliding on a shared literal.
+   */
+  const requestId = params.requestId ?? generateRequestId()
 
   const edge = await resolveForkEdge(targetWorkspaceId, otherWorkspaceId)
   if (!edge) {
diff --git a/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts b/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts
index fb26de1154a..66ed0a0d8fc 100644
--- a/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts
+++ b/apps/sim/lib/copilot/tools/handlers/deployment/manage.test.ts
@@ -344,10 +344,17 @@ describe('executeCheckDeploymentStatus', () => {
   })
 
   it('uses the shared redeployment freshness helper for deployed APIs', async () => {
+    getWorkflowDeploymentSummaryMock.mockResolvedValue({
+      activeDeployment: {
+        deploymentVersionId: 'dv-1',
+        version: 1,
+        deployedAt: '2026-05-28T00:00:00.000Z',
+      },
+      latestDeploymentAttempt: null,
+      warnings: [],
+    })
     vi.mocked(db.select)
-      .mockReturnValueOnce(
-        selectChain([{ isDeployed: true, deployedAt: new Date('2026-05-28') }]) as never
-      )
+      .mockReturnValueOnce(selectChain([{ deployedAt: new Date('2026-05-28') }]) as never)
       .mockReturnValueOnce(selectChain([]) as never)
       .mockReturnValueOnce(selectChain([], true) as never)
     checkNeedsRedeploymentMock.mockResolvedValueOnce(true)
@@ -370,7 +377,7 @@ describe('executeCheckDeploymentStatus', () => {
 
   it('does not check redeployment freshness for undeployed APIs', async () => {
     vi.mocked(db.select)
-      .mockReturnValueOnce(selectChain([{ isDeployed: false, deployedAt: null }]) as never)
+      .mockReturnValueOnce(selectChain([{ deployedAt: null }]) as never)
       .mockReturnValueOnce(selectChain([]) as never)
       .mockReturnValueOnce(selectChain([], true) as never)
 
diff --git a/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts b/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
index 3968140d695..e1b35503c59 100644
--- a/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
+++ b/apps/sim/lib/copilot/tools/handlers/deployment/manage.ts
@@ -48,7 +48,7 @@ export async function executeCheckDeploymentStatus(
 
     const [apiDeploy, chatDeploy, deploymentSummary] = await Promise.all([
       db
-        .select({ isDeployed: workflow.isDeployed, deployedAt: workflow.deployedAt })
+        .select({ deployedAt: workflow.deployedAt })
         .from(workflow)
         .where(eq(workflow.id, workflowId))
         .limit(1),
@@ -70,7 +70,12 @@ export async function executeCheckDeploymentStatus(
       getWorkflowDeploymentSummary(workflowId),
     ])
 
-    const isApiDeployed = apiDeploy[0]?.isDeployed || false
+    /**
+     * Deployed means an active version snapshot exists; the legacy
+     * `workflow.isDeployed` flag is not consulted so this can never
+     * contradict the attached `activeDeployment` summary.
+     */
+    const isApiDeployed = deploymentSummary.activeDeployment !== null
     const needsRedeployment = isApiDeployed ? await checkNeedsRedeployment(workflowId) : false
     const apiDetails = {
       isDeployed: isApiDeployed,
diff --git a/apps/sim/lib/workflows/persistence/deployment-operations.test.ts b/apps/sim/lib/workflows/persistence/deployment-operations.test.ts
index e3a5f9a8d25..5692b0e8a4b 100644
--- a/apps/sim/lib/workflows/persistence/deployment-operations.test.ts
+++ b/apps/sim/lib/workflows/persistence/deployment-operations.test.ts
@@ -253,6 +253,61 @@ describe('deployment operation persistence', () => {
     expect(dbChainMockFns.update).not.toHaveBeenCalled()
   })
 
+  it('reuses an in-flight operation for a duplicate request', async () => {
+    const inFlight = operationRow({
+      idempotencyKey: 'deploy-1',
+      requestHash: 'hash-1',
+      status: 'preparing',
+    })
+    dbChainMockFns.for.mockResolvedValueOnce([{ id: WORKFLOW_ID, archivedAt: null }])
+    dbChainMockFns.limit.mockResolvedValueOnce([inFlight])
+
+    const result = await prepareWorkflowDeployment({
+      workflowId: WORKFLOW_ID,
+      actorId: 'user-1',
+      requestHash: 'hash-1',
+      idempotencyKey: 'deploy-1',
+      workflowState: workflowState(),
+    })
+
+    expect(result).toEqual({ success: true, operation: inFlight, reused: true })
+    expect(dbChainMockFns.insert).not.toHaveBeenCalled()
+  })
+
+  it('releases a spent idempotency key and admits a fresh attempt after a failed operation', async () => {
+    const failed = operationRow({
+      id: 'operation-failed',
+      idempotencyKey: 'deploy-1',
+      requestHash: 'hash-1',
+      status: 'failed',
+      generation: 2,
+    })
+    const fresh = operationRow({ id: 'operation-fresh', generation: 3 })
+    mockGenerateId.mockReturnValueOnce('version-fresh').mockReturnValueOnce('operation-fresh')
+    dbChainMockFns.for.mockResolvedValueOnce([{ id: WORKFLOW_ID, archivedAt: null }])
+    dbChainMockFns.limit
+      .mockResolvedValueOnce([failed])
+      .mockResolvedValueOnce([])
+      .mockResolvedValueOnce([{ maxVersion: 2 }])
+      .mockResolvedValueOnce([{ maxGeneration: 2 }])
+    dbChainMockFns.returning.mockResolvedValueOnce([fresh])
+
+    const result = await prepareWorkflowDeployment({
+      workflowId: WORKFLOW_ID,
+      actorId: 'user-1',
+      requestHash: 'hash-1',
+      idempotencyKey: 'deploy-1',
+      workflowState: workflowState(),
+      readinessComponents: ['webhooks'],
+    })
+
+    expect(result).toEqual({ success: true, operation: fresh, reused: false })
+    expect(dbChainMockFns.set).toHaveBeenCalledWith(
+      expect.objectContaining({ idempotencyKey: null })
+    )
+    expect(dbChainMockFns.insert).toHaveBeenCalled()
+  })
+
   it('rejects stale generation callbacks before mutating legacy deployment state', async () => {
     dbChainMockFns.for
       .mockResolvedValueOnce([{ id: WORKFLOW_ID }])
diff --git a/apps/sim/lib/workflows/persistence/deployment-operations.ts b/apps/sim/lib/workflows/persistence/deployment-operations.ts
index 19a4790c913..f2964dfd5e0 100644
--- a/apps/sim/lib/workflows/persistence/deployment-operations.ts
+++ b/apps/sim/lib/workflows/persistence/deployment-operations.ts
@@ -727,7 +727,20 @@ async function prepareOperation(
             error: 'Idempotency key was already used for a different deployment request',
           }
         }
-        return { success: true, operation: existing, reused: true }
+        if (existing.status !== 'failed' && existing.status !== 'superseded') {
+          return { success: true, operation: existing, reused: true }
+        }
+        /**
+         * A terminally failed or superseded attempt releases its idempotency
+         * key: duplicate-submission protection must never pin a retry to a
+         * spent attempt — the caller would get success with no live work
+         * behind it. The key moves to the fresh operation created below so
+         * later duplicates of the same request reuse that one instead.
+         */
+        await tx
+          .update(workflowDeploymentOperation)
+          .set({ idempotencyKey: null, updatedAt: now })
+          .where(eq(workflowDeploymentOperation.id, existing.id))
       }
     }