fix(triggers): v2 schedules match the dispatcher, guard poll backoff, atomic poll auto-disable

The v2 list and block target read schedules with the dispatcher's own
predicate, so a versionless schedule that never fires is not reported; the
legacy row-id route keeps it for the editor. Enabling clears poll backoff
only on polling rows with an object config. An unknown schedule status reads
as active instead of failing the list. markWebhookFailed increments and
auto-disables in one statement, so a concurrent enable is never switched off
by a decision made on the old count. Documents that a disable lasts until the
next deploy or activation, and that workspace keys are not governed by the
webhook capability.

Author: waleedlatif1

apps/docs/content/docs/cli/reference.mdx

@@ -8273,7 +8273,7 @@ sim workflows triggers update <workflowId> <blockId> [options]
 
 | Option | Required | Description |
 | --- | --- | --- |
-| `--enabled <true\|false>` | Yes | Whether the trigger should fire. Accepted values: `true`, `false`. |
+| `--enabled <true\|false>` | Yes | Whether the trigger should fire. A disable lasts until the next deploy or version activation, which re-enables every trigger. Accepted values: `true`, `false`. |
 
 </CommandTable>
 

apps/docs/content/docs/cli/workflows.mdx

@@ -472,7 +472,7 @@ sim workflows triggers update <workflowId> <blockId> [options]
 
 | Option | Required | Description |
 | --- | --- | --- |
-| `--enabled <true\|false>` | Yes | Whether the trigger should fire. Accepted values: `true`, `false`. |
+| `--enabled <true\|false>` | Yes | Whether the trigger should fire. A disable lasts until the next deploy or version activation, which re-enables every trigger. Accepted values: `true`, `false`. |
 
 </CommandTable>
 

apps/docs/openapi-v2-workflows.json

@@ -2669,7 +2669,7 @@
       "patch": {
         "operationId": "updateWorkflowTrigger",
         "summary": "Update workflow trigger",
-        "description": "Enable or disable one trigger of the live deployment without redeploying. Requires workspace write access. Enabling resets `failedCount`, schedules the next run, and clears any polling backoff; a schedule whose cron expression is invalid or has no future runs returns `400`. A permission group that blocks webhook triggers returns `403` when enabling a polling, internal-event, or webhook trigger. Disabling a completed schedule marks it disabled. A block with several live rows switches them together. Requesting the current state changes nothing.\n\nDisabling only stops Sim from accepting the trigger; nothing is removed at the provider. Deliveries to a disabled webhook receive `404`, and some providers disable their subscription after repeated failures, which requires a redeploy to restore.\n\nOAuth scope: `api:write`.",
+        "description": "Enable or disable one trigger of the live deployment without redeploying. Requires workspace write access. Enabling resets `failedCount`, schedules the next run, and clears any polling backoff; a schedule whose cron expression is invalid or has no future runs returns `400`. A permission group that blocks webhook triggers returns `403` when a member it governs enables a polling, internal-event, or webhook trigger; a workspace API key is not governed by permission groups, as with every other capability. Disabling a completed schedule marks it disabled. A block with several live rows switches them together. Requesting the current state changes nothing.\n\nDisabling only stops Sim from accepting the trigger; nothing is removed at the provider. A disable lasts until the next deploy or version activation, which re-enables every trigger, the same way it clears a trigger that disabled itself after repeated failures. Deliveries to a disabled webhook receive `404`, and some providers disable their subscription after repeated failures, which requires a redeploy to restore.\n\nOAuth scope: `api:write`.",
         "x-sim-operation": "workflows.triggers.set_enabled",
         "x-oauth-scope": "api:write",
         "tags": ["Workflows"],
@@ -13032,7 +13032,7 @@
         "properties": {
           "enabled": {
             "type": "boolean",
-            "description": "Whether the trigger should fire."
+            "description": "Whether the trigger should fire. A disable lasts until the next deploy or version activation, which re-enables every trigger."
           }
         },
         "required": ["enabled"],

apps/sim/lib/api/contracts/v2/openapi/workflows.ts

@@ -949,7 +949,7 @@ const declaredRoutes = [
       applicationOperation: workflowOperations.setTriggerEnabled,
       operationId: 'updateWorkflowTrigger',
       summary: 'Update workflow trigger',
-      description: `Enable or disable one trigger of the live deployment without redeploying. Requires workspace write access. Enabling resets \`failedCount\`, schedules the next run, and clears any polling backoff; a schedule whose cron expression is invalid or has no future runs returns \`400\`. A permission group that blocks webhook triggers returns \`403\` when enabling a polling, internal-event, or webhook trigger. Disabling a completed schedule marks it disabled. A block with several live rows switches them together. Requesting the current state changes nothing.\n\nDisabling only stops Sim from accepting the trigger; nothing is removed at the provider. Deliveries to a disabled webhook receive \`404\`, and some providers disable their subscription after repeated failures, which requires a redeploy to restore.`,
+      description: `Enable or disable one trigger of the live deployment without redeploying. Requires workspace write access. Enabling resets \`failedCount\`, schedules the next run, and clears any polling backoff; a schedule whose cron expression is invalid or has no future runs returns \`400\`. A permission group that blocks webhook triggers returns \`403\` when a member it governs enables a polling, internal-event, or webhook trigger; a workspace API key is not governed by permission groups, as with every other capability. Disabling a completed schedule marks it disabled. A block with several live rows switches them together. Requesting the current state changes nothing.\n\nDisabling only stops Sim from accepting the trigger; nothing is removed at the provider. A disable lasts until the next deploy or version activation, which re-enables every trigger, the same way it clears a trigger that disabled itself after repeated failures. Deliveries to a disabled webhook receive \`404\`, and some providers disable their subscription after repeated failures, which requires a redeploy to restore.`,
       errors: [...RESOURCE_MUTATION_ERRORS, 'PayloadTooLarge'],
       success: jsonSuccess('The trigger after the update.'),
     }),

apps/sim/lib/api/contracts/v2/workflows.ts

@@ -1395,7 +1395,9 @@ const v2UpdateWorkflowTriggerBodySchema = z
   .object({
     enabled: z
       .boolean({ error: 'enabled must be a boolean' })
-      .describe('Whether the trigger should fire.'),
+      .describe(
+        'Whether the trigger should fire. A disable lasts until the next deploy or version activation, which re-enables every trigger.'
+      ),
   })
   .strict()
   .meta({

apps/sim/lib/api/mcp/generated/v2-operations.ts

@@ -2990,7 +2990,7 @@ export const V2_MCP_OPERATIONS = {
     contract: v2UpdateWorkflowTriggerContract,
     summary: 'Update workflow trigger',
     description:
-      'Enable or disable one trigger of the live deployment without redeploying. Requires workspace write access. Enabling resets `failedCount`, schedules the next run, and clears any polling backoff; a schedule with no future runs returns `409` and an invalid cron expression returns `400`. A permission group that blocks webhook triggers returns `403` when enabling a polling, internal-event, or webhook trigger. Requesting the current state changes nothing.\n\nDisabling only stops Sim from accepting the trigger; nothing is removed at the provider. Deliveries to a disabled webhook receive `404`, and some providers disable their subscription after repeated failures, which requires a redeploy to restore.\n\nOAuth scope: `api:write`.',
+      'Enable or disable one trigger of the live deployment without redeploying. Requires workspace write access. Enabling resets `failedCount`, schedules the next run, and clears any polling backoff; a schedule whose cron expression is invalid or has no future runs returns `400`. A permission group that blocks webhook triggers returns `403` when a member it governs enables a polling, internal-event, or webhook trigger; a workspace API key is not governed by permission groups, as with every other capability. Disabling a completed schedule marks it disabled. A block with several live rows switches them together. Requesting the current state changes nothing.\n\nDisabling only stops Sim from accepting the trigger; nothing is removed at the provider. A disable lasts until the next deploy or version activation, which re-enables every trigger, the same way it clears a trigger that disabled itself after repeated failures. Deliveries to a disabled webhook receive `404`, and some providers disable their subscription after repeated failures, which requires a redeploy to restore.\n\nOAuth scope: `api:write`.',
     handler: () =>
       import('@/app/api/v2/workflows/[workflowId]/triggers/[blockId]/route').then(
         (route) => route.PATCH

apps/sim/lib/webhooks/polling/utils.ts

@@ -145,29 +145,27 @@ export async function recordPollSourceFailure(
   await markWebhookFailed(webhookData.id, logger)
 }
 
-/** Increment the webhook's failure count. Auto-disables after MAX_CONSECUTIVE_FAILURES. */
+/**
+ * Increment the webhook's failure count, auto-disabling it once the count
+ * reaches MAX_CONSECUTIVE_FAILURES. One statement, so an enable that resets the
+ * count concurrently is never followed by a disable decided on the old count.
+ */
 export async function markWebhookFailed(webhookId: string, logger: Logger): Promise<void> {
   try {
-    const result = await db
+    const now = new Date()
+    const reachesLimit = sql`COALESCE(${webhook.failedCount}, 0) + 1 >= ${MAX_CONSECUTIVE_FAILURES}`
+    const [result] = await db
       .update(webhook)
       .set({
         failedCount: sql`COALESCE(${webhook.failedCount}, 0) + 1`,
-        lastFailedAt: new Date(),
-        updatedAt: new Date(),
+        lastFailedAt: now,
+        isActive: sql`CASE WHEN ${reachesLimit} THEN false ELSE ${webhook.isActive} END`,
+        updatedAt: now,
       })
       .where(eq(webhook.id, webhookId))
       .returning({ failedCount: webhook.failedCount })
 
-    const newFailedCount = result[0]?.failedCount || 0
-    if (newFailedCount >= MAX_CONSECUTIVE_FAILURES) {
-      await db
-        .update(webhook)
-        .set({
-          isActive: false,
-          updatedAt: new Date(),
-        })
-        .where(eq(webhook.id, webhookId))
-
+    if ((result?.failedCount ?? 0) >= MAX_CONSECUTIVE_FAILURES) {
       logger.warn(
         `Webhook ${webhookId} auto-disabled after ${MAX_CONSECUTIVE_FAILURES} consecutive failures`
       )

apps/sim/lib/workflows/application/triggers.integration.ts

@@ -17,6 +17,7 @@ import {
   workspace,
 } from '@sim/db/schema'
 import { deleteWorkspaceFixture, insertWorkspaceFixture } from '@sim/db/testing/workspace-fixtures'
+import { createLogger } from '@sim/logger'
 import {
   createSessionPrincipal,
   createWorkspaceApiKeyPrincipal,
@@ -26,6 +27,7 @@ import { getErrorMessage } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
 import { and, eq, inArray } from 'drizzle-orm'
 import { afterAll, beforeAll, expect, it, vi } from 'vitest'
+import { markWebhookFailed } from '@/lib/webhooks/polling/utils'
 import { v2WorkflowErrorPolicies } from '@/lib/workflows/api'
 import {
   listWorkflowTriggers,
@@ -69,6 +71,8 @@ const pollingWebhookId = generateId()
 const eventWebhookId = generateId()
 const twinWebhookIds = [generateId(), generateId()]
 const versionlessWebhookId = generateId()
+const scalarConfigWebhookId = generateId()
+const flakyWebhookId = generateId()
 const hookPath = `trigger-health-${generateId()}`
 
 const writer = createSessionPrincipal({ userId: writerId })
@@ -386,7 +390,25 @@ beforeAll(async () => {
       blockId: 'twin',
       path: `${hookPath}-twin-${index}`,
       failedCount: 100,
+      providerConfig: { pollSourceFailures: 1 },
     })),
+    {
+      ...dormantWebhook,
+      id: scalarConfigWebhookId,
+      blockId: 'scalar',
+      provider: 'gmail',
+      path: `${hookPath}-scalar`,
+      providerConfig: 'legacy-scalar-config',
+    },
+    {
+      ...dormantWebhook,
+      id: flakyWebhookId,
+      blockId: 'flaky',
+      provider: 'gmail',
+      path: `${hookPath}-flaky`,
+      isActive: true,
+      failedCount: 98,
+    },
     {
       ...dormantWebhook,
       id: versionlessWebhookId,
@@ -418,8 +440,10 @@ check('lists only the live deployment’s rows, disabled ones included', async (
     ['badcron', 'schedule', 'disabled'],
     ['done', 'schedule', 'completed'],
     ['evt', 'event', 'active'],
+    ['flaky', 'polling', 'active'],
     ['hook', 'webhook', 'disabled'],
     ['poll', 'polling', 'disabled'],
+    ['scalar', 'polling', 'disabled'],
     ['sched', 'schedule', 'disabled'],
     ['twin', 'webhook', 'disabled'],
     ['twin', 'webhook', 'disabled'],
@@ -509,6 +533,7 @@ check('the write itself refuses a row that is no longer live', async () => {
     enabled: true,
     schedules: [{ id: oldScheduleId, nextRunAt: new Date(Date.now() + 60_000) }],
     webhookIds: [oldWebhookId, candidateWebhookId],
+    scheduleLiveness: 'editor',
     now: new Date(),
   })
   expect(updated).toEqual([])
@@ -517,15 +542,23 @@ check('the write itself refuses a row that is no longer live', async () => {
   expect((await webhookRow(candidateWebhookId)).isActive).toBe(false)
 })
 
-check('a versionless deploy is switchable exactly as delivery serves it', async () => {
+check('a versionless schedule is hidden from v2 but kept for the editor row id', async () => {
   const { triggers } = await listWorkflowTriggers.execute({
     principal: reader,
     input: { workflowId: versionlessWorkflowId },
   })
-  expect(triggers.map((trigger) => [trigger.blockId, trigger.kind])).toEqual([
-    ['hook', 'webhook'],
-    ['sched', 'schedule'],
-  ])
+  expect(triggers.map((trigger) => [trigger.blockId, trigger.kind])).toEqual([['hook', 'webhook']])
+  await expect(
+    setWorkflowTriggerEnabled.execute({
+      principal: writer,
+      input: {
+        target: { kind: 'block', workflowId: versionlessWorkflowId, blockId: 'sched' },
+        enabled: true,
+      },
+    })
+  ).rejects.toMatchObject({ code: 'not_found' })
+  expect((await scheduleRow(versionlessScheduleId)).status).toBe('disabled')
+
   const schedule = await setWorkflowTriggerEnabled.execute({
     principal: writer,
     input: { target: { kind: 'row', table: 'schedule', id: versionlessScheduleId }, enabled: true },
@@ -555,7 +588,11 @@ check('a block switches every live row together; a row id switches only that row
     [...twinWebhookIds].sort()
   )
   for (const id of twinWebhookIds) {
-    expect(await webhookRow(id)).toMatchObject({ isActive: true, failedCount: 0 })
+    expect(await webhookRow(id)).toMatchObject({
+      isActive: true,
+      failedCount: 0,
+      providerConfig: { pollSourceFailures: 1 },
+    })
   }
   await expect.poll(async () => (await auditRows(second)).length).toBe(1)
 })
@@ -644,6 +681,22 @@ check('enabling a poller clears its failures and backoff but keeps its config',
   const row = await webhookRow(pollingWebhookId)
   expect(row).toMatchObject({ isActive: true, failedCount: 0 })
   expect(row.providerConfig).toEqual({ labelIds: ['INBOX'] })
+
+  const scalar = await setBlock('scalar', true)
+  expect(scalar.changes).toHaveLength(1)
+  expect((await webhookRow(scalarConfigWebhookId)).providerConfig).toBe('legacy-scalar-config')
+})
+
+check('a poll failure auto-disables at the threshold in the same write', async () => {
+  const logger = createLogger('TriggerHealthIntegration')
+  await markWebhookFailed(flakyWebhookId, logger)
+  expect(await webhookRow(flakyWebhookId)).toMatchObject({ isActive: true, failedCount: 99 })
+  await markWebhookFailed(flakyWebhookId, logger)
+  expect(await webhookRow(flakyWebhookId)).toMatchObject({ isActive: false, failedCount: 100 })
+
+  await setBlock('flaky', true)
+  await markWebhookFailed(flakyWebhookId, logger)
+  expect(await webhookRow(flakyWebhookId)).toMatchObject({ isActive: true, failedCount: 1 })
 })
 
 check('an unknown block is not found', async () => {

apps/sim/lib/workflows/application/triggers.ts

@@ -21,6 +21,7 @@ import {
   isInRequestedState,
   type LiveWorkflowTriggerRecord,
   listLiveWorkflowTriggers,
+  type ScheduleLiveness,
   setLiveTriggersEnabled,
   toWorkflowTriggerHealth,
   type WorkflowTriggerHealth,
@@ -152,16 +153,18 @@ async function assertWebhookEnableAllowed(
  * Enabling resets the failure counters, re-arms a schedule's next run, and
  * clears a poller's backoff. Disabling only closes Sim's gate: nothing is torn
  * down at the provider. A request for the state the trigger is already in
- * changes nothing and records no audit.
+ * changes nothing and records no audit. A disable lasts until the next deploy
+ * or version activation, which re-registers every trigger enabled, exactly as
+ * it already clears an automatic disable.
  */
 export const setWorkflowTriggerEnabled = defineAuthorizedWorkflowUseCase({
   operation: workflowOperations.setTriggerEnabled,
   resolveContext: resolveTriggerTargetContext,
   async execute({ principal, input, context }): Promise<SetWorkflowTriggerEnabledResult> {
-    let [, current] = await Promise.all([
-      requireMutableWorkflow(context.workflowId),
-      findLiveBlockTriggers(context),
-    ])
+    // A legacy row id keeps the versionless schedules the editor shows; a block target sees only what fires.
+    const scheduleLiveness: ScheduleLiveness = context.row ? 'editor' : 'dispatched'
+    const readLive = () => findLiveBlockTriggers({ ...context, scheduleLiveness })
+    let [, current] = await Promise.all([requireMutableWorkflow(context.workflowId), readLive()])
     if (current.length === 0) throw new OrchestrationError('not_found', context.notFoundMessage)
     const pending = current.filter((record) => !isInRequestedState(record, input.enabled))
     if (pending.length === 0) {
@@ -187,10 +190,11 @@ export const setWorkflowTriggerEnabled = defineAuthorizedWorkflowUseCase({
       enabled: input.enabled,
       schedules,
       webhookIds,
+      scheduleLiveness,
       now: new Date(),
     })
     if (updated.length < pending.length) {
-      current = await findLiveBlockTriggers(context)
+      current = await readLive()
       if (current.length === 0) throw new OrchestrationError('not_found', context.notFoundMessage)
       if (current.some((record) => !isInRequestedState(record, input.enabled))) {
         throw new OrchestrationError('conflict', 'Trigger changed during the update; retry')