improvement(forwarding+excel): added forwarding and improve excel read (#1136)

* added forwarding for outlook

* lint

* improved excel sheet read

* addressed greptile

* fixed bodytext getting truncated

* fixed any type

* added html func

---------

Co-authored-by: Adam Gough <[email protected]>

Author: aadamgough

apps/sim/blocks/blocks/outlook.ts

@@ -22,6 +22,7 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
         { label: 'Send Email', id: 'send_outlook' },
         { label: 'Draft Email', id: 'draft_outlook' },
         { label: 'Read Email', id: 'read_outlook' },
+        { label: 'Forward Email', id: 'forward_outlook' },
       ],
       value: () => 'send_outlook',
     },
@@ -51,9 +52,30 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
       type: 'short-input',
       layout: 'full',
       placeholder: 'Recipient email address',
-      condition: { field: 'operation', value: ['send_outlook', 'draft_outlook'] },
+      condition: {
+        field: 'operation',
+        value: ['send_outlook', 'draft_outlook', 'forward_outlook'],
+      },
+      required: true,
+    },
+    {
+      id: 'messageId',
+      title: 'Message ID',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'Message ID to forward',
+      condition: { field: 'operation', value: ['forward_outlook'] },
       required: true,
     },
+    {
+      id: 'comment',
+      title: 'Comment',
+      type: 'long-input',
+      layout: 'full',
+      placeholder: 'Optional comment to include when forwarding',
+      condition: { field: 'operation', value: ['forward_outlook'] },
+      required: false,
+    },
     {
       id: 'subject',
       title: 'Subject',
@@ -157,7 +179,7 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
     },
   ],
   tools: {
-    access: ['outlook_send', 'outlook_draft', 'outlook_read'],
+    access: ['outlook_send', 'outlook_draft', 'outlook_read', 'outlook_forward'],
     config: {
       tool: (params) => {
         switch (params.operation) {
@@ -167,6 +189,8 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
             return 'outlook_read'
           case 'draft_outlook':
             return 'outlook_draft'
+          case 'forward_outlook':
+            return 'outlook_forward'
           default:
             throw new Error(`Invalid Outlook operation: ${params.operation}`)
         }
@@ -197,6 +221,9 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
     to: { type: 'string', description: 'Recipient email address' },
     subject: { type: 'string', description: 'Email subject' },
     body: { type: 'string', description: 'Email content' },
+    // Forward operation inputs
+    messageId: { type: 'string', description: 'Message ID to forward' },
+    comment: { type: 'string', description: 'Optional comment for forwarding' },
     // Read operation inputs
     folder: { type: 'string', description: 'Email folder' },
     manualFolder: { type: 'string', description: 'Manual folder name' },

apps/sim/lib/webhooks/outlook-polling-service.ts

@@ -1,4 +1,5 @@
 import { and, eq } from 'drizzle-orm'
+import { htmlToText } from 'html-to-text'
 import { nanoid } from 'nanoid'
 import { createLogger } from '@/lib/logs/console/logger'
 import { hasProcessedMessage, markMessageAsProcessed } from '@/lib/redis'
@@ -79,6 +80,24 @@ export interface OutlookWebhookPayload {
   rawEmail?: OutlookEmail // Only included when includeRawEmail is true
 }
 
+/**
+ * Convert HTML content to a readable plain-text representation.
+ * Keeps reasonable newlines and decodes common HTML entities.
+ */
+function convertHtmlToPlainText(html: string): string {
+  if (!html) return ''
+  return htmlToText(html, {
+    wordwrap: false,
+    selectors: [
+      { selector: 'a', options: { hideLinkHrefIfSameAsText: true, noAnchorUrl: true } },
+      { selector: 'img', format: 'skip' },
+      { selector: 'script', format: 'skip' },
+      { selector: 'style', format: 'skip' },
+    ],
+    preserveNewlines: true,
+  })
+}
+
 export async function pollOutlookWebhooks() {
   logger.info('Starting Outlook webhook polling')
 
@@ -357,7 +376,18 @@ async function processOutlookEmails(
         to: email.toRecipients?.map((r) => r.emailAddress.address).join(', ') || '',
         cc: email.ccRecipients?.map((r) => r.emailAddress.address).join(', ') || '',
         date: email.receivedDateTime,
-        bodyText: email.bodyPreview || '',
+        bodyText: (() => {
+          const content = email.body?.content || ''
+          const type = (email.body?.contentType || '').toLowerCase()
+          if (!content) {
+            return email.bodyPreview || ''
+          }
+          if (type === 'text' || type === 'text/plain') {
+            return content
+          }
+          // Default to converting HTML or unknown types
+          return convertHtmlToPlainText(content)
+        })(),
         bodyHtml: email.body?.content || '',
         hasAttachments: email.hasAttachments,
         isRead: email.isRead,

apps/sim/package.json

@@ -89,6 +89,7 @@
     "fuse.js": "7.1.0",
     "geist": "1.4.2",
     "groq-sdk": "^0.15.0",
+    "html-to-text": "^9.0.5",
     "input-otp": "^1.4.2",
     "ioredis": "^5.6.0",
     "jose": "6.0.11",
@@ -133,6 +134,7 @@
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
     "@trigger.dev/build": "4.0.0",
+    "@types/html-to-text": "^9.0.4",
     "@types/js-yaml": "4.0.9",
     "@types/jsdom": "21.1.7",
     "@types/lodash": "^4.17.16",

apps/sim/tools/index.ts

@@ -12,6 +12,61 @@ import {
 
 const logger = createLogger('Tools')
 
+// Extract a concise, meaningful error message from diverse API error shapes
+function getDeepApiErrorMessage(errorInfo?: {
+  status?: number
+  statusText?: string
+  data?: any
+}): string {
+  return (
+    // GraphQL errors (Linear API)
+    errorInfo?.data?.errors?.[0]?.message ||
+    // X/Twitter API specific pattern
+    errorInfo?.data?.errors?.[0]?.detail ||
+    // Generic details array
+    errorInfo?.data?.details?.[0]?.message ||
+    // Hunter API pattern
+    errorInfo?.data?.errors?.[0]?.details ||
+    // Direct errors array (when errors[0] is a string or simple object)
+    (Array.isArray(errorInfo?.data?.errors)
+      ? typeof errorInfo.data.errors[0] === 'string'
+        ? errorInfo.data.errors[0]
+        : errorInfo.data.errors[0]?.message
+      : undefined) ||
+    // Notion/Discord/GitHub/Twilio pattern
+    errorInfo?.data?.message ||
+    // SOAP/XML fault patterns
+    errorInfo?.data?.fault?.faultstring ||
+    errorInfo?.data?.faultstring ||
+    // Microsoft/OAuth error descriptions
+    errorInfo?.data?.error_description ||
+    // Airtable/Google fallback pattern
+    (typeof errorInfo?.data?.error === 'object'
+      ? errorInfo?.data?.error?.message || JSON.stringify(errorInfo?.data?.error)
+      : errorInfo?.data?.error) ||
+    // HTTP status text fallback
+    errorInfo?.statusText ||
+    // Final fallback
+    `Request failed with status ${errorInfo?.status || 'unknown'}`
+  )
+}
+
+// Create an Error instance from errorInfo and attach useful context
+function createTransformedErrorFromErrorInfo(errorInfo?: {
+  status?: number
+  statusText?: string
+  data?: any
+}): Error {
+  const message = getDeepApiErrorMessage(errorInfo)
+  const transformed = new Error(message)
+  Object.assign(transformed, {
+    status: errorInfo?.status,
+    statusText: errorInfo?.statusText,
+    data: errorInfo?.data,
+  })
+  return transformed
+}
+
 /**
  * Process file outputs for a tool result if execution context is available
  * Uses dynamic imports to avoid client-side bundling issues
@@ -410,60 +465,54 @@ async function handleInternalRequest(
 
     const response = await fetch(fullUrl, requestOptions)
 
-    // Parse response data once
+    // For non-OK responses, attempt JSON first; if parsing fails, preserve legacy error expected by tests
+    if (!response.ok) {
+      let errorData: any
+      try {
+        errorData = await response.json()
+      } catch (jsonError) {
+        logger.error(`[${requestId}] JSON parse error for ${toolId}:`, {
+          error: jsonError instanceof Error ? jsonError.message : String(jsonError),
+        })
+        throw new Error(`Failed to parse response from ${toolId}: ${jsonError}`)
+      }
+
+      const { isError, errorInfo } = isErrorResponse(response, errorData)
+      if (isError) {
+        const errorToTransform = createTransformedErrorFromErrorInfo(errorInfo)
+
+        logger.error(`[${requestId}] Internal API error for ${toolId}:`, {
+          status: errorInfo?.status,
+          errorData: errorInfo?.data,
+        })
+
+        throw errorToTransform
+      }
+    }
+
+    // Parse response data once with guard for empty 202 bodies
     let responseData
-    try {
-      responseData = await response.json()
-    } catch (jsonError) {
-      logger.error(`[${requestId}] JSON parse error for ${toolId}:`, {
-        error: jsonError instanceof Error ? jsonError.message : String(jsonError),
-      })
-      throw new Error(`Failed to parse response from ${toolId}: ${jsonError}`)
+    const status = response.status
+    if (status === 202) {
+      // Many APIs (e.g., Microsoft Graph) return 202 with empty body
+      responseData = { status }
+    } else {
+      try {
+        responseData = await response.json()
+      } catch (jsonError) {
+        logger.error(`[${requestId}] JSON parse error for ${toolId}:`, {
+          error: jsonError instanceof Error ? jsonError.message : String(jsonError),
+        })
+        throw new Error(`Failed to parse response from ${toolId}: ${jsonError}`)
+      }
     }
 
     // Check for error conditions
     const { isError, errorInfo } = isErrorResponse(response, responseData)
 
     if (isError) {
       // Handle error case
-      const errorToTransform = new Error(
-        // GraphQL errors (Linear API)
-        errorInfo?.data?.errors?.[0]?.message ||
-          // X/Twitter API specific pattern
-          errorInfo?.data?.errors?.[0]?.detail ||
-          // Generic details array
-          errorInfo?.data?.details?.[0]?.message ||
-          // Hunter API pattern
-          errorInfo?.data?.errors?.[0]?.details ||
-          // Direct errors array (when errors[0] is a string or simple object)
-          (Array.isArray(errorInfo?.data?.errors)
-            ? typeof errorInfo.data.errors[0] === 'string'
-              ? errorInfo.data.errors[0]
-              : errorInfo.data.errors[0]?.message
-            : undefined) ||
-          // Notion/Discord/GitHub/Twilio pattern
-          errorInfo?.data?.message ||
-          // SOAP/XML fault patterns
-          errorInfo?.data?.fault?.faultstring ||
-          errorInfo?.data?.faultstring ||
-          // Microsoft/OAuth error descriptions
-          errorInfo?.data?.error_description ||
-          // Airtable/Google fallback pattern
-          (typeof errorInfo?.data?.error === 'object'
-            ? errorInfo?.data?.error?.message || JSON.stringify(errorInfo?.data?.error)
-            : errorInfo?.data?.error) ||
-          // HTTP status text fallback
-          errorInfo?.statusText ||
-          // Final fallback
-          `Request failed with status ${errorInfo?.status || 'unknown'}`
-      )
-
-      // Add error context
-      Object.assign(errorToTransform, {
-        status: errorInfo?.status,
-        statusText: errorInfo?.statusText,
-        data: errorInfo?.data,
-      })
+      const errorToTransform = createTransformedErrorFromErrorInfo(errorInfo)
 
       logger.error(`[${requestId}] Internal API error for ${toolId}:`, {
         status: errorInfo?.status,

apps/sim/tools/microsoft_excel/read.ts

@@ -35,7 +35,8 @@ export const readTool: ToolConfig<MicrosoftExcelToolParams, MicrosoftExcelReadRe
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
-      description: 'The range of cells to read from',
+      description:
+        'The range of cells to read from. Accepts "SheetName!A1:B2" for explicit ranges or just "SheetName" to read the used range of that sheet. If omitted, reads the used range of the first sheet.',
     },
   },
 
@@ -53,10 +54,19 @@ export const readTool: ToolConfig<MicrosoftExcelToolParams, MicrosoftExcelReadRe
       }
 
       const rangeInput = params.range.trim()
+
+      // If the input contains no '!', treat it as a sheet name only and fetch usedRange
+      if (!rangeInput.includes('!')) {
+        const sheetOnly = encodeURIComponent(rangeInput)
+        return `https://graph.microsoft.com/v1.0/me/drive/items/${spreadsheetId}/workbook/worksheets('${sheetOnly}')/usedRange(valuesOnly=true)`
+      }
+
       const match = rangeInput.match(/^([^!]+)!(.+)$/)
 
       if (!match) {
-        throw new Error(`Invalid range format: "${params.range}". Use the format "Sheet1!A1:B2"`)
+        throw new Error(
+          `Invalid range format: "${params.range}". Use "Sheet1!A1:B2" or just "Sheet1" to read the whole sheet`
+        )
       }
 
       const sheetName = encodeURIComponent(match[1])
@@ -104,7 +114,7 @@ export const readTool: ToolConfig<MicrosoftExcelToolParams, MicrosoftExcelReadRe
       if (!rangeResp.ok) {
         // Normalize Microsoft Graph sheet/range errors to a friendly message
         throw new Error(
-          'Invalid range provided or worksheet not found. Provide a range like "Sheet1!A1:B2"'
+          'Invalid range provided or worksheet not found. Provide a range like "Sheet1!A1:B2" or just the sheet name to read the whole sheet'
         )
       }