fix(zoho-desk): webhook creation, attachment naming, and HTML content handling

Webhook trigger (verified end-to-end against a live Enterprise org):
- Omit ignoreSourceId; Zoho rejects a non-Zoho UUID with INVALID_DATA. Drop
  the generateId() fallback and its providerConfig persistence.
- Answer Zoho's create-time notification-URL probe via the existing pending
  webhook verification mechanism (GET/HEAD matchers) so subscription creation
  no longer 405s.
- mapZohoWebhookError now surfaces Zoho's real errorCode / message / field
  errors instead of a catch-all edition message, and attaches an HTTP status so
  4xx flow through NonRetryableDeploymentError while 429/5xx stay retryable.
- Propagate the real status through deploy.ts so failed creates don't retry-loop.

get_attachment polish:
- Return the downloaded file's name under `name` (ToolFileData key) instead of
  `filename`, and derive it (explicit -> Content-Disposition -> URL segment ->
  fallback) so attachments are no longer stored as "untitled".
- Gate the add_comment-only `contentType` param so it isn't sent to get_attachment.

HTML content handling (Zoho content fields emit raw HTML):
- Add a Zoho-local html-to-text converter mirroring the Outlook dual-field
  pattern: when contentType is 'html', derive a plain-text `contentText`
  alongside the untouched raw `content` + `contentType`; plainText mirrors.
- Apply to comments (list/add), threads (list/get), the ticket description
  (descriptionText), and the webhook trigger payload.

Trigger org selector: Organization is now a credential-scoped combobox that
lists the connected account's Zoho Desk organizations.

Author: mzxchandra

apps/sim/app/api/tools/zoho_desk/attachment/route.ts

@@ -5,7 +5,11 @@ import { zohoDeskGetAttachmentContract } from '@/lib/api/contracts/tools/zoho-de
 import { parseRequest } from '@/lib/api/server'
 import { checkInternalAuth } from '@/lib/auth/hybrid'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { buildZohoDeskHeaders, getZohoDeskApiBase } from '@/tools/zoho_desk/utils'
+import {
+  buildZohoDeskHeaders,
+  deriveAttachmentName,
+  getZohoDeskApiBase,
+} from '@/tools/zoho_desk/utils'
 
 export const dynamic = 'force-dynamic'
 
@@ -98,10 +102,12 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
       )
     }
 
-    const contentDisposition = response.headers.get('content-disposition') || ''
-    const dispositionName = /filename\*?=(?:UTF-8'')?["']?([^"';]+)/i.exec(contentDisposition)?.[1]
-    const filename =
-      fileName || (dispositionName ? decodeURIComponent(dispositionName) : 'attachment')
+    // ToolFileData (consumed by FileToolProcessor) keys the file name as `name`.
+    const name = deriveAttachmentName(
+      fileName,
+      response.headers.get('content-disposition'),
+      downloadUrl.pathname
+    )
     const mimeType = response.headers.get('content-type') || 'application/octet-stream'
 
     return NextResponse.json({
@@ -110,7 +116,7 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
         file: {
           data: Buffer.from(arrayBuffer).toString('base64'),
           mimeType,
-          filename,
+          name,
         },
       },
     })

apps/sim/blocks/blocks/zoho-desk-org-options.ts

@@ -0,0 +1,35 @@
+import { requestJson } from '@/lib/api/client/request'
+import { zohoDeskListOrganizationsContract } from '@/lib/api/contracts/tools/zoho-desk'
+import { fetchOAuthToken } from '@/hooks/selectors/helpers'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+import { useSubBlockStore } from '@/stores/workflows/subblock/store'
+
+/**
+ * Populate a Zoho Desk organization selector from the connected credential.
+ *
+ * Shared by the Zoho Desk block (tool operations, credential in `credential`/
+ * `manualCredential`) and its trigger (credential in `triggerCredentials`). It
+ * lives in its own module so the trigger can reuse it without importing the
+ * block file, which would create a block <-> trigger import cycle.
+ */
+export async function fetchZohoDeskOrganizationOptions(
+  blockId: string
+): Promise<Array<{ label: string; id: string }>> {
+  const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
+  if (!activeWorkflowId) return []
+  const blockValues = useSubBlockStore.getState().workflowValues[activeWorkflowId]?.[blockId]
+  const credentialId =
+    (blockValues?.credential as string) ||
+    (blockValues?.manualCredential as string) ||
+    (blockValues?.triggerCredentials as string)
+  if (!credentialId) return []
+  const bundle = await fetchOAuthToken(credentialId, activeWorkflowId)
+  if (!bundle) return []
+  const data = await requestJson(zohoDeskListOrganizationsContract, {
+    body: { accessToken: bundle.accessToken, apiDomain: bundle.apiDomain ?? null },
+  })
+  return data.organizations.map((org) => ({
+    label: org.companyName ? `${org.companyName} (${org.id})` : org.id,
+    id: org.id,
+  }))
+}

apps/sim/blocks/blocks/zoho-desk.ts

@@ -1,12 +1,8 @@
 import { ZohoDeskIcon } from '@/components/icons'
-import { requestJson } from '@/lib/api/client/request'
-import { zohoDeskListOrganizationsContract } from '@/lib/api/contracts/tools/zoho-desk'
 import { getScopesForService } from '@/lib/oauth/utils'
+import { fetchZohoDeskOrganizationOptions } from '@/blocks/blocks/zoho-desk-org-options'
 import type { BlockConfig, BlockMeta } from '@/blocks/types'
 import { AuthMode, IntegrationType } from '@/blocks/types'
-import { fetchOAuthToken } from '@/hooks/selectors/helpers'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import type { ZohoDeskResponse } from '@/tools/zoho_desk/types'
 import { getTrigger } from '@/triggers'
 
@@ -23,27 +19,6 @@ const OPERATIONS_NEEDING_ORG = [
   'get_attachment',
 ]
 
-/** Populate the organization selector from the connected Zoho Desk credential. */
-async function fetchZohoDeskOrganizationOptions(
-  blockId: string
-): Promise<Array<{ label: string; id: string }>> {
-  const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-  if (!activeWorkflowId) return []
-  const blockValues = useSubBlockStore.getState().workflowValues[activeWorkflowId]?.[blockId]
-  const credentialId =
-    (blockValues?.credential as string) || (blockValues?.manualCredential as string)
-  if (!credentialId) return []
-  const bundle = await fetchOAuthToken(credentialId, activeWorkflowId)
-  if (!bundle) return []
-  const data = await requestJson(zohoDeskListOrganizationsContract, {
-    body: { accessToken: bundle.accessToken, apiDomain: bundle.apiDomain ?? null },
-  })
-  return data.organizations.map((org) => ({
-    label: org.companyName ? `${org.companyName} (${org.id})` : org.id,
-    id: org.id,
-  }))
-}
-
 export const ZohoDeskBlock: BlockConfig<ZohoDeskResponse> = {
   type: 'zoho_desk',
   name: 'Zoho Desk',
@@ -181,14 +156,6 @@ export const ZohoDeskBlock: BlockConfig<ZohoDeskResponse> = {
       defaultValue: false,
       condition: { field: 'operation', value: 'add_comment' },
     },
-    {
-      id: 'ignoreSourceId',
-      title: 'Ignore Source ID',
-      type: 'short-input',
-      mode: 'advanced',
-      placeholder: 'Loop-guard source ID (from a Zoho Desk trigger)',
-      condition: { field: 'operation', value: ['add_comment', 'update_ticket'] },
-    },
     // Update ticket
     {
       id: 'subject',
@@ -346,9 +313,17 @@ export const ZohoDeskBlock: BlockConfig<ZohoDeskResponse> = {
         // Pull raw pagination out of the spread so invalid values never reach the
         // tool; only re-add them when Number() yields a finite value (a non-numeric
         // typo would otherwise become NaN and produce an invalid Zoho query param).
-        const { oauthCredential, from: rawFrom, limit: rawLimit, ...rest } = params
+        const { oauthCredential, from: rawFrom, limit: rawLimit, contentType, ...rest } = params
         const result: Record<string, unknown> = { ...rest, oauthCredential }
 
+        // contentType is the comment's content type; its default would otherwise
+        // serialize for every operation (e.g. get_attachment, which has no such
+        // param). Only forward it for add_comment so the UI can't imply an option
+        // that has no effect elsewhere.
+        if (params.operation === 'add_comment' && typeof contentType === 'string' && contentType) {
+          result.contentType = contentType
+        }
+
         if (rawFrom !== undefined && rawFrom !== '') {
           const from = Number(rawFrom)
           if (Number.isFinite(from)) result.from = from
@@ -381,7 +356,6 @@ export const ZohoDeskBlock: BlockConfig<ZohoDeskResponse> = {
     content: { type: 'string', description: 'Comment content' },
     contentType: { type: 'string', description: 'Comment content type (plainText/html)' },
     isPublic: { type: 'boolean', description: 'Whether a comment is public' },
-    ignoreSourceId: { type: 'string', description: 'Loop-guard source ID for writes' },
     subject: { type: 'string', description: 'Ticket subject' },
     status: { type: 'string', description: 'Ticket status' },
     priority: { type: 'string', description: 'Ticket priority' },

apps/sim/lib/api/contracts/tools/zoho-desk.ts

@@ -42,7 +42,8 @@ export const zohoDeskGetAttachmentBodySchema = z.object({
 const zohoDeskFileSchema = z.object({
   data: z.string(),
   mimeType: z.string(),
-  filename: z.string(),
+  // FileToolProcessor (ToolFileData) reads the file name from `name`.
+  name: z.string(),
 })
 
 export const zohoDeskGetAttachmentResponseSchema = z.object({

apps/sim/lib/webhooks/deploy.ts

@@ -940,7 +940,11 @@ export async function saveTriggerWebhooksForDeploy({
             (cleanupFailure as Error)?.message ||
             (error as Error)?.message ||
             'Failed to create external subscription',
-          status: 500,
+          // Propagate a 4xx from the provider handler (e.g. a permanent Zoho
+          // config/permission/invalid-data failure) so the outbox classifies it
+          // as non-retryable; anything else (network, provider 5xx) stays 500 and
+          // retryable. cleanupFailure never overrides the root cause's status.
+          status: (error as { status?: number })?.status ?? 500,
         },
       }
     }

apps/sim/lib/webhooks/pending-verification.ts

@@ -49,6 +49,10 @@ const pendingWebhookVerificationRegistrationMatchers: Record<
   grain: () => true,
   generic: (registration) => registration.metadata?.verifyTestEvents === true,
   salesforce: () => true,
+  // Zoho Desk validates the notification URL with a create-time probe that must
+  // return 200 before it will register the subscription (chicken-and-egg: the
+  // webhook row is inactive until the create succeeds).
+  zoho_desk: () => true,
 }
 
 const pendingWebhookVerificationProbeMatchers: Record<
@@ -68,6 +72,8 @@ const pendingWebhookVerificationProbeMatchers: Record<
     method === 'GET' ||
     method === 'HEAD' ||
     (method === 'POST' && (!body || Object.keys(body).length === 0)),
+  // Zoho Desk sends a GET reachability probe at subscription-create time.
+  zoho_desk: ({ method }) => method === 'GET' || method === 'HEAD',
 }
 
 function getRedisKey(path: string): string {

apps/sim/lib/webhooks/provider-subscriptions.ts

@@ -37,6 +37,10 @@ const SYSTEM_MANAGED_FIELDS = new Set([
   'setupCompleted',
   'subscriptionExpiration',
   'userId',
+  // Zoho Desk provider-managed: the persisted data-center Desk base, set by
+  // createSubscription (not a user trigger field), so it must not count as a
+  // config change that forces delete/recreate.
+  'apiDomain',
 ])
 
 /**