diff --git a/apps/docs/content/docs/en/tools/hubspot.mdx b/apps/docs/content/docs/en/tools/hubspot.mdx
index 99cba9a5343..882f2766f10 100644
--- a/apps/docs/content/docs/en/tools/hubspot.mdx
+++ b/apps/docs/content/docs/en/tools/hubspot.mdx
@@ -41,6 +41,7 @@ Retrieve all users from HubSpot account
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `limit` | string | No | Number of results to return \(default: 100, max: 100\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
 
 #### Output
 
@@ -53,6 +54,9 @@ Retrieve all users from HubSpot account
 |   ↳ `primaryTeamId` | string | Primary team ID |
 |   ↳ `secondaryTeamIds` | array | Secondary team IDs |
 |   ↳ `superAdmin` | boolean | Whether user is a super admin |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
 | `totalItems` | number | Total number of users returned |
 | `success` | boolean | Operation success status |
 
@@ -230,7 +234,7 @@ Search for contacts in HubSpot using filters, sorting, and queries
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `filterGroups` | array | No | Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" \(e.g., "EQ", "CONTAINS"\), and "value" |
+| `filterGroups` | array | No | 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` | array | No | Array of sort objects as JSON with "propertyName" and "direction" \("ASCENDING" or "DESCENDING"\) |
 | `query` | string | No | Search query string to match against contact name, email, and other text fields |
 | `properties` | array | No | Array of HubSpot property names to return \(e.g., \["email", "firstname", "lastname", "phone"\]\) |
@@ -449,7 +453,7 @@ Search for companies in HubSpot using filters, sorting, and queries
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `filterGroups` | array | No | Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" \(e.g., "EQ", "CONTAINS"\), and "value" |
+| `filterGroups` | array | No | 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` | array | No | Array of sort objects as JSON with "propertyName" and "direction" \("ASCENDING" or "DESCENDING"\) |
 | `query` | string | No | Search query string to match against company name, domain, and other text fields |
 | `properties` | array | No | Array of HubSpot property names to return \(e.g., \["name", "domain", "industry"\]\) |
@@ -529,4 +533,887 @@ Retrieve all deals from HubSpot account with pagination support
 |   ↳ `hasMore` | boolean | Whether more records are available |
 | `success` | boolean | Operation success status |
 
+### `hubspot_get_deal`
+
+Retrieve a single deal by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `dealId` | string | Yes | The HubSpot deal ID to retrieve |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "dealname,amount,dealstage"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "contacts,companies"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deal` | object | HubSpot deal record |
+|   ↳ `dealname` | string | Deal name |
+|   ↳ `amount` | string | Deal amount |
+|   ↳ `dealstage` | string | Current deal stage |
+|   ↳ `pipeline` | string | Pipeline the deal is in |
+|   ↳ `closedate` | string | Expected close date \(ISO 8601\) |
+|   ↳ `dealtype` | string | Deal type \(New Business, Existing Business, etc.\) |
+|   ↳ `description` | string | Deal description |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Deal creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+|   ↳ `num_associated_contacts` | string | Number of associated contacts |
+| `dealId` | string | The retrieved deal ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_create_deal`
+
+Create a new deal in HubSpot. Requires at least a dealname property
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `properties` | object | Yes | Deal properties as JSON object. Must include dealname \(e.g., \{"dealname": "New Deal", "amount": "5000", "dealstage": "appointmentscheduled"\}\) |
+| `associations` | array | No | Array of associations to create with the deal as JSON. Each object should have "to.id" and "types" array with "associationCategory" and "associationTypeId" |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deal` | object | HubSpot deal record |
+|   ↳ `dealname` | string | Deal name |
+|   ↳ `amount` | string | Deal amount |
+|   ↳ `dealstage` | string | Current deal stage |
+|   ↳ `pipeline` | string | Pipeline the deal is in |
+|   ↳ `closedate` | string | Expected close date \(ISO 8601\) |
+|   ↳ `dealtype` | string | Deal type \(New Business, Existing Business, etc.\) |
+|   ↳ `description` | string | Deal description |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Deal creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+|   ↳ `num_associated_contacts` | string | Number of associated contacts |
+| `dealId` | string | The created deal ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_update_deal`
+
+Update an existing deal in HubSpot by ID
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `dealId` | string | Yes | The HubSpot deal ID to update |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | object | Yes | Deal properties to update as JSON object \(e.g., \{"amount": "10000", "dealstage": "closedwon"\}\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deal` | object | HubSpot deal record |
+|   ↳ `dealname` | string | Deal name |
+|   ↳ `amount` | string | Deal amount |
+|   ↳ `dealstage` | string | Current deal stage |
+|   ↳ `pipeline` | string | Pipeline the deal is in |
+|   ↳ `closedate` | string | Expected close date \(ISO 8601\) |
+|   ↳ `dealtype` | string | Deal type \(New Business, Existing Business, etc.\) |
+|   ↳ `description` | string | Deal description |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Deal creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+|   ↳ `num_associated_contacts` | string | Number of associated contacts |
+| `dealId` | string | The updated deal ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_search_deals`
+
+Search for deals in HubSpot using filters, sorting, and queries
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `filterGroups` | array | No | Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" \(e.g., "EQ", "NEQ", "CONTAINS_TOKEN", "NOT_CONTAINS_TOKEN"\), and "value" |
+| `sorts` | array | No | Array of sort objects as JSON with "propertyName" and "direction" \("ASCENDING" or "DESCENDING"\) |
+| `query` | string | No | Search query string to match against deal name and other text fields |
+| `properties` | array | No | Array of HubSpot property names to return \(e.g., \["dealname", "amount", "dealstage"\]\) |
+| `limit` | number | No | Maximum number of results to return \(max 200\) |
+| `after` | string | No | Pagination cursor for next page \(from previous response\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deals` | array | Array of HubSpot deal records |
+|   ↳ `dealname` | string | Deal name |
+|   ↳ `amount` | string | Deal amount |
+|   ↳ `dealstage` | string | Current deal stage |
+|   ↳ `pipeline` | string | Pipeline the deal is in |
+|   ↳ `closedate` | string | Expected close date \(ISO 8601\) |
+|   ↳ `dealtype` | string | Deal type \(New Business, Existing Business, etc.\) |
+|   ↳ `description` | string | Deal description |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Deal creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+|   ↳ `num_associated_contacts` | string | Number of associated contacts |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `total` | number | Total number of matching deals |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_tickets`
+
+Retrieve all tickets from HubSpot account with pagination support
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `limit` | string | No | Maximum number of results per page \(max 100, default 10\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "subject,content,hs_ticket_priority"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "contacts,companies"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `tickets` | array | Array of HubSpot ticket records |
+|   ↳ `subject` | string | Ticket subject/name |
+|   ↳ `content` | string | Ticket content/description |
+|   ↳ `hs_pipeline` | string | Pipeline the ticket is in |
+|   ↳ `hs_pipeline_stage` | string | Current pipeline stage |
+|   ↳ `hs_ticket_priority` | string | Ticket priority \(LOW, MEDIUM, HIGH\) |
+|   ↳ `hs_ticket_category` | string | Ticket category |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Ticket creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `success` | boolean | Operation success status |
+
+### `hubspot_get_ticket`
+
+Retrieve a single ticket by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `ticketId` | string | Yes | The HubSpot ticket ID to retrieve |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "subject,content,hs_ticket_priority"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "contacts,companies"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `ticket` | object | HubSpot ticket record |
+|   ↳ `subject` | string | Ticket subject/name |
+|   ↳ `content` | string | Ticket content/description |
+|   ↳ `hs_pipeline` | string | Pipeline the ticket is in |
+|   ↳ `hs_pipeline_stage` | string | Current pipeline stage |
+|   ↳ `hs_ticket_priority` | string | Ticket priority \(LOW, MEDIUM, HIGH\) |
+|   ↳ `hs_ticket_category` | string | Ticket category |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Ticket creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `ticketId` | string | The retrieved ticket ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_create_ticket`
+
+Create a new ticket in HubSpot. Requires subject and hs_pipeline_stage properties
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `properties` | object | Yes | Ticket properties as JSON object. Must include subject and hs_pipeline_stage \(e.g., \{"subject": "Support request", "hs_pipeline_stage": "1", "hs_ticket_priority": "HIGH"\}\) |
+| `associations` | array | No | Array of associations to create with the ticket as JSON. Each object should have "to.id" and "types" array with "associationCategory" and "associationTypeId" |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `ticket` | object | HubSpot ticket record |
+|   ↳ `subject` | string | Ticket subject/name |
+|   ↳ `content` | string | Ticket content/description |
+|   ↳ `hs_pipeline` | string | Pipeline the ticket is in |
+|   ↳ `hs_pipeline_stage` | string | Current pipeline stage |
+|   ↳ `hs_ticket_priority` | string | Ticket priority \(LOW, MEDIUM, HIGH\) |
+|   ↳ `hs_ticket_category` | string | Ticket category |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Ticket creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `ticketId` | string | The created ticket ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_update_ticket`
+
+Update an existing ticket in HubSpot by ID
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `ticketId` | string | Yes | The HubSpot ticket ID to update |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | object | Yes | Ticket properties to update as JSON object \(e.g., \{"subject": "Updated subject", "hs_ticket_priority": "HIGH"\}\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `ticket` | object | HubSpot ticket record |
+|   ↳ `subject` | string | Ticket subject/name |
+|   ↳ `content` | string | Ticket content/description |
+|   ↳ `hs_pipeline` | string | Pipeline the ticket is in |
+|   ↳ `hs_pipeline_stage` | string | Current pipeline stage |
+|   ↳ `hs_ticket_priority` | string | Ticket priority \(LOW, MEDIUM, HIGH\) |
+|   ↳ `hs_ticket_category` | string | Ticket category |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Ticket creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `ticketId` | string | The updated ticket ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_search_tickets`
+
+Search for tickets in HubSpot using filters, sorting, and queries
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `filterGroups` | array | No | Array of filter groups as JSON. Each group contains "filters" array with objects having "propertyName", "operator" \(e.g., "EQ", "NEQ", "CONTAINS_TOKEN", "NOT_CONTAINS_TOKEN"\), and "value" |
+| `sorts` | array | No | Array of sort objects as JSON with "propertyName" and "direction" \("ASCENDING" or "DESCENDING"\) |
+| `query` | string | No | Search query string to match against ticket subject and other text fields |
+| `properties` | array | No | Array of HubSpot property names to return \(e.g., \["subject", "content", "hs_ticket_priority"\]\) |
+| `limit` | number | No | Maximum number of results to return \(max 200\) |
+| `after` | string | No | Pagination cursor for next page \(from previous response\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `tickets` | array | Array of HubSpot ticket records |
+|   ↳ `subject` | string | Ticket subject/name |
+|   ↳ `content` | string | Ticket content/description |
+|   ↳ `hs_pipeline` | string | Pipeline the ticket is in |
+|   ↳ `hs_pipeline_stage` | string | Current pipeline stage |
+|   ↳ `hs_ticket_priority` | string | Ticket priority \(LOW, MEDIUM, HIGH\) |
+|   ↳ `hs_ticket_category` | string | Ticket category |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Ticket creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `total` | number | Total number of matching tickets |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_line_items`
+
+Retrieve all line items from HubSpot account with pagination support
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `limit` | string | No | Maximum number of results per page \(max 100, default 10\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "name,quantity,price,amount"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "deals,quotes"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `lineItems` | array | Array of HubSpot line item records |
+|   ↳ `name` | string | Line item name |
+|   ↳ `description` | string | Full description of the product |
+|   ↳ `hs_sku` | string | Unique product identifier \(SKU\) |
+|   ↳ `quantity` | string | Number of units included |
+|   ↳ `price` | string | Unit price |
+|   ↳ `amount` | string | Total cost \(quantity * unit price\) |
+|   ↳ `hs_line_item_currency_code` | string | Currency code |
+|   ↳ `recurringbillingfrequency` | string | Recurring billing frequency |
+|   ↳ `hs_recurring_billing_start_date` | string | Recurring billing start date |
+|   ↳ `hs_recurring_billing_end_date` | string | Recurring billing end date |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `success` | boolean | Operation success status |
+
+### `hubspot_get_line_item`
+
+Retrieve a single line item by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `lineItemId` | string | Yes | The HubSpot line item ID to retrieve |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "name,quantity,price,amount"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "deals,quotes"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `lineItem` | object | HubSpot line item record |
+|   ↳ `name` | string | Line item name |
+|   ↳ `description` | string | Full description of the product |
+|   ↳ `hs_sku` | string | Unique product identifier \(SKU\) |
+|   ↳ `quantity` | string | Number of units included |
+|   ↳ `price` | string | Unit price |
+|   ↳ `amount` | string | Total cost \(quantity * unit price\) |
+|   ↳ `hs_line_item_currency_code` | string | Currency code |
+|   ↳ `recurringbillingfrequency` | string | Recurring billing frequency |
+|   ↳ `hs_recurring_billing_start_date` | string | Recurring billing start date |
+|   ↳ `hs_recurring_billing_end_date` | string | Recurring billing end date |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `lineItemId` | string | The retrieved line item ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_create_line_item`
+
+Create a new line item in HubSpot. Requires at least a name property
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `properties` | object | Yes | Line item properties as JSON object \(e.g., \{"name": "Product A", "quantity": "2", "price": "50.00", "hs_sku": "SKU-001"\}\) |
+| `associations` | array | No | Array of associations to create with the line item as JSON. Each object should have "to.id" and "types" array with "associationCategory" and "associationTypeId" |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `lineItem` | object | HubSpot line item record |
+|   ↳ `name` | string | Line item name |
+|   ↳ `description` | string | Full description of the product |
+|   ↳ `hs_sku` | string | Unique product identifier \(SKU\) |
+|   ↳ `quantity` | string | Number of units included |
+|   ↳ `price` | string | Unit price |
+|   ↳ `amount` | string | Total cost \(quantity * unit price\) |
+|   ↳ `hs_line_item_currency_code` | string | Currency code |
+|   ↳ `recurringbillingfrequency` | string | Recurring billing frequency |
+|   ↳ `hs_recurring_billing_start_date` | string | Recurring billing start date |
+|   ↳ `hs_recurring_billing_end_date` | string | Recurring billing end date |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `lineItemId` | string | The created line item ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_update_line_item`
+
+Update an existing line item in HubSpot by ID
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `lineItemId` | string | Yes | The HubSpot line item ID to update |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | object | Yes | Line item properties to update as JSON object \(e.g., \{"quantity": "5", "price": "25.00"\}\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `lineItem` | object | HubSpot line item record |
+|   ↳ `name` | string | Line item name |
+|   ↳ `description` | string | Full description of the product |
+|   ↳ `hs_sku` | string | Unique product identifier \(SKU\) |
+|   ↳ `quantity` | string | Number of units included |
+|   ↳ `price` | string | Unit price |
+|   ↳ `amount` | string | Total cost \(quantity * unit price\) |
+|   ↳ `hs_line_item_currency_code` | string | Currency code |
+|   ↳ `recurringbillingfrequency` | string | Recurring billing frequency |
+|   ↳ `hs_recurring_billing_start_date` | string | Recurring billing start date |
+|   ↳ `hs_recurring_billing_end_date` | string | Recurring billing end date |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `lineItemId` | string | The updated line item ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_quotes`
+
+Retrieve all quotes from HubSpot account with pagination support
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `limit` | string | No | Maximum number of results per page \(max 100, default 10\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "hs_title,hs_expiration_date,hs_status"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "deals,line_items"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `quotes` | array | Array of HubSpot quote records |
+|   ↳ `hs_title` | string | Quote name/title |
+|   ↳ `hs_expiration_date` | string | Expiration date |
+|   ↳ `hs_status` | string | Quote status |
+|   ↳ `hs_esign_enabled` | string | Whether e-signatures are enabled |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `success` | boolean | Operation success status |
+
+### `hubspot_get_quote`
+
+Retrieve a single quote by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `quoteId` | string | Yes | The HubSpot quote ID to retrieve |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "hs_title,hs_expiration_date,hs_status"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "deals,line_items"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `quote` | object | HubSpot quote record |
+|   ↳ `hs_title` | string | Quote name/title |
+|   ↳ `hs_expiration_date` | string | Expiration date |
+|   ↳ `hs_status` | string | Quote status |
+|   ↳ `hs_esign_enabled` | string | Whether e-signatures are enabled |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `quoteId` | string | The retrieved quote ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_appointments`
+
+Retrieve all appointments from HubSpot account with pagination support
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `limit` | string | No | Maximum number of results per page \(max 100, default 10\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "hs_meeting_title,hs_meeting_start_time"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "contacts,companies"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `appointments` | array | Array of HubSpot appointment records |
+|   ↳ `hs_appointment_type` | string | Appointment type |
+|   ↳ `hs_meeting_title` | string | Meeting title |
+|   ↳ `hs_meeting_start_time` | string | Start time \(ISO 8601\) |
+|   ↳ `hs_meeting_end_time` | string | End time \(ISO 8601\) |
+|   ↳ `hs_meeting_location` | string | Meeting location |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `hs_createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `success` | boolean | Operation success status |
+
+### `hubspot_get_appointment`
+
+Retrieve a single appointment by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `appointmentId` | string | Yes | The HubSpot appointment ID to retrieve |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return \(e.g., "hs_meeting_title,hs_meeting_start_time"\) |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for \(e.g., "contacts,companies"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `appointment` | object | HubSpot appointment record |
+|   ↳ `hs_appointment_type` | string | Appointment type |
+|   ↳ `hs_meeting_title` | string | Meeting title |
+|   ↳ `hs_meeting_start_time` | string | Start time \(ISO 8601\) |
+|   ↳ `hs_meeting_end_time` | string | End time \(ISO 8601\) |
+|   ↳ `hs_meeting_location` | string | Meeting location |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `hs_createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `appointmentId` | string | The retrieved appointment ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_create_appointment`
+
+Create a new appointment in HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `properties` | object | Yes | Appointment properties as JSON object \(e.g., \{"hs_meeting_title": "Discovery Call", "hs_meeting_start_time": "2024-01-15T10:00:00Z", "hs_meeting_end_time": "2024-01-15T11:00:00Z"\}\) |
+| `associations` | array | No | Array of associations to create with the appointment as JSON. Each object should have "to.id" and "types" array with "associationCategory" and "associationTypeId" |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `appointment` | object | HubSpot appointment record |
+|   ↳ `hs_appointment_type` | string | Appointment type |
+|   ↳ `hs_meeting_title` | string | Meeting title |
+|   ↳ `hs_meeting_start_time` | string | Start time \(ISO 8601\) |
+|   ↳ `hs_meeting_end_time` | string | End time \(ISO 8601\) |
+|   ↳ `hs_meeting_location` | string | Meeting location |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `hs_createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `appointmentId` | string | The created appointment ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_update_appointment`
+
+Update an existing appointment in HubSpot by ID
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `appointmentId` | string | Yes | The HubSpot appointment ID to update |
+| `idProperty` | string | No | Property to use as unique identifier. If not specified, uses record ID |
+| `properties` | object | Yes | Appointment properties to update as JSON object \(e.g., \{"hs_meeting_title": "Updated Call", "hs_meeting_location": "Zoom"\}\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `appointment` | object | HubSpot appointment record |
+|   ↳ `hs_appointment_type` | string | Appointment type |
+|   ↳ `hs_meeting_title` | string | Meeting title |
+|   ↳ `hs_meeting_start_time` | string | Start time \(ISO 8601\) |
+|   ↳ `hs_meeting_end_time` | string | End time \(ISO 8601\) |
+|   ↳ `hs_meeting_location` | string | Meeting location |
+|   ↳ `hubspot_owner_id` | string | HubSpot owner ID |
+|   ↳ `hs_object_id` | string | HubSpot object ID \(same as record ID\) |
+|   ↳ `hs_createdate` | string | Creation date \(ISO 8601\) |
+|   ↳ `hs_lastmodifieddate` | string | Last modified date \(ISO 8601\) |
+| `appointmentId` | string | The updated appointment ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_carts`
+
+Retrieve all carts from HubSpot account with pagination support
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `limit` | string | No | Maximum number of results per page \(max 100, default 10\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `carts` | array | Array of HubSpot CRM records |
+|   ↳ `id` | string | Unique record ID \(hs_object_id\) |
+|   ↳ `createdAt` | string | Record creation timestamp \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Record last updated timestamp \(ISO 8601\) |
+|   ↳ `archived` | boolean | Whether the record is archived |
+|   ↳ `properties` | object | Record properties |
+|   ↳ `associations` | object | Associated records |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `success` | boolean | Operation success status |
+
+### `hubspot_get_cart`
+
+Retrieve a single cart by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `cartId` | string | Yes | The HubSpot cart ID to retrieve |
+| `properties` | string | No | Comma-separated list of HubSpot property names to return |
+| `associations` | string | No | Comma-separated list of object types to retrieve associated IDs for |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `cart` | object | HubSpot CRM record |
+|   ↳ `id` | string | Unique record ID \(hs_object_id\) |
+|   ↳ `createdAt` | string | Record creation timestamp \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Record last updated timestamp \(ISO 8601\) |
+|   ↳ `archived` | boolean | Whether the record is archived |
+|   ↳ `properties` | object | Record properties |
+|   ↳ `associations` | object | Associated records |
+| `cartId` | string | The retrieved cart ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_owners`
+
+Retrieve all owners from HubSpot account with pagination support
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `limit` | string | No | Maximum number of results per page \(max 100, default 100\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
+| `email` | string | No | Filter owners by email address |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `owners` | array | Array of HubSpot owner objects |
+|   ↳ `id` | string | Owner ID |
+|   ↳ `email` | string | Owner email address |
+|   ↳ `firstName` | string | Owner first name |
+|   ↳ `lastName` | string | Owner last name |
+|   ↳ `userId` | number | Associated user ID |
+|   ↳ `teams` | array | Teams the owner belongs to |
+|     ↳ `id` | string | Team ID |
+|     ↳ `name` | string | Team name |
+|   ↳ `createdAt` | string | Creation date \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Last updated date \(ISO 8601\) |
+|   ↳ `archived` | boolean | Whether the owner is archived |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_marketing_events`
+
+Retrieve all marketing events from HubSpot account with pagination support
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `limit` | string | No | Maximum number of results per page \(max 100, default 10\) |
+| `after` | string | No | Pagination cursor for next page of results \(from previous response\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `events` | array | Array of HubSpot marketing event objects |
+|   ↳ `objectId` | string | Unique event ID \(HubSpot internal\) |
+|   ↳ `eventName` | string | Event name |
+|   ↳ `eventType` | string | Event type |
+|   ↳ `eventStatus` | string | Event status |
+|   ↳ `eventDescription` | string | Event description |
+|   ↳ `eventUrl` | string | Event URL |
+|   ↳ `eventOrganizer` | string | Event organizer |
+|   ↳ `startDateTime` | string | Start date/time \(ISO 8601\) |
+|   ↳ `endDateTime` | string | End date/time \(ISO 8601\) |
+|   ↳ `eventCancelled` | boolean | Whether event is cancelled |
+|   ↳ `eventCompleted` | boolean | Whether event is completed |
+|   ↳ `registrants` | number | Number of registrants |
+|   ↳ `attendees` | number | Number of attendees |
+|   ↳ `cancellations` | number | Number of cancellations |
+|   ↳ `noShows` | number | Number of no-shows |
+|   ↳ `externalEventId` | string | External event ID |
+|   ↳ `createdAt` | string | Creation date \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Last updated date \(ISO 8601\) |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+| `success` | boolean | Operation success status |
+
+### `hubspot_get_marketing_event`
+
+Retrieve a single marketing event by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `eventId` | string | Yes | The HubSpot marketing event objectId to retrieve |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `event` | object | HubSpot marketing event |
+|   ↳ `objectId` | string | Unique event ID \(HubSpot internal\) |
+|   ↳ `eventName` | string | Event name |
+|   ↳ `eventType` | string | Event type |
+|   ↳ `eventStatus` | string | Event status |
+|   ↳ `eventDescription` | string | Event description |
+|   ↳ `eventUrl` | string | Event URL |
+|   ↳ `eventOrganizer` | string | Event organizer |
+|   ↳ `startDateTime` | string | Start date/time \(ISO 8601\) |
+|   ↳ `endDateTime` | string | End date/time \(ISO 8601\) |
+|   ↳ `eventCancelled` | boolean | Whether event is cancelled |
+|   ↳ `eventCompleted` | boolean | Whether event is completed |
+|   ↳ `registrants` | number | Number of registrants |
+|   ↳ `attendees` | number | Number of attendees |
+|   ↳ `cancellations` | number | Number of cancellations |
+|   ↳ `noShows` | number | Number of no-shows |
+|   ↳ `externalEventId` | string | External event ID |
+|   ↳ `createdAt` | string | Creation date \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Last updated date \(ISO 8601\) |
+| `eventId` | string | The retrieved marketing event ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_list_lists`
+
+Search and retrieve lists from HubSpot account
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `query` | string | No | Search query to filter lists by name. Leave empty to return all lists. |
+| `count` | string | No | Maximum number of results to return \(default 20, max 500\) |
+| `offset` | string | No | Pagination offset for next page of results \(use the offset value from previous response\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `lists` | array | Array of HubSpot list objects |
+|   ↳ `listId` | string | List ID |
+|   ↳ `name` | string | List name |
+|   ↳ `objectTypeId` | string | Object type ID \(e.g., 0-1 for contacts\) |
+|   ↳ `processingType` | string | Processing type \(MANUAL, DYNAMIC, SNAPSHOT\) |
+|   ↳ `processingStatus` | string | Processing status \(COMPLETE, PROCESSING\) |
+|   ↳ `listVersion` | number | List version number |
+|   ↳ `createdAt` | string | Creation date \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Last updated date \(ISO 8601\) |
+| `paging` | object | Pagination information for fetching more results |
+|   ↳ `after` | string | Cursor for next page of results |
+|   ↳ `link` | string | Link to next page |
+| `metadata` | object | Response metadata |
+|   ↳ `totalReturned` | number | Number of records returned in this response |
+|   ↳ `hasMore` | boolean | Whether more records are available |
+|   ↳ `total` | number | Total number of lists matching the query |
+| `success` | boolean | Operation success status |
+
+### `hubspot_get_list`
+
+Retrieve a single list by ID from HubSpot
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `listId` | string | Yes | The HubSpot list ID to retrieve |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `list` | object | HubSpot list |
+|   ↳ `listId` | string | List ID |
+|   ↳ `name` | string | List name |
+|   ↳ `objectTypeId` | string | Object type ID \(e.g., 0-1 for contacts\) |
+|   ↳ `processingType` | string | Processing type \(MANUAL, DYNAMIC, SNAPSHOT\) |
+|   ↳ `processingStatus` | string | Processing status \(COMPLETE, PROCESSING\) |
+|   ↳ `listVersion` | number | List version number |
+|   ↳ `createdAt` | string | Creation date \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Last updated date \(ISO 8601\) |
+| `listId` | string | The retrieved list ID |
+| `success` | boolean | Operation success status |
+
+### `hubspot_create_list`
+
+Create a new list in HubSpot. Specify the object type and processing type (MANUAL or DYNAMIC)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `name` | string | Yes | Name of the list |
+| `objectTypeId` | string | Yes | Object type ID \(e.g., "0-1" for contacts, "0-2" for companies\) |
+| `processingType` | string | Yes | Processing type: "MANUAL" for static lists or "DYNAMIC" for active lists |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `list` | object | HubSpot list |
+|   ↳ `listId` | string | List ID |
+|   ↳ `name` | string | List name |
+|   ↳ `objectTypeId` | string | Object type ID \(e.g., 0-1 for contacts\) |
+|   ↳ `processingType` | string | Processing type \(MANUAL, DYNAMIC, SNAPSHOT\) |
+|   ↳ `processingStatus` | string | Processing status \(COMPLETE, PROCESSING\) |
+|   ↳ `listVersion` | number | List version number |
+|   ↳ `createdAt` | string | Creation date \(ISO 8601\) |
+|   ↳ `updatedAt` | string | Last updated date \(ISO 8601\) |
+| `listId` | string | The created list ID |
+| `success` | boolean | Operation success status |
+
 
diff --git a/apps/docs/content/docs/en/tools/rippling.mdx b/apps/docs/content/docs/en/tools/rippling.mdx
index 6eecade9a09..b029318cf27 100644
--- a/apps/docs/content/docs/en/tools/rippling.mdx
+++ b/apps/docs/content/docs/en/tools/rippling.mdx
@@ -72,7 +72,7 @@ List all employees in Rippling with optional pagination
 |   ↳ `endDate` | string | Employment end date |
 |   ↳ `manager` | string | Manager ID or name |
 |   ↳ `phone` | string | Phone number |
-| `totalCount` | number | Total number of employees returned |
+| `totalCount` | number | Number of employees returned on this page |
 
 ### `rippling_get_employee`
 
@@ -131,7 +131,7 @@ List all employees in Rippling including terminated employees with optional pagi
 |   ↳ `endDate` | string | Employment end date |
 |   ↳ `manager` | string | Manager ID or name |
 |   ↳ `phone` | string | Phone number |
-| `totalCount` | number | Total number of employees returned |
+| `totalCount` | number | Number of employees returned on this page |
 
 ### `rippling_list_departments`
 
@@ -153,7 +153,7 @@ List all departments in the Rippling organization
 |   ↳ `id` | string | Department ID |
 |   ↳ `name` | string | Department name |
 |   ↳ `parent` | string | Parent department ID |
-| `totalCount` | number | Total number of departments returned |
+| `totalCount` | number | Number of departments returned on this page |
 
 ### `rippling_list_teams`
 
@@ -175,7 +175,7 @@ List all teams in Rippling
 |   ↳ `id` | string | Team ID |
 |   ↳ `name` | string | Team name |
 |   ↳ `parent` | string | Parent team ID |
-| `totalCount` | number | Total number of teams returned |
+| `totalCount` | number | Number of teams returned on this page |
 
 ### `rippling_list_levels`
 
@@ -197,7 +197,7 @@ List all position levels in Rippling
 |   ↳ `id` | string | Level ID |
 |   ↳ `name` | string | Level name |
 |   ↳ `parent` | string | Parent level ID |
-| `totalCount` | number | Total number of levels returned |
+| `totalCount` | number | Number of levels returned on this page |
 
 ### `rippling_list_work_locations`
 
@@ -223,7 +223,7 @@ List all work locations in Rippling
 |   ↳ `state` | string | State or province |
 |   ↳ `zip` | string | ZIP or postal code |
 |   ↳ `country` | string | Country |
-| `totalCount` | number | Total number of work locations returned |
+| `totalCount` | number | Number of work locations returned on this page |
 
 ### `rippling_get_company`
 
@@ -270,7 +270,7 @@ Get activity events for the current company in Rippling
 |   ↳ `description` | string | Event description |
 |   ↳ `createdAt` | string | Event creation timestamp |
 |   ↳ `actor` | json | Actor who triggered the event \(id, name\) |
-| `totalCount` | number | Total number of activity events returned |
+| `totalCount` | number | Number of activity events returned on this page |
 | `nextCursor` | string | Cursor for fetching the next page of results |
 
 ### `rippling_list_custom_fields`
@@ -294,7 +294,7 @@ List all custom fields defined in Rippling
 |   ↳ `type` | string | Field type |
 |   ↳ `title` | string | Field title |
 |   ↳ `mandatory` | boolean | Whether the field is mandatory |
-| `totalCount` | number | Total number of custom fields returned |
+| `totalCount` | number | Number of custom fields returned on this page |
 
 ### `rippling_get_current_user`
 
@@ -385,7 +385,7 @@ List leave balances for all employees in Rippling
 |   ↳ `balances` | array | Leave balance entries |
 |     ↳ `leaveType` | string | Type of leave |
 |     ↳ `minutesRemaining` | number | Minutes of leave remaining |
-| `totalCount` | number | Total number of leave balances returned |
+| `totalCount` | number | Number of leave balances returned on this page |
 
 ### `rippling_get_leave_balance`
 
diff --git a/apps/sim/app/(home)/components/demo-request/consts.ts b/apps/sim/app/(home)/components/demo-request/consts.ts
new file mode 100644
index 00000000000..fadfdd389a9
--- /dev/null
+++ b/apps/sim/app/(home)/components/demo-request/consts.ts
@@ -0,0 +1,84 @@
+import { z } from 'zod'
+import { NO_EMAIL_HEADER_CONTROL_CHARS_REGEX } from '@/lib/messaging/email/utils'
+import { quickValidateEmail } from '@/lib/messaging/email/validation'
+
+export const DEMO_REQUEST_REGION_VALUES = [
+  'north_america',
+  'europe',
+  'asia_pacific',
+  'latin_america',
+  'middle_east_africa',
+  'other',
+] as const
+
+export const DEMO_REQUEST_USER_COUNT_VALUES = [
+  '1_10',
+  '11_50',
+  '51_200',
+  '201_500',
+  '501_1000',
+  '1000_plus',
+] as const
+
+export const DEMO_REQUEST_REGION_OPTIONS = [
+  { value: 'north_america', label: 'North America' },
+  { value: 'europe', label: 'Europe' },
+  { value: 'asia_pacific', label: 'Asia Pacific' },
+  { value: 'latin_america', label: 'Latin America' },
+  { value: 'middle_east_africa', label: 'Middle East & Africa' },
+  { value: 'other', label: 'Other' },
+] as const
+
+export const DEMO_REQUEST_USER_COUNT_OPTIONS = [
+  { value: '1_10', label: '1-10' },
+  { value: '11_50', label: '11-50' },
+  { value: '51_200', label: '51-200' },
+  { value: '201_500', label: '201-500' },
+  { value: '501_1000', label: '501-1,000' },
+  { value: '1000_plus', label: '1,000+' },
+] as const
+
+export const demoRequestSchema = z.object({
+  firstName: z
+    .string()
+    .trim()
+    .min(1, 'First name is required')
+    .max(100)
+    .regex(NO_EMAIL_HEADER_CONTROL_CHARS_REGEX, 'Invalid characters'),
+  lastName: z
+    .string()
+    .trim()
+    .min(1, 'Last name is required')
+    .max(100)
+    .regex(NO_EMAIL_HEADER_CONTROL_CHARS_REGEX, 'Invalid characters'),
+  companyEmail: z
+    .string()
+    .trim()
+    .min(1, 'Company email is required')
+    .max(320)
+    .transform((value) => value.toLowerCase())
+    .refine((value) => quickValidateEmail(value).isValid, 'Enter a valid work email'),
+  phoneNumber: z
+    .string()
+    .trim()
+    .max(50, 'Phone number must be 50 characters or less')
+    .optional()
+    .transform((value) => (value && value.length > 0 ? value : undefined)),
+  region: z.enum(DEMO_REQUEST_REGION_VALUES, {
+    errorMap: () => ({ message: 'Please select a region' }),
+  }),
+  userCount: z.enum(DEMO_REQUEST_USER_COUNT_VALUES, {
+    errorMap: () => ({ message: 'Please select the number of users' }),
+  }),
+  details: z.string().trim().min(1, 'Details are required').max(2000),
+})
+
+export type DemoRequestPayload = z.infer<typeof demoRequestSchema>
+
+export function getDemoRequestRegionLabel(value: DemoRequestPayload['region']): string {
+  return DEMO_REQUEST_REGION_OPTIONS.find((option) => option.value === value)?.label ?? value
+}
+
+export function getDemoRequestUserCountLabel(value: DemoRequestPayload['userCount']): string {
+  return DEMO_REQUEST_USER_COUNT_OPTIONS.find((option) => option.value === value)?.label ?? value
+}
diff --git a/apps/sim/app/(home)/components/demo-request/demo-request-modal.tsx b/apps/sim/app/(home)/components/demo-request/demo-request-modal.tsx
new file mode 100644
index 00000000000..0d5e7ff9ed8
--- /dev/null
+++ b/apps/sim/app/(home)/components/demo-request/demo-request-modal.tsx
@@ -0,0 +1,298 @@
+'use client'
+
+import { useCallback, useState } from 'react'
+import {
+  Button,
+  Combobox,
+  FormField,
+  Input,
+  Modal,
+  ModalBody,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalTrigger,
+  Textarea,
+} from '@/components/emcn'
+import { Check } from '@/components/emcn/icons'
+import {
+  DEMO_REQUEST_REGION_OPTIONS,
+  DEMO_REQUEST_USER_COUNT_OPTIONS,
+  type DemoRequestPayload,
+  demoRequestSchema,
+} from '@/app/(home)/components/demo-request/consts'
+
+interface DemoRequestModalProps {
+  children: React.ReactNode
+  theme?: 'dark' | 'light'
+}
+
+type DemoRequestField = keyof DemoRequestPayload
+type DemoRequestErrors = Partial<Record<DemoRequestField, string>>
+
+interface DemoRequestFormState {
+  firstName: string
+  lastName: string
+  companyEmail: string
+  phoneNumber: string
+  region: DemoRequestPayload['region'] | ''
+  userCount: DemoRequestPayload['userCount'] | ''
+  details: string
+}
+
+const SUBMIT_SUCCESS_MESSAGE = "We'll be in touch soon!"
+const COMBOBOX_REGIONS = [...DEMO_REQUEST_REGION_OPTIONS]
+const COMBOBOX_USER_COUNTS = [...DEMO_REQUEST_USER_COUNT_OPTIONS]
+
+const INITIAL_FORM_STATE: DemoRequestFormState = {
+  firstName: '',
+  lastName: '',
+  companyEmail: '',
+  phoneNumber: '',
+  region: '',
+  userCount: '',
+  details: '',
+}
+
+export function DemoRequestModal({ children, theme = 'dark' }: DemoRequestModalProps) {
+  const [open, setOpen] = useState(false)
+  const [form, setForm] = useState<DemoRequestFormState>(INITIAL_FORM_STATE)
+  const [errors, setErrors] = useState<DemoRequestErrors>({})
+  const [isSubmitting, setIsSubmitting] = useState(false)
+  const [submitError, setSubmitError] = useState<string | null>(null)
+  const [submitSuccess, setSubmitSuccess] = useState(false)
+
+  const resetForm = useCallback(() => {
+    setForm(INITIAL_FORM_STATE)
+    setErrors({})
+    setIsSubmitting(false)
+    setSubmitError(null)
+    setSubmitSuccess(false)
+  }, [])
+
+  const handleOpenChange = useCallback(
+    (nextOpen: boolean) => {
+      setOpen(nextOpen)
+      resetForm()
+    },
+    [resetForm]
+  )
+
+  const updateField = useCallback(
+    <TField extends keyof DemoRequestFormState>(
+      field: TField,
+      value: DemoRequestFormState[TField]
+    ) => {
+      setForm((prev) => ({ ...prev, [field]: value }))
+      setErrors((prev) => {
+        if (!prev[field]) {
+          return prev
+        }
+
+        const nextErrors = { ...prev }
+        delete nextErrors[field]
+        return nextErrors
+      })
+      setSubmitError(null)
+      setSubmitSuccess(false)
+    },
+    []
+  )
+
+  const handleSubmit = useCallback(
+    async (event: React.FormEvent<HTMLFormElement>) => {
+      event.preventDefault()
+      setSubmitError(null)
+      setSubmitSuccess(false)
+
+      const parsed = demoRequestSchema.safeParse({
+        ...form,
+        phoneNumber: form.phoneNumber || undefined,
+      })
+
+      if (!parsed.success) {
+        const fieldErrors = parsed.error.flatten().fieldErrors
+        setErrors({
+          firstName: fieldErrors.firstName?.[0],
+          lastName: fieldErrors.lastName?.[0],
+          companyEmail: fieldErrors.companyEmail?.[0],
+          phoneNumber: fieldErrors.phoneNumber?.[0],
+          region: fieldErrors.region?.[0],
+          userCount: fieldErrors.userCount?.[0],
+          details: fieldErrors.details?.[0],
+        })
+        return
+      }
+
+      setIsSubmitting(true)
+
+      try {
+        const response = await fetch('/api/demo-requests', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(parsed.data),
+        })
+
+        const result = (await response.json().catch(() => null)) as {
+          error?: string
+          message?: string
+        } | null
+
+        if (!response.ok) {
+          throw new Error(result?.error || 'Failed to submit demo request')
+        }
+
+        setSubmitSuccess(true)
+      } catch (error) {
+        setSubmitError(
+          error instanceof Error
+            ? error.message
+            : 'Failed to submit demo request. Please try again.'
+        )
+      } finally {
+        setIsSubmitting(false)
+      }
+    },
+    [form, resetForm]
+  )
+
+  return (
+    <Modal open={open} onOpenChange={handleOpenChange}>
+      <ModalTrigger asChild>{children}</ModalTrigger>
+      <ModalContent size='lg' className={theme === 'dark' ? 'dark' : undefined}>
+        <ModalHeader>
+          <span className={submitSuccess ? 'sr-only' : undefined}>
+            {submitSuccess ? 'Demo request submitted' : 'Nearly there!'}
+          </span>
+        </ModalHeader>
+        <div className='relative flex-1'>
+          <form
+            onSubmit={handleSubmit}
+            aria-hidden={submitSuccess}
+            className={
+              submitSuccess
+                ? 'pointer-events-none invisible flex h-full flex-col'
+                : 'flex h-full flex-col'
+            }
+          >
+            <ModalBody>
+              <div className='space-y-4'>
+                <div className='grid gap-4 sm:grid-cols-2'>
+                  <FormField htmlFor='firstName' label='First name' error={errors.firstName}>
+                    <Input
+                      id='firstName'
+                      value={form.firstName}
+                      onChange={(event) => updateField('firstName', event.target.value)}
+                      placeholder='First'
+                    />
+                  </FormField>
+                  <FormField htmlFor='lastName' label='Last name' error={errors.lastName}>
+                    <Input
+                      id='lastName'
+                      value={form.lastName}
+                      onChange={(event) => updateField('lastName', event.target.value)}
+                      placeholder='Last'
+                    />
+                  </FormField>
+                </div>
+
+                <FormField htmlFor='companyEmail' label='Company email' error={errors.companyEmail}>
+                  <Input
+                    id='companyEmail'
+                    type='email'
+                    value={form.companyEmail}
+                    onChange={(event) => updateField('companyEmail', event.target.value)}
+                    placeholder='Your work email'
+                  />
+                </FormField>
+
+                <FormField
+                  htmlFor='phoneNumber'
+                  label='Phone number'
+                  optional
+                  error={errors.phoneNumber}
+                >
+                  <Input
+                    id='phoneNumber'
+                    type='tel'
+                    value={form.phoneNumber}
+                    onChange={(event) => updateField('phoneNumber', event.target.value)}
+                    placeholder='Your phone number'
+                  />
+                </FormField>
+
+                <div className='grid gap-4 sm:grid-cols-2'>
+                  <FormField htmlFor='region' label='Region' error={errors.region}>
+                    <Combobox
+                      options={COMBOBOX_REGIONS}
+                      value={form.region}
+                      selectedValue={form.region}
+                      onChange={(value) =>
+                        updateField('region', value as DemoRequestPayload['region'])
+                      }
+                      placeholder='Select'
+                      editable={false}
+                      filterOptions={false}
+                    />
+                  </FormField>
+                  <FormField htmlFor='userCount' label='Number of users' error={errors.userCount}>
+                    <Combobox
+                      options={COMBOBOX_USER_COUNTS}
+                      value={form.userCount}
+                      selectedValue={form.userCount}
+                      onChange={(value) =>
+                        updateField('userCount', value as DemoRequestPayload['userCount'])
+                      }
+                      placeholder='Select'
+                      editable={false}
+                      filterOptions={false}
+                    />
+                  </FormField>
+                </div>
+
+                <FormField htmlFor='details' label='Details' error={errors.details}>
+                  <Textarea
+                    id='details'
+                    value={form.details}
+                    onChange={(event) => updateField('details', event.target.value)}
+                    placeholder='Tell us about your needs and questions'
+                  />
+                </FormField>
+              </div>
+            </ModalBody>
+
+            <ModalFooter className='flex-col items-stretch gap-3'>
+              {submitError && <p className='text-[13px] text-[var(--text-error)]'>{submitError}</p>}
+              <Button type='submit' variant='primary' disabled={isSubmitting}>
+                {isSubmitting ? 'Submitting...' : 'Submit'}
+              </Button>
+            </ModalFooter>
+          </form>
+
+          {submitSuccess ? (
+            <div className='absolute inset-0 flex items-center justify-center px-8 pb-10 sm:px-12 sm:pb-14'>
+              <div className='flex max-w-md flex-col items-center justify-center text-center'>
+                <div className='flex h-20 w-20 items-center justify-center rounded-full border border-[var(--border)] bg-[var(--bg-subtle)] text-[var(--text-primary)]'>
+                  <Check className='h-10 w-10' />
+                </div>
+                <h2 className='mt-8 font-medium text-[34px] text-[var(--text-primary)] leading-[1.1] tracking-[-0.03em]'>
+                  {SUBMIT_SUCCESS_MESSAGE}
+                </h2>
+                <p className='mt-4 text-[17px] text-[var(--text-secondary)] leading-7'>
+                  Our team will be in touch soon. If you have any questions, please email us at{' '}
+                  <a
+                    href='mailto:enterprise@sim.ai'
+                    className='text-[var(--text-primary)] underline underline-offset-2'
+                  >
+                    enterprise@sim.ai
+                  </a>
+                  .
+                </p>
+              </div>
+            </div>
+          ) : null}
+        </div>
+      </ModalContent>
+    </Modal>
+  )
+}
diff --git a/apps/sim/app/(home)/components/enterprise/enterprise.tsx b/apps/sim/app/(home)/components/enterprise/enterprise.tsx
index 08aab8bbf5b..1d547140108 100644
--- a/apps/sim/app/(home)/components/enterprise/enterprise.tsx
+++ b/apps/sim/app/(home)/components/enterprise/enterprise.tsx
@@ -18,6 +18,7 @@ import Link from 'next/link'
 import { Badge, ChevronDown } from '@/components/emcn'
 import { Lock } from '@/components/emcn/icons'
 import { GithubIcon } from '@/components/icons'
+import { DemoRequestModal } from '@/app/(home)/components/demo-request/demo-request-modal'
 import { AccessControlPanel } from '@/app/(home)/components/enterprise/components/access-control-panel'
 import { AuditLogPreview } from '@/app/(home)/components/enterprise/components/audit-log-preview'
 
@@ -177,12 +178,12 @@ export default function Enterprise() {
             {/* Fade edges */}
             <div
               aria-hidden='true'
-              className='pointer-events-none absolute top-0 bottom-0 left-0 z-10 w-16'
+              className='pointer-events-none absolute top-0 bottom-0 left-0 z-10 w-24'
               style={{ background: 'linear-gradient(to right, #1C1C1C, transparent)' }}
             />
             <div
               aria-hidden='true'
-              className='pointer-events-none absolute top-0 right-0 bottom-0 z-10 w-16'
+              className='pointer-events-none absolute top-0 right-0 bottom-0 z-10 w-24'
               style={{ background: 'linear-gradient(to left, #1C1C1C, transparent)' }}
             />
             {/* Duplicate tags for seamless loop */}
@@ -204,31 +205,31 @@ export default function Enterprise() {
             <p className='font-[430] font-season text-[#F6F6F6]/40 text-[15px] leading-[150%] tracking-[0.02em]'>
               Ready for growth?
             </p>
-            <Link
-              href='https://form.typeform.com/to/jqCO12pF'
-              target='_blank'
-              rel='noopener noreferrer'
-              className='group/cta inline-flex h-[32px] items-center gap-[6px] rounded-[5px] border border-white bg-white px-[10px] font-[430] font-season text-[14px] text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
-            >
-              Book a demo
-              <span className='relative h-[10px] w-[10px] shrink-0'>
-                <ChevronDown className='-rotate-90 absolute inset-0 h-[10px] w-[10px] transition-opacity duration-150 group-hover/cta:opacity-0' />
-                <svg
-                  className='absolute inset-0 h-[10px] w-[10px] opacity-0 transition-opacity duration-150 group-hover/cta:opacity-100'
-                  viewBox='0 0 10 10'
-                  fill='none'
-                >
-                  <path
-                    d='M1 5H8M5.5 2L8.5 5L5.5 8'
-                    stroke='currentColor'
-                    strokeWidth='1.33'
-                    strokeLinecap='square'
-                    strokeLinejoin='miter'
+            <DemoRequestModal>
+              <button
+                type='button'
+                className='group/cta inline-flex h-[32px] cursor-pointer items-center gap-[6px] rounded-[5px] border border-white bg-white px-[10px] font-[430] font-season text-[14px] text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
+              >
+                Book a demo
+                <span className='relative h-[10px] w-[10px] shrink-0'>
+                  <ChevronDown className='-rotate-90 absolute inset-0 h-[10px] w-[10px] transition-opacity duration-150 group-hover/cta:opacity-0' />
+                  <svg
+                    className='absolute inset-0 h-[10px] w-[10px] opacity-0 transition-opacity duration-150 group-hover/cta:opacity-100'
+                    viewBox='0 0 10 10'
                     fill='none'
-                  />
-                </svg>
-              </span>
-            </Link>
+                  >
+                    <path
+                      d='M1 5H8M5.5 2L8.5 5L5.5 8'
+                      stroke='currentColor'
+                      strokeWidth='1.33'
+                      strokeLinecap='square'
+                      strokeLinejoin='miter'
+                      fill='none'
+                    />
+                  </svg>
+                </span>
+              </button>
+            </DemoRequestModal>
           </div>
         </div>
       </div>
diff --git a/apps/sim/app/(home)/components/features/components/features-preview.tsx b/apps/sim/app/(home)/components/features/components/features-preview.tsx
index 255e9fd4dc6..fd05ed0857e 100644
--- a/apps/sim/app/(home)/components/features/components/features-preview.tsx
+++ b/apps/sim/app/(home)/components/features/components/features-preview.tsx
@@ -608,9 +608,12 @@ const MOCK_KB_DATA = [
 
 const MD_COMPONENTS: Components = {
   h1: ({ children }) => (
-    <h1 className='mb-4 border-[#E5E5E5] border-b pb-2 font-semibold text-[#1C1C1C] text-[20px]'>
+    <p
+      role='presentation'
+      className='mb-4 border-[#E5E5E5] border-b pb-2 font-semibold text-[#1C1C1C] text-[20px]'
+    >
       {children}
-    </h1>
+    </p>
   ),
   h2: ({ children }) => (
     <h2 className='mt-5 mb-3 border-[#E5E5E5] border-b pb-1.5 font-semibold text-[#1C1C1C] text-[16px]'>
diff --git a/apps/sim/app/(home)/components/hero/hero.tsx b/apps/sim/app/(home)/components/hero/hero.tsx
index d6c75765ca1..15ee28c832c 100644
--- a/apps/sim/app/(home)/components/hero/hero.tsx
+++ b/apps/sim/app/(home)/components/hero/hero.tsx
@@ -3,6 +3,7 @@
 import dynamic from 'next/dynamic'
 import Image from 'next/image'
 import Link from 'next/link'
+import { DemoRequestModal } from '@/app/(home)/components/demo-request/demo-request-modal'
 import {
   BlocksLeftAnimated,
   BlocksRightAnimated,
@@ -70,15 +71,15 @@ export default function Hero() {
         </p>
 
         <div className='mt-[12px] flex items-center gap-[8px]'>
-          <a
-            href='https://form.typeform.com/to/jqCO12pF'
-            target='_blank'
-            rel='noopener noreferrer'
-            className={`${CTA_BASE} border-[#3d3d3d] text-[#ECECEC] transition-colors hover:bg-[#2A2A2A]`}
-            aria-label='Get a demo'
-          >
-            Get a demo
-          </a>
+          <DemoRequestModal>
+            <button
+              type='button'
+              className={`${CTA_BASE} border-[#3d3d3d] bg-transparent text-[#ECECEC] transition-colors hover:bg-[#2A2A2A]`}
+              aria-label='Get a demo'
+            >
+              Get a demo
+            </button>
+          </DemoRequestModal>
           <Link
             href='/signup'
             className={`${CTA_BASE} gap-[8px] border-[#FFFFFF] bg-[#FFFFFF] text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]`}
diff --git a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx b/apps/sim/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
index 745e220a0ef..325e98d18e8 100644
--- a/apps/sim/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
+++ b/apps/sim/app/(home)/components/landing-preview/components/landing-preview-home/landing-preview-home.tsx
@@ -49,12 +49,13 @@ export const LandingPreviewHome = memo(function LandingPreviewHome() {
 
   return (
     <div className='flex min-w-0 flex-1 flex-col items-center justify-center px-[24px] pb-[2vh]'>
-      <h1
+      <p
+        role='presentation'
         className='mb-[24px] max-w-[42rem] font-[430] font-season text-[32px] tracking-[-0.02em]'
         style={{ color: C.TEXT_PRIMARY }}
       >
         What should we get done?
-      </h1>
+      </p>
 
       <div className='w-full max-w-[32rem]'>
         <div
diff --git a/apps/sim/app/(home)/components/navbar/components/blog-dropdown.tsx b/apps/sim/app/(home)/components/navbar/components/blog-dropdown.tsx
index 068a1c3a2f6..4b153adffa8 100644
--- a/apps/sim/app/(home)/components/navbar/components/blog-dropdown.tsx
+++ b/apps/sim/app/(home)/components/navbar/components/blog-dropdown.tsx
@@ -1,3 +1,4 @@
+import Image from 'next/image'
 import Link from 'next/link'
 import { cn } from '@/lib/core/utils/cn'
 
@@ -12,6 +13,7 @@ function BlogCard({
   image,
   title,
   imageHeight,
+  sizes,
   titleSize = '12px',
   className,
 }: {
@@ -19,6 +21,7 @@ function BlogCard({
   image: string
   title: string
   imageHeight: string
+  sizes: string
   titleSize?: string
   className?: string
 }) {
@@ -31,12 +34,13 @@ function BlogCard({
       )}
       prefetch={false}
     >
-      <div className='w-full overflow-hidden bg-[#141414]' style={{ height: imageHeight }}>
-        <img
+      <div className='relative w-full overflow-hidden bg-[#141414]' style={{ height: imageHeight }}>
+        <Image
           src={image}
           alt={title}
-          decoding='async'
-          className='h-full w-full object-cover transition-transform duration-200 group-hover/card:scale-[1.02]'
+          fill
+          sizes={sizes}
+          className='object-cover transition-transform duration-200 group-hover/card:scale-[1.02]'
         />
       </div>
       <div className='flex-shrink-0 px-[10px] py-[6px]'>
@@ -68,6 +72,7 @@ export function BlogDropdown({ posts }: BlogDropdownProps) {
           image={featured.ogImage}
           title={featured.title}
           imageHeight='190px'
+          sizes='340px'
           titleSize='13px'
           className='col-span-2 row-span-2'
         />
@@ -79,6 +84,7 @@ export function BlogDropdown({ posts }: BlogDropdownProps) {
             image={post.ogImage}
             title={post.title}
             imageHeight='72px'
+            sizes='170px'
           />
         ))}
       </div>
diff --git a/apps/sim/app/(home)/components/navbar/components/docs-dropdown.tsx b/apps/sim/app/(home)/components/navbar/components/docs-dropdown.tsx
index 9d5daa4fa2f..df218c1c7ac 100644
--- a/apps/sim/app/(home)/components/navbar/components/docs-dropdown.tsx
+++ b/apps/sim/app/(home)/components/navbar/components/docs-dropdown.tsx
@@ -1,3 +1,4 @@
+import Image from 'next/image'
 import { AgentIcon, GithubOutlineIcon, McpIcon } from '@/components/icons'
 
 const PREVIEW_CARDS = [
@@ -46,12 +47,13 @@ export function DocsDropdown() {
             rel='noopener noreferrer'
             className='group/card overflow-hidden rounded-[5px] border border-[#2A2A2A] bg-[#1C1C1C] transition-colors hover:border-[#3D3D3D] hover:bg-[#2A2A2A]'
           >
-            <div className='h-[120px] w-full overflow-hidden bg-[#141414]'>
-              <img
+            <div className='relative h-[120px] w-full overflow-hidden bg-[#141414]'>
+              <Image
                 src={card.image}
                 alt={card.title}
-                decoding='async'
-                className='h-full w-full scale-[1.04] object-cover transition-transform duration-200 group-hover/card:scale-[1.06]'
+                fill
+                sizes='220px'
+                className='scale-[1.04] object-cover transition-transform duration-200 group-hover/card:scale-[1.06]'
               />
             </div>
             <div className='px-[10px] py-[8px]'>
diff --git a/apps/sim/app/(home)/components/pricing/pricing.tsx b/apps/sim/app/(home)/components/pricing/pricing.tsx
index 77c4b9b46f0..de1a719d36c 100644
--- a/apps/sim/app/(home)/components/pricing/pricing.tsx
+++ b/apps/sim/app/(home)/components/pricing/pricing.tsx
@@ -1,5 +1,6 @@
 import Link from 'next/link'
 import { Badge } from '@/components/emcn'
+import { DemoRequestModal } from '@/app/(home)/components/demo-request/demo-request-modal'
 
 interface PricingTier {
   id: string
@@ -9,7 +10,7 @@ interface PricingTier {
   billingPeriod?: string
   color: string
   features: string[]
-  cta: { label: string; href: string }
+  cta: { label: string; href?: string; action?: 'demo-request' }
 }
 
 const PRICING_TIERS: PricingTier[] = [
@@ -78,7 +79,7 @@ const PRICING_TIERS: PricingTier[] = [
       'SSO & SCIM · SOC2 & HIPAA',
       'Self hosting · Dedicated support',
     ],
-    cta: { label: 'Book a demo', href: 'https://form.typeform.com/to/jqCO12pF' },
+    cta: { label: 'Book a demo', action: 'demo-request' },
   },
 ]
 
@@ -101,7 +102,7 @@ interface PricingCardProps {
 }
 
 function PricingCard({ tier }: PricingCardProps) {
-  const isEnterprise = tier.id === 'enterprise'
+  const isDemoRequest = tier.cta.action === 'demo-request'
   const isPro = tier.id === 'pro'
 
   return (
@@ -124,25 +125,25 @@ function PricingCard({ tier }: PricingCardProps) {
             )}
           </p>
           <div className='mt-4'>
-            {isEnterprise ? (
-              <a
-                href={tier.cta.href}
-                target='_blank'
-                rel='noopener noreferrer'
-                className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[#E5E5E5] px-[10px] font-[430] font-season text-[#1C1C1C] text-[14px] transition-colors hover:bg-[#F0F0F0]'
-              >
-                {tier.cta.label}
-              </a>
+            {isDemoRequest ? (
+              <DemoRequestModal theme='light'>
+                <button
+                  type='button'
+                  className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[#E5E5E5] bg-transparent px-[10px] font-[430] font-season text-[#1C1C1C] text-[14px] transition-colors hover:bg-[#F0F0F0]'
+                >
+                  {tier.cta.label}
+                </button>
+              </DemoRequestModal>
             ) : isPro ? (
               <Link
-                href={tier.cta.href}
+                href={tier.cta.href || '/signup'}
                 className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[#1D1D1D] bg-[#1D1D1D] px-[10px] font-[430] font-season text-[14px] text-white transition-colors hover:border-[#2A2A2A] hover:bg-[#2A2A2A]'
               >
                 {tier.cta.label}
               </Link>
             ) : (
               <Link
-                href={tier.cta.href}
+                href={tier.cta.href || '/signup'}
                 className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[#E5E5E5] px-[10px] font-[430] font-season text-[#1C1C1C] text-[14px] transition-colors hover:bg-[#F0F0F0]'
               >
                 {tier.cta.label}
diff --git a/apps/sim/app/(home)/landing.tsx b/apps/sim/app/(home)/landing.tsx
index 79689dd57a7..9463afa4be6 100644
--- a/apps/sim/app/(home)/landing.tsx
+++ b/apps/sim/app/(home)/landing.tsx
@@ -37,11 +37,17 @@ export default async function Landing() {
 
   return (
     <div className={`${season.variable} ${martianMono.variable} min-h-screen bg-[#1C1C1C]`}>
+      <a
+        href='#main-content'
+        className='sr-only focus:not-sr-only focus:fixed focus:top-4 focus:left-4 focus:z-[100] focus:rounded-md focus:bg-white focus:px-4 focus:py-2 focus:font-medium focus:text-black focus:text-sm'
+      >
+        Skip to main content
+      </a>
       <StructuredData />
       <header>
         <Navbar blogPosts={blogPosts} />
       </header>
-      <main>
+      <main id='main-content'>
         <Hero />
         <Templates />
         <Features />
diff --git a/apps/sim/app/(landing)/integrations/[slug]/page.tsx b/apps/sim/app/(landing)/integrations/[slug]/page.tsx
index 4229fc2ec5d..a486f105f7f 100644
--- a/apps/sim/app/(landing)/integrations/[slug]/page.tsx
+++ b/apps/sim/app/(landing)/integrations/[slug]/page.tsx
@@ -1,6 +1,8 @@
 import type { Metadata } from 'next'
+import Image from 'next/image'
 import Link from 'next/link'
 import { notFound } from 'next/navigation'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { TEMPLATES } from '@/app/workspace/[workspaceId]/home/components/template-prompts/consts'
 import { IntegrationIcon } from '../components/integration-icon'
 import { blockTypeToIconMap } from '../data/icon-mapping'
@@ -11,6 +13,7 @@ import { TemplateCardButton } from './components/template-card-button'
 
 const allIntegrations = integrations as Integration[]
 const INTEGRATION_COUNT = allIntegrations.length
+const baseUrl = getBaseUrl()
 
 /** Fast O(1) lookups — avoids repeated linear scans inside render loops. */
 const bySlug = new Map(allIntegrations.map((i) => [i.slug, i]))
@@ -173,16 +176,24 @@ export async function generateMetadata({
     openGraph: {
       title: `${name} Integration — AI Workflow Automation | Sim`,
       description: `Connect ${name} to ${INTEGRATION_COUNT - 1}+ tools using AI agents. ${description.slice(0, 100).trimEnd()}.`,
-      url: `https://sim.ai/integrations/${slug}`,
+      url: `${baseUrl}/integrations/${slug}`,
       type: 'website',
-      images: [{ url: 'https://sim.ai/opengraph-image.png', width: 1200, height: 630 }],
+      images: [
+        {
+          url: `${baseUrl}/opengraph-image.png`,
+          width: 1200,
+          height: 630,
+          alt: `${name} Integration — Sim`,
+        },
+      ],
     },
     twitter: {
       card: 'summary_large_image',
       title: `${name} Integration | Sim`,
       description: `Automate ${name} with AI-powered workflows. Connect to ${INTEGRATION_COUNT - 1}+ tools. Free to start.`,
+      images: [{ url: `${baseUrl}/opengraph-image.png`, alt: `${name} Integration — Sim` }],
     },
-    alternates: { canonical: `https://sim.ai/integrations/${slug}` },
+    alternates: { canonical: `${baseUrl}/integrations/${slug}` },
   }
 }
 
@@ -211,14 +222,14 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
     '@context': 'https://schema.org',
     '@type': 'BreadcrumbList',
     itemListElement: [
-      { '@type': 'ListItem', position: 1, name: 'Home', item: 'https://sim.ai' },
+      { '@type': 'ListItem', position: 1, name: 'Home', item: baseUrl },
       {
         '@type': 'ListItem',
         position: 2,
         name: 'Integrations',
-        item: 'https://sim.ai/integrations',
+        item: `${baseUrl}/integrations`,
       },
-      { '@type': 'ListItem', position: 3, name, item: `https://sim.ai/integrations/${slug}` },
+      { '@type': 'ListItem', position: 3, name, item: `${baseUrl}/integrations/${slug}` },
     ],
   }
 
@@ -227,7 +238,7 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
     '@type': 'SoftwareApplication',
     name: `${name} Integration`,
     description,
-    url: `https://sim.ai/integrations/${slug}`,
+    url: `${baseUrl}/integrations/${slug}`,
     applicationCategory: 'BusinessApplication',
     operatingSystem: 'Web',
     featureList: operations.map((o) => o.name),
@@ -647,39 +658,43 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
             </div>
 
             {/* Related integrations — internal linking for SEO */}
-            {relatedIntegrations.length > 0 && (
-              <div className='rounded-lg border border-[#2A2A2A] bg-[#242424] p-5'>
-                <h3 className='mb-4 font-[500] text-[#ECECEC] text-[14px]'>Related integrations</h3>
-                <ul className='space-y-2'>
-                  {relatedIntegrations.map((rel) => (
-                    <li key={rel.slug}>
-                      <Link
-                        href={`/integrations/${rel.slug}`}
-                        className='flex items-center gap-2.5 rounded-[6px] p-1.5 text-[#999] text-[13px] transition-colors hover:bg-[#2A2A2A] hover:text-[#ECECEC]'
-                      >
-                        <IntegrationIcon
-                          bgColor={rel.bgColor}
-                          name={rel.name}
-                          Icon={blockTypeToIconMap[rel.type]}
-                          as='span'
-                          className='h-6 w-6 rounded-[4px]'
-                          iconClassName='h-3.5 w-3.5'
-                          fallbackClassName='text-[10px]'
-                          aria-hidden='true'
-                        />
-                        {rel.name}
-                      </Link>
-                    </li>
-                  ))}
-                </ul>
-                <Link
-                  href='/integrations'
-                  className='mt-4 block text-[#555] text-[12px] transition-colors hover:text-[#999]'
-                >
-                  All integrations →
-                </Link>
-              </div>
-            )}
+            <div className='rounded-lg border border-[#2A2A2A] bg-[#242424] p-5'>
+              {relatedIntegrations.length > 0 && (
+                <>
+                  <h3 className='mb-4 font-[500] text-[#ECECEC] text-[14px]'>
+                    Related integrations
+                  </h3>
+                  <ul className='space-y-2'>
+                    {relatedIntegrations.map((rel) => (
+                      <li key={rel.slug}>
+                        <Link
+                          href={`/integrations/${rel.slug}`}
+                          className='flex items-center gap-2.5 rounded-[6px] p-1.5 text-[#999] text-[13px] transition-colors hover:bg-[#2A2A2A] hover:text-[#ECECEC]'
+                        >
+                          <IntegrationIcon
+                            bgColor={rel.bgColor}
+                            name={rel.name}
+                            Icon={blockTypeToIconMap[rel.type]}
+                            as='span'
+                            className='h-6 w-6 rounded-[4px]'
+                            iconClassName='h-3.5 w-3.5'
+                            fallbackClassName='text-[10px]'
+                            aria-hidden='true'
+                          />
+                          {rel.name}
+                        </Link>
+                      </li>
+                    ))}
+                  </ul>
+                </>
+              )}
+              <Link
+                href='/integrations'
+                className={`block text-[#555] text-[12px] transition-colors hover:text-[#999]${relatedIntegrations.length > 0 ? ' mt-4' : ''}`}
+              >
+                All integrations →
+              </Link>
+            </div>
           </aside>
         </div>
 
@@ -690,10 +705,12 @@ export default async function IntegrationPage({ params }: { params: Promise<{ sl
         >
           {/* Logo pair: Sim × Integration */}
           <div className='mx-auto mb-6 flex items-center justify-center gap-3'>
-            <img
+            <Image
               src='/brandbook/logo/small.png'
               alt='Sim'
-              className='h-14 w-14 shrink-0 rounded-xl'
+              width={56}
+              height={56}
+              className='shrink-0 rounded-xl'
             />
             <div className='flex items-center gap-2'>
               <span className='h-px w-5 bg-[#3d3d3d]' aria-hidden='true' />
diff --git a/apps/sim/app/(landing)/integrations/data/integrations.json b/apps/sim/app/(landing)/integrations/data/integrations.json
index 2b3f9e19a1c..7d8cf706be5 100644
--- a/apps/sim/app/(landing)/integrations/data/integrations.json
+++ b/apps/sim/app/(landing)/integrations/data/integrations.json
@@ -168,35 +168,35 @@
     "operations": [
       {
         "name": "List Bases",
-        "description": ""
+        "description": "List all bases the authenticated user has access to"
       },
       {
         "name": "List Tables",
-        "description": ""
+        "description": "List all tables and their schema in an Airtable base"
       },
       {
         "name": "Get Base Schema",
-        "description": ""
+        "description": "Get the schema of all tables, fields, and views in an Airtable base"
       },
       {
         "name": "List Records",
-        "description": ""
+        "description": "Read records from an Airtable table"
       },
       {
         "name": "Get Record",
-        "description": ""
+        "description": "Retrieve a single record from an Airtable table by its ID"
       },
       {
         "name": "Create Records",
-        "description": ""
+        "description": "Write new records to an Airtable table"
       },
       {
         "name": "Update Record",
-        "description": ""
+        "description": "Update an existing record in an Airtable table by ID"
       },
       {
         "name": "Update Multiple Records",
-        "description": ""
+        "description": "Update multiple existing records in an Airtable table"
       }
     ],
     "operationCount": 8,
@@ -287,11 +287,11 @@
       },
       {
         "name": "Delete Index",
-        "description": ""
+        "description": "Delete an entire Algolia index and all its records"
       },
       {
         "name": "Copy/Move Index",
-        "description": ""
+        "description": "Copy or move an Algolia index to a new destination"
       },
       {
         "name": "Clear Records",
@@ -609,7 +609,7 @@
       },
       {
         "name": "Add to Sequence",
-        "description": ""
+        "description": "Add contacts to an Apollo sequence"
       },
       {
         "name": "Create Task",
@@ -904,7 +904,7 @@
       },
       {
         "name": "Assert Record (Upsert)",
-        "description": "Upsert a record in Attio \u2014 creates it if no match is found, updates it if a match exists"
+        "description": "Upsert a record in Attio — creates it if no match is found, updates it if a match exists"
       },
       {
         "name": "List Notes",
@@ -1399,7 +1399,7 @@
       },
       {
         "name": "List Event Types",
-        "description": ""
+        "description": "Retrieve a list of all event types"
       },
       {
         "name": "Update Event Type",
@@ -1508,7 +1508,7 @@
       },
       {
         "name": "List Event Types",
-        "description": ""
+        "description": "Retrieve a list of all event types for a user or organization"
       },
       {
         "name": "Get Event Type",
@@ -1758,11 +1758,11 @@
     "operations": [
       {
         "name": "Read Page",
-        "description": ""
+        "description": "Retrieve content from Confluence pages using the Confluence API."
       },
       {
         "name": "Create Page",
-        "description": ""
+        "description": "Create a new page in a Confluence space."
       },
       {
         "name": "Update Page",
@@ -1770,7 +1770,7 @@
       },
       {
         "name": "Delete Page",
-        "description": ""
+        "description": "Delete a Confluence page. By default moves to trash; use purge=true to permanently delete."
       },
       {
         "name": "List Pages in Space",
@@ -2504,7 +2504,7 @@
     "slug": "dspy",
     "name": "DSPy",
     "description": "Run predictions using self-hosted DSPy programs",
-    "longDescription": "Integrate with your self-hosted DSPy programs for LLM-powered predictions. Supports Predict, Chain of Thought, and ReAct agents. DSPy is the framework for programming\u2014not prompting\u2014language models.",
+    "longDescription": "Integrate with your self-hosted DSPy programs for LLM-powered predictions. Supports Predict, Chain of Thought, and ReAct agents. DSPy is the framework for programming—not prompting—language models.",
     "bgColor": "#E0E0E0",
     "iconName": "DsPyIcon",
     "docsUrl": "https://docs.sim.ai/tools/dspy",
@@ -2635,15 +2635,15 @@
       },
       {
         "name": "Create Index",
-        "description": ""
+        "description": "Create a new index with optional settings and mappings."
       },
       {
         "name": "Delete Index",
-        "description": ""
+        "description": "Delete an index and all its documents. This operation is irreversible."
       },
       {
         "name": "Get Index Info",
-        "description": ""
+        "description": "Retrieve index information including settings, mappings, and aliases."
       },
       {
         "name": "List Indices",
@@ -3668,51 +3668,51 @@
     "operations": [
       {
         "name": "Send Email",
-        "description": ""
+        "description": "Send Gmail messages"
       },
       {
         "name": "Read Email",
-        "description": ""
+        "description": "Read Gmail messages"
       },
       {
         "name": "Draft Email",
-        "description": ""
+        "description": "Draft emails using Gmail"
       },
       {
         "name": "Search Email",
-        "description": ""
+        "description": "Search emails in Gmail"
       },
       {
         "name": "Move Email",
-        "description": ""
+        "description": "Move emails between Gmail labels/folders"
       },
       {
         "name": "Mark as Read",
-        "description": ""
+        "description": "Mark a Gmail message as read"
       },
       {
         "name": "Mark as Unread",
-        "description": ""
+        "description": "Mark a Gmail message as unread"
       },
       {
         "name": "Archive Email",
-        "description": ""
+        "description": "Archive a Gmail message (remove from inbox)"
       },
       {
         "name": "Unarchive Email",
-        "description": ""
+        "description": "Unarchive a Gmail message (move back to inbox)"
       },
       {
         "name": "Delete Email",
-        "description": ""
+        "description": "Delete a Gmail message (move to trash)"
       },
       {
         "name": "Add Label",
-        "description": ""
+        "description": "Add label(s) to a Gmail message"
       },
       {
         "name": "Remove Label",
-        "description": ""
+        "description": "Remove label(s) from a Gmail message"
       }
     ],
     "operationCount": 12,
@@ -4080,7 +4080,7 @@
       },
       {
         "name": "Create File",
-        "description": ""
+        "description": "Upload a file to Google Drive with complete metadata returned"
       },
       {
         "name": "Upload File",
@@ -4453,31 +4453,31 @@
       },
       {
         "name": "Clear Data",
-        "description": ""
+        "description": "Clear values from a specific range in a Google Sheets spreadsheet"
       },
       {
         "name": "Get Spreadsheet Info",
-        "description": ""
+        "description": "Get metadata about a Google Sheets spreadsheet including title and sheet list"
       },
       {
         "name": "Create Spreadsheet",
-        "description": ""
+        "description": "Create a new Google Sheets spreadsheet"
       },
       {
         "name": "Batch Read",
-        "description": ""
+        "description": "Read multiple ranges from a Google Sheets spreadsheet in a single request"
       },
       {
         "name": "Batch Update",
-        "description": ""
+        "description": "Update multiple ranges in a Google Sheets spreadsheet in a single request"
       },
       {
         "name": "Batch Clear",
-        "description": ""
+        "description": "Clear multiple ranges in a Google Sheets spreadsheet in a single request"
       },
       {
         "name": "Copy Sheet",
-        "description": ""
+        "description": "Copy a sheet from one spreadsheet to another"
       }
     ],
     "operationCount": 11,
@@ -4540,7 +4540,7 @@
       },
       {
         "name": "Reorder Slides",
-        "description": ""
+        "description": "Move one or more slides to a new position in a Google Slides presentation"
       },
       {
         "name": "Create Table",
@@ -4807,7 +4807,7 @@
       },
       {
         "name": "List Meeting Types",
-        "description": ""
+        "description": "List all meeting types in the workspace"
       },
       {
         "name": "Create Webhook",
@@ -5062,13 +5062,9 @@
     "iconName": "HubspotIcon",
     "docsUrl": "https://docs.sim.ai/tools/hubspot",
     "operations": [
-      {
-        "name": "Get Users",
-        "description": "Retrieve all users from HubSpot account"
-      },
       {
         "name": "Get Contacts",
-        "description": ""
+        "description": "Retrieve all contacts from HubSpot account with pagination support"
       },
       {
         "name": "Create Contact",
@@ -5084,7 +5080,7 @@
       },
       {
         "name": "Get Companies",
-        "description": ""
+        "description": "Retrieve all companies from HubSpot account with pagination support"
       },
       {
         "name": "Create Company",
@@ -5100,10 +5096,90 @@
       },
       {
         "name": "Get Deals",
-        "description": ""
+        "description": "Retrieve all deals from HubSpot account with pagination support"
+      },
+      {
+        "name": "Create Deal",
+        "description": "Create a new deal in HubSpot. Requires at least a dealname property"
+      },
+      {
+        "name": "Update Deal",
+        "description": "Update an existing deal in HubSpot by ID"
+      },
+      {
+        "name": "Search Deals",
+        "description": "Search for deals in HubSpot using filters, sorting, and queries"
+      },
+      {
+        "name": "Get Tickets",
+        "description": "Retrieve all tickets from HubSpot account with pagination support"
+      },
+      {
+        "name": "Create Ticket",
+        "description": "Create a new ticket in HubSpot. Requires subject and hs_pipeline_stage properties"
+      },
+      {
+        "name": "Update Ticket",
+        "description": "Update an existing ticket in HubSpot by ID"
+      },
+      {
+        "name": "Search Tickets",
+        "description": "Search for tickets in HubSpot using filters, sorting, and queries"
+      },
+      {
+        "name": "Get Line Items",
+        "description": "Retrieve all line items from HubSpot account with pagination support"
+      },
+      {
+        "name": "Create Line Item",
+        "description": "Create a new line item in HubSpot. Requires at least a name property"
+      },
+      {
+        "name": "Update Line Item",
+        "description": "Update an existing line item in HubSpot by ID"
+      },
+      {
+        "name": "Get Quotes",
+        "description": "Retrieve all quotes from HubSpot account with pagination support"
+      },
+      {
+        "name": "Get Appointments",
+        "description": "Retrieve all appointments from HubSpot account with pagination support"
+      },
+      {
+        "name": "Create Appointment",
+        "description": "Create a new appointment in HubSpot"
+      },
+      {
+        "name": "Update Appointment",
+        "description": "Update an existing appointment in HubSpot by ID"
+      },
+      {
+        "name": "Get Carts",
+        "description": "Retrieve all carts from HubSpot account with pagination support"
+      },
+      {
+        "name": "List Owners",
+        "description": "Retrieve all owners from HubSpot account with pagination support"
+      },
+      {
+        "name": "Get Marketing Events",
+        "description": "Retrieve all marketing events from HubSpot account with pagination support"
+      },
+      {
+        "name": "Get Lists",
+        "description": "Search and retrieve lists from HubSpot account"
+      },
+      {
+        "name": "Create List",
+        "description": "Create a new list in HubSpot. Specify the object type and processing type (MANUAL or DYNAMIC)"
+      },
+      {
+        "name": "Get Users",
+        "description": "Retrieve all users from HubSpot account"
       }
     ],
-    "operationCount": 10,
+    "operationCount": 29,
     "triggers": [
       {
         "id": "hubspot_contact_created",
@@ -5611,7 +5687,7 @@
       },
       {
         "name": "Update Ticket",
-        "description": ""
+        "description": "Update a ticket in Intercom (change state, assignment, attributes)"
       },
       {
         "name": "Create Message",
@@ -5619,59 +5695,59 @@
       },
       {
         "name": "List Admins",
-        "description": ""
+        "description": "Fetch a list of all admins for the workspace"
       },
       {
         "name": "Close Conversation",
-        "description": ""
+        "description": "Close a conversation in Intercom"
       },
       {
         "name": "Open Conversation",
-        "description": ""
+        "description": "Open a closed or snoozed conversation in Intercom"
       },
       {
         "name": "Snooze Conversation",
-        "description": ""
+        "description": "Snooze a conversation to reopen at a future time"
       },
       {
         "name": "Assign Conversation",
-        "description": ""
+        "description": "Assign a conversation to an admin or team in Intercom"
       },
       {
         "name": "List Tags",
-        "description": ""
+        "description": "Fetch a list of all tags in the workspace"
       },
       {
         "name": "Create Tag",
-        "description": ""
+        "description": "Create a new tag or update an existing tag name"
       },
       {
         "name": "Tag Contact",
-        "description": ""
+        "description": "Add a tag to a specific contact"
       },
       {
         "name": "Untag Contact",
-        "description": ""
+        "description": "Remove a tag from a specific contact"
       },
       {
         "name": "Tag Conversation",
-        "description": ""
+        "description": "Add a tag to a specific conversation"
       },
       {
         "name": "Create Note",
-        "description": ""
+        "description": "Add a note to a specific contact"
       },
       {
         "name": "Create Event",
-        "description": ""
+        "description": "Track a custom event for a contact in Intercom"
       },
       {
         "name": "Attach Contact to Company",
-        "description": ""
+        "description": "Attach a contact to a company in Intercom"
       },
       {
         "name": "Detach Contact from Company",
-        "description": ""
+        "description": "Remove a contact from a company in Intercom"
       }
     ],
     "operationCount": 31,
@@ -5721,7 +5797,7 @@
     "operations": [
       {
         "name": "Read Issue",
-        "description": ""
+        "description": "Retrieve detailed information about a specific Jira issue"
       },
       {
         "name": "Update Issue",
@@ -5733,19 +5809,19 @@
       },
       {
         "name": "Delete Issue",
-        "description": ""
+        "description": "Delete a Jira issue"
       },
       {
         "name": "Assign Issue",
-        "description": ""
+        "description": "Assign a Jira issue to a user"
       },
       {
         "name": "Transition Issue",
-        "description": ""
+        "description": "Move a Jira issue between workflow statuses (e.g., To Do -> In Progress)"
       },
       {
         "name": "Search Issues",
-        "description": ""
+        "description": "Search for Jira issues using JQL (Jira Query Language)"
       },
       {
         "name": "Add Comment",
@@ -5793,11 +5869,11 @@
       },
       {
         "name": "Create Issue Link",
-        "description": ""
+        "description": "Create a link relationship between two Jira issues"
       },
       {
         "name": "Delete Issue Link",
-        "description": ""
+        "description": "Delete a link between two Jira issues"
       },
       {
         "name": "Add Watcher",
@@ -5867,87 +5943,87 @@
     "operations": [
       {
         "name": "Get Service Desks",
-        "description": ""
+        "description": "Get all service desks from Jira Service Management"
       },
       {
         "name": "Get Request Types",
-        "description": ""
+        "description": "Get request types for a service desk in Jira Service Management"
       },
       {
         "name": "Create Request",
-        "description": ""
+        "description": "Create a new service request in Jira Service Management"
       },
       {
         "name": "Get Request",
-        "description": ""
+        "description": "Get a single service request from Jira Service Management"
       },
       {
         "name": "Get Requests",
-        "description": ""
+        "description": "Get multiple service requests from Jira Service Management"
       },
       {
         "name": "Add Comment",
-        "description": ""
+        "description": "Add a comment (public or internal) to a service request in Jira Service Management"
       },
       {
         "name": "Get Comments",
-        "description": ""
+        "description": "Get comments for a service request in Jira Service Management"
       },
       {
         "name": "Get Customers",
-        "description": ""
+        "description": "Get customers for a service desk in Jira Service Management"
       },
       {
         "name": "Add Customer",
-        "description": ""
+        "description": "Add customers to a service desk in Jira Service Management"
       },
       {
         "name": "Get Organizations",
-        "description": ""
+        "description": "Get organizations for a service desk in Jira Service Management"
       },
       {
         "name": "Create Organization",
-        "description": ""
+        "description": "Create a new organization in Jira Service Management"
       },
       {
         "name": "Add Organization",
-        "description": ""
+        "description": "Add an organization to a service desk in Jira Service Management"
       },
       {
         "name": "Get Queues",
-        "description": ""
+        "description": "Get queues for a service desk in Jira Service Management"
       },
       {
         "name": "Get SLA",
-        "description": ""
+        "description": "Get SLA information for a service request in Jira Service Management"
       },
       {
         "name": "Get Transitions",
-        "description": ""
+        "description": "Get available transitions for a service request in Jira Service Management"
       },
       {
         "name": "Transition Request",
-        "description": ""
+        "description": "Transition a service request to a new status in Jira Service Management"
       },
       {
         "name": "Get Participants",
-        "description": ""
+        "description": "Get participants for a request in Jira Service Management"
       },
       {
         "name": "Add Participants",
-        "description": ""
+        "description": "Add participants to a request in Jira Service Management"
       },
       {
         "name": "Get Approvals",
-        "description": ""
+        "description": "Get approvals for a request in Jira Service Management"
       },
       {
         "name": "Answer Approval",
-        "description": ""
+        "description": "Approve or decline an approval request in Jira Service Management"
       },
       {
         "name": "Get Request Type Fields",
-        "description": ""
+        "description": "Get the fields required to create a request of a specific type in Jira Service Management"
       }
     ],
     "operationCount": 21,
@@ -7823,7 +7899,7 @@
       },
       {
         "name": "Create File",
-        "description": ""
+        "description": "Upload a file to OneDrive"
       },
       {
         "name": "Upload File",
@@ -7862,39 +7938,39 @@
     "operations": [
       {
         "name": "Send Email",
-        "description": ""
+        "description": "Send emails using Outlook"
       },
       {
         "name": "Draft Email",
-        "description": ""
+        "description": "Draft emails using Outlook"
       },
       {
         "name": "Read Email",
-        "description": ""
+        "description": "Read emails from Outlook"
       },
       {
         "name": "Forward Email",
-        "description": ""
+        "description": "Forward an existing Outlook message to specified recipients"
       },
       {
         "name": "Move Email",
-        "description": ""
+        "description": "Move emails between Outlook folders"
       },
       {
         "name": "Mark as Read",
-        "description": ""
+        "description": "Mark an Outlook message as read"
       },
       {
         "name": "Mark as Unread",
-        "description": ""
+        "description": "Mark an Outlook message as unread"
       },
       {
         "name": "Delete Email",
-        "description": ""
+        "description": "Delete an Outlook message (move to Deleted Items)"
       },
       {
         "name": "Copy Email",
-        "description": ""
+        "description": "Copy an Outlook message to another folder"
       }
     ],
     "operationCount": 9,
@@ -7960,15 +8036,15 @@
     "operations": [
       {
         "name": "Search",
-        "description": ""
+        "description": "Search the web using Parallel AI. Provides comprehensive search results with intelligent processing and content extraction."
       },
       {
         "name": "Extract from URLs",
-        "description": ""
+        "description": "Extract targeted information from specific URLs using Parallel AI. Processes provided URLs to pull relevant content based on your objective."
       },
       {
         "name": "Deep Research",
-        "description": ""
+        "description": "Conduct comprehensive deep research across the web using Parallel AI. Synthesizes information from multiple sources with citations. Can take up to 45 minutes to complete."
       }
     ],
     "operationCount": 3,
@@ -8018,7 +8094,7 @@
     "operations": [
       {
         "name": "Generate Embeddings",
-        "description": ""
+        "description": "Generate embeddings from text using Pinecone"
       },
       {
         "name": "Upsert Text",
@@ -8499,15 +8575,15 @@
     "operations": [
       {
         "name": "Upsert",
-        "description": ""
+        "description": "Insert or update points in a Qdrant collection"
       },
       {
         "name": "Search",
-        "description": ""
+        "description": "Search for similar vectors in a Qdrant collection"
       },
       {
         "name": "Fetch",
-        "description": ""
+        "description": "Fetch points by ID from a Qdrant collection"
       }
     ],
     "operationCount": 3,
@@ -8943,7 +9019,7 @@
       },
       {
         "name": "List Leave Types",
-        "description": ""
+        "description": "List company leave types configured in Rippling"
       },
       {
         "name": "Create Group",
@@ -9125,7 +9201,7 @@
       },
       {
         "name": "List Report Types",
-        "description": ""
+        "description": "Get a list of available report types"
       },
       {
         "name": "List Dashboards",
@@ -9456,7 +9532,7 @@
       },
       {
         "name": "Read List",
-        "description": ""
+        "description": "Get metadata (and optionally columns/items) for a SharePoint list"
       },
       {
         "name": "Update List",
@@ -9633,11 +9709,11 @@
     "operations": [
       {
         "name": "Send Message",
-        "description": ""
+        "description": "Send messages to Slack channels or direct messages. Supports Slack mrkdwn formatting."
       },
       {
         "name": "Send Ephemeral Message",
-        "description": ""
+        "description": "Send an ephemeral message visible only to a specific user in a channel. Optionally reply in a thread. The message does not persist across sessions."
       },
       {
         "name": "Create Canvas",
@@ -9645,7 +9721,7 @@
       },
       {
         "name": "Read Messages",
-        "description": ""
+        "description": "Read the latest messages from Slack channels. Retrieve conversation history with filtering options."
       },
       {
         "name": "Get Message",
@@ -9677,19 +9753,19 @@
       },
       {
         "name": "Update Message",
-        "description": ""
+        "description": "Update a message previously sent by the bot in Slack"
       },
       {
         "name": "Delete Message",
-        "description": ""
+        "description": "Delete a message previously sent by the bot in Slack"
       },
       {
         "name": "Add Reaction",
-        "description": ""
+        "description": "Add an emoji reaction to a Slack message"
       },
       {
         "name": "Remove Reaction",
-        "description": ""
+        "description": "Remove an emoji reaction from a Slack message"
       },
       {
         "name": "Get Channel Info",
@@ -10530,67 +10606,67 @@
     "operations": [
       {
         "name": "Get",
-        "description": ""
+        "description": "Get the value of a key from Upstash Redis."
       },
       {
         "name": "Set",
-        "description": ""
+        "description": "Set the value of a key in Upstash Redis with an optional expiration time in seconds."
       },
       {
         "name": "Delete",
-        "description": ""
+        "description": "Delete a key from Upstash Redis."
       },
       {
         "name": "List Keys",
-        "description": ""
+        "description": "List keys matching a pattern in Upstash Redis. Defaults to listing all keys (*)."
       },
       {
         "name": "HSET",
-        "description": ""
+        "description": "Set a field in a hash stored at a key in Upstash Redis."
       },
       {
         "name": "HGET",
-        "description": ""
+        "description": "Get the value of a field in a hash stored at a key in Upstash Redis."
       },
       {
         "name": "HGETALL",
-        "description": ""
+        "description": "Get all fields and values of a hash stored at a key in Upstash Redis."
       },
       {
         "name": "INCR",
-        "description": ""
+        "description": "Atomically increment the integer value of a key by one in Upstash Redis. If the key does not exist, it is set to 0 before incrementing."
       },
       {
         "name": "INCRBY",
-        "description": ""
+        "description": "Increment the integer value of a key by a given amount. Use a negative value to decrement. If the key does not exist, it is set to 0 before the operation."
       },
       {
         "name": "EXISTS",
-        "description": ""
+        "description": "Check if a key exists in Upstash Redis. Returns true if the key exists, false otherwise."
       },
       {
         "name": "SETNX",
-        "description": ""
+        "description": "Set the value of a key only if it does not already exist. Returns true if the key was set, false if it already existed."
       },
       {
         "name": "LPUSH",
-        "description": ""
+        "description": "Prepend a value to the beginning of a list in Upstash Redis. Creates the list if it does not exist."
       },
       {
         "name": "LRANGE",
-        "description": ""
+        "description": "Get a range of elements from a list in Upstash Redis. Use 0 and -1 for start and stop to get all elements."
       },
       {
         "name": "EXPIRE",
-        "description": ""
+        "description": "Set a timeout on a key in Upstash Redis. After the timeout, the key is deleted."
       },
       {
         "name": "TTL",
-        "description": ""
+        "description": "Get the remaining time to live of a key in Upstash Redis. Returns -1 if the key has no expiration, -2 if the key does not exist."
       },
       {
         "name": "Command",
-        "description": ""
+        "description": "Execute an arbitrary Redis command against Upstash Redis. Pass the full command as a JSON array (e.g., ["
       }
     ],
     "operationCount": 16,
@@ -10911,23 +10987,23 @@
     "operations": [
       {
         "name": "List Items",
-        "description": ""
+        "description": "List all items from a Webflow CMS collection"
       },
       {
         "name": "Get Item",
-        "description": ""
+        "description": "Get a single item from a Webflow CMS collection"
       },
       {
         "name": "Create Item",
-        "description": ""
+        "description": "Create a new item in a Webflow CMS collection"
       },
       {
         "name": "Update Item",
-        "description": ""
+        "description": "Update an existing item in a Webflow CMS collection"
       },
       {
         "name": "Delete Item",
-        "description": ""
+        "description": "Delete an item from a Webflow CMS collection"
       }
     ],
     "operationCount": 5,
diff --git a/apps/sim/app/(landing)/integrations/layout.tsx b/apps/sim/app/(landing)/integrations/layout.tsx
index 9691c27ebef..8b523aa9ff1 100644
--- a/apps/sim/app/(landing)/integrations/layout.tsx
+++ b/apps/sim/app/(landing)/integrations/layout.tsx
@@ -1,15 +1,17 @@
 import { getNavBlogPosts } from '@/lib/blog/registry'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import Footer from '@/app/(home)/components/footer/footer'
 import Navbar from '@/app/(home)/components/navbar/navbar'
 
 export default async function IntegrationsLayout({ children }: { children: React.ReactNode }) {
   const blogPosts = await getNavBlogPosts()
+  const url = getBaseUrl()
   const orgJsonLd = {
     '@context': 'https://schema.org',
     '@type': 'Organization',
     name: 'Sim',
-    url: 'https://sim.ai',
-    logo: 'https://sim.ai/logo/primary/small.png',
+    url,
+    logo: `${url}/logo/primary/small.png`,
     sameAs: ['https://x.com/simdotai'],
   }
 
@@ -17,10 +19,10 @@ export default async function IntegrationsLayout({ children }: { children: React
     '@context': 'https://schema.org',
     '@type': 'WebSite',
     name: 'Sim',
-    url: 'https://sim.ai',
+    url,
     potentialAction: {
       '@type': 'SearchAction',
-      target: 'https://sim.ai/search?q={search_term_string}',
+      target: `${url}/search?q={search_term_string}`,
       'query-input': 'required name=search_term_string',
     },
   }
diff --git a/apps/sim/app/(landing)/integrations/page.tsx b/apps/sim/app/(landing)/integrations/page.tsx
index b4d8243c3db..65a65262366 100644
--- a/apps/sim/app/(landing)/integrations/page.tsx
+++ b/apps/sim/app/(landing)/integrations/page.tsx
@@ -1,4 +1,5 @@
 import type { Metadata } from 'next'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { IntegrationGrid } from './components/integration-grid'
 import { RequestIntegrationModal } from './components/request-integration-modal'
 import { blockTypeToIconMap } from './data/icon-mapping'
@@ -15,6 +16,8 @@ const INTEGRATION_COUNT = allIntegrations.length
  */
 const TOP_NAMES = [...new Set(POPULAR_WORKFLOWS.flatMap((p) => [p.from, p.to]))].slice(0, 6)
 
+const baseUrl = getBaseUrl()
+
 export const metadata: Metadata = {
   title: 'Integrations',
   description: `Connect ${INTEGRATION_COUNT}+ apps and services with Sim's AI workflow automation. Build intelligent pipelines with ${TOP_NAMES.join(', ')}, and more.`,
@@ -28,16 +31,26 @@ export const metadata: Metadata = {
   openGraph: {
     title: 'Integrations for AI Workflow Automation | Sim',
     description: `Connect ${INTEGRATION_COUNT}+ apps with Sim. Build AI-powered pipelines that link ${TOP_NAMES.join(', ')}, and every tool your team uses.`,
-    url: 'https://sim.ai/integrations',
+    url: `${baseUrl}/integrations`,
     type: 'website',
-    images: [{ url: 'https://sim.ai/opengraph-image.png', width: 1200, height: 630 }],
+    images: [
+      {
+        url: `${baseUrl}/opengraph-image.png`,
+        width: 1200,
+        height: 630,
+        alt: 'Sim Integrations for AI Workflow Automation',
+      },
+    ],
   },
   twitter: {
     card: 'summary_large_image',
     title: 'Integrations | Sim',
     description: `Connect ${INTEGRATION_COUNT}+ apps with Sim's AI workflow automation.`,
+    images: [
+      { url: `${baseUrl}/opengraph-image.png`, alt: 'Sim Integrations for AI Workflow Automation' },
+    ],
   },
-  alternates: { canonical: 'https://sim.ai/integrations' },
+  alternates: { canonical: `${baseUrl}/integrations` },
 }
 
 export default function IntegrationsPage() {
@@ -45,12 +58,12 @@ export default function IntegrationsPage() {
     '@context': 'https://schema.org',
     '@type': 'BreadcrumbList',
     itemListElement: [
-      { '@type': 'ListItem', position: 1, name: 'Home', item: 'https://sim.ai' },
+      { '@type': 'ListItem', position: 1, name: 'Home', item: baseUrl },
       {
         '@type': 'ListItem',
         position: 2,
         name: 'Integrations',
-        item: 'https://sim.ai/integrations',
+        item: `${baseUrl}/integrations`,
       },
     ],
   }
@@ -60,7 +73,7 @@ export default function IntegrationsPage() {
     '@type': 'ItemList',
     name: 'Sim AI Workflow Integrations',
     description: `Complete list of ${INTEGRATION_COUNT}+ integrations available in Sim for building AI-powered workflow automation.`,
-    url: 'https://sim.ai/integrations',
+    url: `${baseUrl}/integrations`,
     numberOfItems: INTEGRATION_COUNT,
     itemListElement: allIntegrations.map((integration, index) => ({
       '@type': 'ListItem',
@@ -69,7 +82,7 @@ export default function IntegrationsPage() {
         '@type': 'SoftwareApplication',
         name: integration.name,
         description: integration.description,
-        url: `https://sim.ai/integrations/${integration.slug}`,
+        url: `${baseUrl}/integrations/${integration.slug}`,
         applicationCategory: 'BusinessApplication',
         featureList: integration.operations.map((o) => o.name),
       },
diff --git a/apps/sim/app/api/demo-requests/route.ts b/apps/sim/app/api/demo-requests/route.ts
new file mode 100644
index 00000000000..8ca458f6cbc
--- /dev/null
+++ b/apps/sim/app/api/demo-requests/route.ts
@@ -0,0 +1,106 @@
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { env } from '@/lib/core/config/env'
+import type { TokenBucketConfig } from '@/lib/core/rate-limiter'
+import { RateLimiter } from '@/lib/core/rate-limiter'
+import { generateRequestId } from '@/lib/core/utils/request'
+import { getEmailDomain } from '@/lib/core/utils/urls'
+import { sendEmail } from '@/lib/messaging/email/mailer'
+import { getFromEmailAddress } from '@/lib/messaging/email/utils'
+import {
+  demoRequestSchema,
+  getDemoRequestRegionLabel,
+  getDemoRequestUserCountLabel,
+} from '@/app/(home)/components/demo-request/consts'
+
+const logger = createLogger('DemoRequestAPI')
+const rateLimiter = new RateLimiter()
+
+const PUBLIC_ENDPOINT_RATE_LIMIT: TokenBucketConfig = {
+  maxTokens: 10,
+  refillRate: 5,
+  refillIntervalMs: 60_000,
+}
+
+export async function POST(req: NextRequest) {
+  const requestId = generateRequestId()
+
+  try {
+    const ip = req.headers.get('x-forwarded-for')?.split(',')[0]?.trim() ?? 'unknown'
+    const storageKey = `public:demo-request:${ip}`
+
+    const { allowed, remaining, resetAt } = await rateLimiter.checkRateLimitDirect(
+      storageKey,
+      PUBLIC_ENDPOINT_RATE_LIMIT
+    )
+
+    if (!allowed) {
+      logger.warn(`[${requestId}] Rate limit exceeded for IP ${ip}`, { remaining, resetAt })
+      return NextResponse.json(
+        { error: 'Too many requests. Please try again later.' },
+        {
+          status: 429,
+          headers: { 'Retry-After': String(Math.ceil((resetAt.getTime() - Date.now()) / 1000)) },
+        }
+      )
+    }
+
+    const body = await req.json()
+    const validationResult = demoRequestSchema.safeParse(body)
+
+    if (!validationResult.success) {
+      logger.warn(`[${requestId}] Invalid demo request data`, {
+        errors: validationResult.error.format(),
+      })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: validationResult.error.format() },
+        { status: 400 }
+      )
+    }
+
+    const { firstName, lastName, companyEmail, phoneNumber, region, userCount, details } =
+      validationResult.data
+
+    logger.info(`[${requestId}] Processing demo request`, {
+      email: `${companyEmail.substring(0, 3)}***`,
+      region,
+      userCount,
+    })
+
+    const emailText = `Demo request submitted
+Submitted: ${new Date().toISOString()}
+Name: ${firstName} ${lastName}
+Email: ${companyEmail}
+Phone: ${phoneNumber ?? 'Not provided'}
+Region: ${getDemoRequestRegionLabel(region)}
+Users: ${getDemoRequestUserCountLabel(userCount)}
+
+Details:
+${details}
+`
+
+    const emailResult = await sendEmail({
+      to: [`enterprise@${env.EMAIL_DOMAIN || getEmailDomain()}`],
+      subject: `[DEMO REQUEST] ${firstName} ${lastName}`,
+      text: emailText,
+      from: getFromEmailAddress(),
+      replyTo: companyEmail,
+      emailType: 'transactional',
+    })
+
+    if (!emailResult.success) {
+      logger.error(`[${requestId}] Error sending demo request email`, emailResult.message)
+      return NextResponse.json({ error: 'Failed to submit request' }, { status: 500 })
+    }
+
+    logger.info(`[${requestId}] Demo request email sent successfully`)
+
+    return NextResponse.json(
+      { success: true, message: 'Thanks! Our team will reach out shortly.' },
+      { status: 201 }
+    )
+  } catch (error) {
+    logger.error(`[${requestId}] Error processing demo request`, error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
diff --git a/apps/sim/app/api/help/integration-request/route.ts b/apps/sim/app/api/help/integration-request/route.ts
index c6773d2f686..929ae36730a 100644
--- a/apps/sim/app/api/help/integration-request/route.ts
+++ b/apps/sim/app/api/help/integration-request/route.ts
@@ -7,7 +7,10 @@ import { RateLimiter } from '@/lib/core/rate-limiter'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getEmailDomain } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
-import { getFromEmailAddress } from '@/lib/messaging/email/utils'
+import {
+  getFromEmailAddress,
+  NO_EMAIL_HEADER_CONTROL_CHARS_REGEX,
+} from '@/lib/messaging/email/utils'
 
 const logger = createLogger('IntegrationRequestAPI')
 
@@ -20,7 +23,12 @@ const PUBLIC_ENDPOINT_RATE_LIMIT: TokenBucketConfig = {
 }
 
 const integrationRequestSchema = z.object({
-  integrationName: z.string().min(1, 'Integration name is required').max(200),
+  integrationName: z
+    .string()
+    .trim()
+    .min(1, 'Integration name is required')
+    .max(200)
+    .regex(NO_EMAIL_HEADER_CONTROL_CHARS_REGEX, 'Invalid characters'),
   email: z.string().email('A valid email is required'),
   useCase: z.string().max(2000).optional(),
 })
diff --git a/apps/sim/app/api/help/route.ts b/apps/sim/app/api/help/route.ts
index 2c2e24ddb7d..a028bd4005f 100644
--- a/apps/sim/app/api/help/route.ts
+++ b/apps/sim/app/api/help/route.ts
@@ -7,12 +7,19 @@ import { env } from '@/lib/core/config/env'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getEmailDomain } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
-import { getFromEmailAddress } from '@/lib/messaging/email/utils'
+import {
+  getFromEmailAddress,
+  NO_EMAIL_HEADER_CONTROL_CHARS_REGEX,
+} from '@/lib/messaging/email/utils'
 
 const logger = createLogger('HelpAPI')
 
 const helpFormSchema = z.object({
-  subject: z.string().min(1, 'Subject is required'),
+  subject: z
+    .string()
+    .trim()
+    .min(1, 'Subject is required')
+    .regex(NO_EMAIL_HEADER_CONTROL_CHARS_REGEX, 'Invalid characters'),
   message: z.string().min(1, 'Message is required'),
   type: z.enum(['bug', 'feedback', 'feature_request', 'other']),
 })
diff --git a/apps/sim/app/layout.tsx b/apps/sim/app/layout.tsx
index c4d5db0301e..a58f0c25cbf 100644
--- a/apps/sim/app/layout.tsx
+++ b/apps/sim/app/layout.tsx
@@ -3,11 +3,7 @@ import Script from 'next/script'
 import { PublicEnvScript } from 'next-runtime-env'
 import { BrandedLayout } from '@/components/branded-layout'
 import { PostHogProvider } from '@/app/_shell/providers/posthog-provider'
-import {
-  generateBrandedMetadata,
-  generateStructuredData,
-  generateThemeCSS,
-} from '@/ee/whitelabeling'
+import { generateBrandedMetadata, generateThemeCSS } from '@/ee/whitelabeling'
 import '@/app/_styles/globals.css'
 import { OneDollarStats } from '@/components/analytics/onedollarstats'
 import { isReactGrabEnabled, isReactScanEnabled } from '@/lib/core/config/feature-flags'
@@ -21,8 +17,6 @@ import { season } from '@/app/_styles/fonts/season/season'
 export const viewport: Viewport = {
   width: 'device-width',
   initialScale: 1,
-  maximumScale: 1,
-  userScalable: false,
   themeColor: [
     { media: '(prefers-color-scheme: light)', color: '#ffffff' },
     { media: '(prefers-color-scheme: dark)', color: '#0c0c0c' },
@@ -32,7 +26,6 @@ export const viewport: Viewport = {
 export const metadata: Metadata = generateBrandedMetadata()
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
-  const structuredData = generateStructuredData()
   const themeCSS = generateThemeCSS()
 
   return (
@@ -76,14 +69,6 @@ export default function RootLayout({ children }: { children: React.ReactNode })
             strategy='lazyOnload'
           />
         )}
-        {/* Structured Data for SEO */}
-        <script
-          type='application/ld+json'
-          dangerouslySetInnerHTML={{
-            __html: JSON.stringify(structuredData),
-          }}
-        />
-
         {/* 
           Workspace layout dimensions: set CSS vars before hydration to avoid layout jump.
           
diff --git a/apps/sim/app/sitemap.ts b/apps/sim/app/sitemap.ts
index a3553f13d74..b1a56d264fa 100644
--- a/apps/sim/app/sitemap.ts
+++ b/apps/sim/app/sitemap.ts
@@ -1,6 +1,7 @@
 import type { MetadataRoute } from 'next'
 import { getAllPostMeta } from '@/lib/blog/registry'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import integrations from '@/app/(landing)/integrations/data/integrations.json'
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const baseUrl = getBaseUrl()
@@ -24,6 +25,10 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     //   url: `${baseUrl}/templates`,
     //   lastModified: now,
     // },
+    {
+      url: `${baseUrl}/integrations`,
+      lastModified: now,
+    },
     {
       url: `${baseUrl}/changelog`,
       lastModified: now,
@@ -44,5 +49,10 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
     lastModified: new Date(p.updated ?? p.date),
   }))
 
-  return [...staticPages, ...blogPages]
+  const integrationPages: MetadataRoute.Sitemap = integrations.map((i) => ({
+    url: `${baseUrl}/integrations/${i.slug}`,
+    lastModified: now,
+  }))
+
+  return [...staticPages, ...blogPages, ...integrationPages]
 }
diff --git a/apps/sim/blocks/blocks/upstash.ts b/apps/sim/blocks/blocks/upstash.ts
index 040377d9625..854c99fccba 100644
--- a/apps/sim/blocks/blocks/upstash.ts
+++ b/apps/sim/blocks/blocks/upstash.ts
@@ -256,7 +256,42 @@ export const UpstashBlock: BlockConfig<UpstashResponse> = {
         if (params.increment !== undefined) {
           params.increment = Number(params.increment)
         }
-        return `upstash_redis_${params.operation}`
+        switch (params.operation) {
+          case 'get':
+            return 'upstash_redis_get'
+          case 'set':
+            return 'upstash_redis_set'
+          case 'delete':
+            return 'upstash_redis_delete'
+          case 'keys':
+            return 'upstash_redis_keys'
+          case 'command':
+            return 'upstash_redis_command'
+          case 'hset':
+            return 'upstash_redis_hset'
+          case 'hget':
+            return 'upstash_redis_hget'
+          case 'hgetall':
+            return 'upstash_redis_hgetall'
+          case 'incr':
+            return 'upstash_redis_incr'
+          case 'incrby':
+            return 'upstash_redis_incrby'
+          case 'exists':
+            return 'upstash_redis_exists'
+          case 'setnx':
+            return 'upstash_redis_setnx'
+          case 'lpush':
+            return 'upstash_redis_lpush'
+          case 'lrange':
+            return 'upstash_redis_lrange'
+          case 'expire':
+            return 'upstash_redis_expire'
+          case 'ttl':
+            return 'upstash_redis_ttl'
+          default:
+            throw new Error(`Unknown operation: ${params.operation}`)
+        }
       },
     },
   },
diff --git a/apps/sim/components/emcn/components/form-field/form-field.tsx b/apps/sim/components/emcn/components/form-field/form-field.tsx
new file mode 100644
index 00000000000..69b9c5c5290
--- /dev/null
+++ b/apps/sim/components/emcn/components/form-field/form-field.tsx
@@ -0,0 +1,28 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import { Label } from '@/components/emcn'
+
+export interface FormFieldProps {
+  label: ReactNode
+  children: ReactNode
+  htmlFor?: string
+  optional?: boolean
+  error?: ReactNode
+}
+
+/**
+ * Standard labeled field wrapper for forms and modals.
+ */
+export function FormField({ label, children, htmlFor, optional = false, error }: FormFieldProps) {
+  return (
+    <div className='flex flex-col gap-2'>
+      <Label htmlFor={htmlFor}>
+        {label}
+        {optional ? <span className='ml-1 text-[var(--text-muted)]'>(optional)</span> : null}
+      </Label>
+      {children}
+      {error ? <p className='text-[12px] text-[var(--text-error)]'>{error}</p> : null}
+    </div>
+  )
+}
diff --git a/apps/sim/components/emcn/components/index.ts b/apps/sim/components/emcn/components/index.ts
index 269510bda0f..1d8afcef3f1 100644
--- a/apps/sim/components/emcn/components/index.ts
+++ b/apps/sim/components/emcn/components/index.ts
@@ -56,6 +56,7 @@ export {
   DropdownMenuSubTrigger,
   DropdownMenuTrigger,
 } from './dropdown-menu/dropdown-menu'
+export { FormField, type FormFieldProps } from './form-field/form-field'
 export { Input, type InputProps, inputVariants } from './input/input'
 export { InputOTP, InputOTPGroup, InputOTPSeparator, InputOTPSlot } from './input-otp/input-otp'
 export { Label } from './label/label'
diff --git a/apps/sim/lib/messaging/email/mailer.test.ts b/apps/sim/lib/messaging/email/mailer.test.ts
index 327c8f49657..18e720b6268 100644
--- a/apps/sim/lib/messaging/email/mailer.test.ts
+++ b/apps/sim/lib/messaging/email/mailer.test.ts
@@ -1,21 +1,11 @@
 import { createEnvMock, loggerMock } from '@sim/testing'
 import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
 
-/**
- * Tests for the mailer module.
- *
- * Note: Due to bun test runner's module loading behavior, the Resend and Azure
- * clients are initialized at module load time. These tests mock the actual
- * Resend and EmailClient classes to return mock implementations that our
- * mock functions can intercept.
- */
-
 const mockSend = vi.fn()
 const mockBatchSend = vi.fn()
 const mockAzureBeginSend = vi.fn()
 const mockAzurePollUntilDone = vi.fn()
 
-// Mock the Resend module - returns an object with emails.send
 vi.mock('resend', () => {
   return {
     Resend: vi.fn().mockImplementation(() => ({
@@ -29,7 +19,6 @@ vi.mock('resend', () => {
   }
 })
 
-// Mock Azure Communication Email - returns an object with beginSend
 vi.mock('@azure/communication-email', () => {
   return {
     EmailClient: vi.fn().mockImplementation(() => ({
@@ -38,13 +27,11 @@ vi.mock('@azure/communication-email', () => {
   }
 })
 
-// Mock unsubscribe module
 vi.mock('@/lib/messaging/email/unsubscribe', () => ({
   isUnsubscribed: vi.fn(),
   generateUnsubscribeToken: vi.fn(),
 }))
 
-// Mock env with valid API keys so the clients get initialized
 vi.mock('@/lib/core/config/env', () =>
   createEnvMock({
     RESEND_API_KEY: 'test-api-key',
@@ -55,28 +42,23 @@ vi.mock('@/lib/core/config/env', () =>
   })
 )
 
-// Mock URL utilities
 vi.mock('@/lib/core/utils/urls', () => ({
   getEmailDomain: vi.fn().mockReturnValue('sim.ai'),
   getBaseUrl: vi.fn().mockReturnValue('https://test.sim.ai'),
   getBaseDomain: vi.fn().mockReturnValue('test.sim.ai'),
 }))
 
-// Mock the utils module (getFromEmailAddress)
 vi.mock('@/lib/messaging/email/utils', () => ({
   getFromEmailAddress: vi.fn().mockReturnValue('Sim <noreply@sim.ai>'),
+  hasEmailHeaderControlChars: vi.fn().mockImplementation((value: string) => /[\r\n]/.test(value)),
+  EMAIL_HEADER_CONTROL_CHARS_REGEX: /[\r\n]/,
+  NO_EMAIL_HEADER_CONTROL_CHARS_REGEX: /^[^\r\n]*$/,
 }))
 
 vi.mock('@sim/logger', () => loggerMock)
 
-// Import after mocks are set up
-import {
-  type EmailType,
-  hasEmailService,
-  sendBatchEmails,
-  sendEmail,
-} from '@/lib/messaging/email/mailer'
-import { generateUnsubscribeToken, isUnsubscribed } from '@/lib/messaging/email/unsubscribe'
+import { type EmailType, hasEmailService, sendBatchEmails, sendEmail } from './mailer'
+import { generateUnsubscribeToken, isUnsubscribed } from './unsubscribe'
 
 describe('mailer', () => {
   const testEmailOptions = {
@@ -90,7 +72,6 @@ describe('mailer', () => {
     ;(isUnsubscribed as Mock).mockResolvedValue(false)
     ;(generateUnsubscribeToken as Mock).mockReturnValue('mock-token-123')
 
-    // Mock successful Resend response
     mockSend.mockResolvedValue({
       data: { id: 'test-email-id' },
       error: null,
@@ -101,7 +82,6 @@ describe('mailer', () => {
       error: null,
     })
 
-    // Mock successful Azure response
     mockAzurePollUntilDone.mockResolvedValue({
       status: 'Succeeded',
       id: 'azure-email-id',
@@ -114,7 +94,6 @@ describe('mailer', () => {
 
   describe('hasEmailService', () => {
     it('should return true when email service is configured', () => {
-      // The mailer module initializes with mocked env that has valid API keys
       const result = hasEmailService()
       expect(typeof result).toBe('boolean')
     })
@@ -128,7 +107,6 @@ describe('mailer', () => {
       })
 
       expect(result.success).toBe(true)
-      // Should not check unsubscribe status for transactional emails
       expect(isUnsubscribed).not.toHaveBeenCalled()
     })
 
@@ -175,6 +153,34 @@ describe('mailer', () => {
       expect(result.success).toBe(true)
     })
 
+    it('should sanitize CRLF characters in subjects before sending', async () => {
+      const result = await sendEmail({
+        to: 'test@example.com',
+        subject: 'Hello\r\nBcc: attacker@evil.com',
+        text: 'Plain text content',
+      })
+
+      expect(result.success).toBe(true)
+      expect(mockSend).toHaveBeenCalledWith(
+        expect.objectContaining({
+          subject: 'Hello Bcc: attacker@evil.com',
+        })
+      )
+    })
+
+    it('should reject reply-to values containing header control characters', async () => {
+      const result = await sendEmail({
+        to: 'test@example.com',
+        subject: 'Test Subject',
+        text: 'Plain text content',
+        replyTo: 'user@example.com\r\nBcc: attacker@evil.com',
+      })
+
+      expect(result.success).toBe(false)
+      expect(result.message).toBe('Failed to send email')
+      expect(mockSend).not.toHaveBeenCalled()
+    })
+
     it('should handle multiple recipients as array', async () => {
       const recipients = ['user1@example.com', 'user2@example.com', 'user3@example.com']
       const result = await sendEmail({
@@ -184,12 +190,10 @@ describe('mailer', () => {
       })
 
       expect(result.success).toBe(true)
-      // Should use first recipient for unsubscribe check
       expect(isUnsubscribed).toHaveBeenCalledWith('user1@example.com', 'marketing')
     })
 
     it('should handle general exceptions gracefully', async () => {
-      // Mock an unexpected error before any email service call
       ;(isUnsubscribed as Mock).mockRejectedValue(new Error('Database connection failed'))
 
       const result = await sendEmail({
@@ -222,6 +226,23 @@ describe('mailer', () => {
       expect(result.results.length).toBeGreaterThanOrEqual(0)
     })
 
+    it('should sanitize CRLF characters in batch email subjects', async () => {
+      await sendBatchEmails({
+        emails: [
+          {
+            ...testEmailOptions,
+            subject: 'Batch\r\nCc: attacker@evil.com',
+          },
+        ],
+      })
+
+      expect(mockBatchSend).toHaveBeenCalledWith([
+        expect.objectContaining({
+          subject: 'Batch Cc: attacker@evil.com',
+        }),
+      ])
+    })
+
     it('should handle transactional emails without unsubscribe check', async () => {
       const batchEmails = [
         { ...testEmailOptions, to: 'user1@example.com', emailType: 'transactional' as EmailType },
@@ -230,7 +251,6 @@ describe('mailer', () => {
 
       await sendBatchEmails({ emails: batchEmails })
 
-      // Should not check unsubscribe for transactional emails
       expect(isUnsubscribed).not.toHaveBeenCalled()
     })
   })
diff --git a/apps/sim/lib/messaging/email/mailer.ts b/apps/sim/lib/messaging/email/mailer.ts
index 9d3c7b33378..0a7a8dbc6e7 100644
--- a/apps/sim/lib/messaging/email/mailer.ts
+++ b/apps/sim/lib/messaging/email/mailer.ts
@@ -4,7 +4,7 @@ import { Resend } from 'resend'
 import { env } from '@/lib/core/config/env'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { generateUnsubscribeToken, isUnsubscribed } from '@/lib/messaging/email/unsubscribe'
-import { getFromEmailAddress } from '@/lib/messaging/email/utils'
+import { getFromEmailAddress, hasEmailHeaderControlChars } from '@/lib/messaging/email/utils'
 
 const logger = createLogger('Mailer')
 
@@ -57,6 +57,17 @@ interface ProcessedEmailData {
   replyTo?: string
 }
 
+interface PreparedEmailHeaderData {
+  to: string | string[]
+  subject: string
+  senderEmail: string
+  replyTo?: string
+}
+
+function sanitizeEmailSubject(subject: string): string {
+  return subject.replace(/[\r\n]+/g, ' ').trim()
+}
+
 const resendApiKey = env.RESEND_API_KEY
 const azureConnectionString = env.AZURE_ACS_CONNECTION_STRING
 
@@ -172,17 +183,14 @@ function addUnsubscribeData(
 async function processEmailData(options: EmailOptions): Promise<ProcessedEmailData> {
   const {
     to,
-    subject,
     html,
     text,
-    from,
     emailType = 'transactional',
     includeUnsubscribe = true,
     attachments,
-    replyTo,
   } = options
 
-  const senderEmail = from || getFromEmailAddress()
+  const preparedHeaders = prepareEmailHeaders(options)
 
   let finalHtml = html
   let finalText = text
@@ -197,14 +205,43 @@ async function processEmailData(options: EmailOptions): Promise<ProcessedEmailDa
   }
 
   return {
-    to,
-    subject,
+    to: preparedHeaders.to,
+    subject: preparedHeaders.subject,
     html: finalHtml,
     text: finalText,
-    senderEmail,
+    senderEmail: preparedHeaders.senderEmail,
     headers,
     attachments,
-    replyTo,
+    replyTo: preparedHeaders.replyTo,
+  }
+}
+
+function prepareEmailHeaders(options: EmailOptions): PreparedEmailHeaderData {
+  const senderEmail = options.from || getFromEmailAddress()
+  const recipients = Array.isArray(options.to) ? options.to : [options.to]
+
+  if (recipients.some(hasEmailHeaderControlChars)) {
+    throw new Error('Invalid recipient email header')
+  }
+
+  if (hasEmailHeaderControlChars(senderEmail)) {
+    throw new Error('Invalid from email header')
+  }
+
+  if (options.replyTo && hasEmailHeaderControlChars(options.replyTo)) {
+    throw new Error('Invalid reply-to email header')
+  }
+
+  const subject = sanitizeEmailSubject(options.subject)
+  if (subject.length === 0) {
+    throw new Error('Email subject cannot be empty')
+  }
+
+  return {
+    to: options.to,
+    subject,
+    senderEmail,
+    replyTo: options.replyTo,
   }
 }
 
@@ -359,11 +396,11 @@ async function sendBatchWithResend(emails: EmailOptions[]): Promise<BatchSendEma
       }
     }
 
-    const senderEmail = email.from || getFromEmailAddress()
+    const preparedHeaders = prepareEmailHeaders(email)
     const emailData: any = {
-      from: senderEmail,
-      to: email.to,
-      subject: email.subject,
+      from: preparedHeaders.senderEmail,
+      to: preparedHeaders.to,
+      subject: preparedHeaders.subject,
     }
 
     if (includeUnsubscribe && emailType !== 'transactional') {
diff --git a/apps/sim/lib/messaging/email/utils.test.ts b/apps/sim/lib/messaging/email/utils.test.ts
index 2d398a54922..f23a34c413c 100644
--- a/apps/sim/lib/messaging/email/utils.test.ts
+++ b/apps/sim/lib/messaging/email/utils.test.ts
@@ -1,5 +1,11 @@
 import { createEnvMock } from '@sim/testing'
 import { describe, expect, it, vi } from 'vitest'
+import {
+  EMAIL_HEADER_CONTROL_CHARS_REGEX,
+  getFromEmailAddress,
+  hasEmailHeaderControlChars,
+  NO_EMAIL_HEADER_CONTROL_CHARS_REGEX,
+} from './utils'
 
 /**
  * Tests for getFromEmailAddress utility function.
@@ -20,8 +26,6 @@ vi.mock('@/lib/core/utils/urls', () => ({
   getEmailDomain: vi.fn().mockReturnValue('fallback.com'),
 }))
 
-import { getFromEmailAddress } from './utils'
-
 describe('getFromEmailAddress', () => {
   it('should return the configured FROM_EMAIL_ADDRESS', () => {
     const result = getFromEmailAddress()
@@ -36,7 +40,6 @@ describe('getFromEmailAddress', () => {
 
   it('should contain an @ symbol in the email', () => {
     const result = getFromEmailAddress()
-    // Either contains @ directly or in angle brackets
     expect(result.includes('@')).toBe(true)
   })
 
@@ -46,3 +49,21 @@ describe('getFromEmailAddress', () => {
     expect(result1).toBe(result2)
   })
 })
+
+describe('email header safety', () => {
+  it('rejects CRLF characters consistently', () => {
+    const injectedHeader = 'Hello\r\nBcc: attacker@example.com'
+
+    expect(EMAIL_HEADER_CONTROL_CHARS_REGEX.test(injectedHeader)).toBe(true)
+    expect(hasEmailHeaderControlChars(injectedHeader)).toBe(true)
+    expect(NO_EMAIL_HEADER_CONTROL_CHARS_REGEX.test(injectedHeader)).toBe(false)
+  })
+
+  it('allows plain header content', () => {
+    const safeHeader = 'Product feedback'
+
+    expect(EMAIL_HEADER_CONTROL_CHARS_REGEX.test(safeHeader)).toBe(false)
+    expect(hasEmailHeaderControlChars(safeHeader)).toBe(false)
+    expect(NO_EMAIL_HEADER_CONTROL_CHARS_REGEX.test(safeHeader)).toBe(true)
+  })
+})
diff --git a/apps/sim/lib/messaging/email/utils.ts b/apps/sim/lib/messaging/email/utils.ts
index 2c26737e107..b7fa5060ab7 100644
--- a/apps/sim/lib/messaging/email/utils.ts
+++ b/apps/sim/lib/messaging/email/utils.ts
@@ -1,6 +1,14 @@
 import { env } from '@/lib/core/config/env'
 import { getEmailDomain } from '@/lib/core/utils/urls'
 
+export const EMAIL_HEADER_CONTROL_CHARS_REGEX = /[\r\n]/
+
+export const NO_EMAIL_HEADER_CONTROL_CHARS_REGEX = /^[^\r\n]*$/
+
+export function hasEmailHeaderControlChars(value: string): boolean {
+  return EMAIL_HEADER_CONTROL_CHARS_REGEX.test(value)
+}
+
 /**
  * Get the from email address, preferring FROM_EMAIL_ADDRESS over EMAIL_DOMAIN
  */
diff --git a/apps/sim/tools/hubspot/list_lists.ts b/apps/sim/tools/hubspot/list_lists.ts
index 7fa3fbabb52..eb0c08fa333 100644
--- a/apps/sim/tools/hubspot/list_lists.ts
+++ b/apps/sim/tools/hubspot/list_lists.ts
@@ -1,6 +1,10 @@
 import { createLogger } from '@sim/logger'
 import type { HubSpotListListsParams, HubSpotListListsResponse } from '@/tools/hubspot/types'
-import { LISTS_ARRAY_OUTPUT, METADATA_OUTPUT_PROPERTIES, PAGING_OUTPUT } from '@/tools/hubspot/types'
+import {
+  LISTS_ARRAY_OUTPUT,
+  METADATA_OUTPUT_PROPERTIES,
+  PAGING_OUTPUT,
+} from '@/tools/hubspot/types'
 import type { ToolConfig } from '@/tools/types'
 
 const logger = createLogger('HubSpotListLists')
@@ -99,7 +103,11 @@ export const hubspotListListsTool: ToolConfig<HubSpotListListsParams, HubSpotLis
       description: 'Response metadata',
       properties: {
         ...METADATA_OUTPUT_PROPERTIES,
-        total: { type: 'number', description: 'Total number of lists matching the query', optional: true },
+        total: {
+          type: 'number',
+          description: 'Total number of lists matching the query',
+          optional: true,
+        },
       },
     },
     success: { type: 'boolean', description: 'Operation success status' },
diff --git a/scripts/generate-docs.ts b/scripts/generate-docs.ts
index ddbad423d35..9f6b4387fa8 100755
--- a/scripts/generate-docs.ts
+++ b/scripts/generate-docs.ts
@@ -123,7 +123,7 @@ async function generateIconMapping(): Promise<Record<string, string>> {
       // For icon mapping, we need ALL blocks including hidden ones
       // because V2 blocks inherit icons from legacy blocks via spread
       // First, extract the primary icon from the file (usually the legacy block's icon)
-      const primaryIcon = extractIconName(fileContent)
+      const primaryIcon = extractIconNameFromContent(fileContent)
 
       // Find all block exports and their types
       const exportRegex = /export\s+const\s+(\w+)Block\s*:\s*BlockConfig[^=]*=\s*\{/g
@@ -315,6 +315,49 @@ function extractOperationsFromContent(blockContent: string): { label: string; id
   return []
 }
 
+/**
+ * Extract a mapping from operation id → tool id by scanning switch/case/return
+ * patterns in a block file. Handles both simple returns and ternary returns
+ * (for ternaries, takes the last quoted tool-like string, which is typically
+ * the default/list variant). Also picks up named helper functions referenced
+ * from tools.config.tool (e.g. selectGmailToolId).
+ */
+function extractSwitchCaseToolMapping(fileContent: string): Map<string, string> {
+  const mapping = new Map<string, string>()
+  const caseRegex = /\bcase\s+['"]([^'"]+)['"]\s*:/g
+  let caseMatch: RegExpExecArray | null
+
+  while ((caseMatch = caseRegex.exec(fileContent)) !== null) {
+    const opId = caseMatch[1]
+    if (mapping.has(opId)) continue
+
+    const searchStart = caseMatch.index + caseMatch[0].length
+    const searchEnd = Math.min(searchStart + 300, fileContent.length)
+    const segment = fileContent.substring(searchStart, searchEnd)
+
+    const returnIdx = segment.search(/\breturn\b/)
+    if (returnIdx === -1) continue
+
+    const afterReturn = segment.substring(returnIdx + 'return'.length)
+    // Limit scope to before the next case/default to avoid capturing sibling cases
+    const nextCaseIdx = afterReturn.search(/\bcase\b|\bdefault\b/)
+    const returnScope = nextCaseIdx > 0 ? afterReturn.substring(0, nextCaseIdx) : afterReturn
+
+    const toolMatches = [...returnScope.matchAll(/['"]([a-z][a-z0-9_]+)['"]/g)]
+    // Take the last tool-like string (underscore = tool ID pattern); for ternaries this
+    // is the fallback/list variant
+    const toolId = toolMatches
+      .map((m) => m[1])
+      .filter((id) => id.includes('_'))
+      .pop()
+    if (toolId) {
+      mapping.set(opId, toolId)
+    }
+  }
+
+  return mapping
+}
+
 /**
  * Scan all tool files under apps/sim/tools/ and build a map from tool ID to description.
  * Used to enrich operation entries with descriptions.
@@ -331,7 +374,8 @@ async function buildToolDescriptionMap(): Promise<ToolMaps> {
   try {
     const toolFiles = await glob(`${toolsDir}/**/*.ts`)
     for (const file of toolFiles) {
-      if (file.endsWith('index.ts') || file.endsWith('types.ts')) continue
+      const basename = path.basename(file)
+      if (basename === 'index.ts' || basename === 'types.ts') continue
       const content = fs.readFileSync(file, 'utf-8')
 
       // Find every `id: 'tool_id'` occurrence in the file. For each, search
@@ -512,6 +556,7 @@ async function writeIntegrationsJson(iconMapping: Record<string, string>): Promi
 
     for (const blockFile of blockFiles) {
       const fileContent = fs.readFileSync(blockFile, 'utf-8')
+      const switchCaseMap = extractSwitchCaseToolMapping(fileContent)
       const configs = extractAllBlockConfigs(fileContent)
 
       for (const config of configs) {
@@ -542,16 +587,33 @@ async function writeIntegrationsJson(iconMapping: Record<string, string>): Promi
         const rawOps: { label: string; id: string }[] = (config as any).operations || []
 
         // Enrich each operation with a description from the tool registry.
-        // Primary lookup: derive toolId as `{baseType}_{operationId}` and check
-        // the map directly. Fallback: some blocks use short op IDs that don't
-        // match tool IDs (e.g. Slack uses "send" while the tool ID is
-        // "slack_message"). In that case, find the tool in tools.access whose
-        // name exactly matches the operation label.
+        // Lookup order:
+        // 1. Derive toolId as `{baseType}_{operationId}` and check directly.
+        // 2. Check switch/case mapping parsed from tools.config.tool (handles
+        //    cases where op IDs differ from tool IDs, e.g. get_carts → list_carts,
+        //    or send_gmail → gmail_send).
+        // 3. Find the tool in tools.access whose name exactly matches the label.
         const toolsAccess: string[] = (config as any).tools?.access || []
         const operations: OperationInfo[] = rawOps.map(({ label, id }) => {
           const toolId = `${baseType}_${id}`
           let opDesc = toolDescMap.get(toolId) || toolDescMap.get(id) || ''
 
+          if (!opDesc) {
+            const switchMappedId = switchCaseMap.get(id)
+            if (switchMappedId) {
+              opDesc = toolDescMap.get(switchMappedId) || ''
+              // Also check versioned variants in tools.access (e.g. gmail_send_v2)
+              if (!opDesc) {
+                for (const tId of toolsAccess) {
+                  if (tId === switchMappedId || tId.startsWith(`${switchMappedId}_v`)) {
+                    opDesc = toolDescMap.get(tId) || ''
+                    if (opDesc) break
+                  }
+                }
+              }
+            }
+          }
+
           if (!opDesc && toolsAccess.length > 0) {
             for (const tId of toolsAccess) {
               if (toolNameMap.get(tId)?.toLowerCase() === label.toLowerCase()) {
@@ -575,9 +637,7 @@ async function writeIntegrationsJson(iconMapping: Record<string, string>): Promi
           .replace(/[^a-z0-9]+/g, '-')
           .replace(/^-|-$/g, '')
 
-        // Detect auth type from the original block file content
-        const blockFileContent = fs.readFileSync(blockFile, 'utf-8')
-        const authType = extractAuthType(blockFileContent)
+        const authType = extractAuthType(fileContent)
 
         integrations.push({
           type: blockType,
@@ -618,7 +678,7 @@ function extractAllBlockConfigs(fileContent: string): BlockConfig[] {
   const configs: BlockConfig[] = []
 
   // First, extract the primary icon from the file (for V2 blocks that inherit via spread)
-  const primaryIcon = extractIconName(fileContent)
+  const primaryIcon = extractIconNameFromContent(fileContent)
 
   // Find all block exports in the file
   const exportRegex = /export\s+const\s+(\w+)Block\s*:\s*BlockConfig[^=]*=\s*\{/g
@@ -770,10 +830,7 @@ function extractBlockConfigFromContent(
       extractEnumPropertyFromContent(blockContent, 'integrationType') ||
       baseConfig?.integrationType ||
       null
-    const tags =
-      extractArrayPropertyFromContent(blockContent, 'tags') ||
-      baseConfig?.tags ||
-      null
+    const tags = extractArrayPropertyFromContent(blockContent, 'tags') || baseConfig?.tags || null
 
     return {
       type: blockType,
@@ -977,209 +1034,7 @@ function extractOutputsFromContent(content: string): Record<string, any> {
 function extractToolsAccessFromContent(content: string): string[] {
   const accessMatch = content.match(/access\s*:\s*\[\s*([^\]]+)\s*\]/)
   if (!accessMatch) return []
-
-  const accessContent = accessMatch[1]
-  const tools: string[] = []
-
-  const toolMatches = accessContent.match(/['"]([^'"]+)['"]/g)
-  if (toolMatches) {
-    toolMatches.forEach((toolText) => {
-      const match = toolText.match(/['"]([^'"]+)['"]/)
-      if (match) {
-        tools.push(match[1])
-      }
-    })
-  }
-
-  return tools
-}
-
-// Legacy function for backward compatibility (icon mapping, etc.)
-function extractBlockConfig(fileContent: string): BlockConfig | null {
-  const configs = extractAllBlockConfigs(fileContent)
-  // Return first non-hidden block for legacy code paths
-  return configs.length > 0 ? configs[0] : null
-}
-
-function findBlockType(content: string, blockName: string): string {
-  const blockExportRegex = new RegExp(
-    `export\\s+const\\s+${blockName}Block\\s*:[^{]*{[\\s\\S]*?type\\s*:\\s*['"]([^'"]+)['"][\\s\\S]*?}`,
-    'i'
-  )
-  const blockExportMatch = content.match(blockExportRegex)
-  if (blockExportMatch) return blockExportMatch[1]
-
-  const exportMatch = content.match(new RegExp(`export\\s+const\\s+${blockName}Block\\s*:`))
-  if (exportMatch) {
-    const afterExport = content.substring(exportMatch.index! + exportMatch[0].length)
-
-    const blockStartMatch = afterExport.match(/{/)
-    if (blockStartMatch) {
-      const blockStart = blockStartMatch.index!
-
-      let braceCount = 1
-      let blockEnd = blockStart + 1
-
-      while (blockEnd < afterExport.length && braceCount > 0) {
-        if (afterExport[blockEnd] === '{') braceCount++
-        else if (afterExport[blockEnd] === '}') braceCount--
-        blockEnd++
-      }
-
-      const blockContent = afterExport.substring(blockStart, blockEnd)
-      const typeMatch = blockContent.match(/type\s*:\s*['"]([^'"]+)['"]/)
-      if (typeMatch) return typeMatch[1]
-    }
-  }
-
-  return blockName
-    .replace(/([A-Z])/g, '_$1')
-    .toLowerCase()
-    .replace(/^_/, '')
-}
-
-function extractStringProperty(content: string, propName: string): string | null {
-  const singleQuoteMatch = content.match(new RegExp(`${propName}\\s*:\\s*'(.*?)'`, 'm'))
-  if (singleQuoteMatch) return singleQuoteMatch[1]
-
-  const doubleQuoteMatch = content.match(new RegExp(`${propName}\\s*:\\s*"(.*?)"`, 'm'))
-  if (doubleQuoteMatch) return doubleQuoteMatch[1]
-
-  const templateMatch = content.match(new RegExp(`${propName}\\s*:\\s*\`([^\`]+)\``, 's'))
-  if (templateMatch) {
-    let templateContent = templateMatch[1]
-
-    templateContent = templateContent.replace(
-      /\$\{[^}]*shouldEnableURLInput[^}]*\?[^:]*:[^}]*\}/g,
-      'Upload files directly. '
-    )
-    templateContent = templateContent.replace(/\$\{[^}]*shouldEnableURLInput[^}]*\}/g, 'false')
-
-    templateContent = templateContent.replace(/\$\{[^}]+\}/g, '')
-
-    templateContent = templateContent.replace(/\s+/g, ' ').trim()
-
-    return templateContent
-  }
-
-  return null
-}
-
-function extractIconName(content: string): string | null {
-  const iconMatch = content.match(/icon\s*:\s*(\w+Icon)/)
-  return iconMatch ? iconMatch[1] : null
-}
-
-function extractOutputs(content: string): Record<string, any> {
-  const outputsStart = content.search(/outputs\s*:\s*{/)
-  if (outputsStart === -1) return {}
-
-  const openBracePos = content.indexOf('{', outputsStart)
-  if (openBracePos === -1) return {}
-
-  let braceCount = 1
-  let pos = openBracePos + 1
-
-  while (pos < content.length && braceCount > 0) {
-    if (content[pos] === '{') {
-      braceCount++
-    } else if (content[pos] === '}') {
-      braceCount--
-    }
-    pos++
-  }
-
-  if (braceCount === 0) {
-    const outputsContent = content.substring(openBracePos + 1, pos - 1).trim()
-    const outputs: Record<string, any> = {}
-
-    const fieldRegex = /(\w+)\s*:\s*{/g
-    let match
-    const fieldPositions: Array<{ name: string; start: number }> = []
-
-    while ((match = fieldRegex.exec(outputsContent)) !== null) {
-      fieldPositions.push({
-        name: match[1],
-        start: match.index + match[0].length - 1,
-      })
-    }
-
-    fieldPositions.forEach((field) => {
-      const startPos = field.start
-      let braceCount = 1
-      let endPos = startPos + 1
-
-      while (endPos < outputsContent.length && braceCount > 0) {
-        if (outputsContent[endPos] === '{') {
-          braceCount++
-        } else if (outputsContent[endPos] === '}') {
-          braceCount--
-        }
-        endPos++
-      }
-
-      if (braceCount === 0) {
-        const fieldContent = outputsContent.substring(startPos + 1, endPos - 1).trim()
-
-        const typeMatch = fieldContent.match(/type\s*:\s*['"](.*?)['"]/)
-        const description = extractDescription(fieldContent)
-
-        if (typeMatch) {
-          outputs[field.name] = {
-            type: typeMatch[1],
-            description: description || `${field.name} output from the block`,
-          }
-        }
-      }
-    })
-
-    if (Object.keys(outputs).length > 0) {
-      return outputs
-    }
-
-    const flatFieldMatches = outputsContent.match(/(\w+)\s*:\s*['"](.*?)['"]/g)
-
-    if (flatFieldMatches && flatFieldMatches.length > 0) {
-      flatFieldMatches.forEach((fieldMatch) => {
-        const fieldParts = fieldMatch.match(/(\w+)\s*:\s*['"](.*?)['"]/)
-        if (fieldParts) {
-          const fieldName = fieldParts[1]
-          const fieldType = fieldParts[2]
-
-          outputs[fieldName] = {
-            type: fieldType,
-            description: `${fieldName} output from the block`,
-          }
-        }
-      })
-
-      if (Object.keys(outputs).length > 0) {
-        return outputs
-      }
-    }
-  }
-
-  return {}
-}
-
-function extractToolsAccess(content: string): string[] {
-  const accessMatch = content.match(/access\s*:\s*\[\s*([^\]]+)\s*\]/)
-  if (!accessMatch) return []
-
-  const accessContent = accessMatch[1]
-  const tools: string[] = []
-
-  const toolMatches = accessContent.match(/['"]([^'"]+)['"]/g)
-  if (toolMatches) {
-    toolMatches.forEach((toolText) => {
-      const match = toolText.match(/['"]([^'"]+)['"]/)
-      if (match) {
-        tools.push(match[1])
-      }
-    })
-  }
-
-  return tools
+  return [...accessMatch[1].matchAll(/['"]([^'"]+)['"]/g)].map((m) => m[1])
 }
 
 /**