fix(hubspot): address review comments - schema mismatch, pagination, trim, descriptions

- Switch marketing event outputs to CRM envelope structure (id, properties, createdAt, updatedAt, archived) matching CRM Objects API
- Fix list_lists pagination: add offset param, map offset-based response to paging structure
- Add .trim() to contactId/companyId in pre-existing get/update tools
- Fix default limit descriptions (100 → 10) in list_contacts/list_companies
- Fix operator examples (CONTAINS → CONTAINS_TOKEN) in search_contacts/search_companies
- Remove unused params arg in get_users transformResponse

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: waleedlatif1

apps/sim/blocks/blocks/hubspot.ts

@@ -495,7 +495,13 @@ Return ONLY the JSON object with properties - no explanations, no markdown, no e
       placeholder: 'Search term (e.g., company name, contact email)',
       condition: {
         field: 'operation',
-        value: ['search_contacts', 'search_companies', 'search_deals', 'search_tickets', 'get_lists'],
+        value: [
+          'search_contacts',
+          'search_companies',
+          'search_deals',
+          'search_tickets',
+          'get_lists',
+        ],
       },
     },
     {
@@ -1077,9 +1083,7 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
           case 'get_quotes':
             return params.quoteId ? 'hubspot_get_quote' : 'hubspot_list_quotes'
           case 'get_appointments':
-            return params.appointmentId
-              ? 'hubspot_get_appointment'
-              : 'hubspot_list_appointments'
+            return params.appointmentId ? 'hubspot_get_appointment' : 'hubspot_list_appointments'
           case 'create_appointment':
             return 'hubspot_create_appointment'
           case 'update_appointment':
@@ -1089,9 +1093,7 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
           case 'list_owners':
             return 'hubspot_list_owners'
           case 'get_marketing_events':
-            return params.eventId
-              ? 'hubspot_get_marketing_event'
-              : 'hubspot_list_marketing_events'
+            return params.eventId ? 'hubspot_get_marketing_event' : 'hubspot_list_marketing_events'
           case 'get_lists':
             return params.listId ? 'hubspot_get_list' : 'hubspot_list_lists'
           case 'create_list':
@@ -1150,12 +1152,7 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
           cleanParams.properties = properties
         }
 
-        const searchOps = [
-          'search_contacts',
-          'search_companies',
-          'search_deals',
-          'search_tickets',
-        ]
+        const searchOps = ['search_contacts', 'search_companies', 'search_deals', 'search_tickets']
         if (searchProperties && searchOps.includes(operation as string)) {
           cleanParams.properties = searchProperties
         }
@@ -1185,9 +1182,15 @@ Return ONLY the JSON array of property names - no explanations, no markdown, no
           cleanParams.name = listName
         }
 
-        if (operation === 'get_lists' && rest.limit) {
-          cleanParams.count = rest.limit
-          delete rest.limit
+        if (operation === 'get_lists') {
+          if (rest.limit) {
+            cleanParams.count = rest.limit
+            rest.limit = undefined
+          }
+          if (rest.after) {
+            cleanParams.offset = rest.after
+            rest.after = undefined
+          }
         }
 
         const excludeKeys = [

apps/sim/tools/hubspot/get_company.ts

@@ -55,7 +55,7 @@ export const hubspotGetCompanyTool: ToolConfig<HubSpotGetCompanyParams, HubSpotG
 
     request: {
       url: (params) => {
-        const baseUrl = `https://api.hubapi.com/crm/v3/objects/companies/${params.companyId}`
+        const baseUrl = `https://api.hubapi.com/crm/v3/objects/companies/${params.companyId.trim()}`
         const queryParams = new URLSearchParams()
 
         if (params.idProperty) {

apps/sim/tools/hubspot/get_contact.ts

@@ -55,7 +55,7 @@ export const hubspotGetContactTool: ToolConfig<HubSpotGetContactParams, HubSpotG
 
     request: {
       url: (params) => {
-        const baseUrl = `https://api.hubapi.com/crm/v3/objects/contacts/${params.contactId}`
+        const baseUrl = `https://api.hubapi.com/crm/v3/objects/contacts/${params.contactId.trim()}`
         const queryParams = new URLSearchParams()
 
         if (params.idProperty) {

apps/sim/tools/hubspot/get_marketing_event.ts

@@ -3,7 +3,7 @@ import type {
   HubSpotGetMarketingEventParams,
   HubSpotGetMarketingEventResponse,
 } from '@/tools/hubspot/types'
-import { MARKETING_EVENT_OUTPUT_PROPERTIES } from '@/tools/hubspot/types'
+import { MARKETING_EVENT_OBJECT_OUTPUT } from '@/tools/hubspot/types'
 import type { ToolConfig } from '@/tools/types'
 
 const logger = createLogger('HubSpotGetMarketingEvent')
@@ -69,11 +69,7 @@ export const hubspotGetMarketingEventTool: ToolConfig<
   },
 
   outputs: {
-    event: {
-      type: 'object',
-      description: 'HubSpot marketing event',
-      properties: MARKETING_EVENT_OUTPUT_PROPERTIES,
-    },
+    event: MARKETING_EVENT_OBJECT_OUTPUT,
     eventId: { type: 'string', description: 'The retrieved marketing event ID' },
     success: { type: 'boolean', description: 'Operation success status' },
   },

apps/sim/tools/hubspot/get_users.ts

@@ -56,7 +56,7 @@ export const hubspotGetUsersTool: ToolConfig<HubSpotGetUsersParams, HubSpotGetUs
     },
   },
 
-  transformResponse: async (response: Response, params) => {
+  transformResponse: async (response: Response) => {
     const data = await response.json()
 
     if (!response.ok) {

apps/sim/tools/hubspot/list_companies.ts

@@ -33,7 +33,7 @@ export const hubspotListCompaniesTool: ToolConfig<
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
-      description: 'Maximum number of results per page (max 100, default 100)',
+      description: 'Maximum number of results per page (max 100, default 10)',
     },
     after: {
       type: 'string',

apps/sim/tools/hubspot/list_contacts.ts

@@ -30,7 +30,7 @@ export const hubspotListContactsTool: ToolConfig<
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
-      description: 'Maximum number of results per page (max 100, default 100)',
+      description: 'Maximum number of results per page (max 100, default 10)',
     },
     after: {
       type: 'string',

apps/sim/tools/hubspot/list_lists.ts

@@ -35,6 +35,12 @@ export const hubspotListListsTool: ToolConfig<HubSpotListListsParams, HubSpotLis
       visibility: 'user-or-llm',
       description: 'Maximum number of results to return (default 25)',
     },
+    offset: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Pagination offset for next page (from previous response)',
+    },
   },
 
   request: {
@@ -53,6 +59,7 @@ export const hubspotListListsTool: ToolConfig<HubSpotListListsParams, HubSpotLis
       const body: Record<string, unknown> = {}
       if (params.query) body.query = params.query
       if (params.count) body.count = Number(params.count)
+      if (params.offset) body.offset = Number(params.offset)
       return body
     },
   },
@@ -68,10 +75,12 @@ export const hubspotListListsTool: ToolConfig<HubSpotListListsParams, HubSpotLis
       success: true,
       output: {
         lists,
-        paging: data.paging ?? null,
+        paging:
+          data.offset != null ? { next: { after: String(data.offset) } } : (data.paging ?? null),
         metadata: {
           totalReturned: lists.length,
-          hasMore: !!data.paging?.next || data.hasMore === true,
+          total: data.total ?? null,
+          hasMore: data.hasMore === true || !!data.paging?.next,
         },
         success: true,
       },

apps/sim/tools/hubspot/search_companies.ts

@@ -34,7 +34,7 @@ export const hubspotSearchCompaniesTool: ToolConfig<
       required: false,
       visibility: 'user-or-llm',
       description:
-        'Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" (e.g., "EQ", "CONTAINS"), and "value"',
+        'Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" (e.g., "EQ", "CONTAINS_TOKEN", "GT"), and "value"',
     },
     sorts: {
       type: 'array',

apps/sim/tools/hubspot/search_contacts.ts

@@ -34,7 +34,7 @@ export const hubspotSearchContactsTool: ToolConfig<
       required: false,
       visibility: 'user-or-llm',
       description:
-        'Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" (e.g., "EQ", "CONTAINS"), and "value"',
+        'Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" (e.g., "EQ", "CONTAINS_TOKEN", "GT"), and "value"',
     },
     sorts: {
       type: 'array',