improvement(deployments): bugfixes for run-block, airtable + external sub management

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
 

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)
   })
 

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) {
@@ -153,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})`
       )

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')

apps/sim/app/api/mcp/serve/[serverId]/route.test.ts

@@ -251,7 +251,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,
@@ -656,7 +658,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({
@@ -689,6 +693,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 () => {

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'
@@ -751,8 +757,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)
@@ -813,6 +830,7 @@ async function handleToolsCall(
       input: params.arguments || {},
       triggerType: 'mcp',
       includeFileBase64: false,
+      ...(wf.deploymentVersionId ? { deploymentVersionId: wf.deploymentVersionId } : {}),
     })
     assertKnownSizeWithinLimit(
       Buffer.byteLength(workflowRequestBody, 'utf-8'),

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(),

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 ?? [],
       },
     })

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 ?? [],
       },
     })

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: [],
     })
   })

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
 // =============================================================================

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,
       }

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(