v0.5.80: lock feature, enterprise modules, time formatting consolidation, files, UX and UI improvements, longer timeouts

v0.5.79: longer MCP tools timeout, optimize loop/parallel regeneration, enrich.so integration
v0.5.78: billing fixes, mcp timeout increase, reactquery migrations, updated tool param visibilities, DSPy and Google Maps integrations
2026-02-05 04:05:14 -05:00 · 2026-02-04 18:27:05 -08:00 · 2026-01-31 21:57:56 -08:00 · 2026-01-31 13:48:22 -08:00 · 2026-01-30 14:57:17 -08:00 · 2026-01-29 00:13:19 -08:00
183 changed files with 1597 additions and 6696 deletions
--- a/.claude/commands/add-integration.md
+++ b/.claude/commands/add-integration.md
@@ -206,15 +206,10 @@ export const {Service}Block: BlockConfig = {
 }
 ```

-**Critical Canonical Param Rules:**
- `canonicalParamId` must NOT match any subblock's `id` in the block
- `canonicalParamId` must be unique per operation/condition context
- Only use `canonicalParamId` to link basic/advanced alternatives for the same logical parameter
- `mode` only controls UI visibility, NOT serialization. Without `canonicalParamId`, both basic and advanced field values would be sent
- Every subblock `id` must be unique within the block. Duplicate IDs cause conflicts even with different conditions
- **Required consistency:** If one subblock in a canonical group has `required: true`, ALL subblocks in that group must have `required: true` (prevents bypassing validation by switching modes)
- **Inputs section:** Must list canonical param IDs (e.g., `fileId`), NOT raw subblock IDs (e.g., `fileSelector`, `manualFileId`)
- **Params function:** Must use canonical param IDs, NOT raw subblock IDs (raw IDs are deleted after canonical transformation)
+**Critical:**
+- `canonicalParamId` must NOT match any other subblock's `id`, must be unique per block, and should only be used to link basic/advanced alternatives for the same parameter.
+- `mode` only controls UI visibility, NOT serialization. Without `canonicalParamId`, both basic and advanced field values would be sent.
+- Every subblock `id` must be unique within the block. Duplicate IDs cause conflicts even with different conditions.

 ## Step 4: Add Icon

--- a/.claude/rules/sim-integrations.md
+++ b/.claude/rules/sim-integrations.md
@@ -157,36 +157,6 @@ dependsOn: { all: ['authMethod'], any: ['credential', 'botToken'] }
 - `'both'` - Show in both modes (default)
 - `'trigger'` - Only when block is used as trigger

-### `canonicalParamId` - Link basic/advanced alternatives
-
-Use to map multiple UI inputs to a single logical parameter:
-
-```typescript
-// Basic mode: Visual selector
-{
-  id: 'fileSelector',
-  type: 'file-selector',
-  mode: 'basic',
-  canonicalParamId: 'fileId',
-  required: true,
-},
-// Advanced mode: Manual input
-{
-  id: 'manualFileId',
-  type: 'short-input',
-  mode: 'advanced',
-  canonicalParamId: 'fileId',
-  required: true,
-},
-```
-
-**Critical Rules:**
- `canonicalParamId` must NOT match any subblock's `id`
- `canonicalParamId` must be unique per operation/condition context
- **Required consistency:** All subblocks in a canonical group must have the same `required` status
- **Inputs section:** Must list canonical param IDs (e.g., `fileId`), NOT raw subblock IDs
- **Params function:** Must use canonical param IDs (raw IDs are deleted after canonical transformation)
-
 **Register in `blocks/registry.ts`:**

 ```typescript
--- a/.cursor/rules/sim-integrations.mdc
+++ b/.cursor/rules/sim-integrations.mdc
@@ -155,36 +155,6 @@ dependsOn: { all: ['authMethod'], any: ['credential', 'botToken'] }
 - `'both'` - Show in both modes (default)
 - `'trigger'` - Only when block is used as trigger

-### `canonicalParamId` - Link basic/advanced alternatives
-
-Use to map multiple UI inputs to a single logical parameter:
-
-```typescript
-// Basic mode: Visual selector
-{
-  id: 'fileSelector',
-  type: 'file-selector',
-  mode: 'basic',
-  canonicalParamId: 'fileId',
-  required: true,
-},
-// Advanced mode: Manual input
-{
-  id: 'manualFileId',
-  type: 'short-input',
-  mode: 'advanced',
-  canonicalParamId: 'fileId',
-  required: true,
-},
-```
-
-**Critical Rules:**
- `canonicalParamId` must NOT match any subblock's `id`
- `canonicalParamId` must be unique per operation/condition context
- **Required consistency:** All subblocks in a canonical group must have the same `required` status
- **Inputs section:** Must list canonical param IDs (e.g., `fileId`), NOT raw subblock IDs
- **Params function:** Must use canonical param IDs (raw IDs are deleted after canonical transformation)
-
 **Register in `blocks/registry.ts`:**

 ```typescript
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -163,9 +163,9 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  elevenlabs: ElevenLabsIcon,
  enrich: EnrichSoIcon,
  exa: ExaAIIcon,
-  file_v3: DocumentIcon,
+  file_v2: DocumentIcon,
  firecrawl: FirecrawlIcon,
-  fireflies_v2: FirefliesIcon,
+  fireflies: FirefliesIcon,
  github_v2: GithubIcon,
  gitlab: GitLabIcon,
  gmail_v2: GmailIcon,
@@ -177,7 +177,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  google_maps: GoogleMapsIcon,
  google_search: GoogleIcon,
  google_sheets_v2: GoogleSheetsIcon,
-  google_slides_v2: GoogleSlidesIcon,
+  google_slides: GoogleSlidesIcon,
  google_vault: GoogleVaultIcon,
  grafana: GrafanaIcon,
  grain: GrainIcon,
@@ -206,7 +206,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  microsoft_excel_v2: MicrosoftExcelIcon,
  microsoft_planner: MicrosoftPlannerIcon,
  microsoft_teams: MicrosoftTeamsIcon,
-  mistral_parse_v3: MistralIcon,
+  mistral_parse_v2: MistralIcon,
  mongodb: MongoDBIcon,
  mysql: MySQLIcon,
  neo4j: Neo4jIcon,
@@ -221,11 +221,11 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  polymarket: PolymarketIcon,
  postgresql: PostgresIcon,
  posthog: PosthogIcon,
-  pulse_v2: PulseIcon,
+  pulse: PulseIcon,
  qdrant: QdrantIcon,
  rds: RDSIcon,
  reddit: RedditIcon,
-  reducto_v2: ReductoIcon,
+  reducto: ReductoIcon,
  resend: ResendIcon,
  s3: S3Icon,
  salesforce: SalesforceIcon,
@@ -244,11 +244,11 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  ssh: SshIcon,
  stagehand: StagehandIcon,
  stripe: StripeIcon,
-  stt_v2: STTIcon,
+  stt: STTIcon,
  supabase: SupabaseIcon,
  tavily: TavilyIcon,
  telegram: TelegramIcon,
-  textract_v2: TextractIcon,
+  textract: TextractIcon,
  tinybird: TinybirdIcon,
  translate: TranslateIcon,
  trello: TrelloIcon,
@@ -257,7 +257,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  twilio_voice: TwilioIcon,
  typeform: TypeformIcon,
  video_generator_v2: VideoIcon,
-  vision_v2: EyeIcon,
+  vision: EyeIcon,
  wealthbox: WealthboxIcon,
  webflow: WebflowIcon,
  whatsapp: WhatsAppIcon,
--- a/apps/docs/content/docs/de/tools/file.mdx
+++ b/apps/docs/content/docs/de/tools/file.mdx
@@ -6,7 +6,7 @@ description: Mehrere Dateien lesen und parsen
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="file_v3"
+  type="file"
  color="#40916C"
 />

--- a/apps/docs/content/docs/de/tools/fireflies.mdx
+++ b/apps/docs/content/docs/de/tools/fireflies.mdx
@@ -6,7 +6,7 @@ description: Interagieren Sie mit Fireflies.ai-Besprechungstranskripten und -auf
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="fireflies_v2"
+  type="fireflies"
  color="#100730"
 />

--- a/apps/docs/content/docs/de/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/de/tools/mistral_parse.mdx
@@ -6,7 +6,7 @@ description: Text aus PDF-Dokumenten extrahieren
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="mistral_parse_v3"
+  type="mistral_parse"
  color="#000000"
 />

--- a/apps/docs/content/docs/en/tools/confluence.mdx
+++ b/apps/docs/content/docs/en/tools/confluence.mdx
@@ -49,25 +49,10 @@ Retrieve content from Confluence pages using the Confluence API.

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
+| `ts` | string | Timestamp of retrieval |
 | `pageId` | string | Confluence page ID |
-| `title` | string | Page title |
 | `content` | string | Page content with HTML tags stripped |
-| `status` | string | Page status \(current, archived, trashed, draft\) |
-| `spaceId` | string | ID of the space containing the page |
-| `parentId` | string | ID of the parent page |
-| `authorId` | string | Account ID of the page author |
-| `createdAt` | string | ISO 8601 timestamp when the page was created |
-| `url` | string | URL to view the page in Confluence |
-| `body` | object | Raw page body content in storage format |
-|   ↳ `value` | string | The content value in the specified format |
-|   ↳ `representation` | string | Content representation type |
-| `version` | object | Page version information |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
+| `title` | string | Page title |

 ### `confluence_update`

@@ -91,25 +76,6 @@ Update a Confluence page using the Confluence API.
 | `ts` | string | Timestamp of update |
 | `pageId` | string | Confluence page ID |
 | `title` | string | Updated page title |
-| `status` | string | Page status |
-| `spaceId` | string | Space ID |
-| `body` | object | Page body content in storage format |
-|   ↳ `storage` | object | Body in storage format \(Confluence markup\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `view` | object | Body in view format \(rendered HTML\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `atlas_doc_format` | object | Body in Atlassian Document Format \(ADF\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-| `version` | object | Page version information |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-| `url` | string | URL to view the page in Confluence |
 | `success` | boolean | Update operation success status |

 ### `confluence_create_page`
@@ -134,30 +100,11 @@ Create a new page in a Confluence space.
 | `ts` | string | Timestamp of creation |
 | `pageId` | string | Created page ID |
 | `title` | string | Page title |
-| `status` | string | Page status |
-| `spaceId` | string | Space ID |
-| `parentId` | string | Parent page ID |
-| `body` | object | Page body content |
-|   ↳ `storage` | object | Body in storage format \(Confluence markup\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `view` | object | Body in view format \(rendered HTML\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `atlas_doc_format` | object | Body in Atlassian Document Format \(ADF\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-| `version` | object | Page version information |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
 | `url` | string | Page URL |

 ### `confluence_delete_page`

-Delete a Confluence page. By default moves to trash; use purge=true to permanently delete.
+Delete a Confluence page (moves it to trash where it can be restored).

 #### Input

@@ -165,7 +112,6 @@ Delete a Confluence page. By default moves to trash; use purge=true to permanent
 | --------- | ---- | -------- | ----------- |
 | `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
 | `pageId` | string | Yes | Confluence page ID to delete |
-| `purge` | boolean | No | If true, permanently deletes the page instead of moving to trash \(default: false\) |
 | `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |

 #### Output
@@ -176,229 +122,6 @@ Delete a Confluence page. By default moves to trash; use purge=true to permanent
 | `pageId` | string | Deleted page ID |
 | `deleted` | boolean | Deletion status |

-### `confluence_list_pages_in_space`
-
-List all pages within a specific Confluence space. Supports pagination and filtering by status.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `spaceId` | string | Yes | The ID of the Confluence space to list pages from |
-| `limit` | number | No | Maximum number of pages to return \(default: 50, max: 250\) |
-| `status` | string | No | Filter pages by status: current, archived, trashed, or draft |
-| `bodyFormat` | string | No | Format for page body content: storage, atlas_doc_format, or view. If not specified, body is not included. |
-| `cursor` | string | No | Pagination cursor from previous response to get the next page of results |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `pages` | array | Array of pages in the space |
-|   ↳ `id` | string | Unique page identifier |
-|   ↳ `title` | string | Page title |
-|   ↳ `status` | string | Page status \(e.g., current, archived, trashed, draft\) |
-|   ↳ `spaceId` | string | ID of the space containing the page |
-|   ↳ `parentId` | string | ID of the parent page \(null if top-level\) |
-|   ↳ `authorId` | string | Account ID of the page author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp when the page was created |
-|   ↳ `version` | object | Page version information |
-|     ↳ `number` | number | Version number |
-|     ↳ `message` | string | Version message |
-|     ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|     ↳ `authorId` | string | Account ID of the version author |
-|     ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-|   ↳ `body` | object | Page body content \(if bodyFormat was specified\) |
-|     ↳ `storage` | object | Body in storage format \(Confluence markup\) |
-|       ↳ `value` | string | The content value in the specified format |
-|       ↳ `representation` | string | Content representation type |
-|     ↳ `view` | object | Body in view format \(rendered HTML\) |
-|       ↳ `value` | string | The content value in the specified format |
-|       ↳ `representation` | string | Content representation type |
-|     ↳ `atlas_doc_format` | object | Body in Atlassian Document Format \(ADF\) |
-|       ↳ `value` | string | The content value in the specified format |
-|       ↳ `representation` | string | Content representation type |
-|   ↳ `webUrl` | string | URL to view the page in Confluence |
-| `nextCursor` | string | Cursor for fetching the next page of results |
-
-### `confluence_get_page_children`
-
-Get all child pages of a specific Confluence page. Useful for navigating page hierarchies.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `pageId` | string | Yes | The ID of the parent page to get children from |
-| `limit` | number | No | Maximum number of child pages to return \(default: 50, max: 250\) |
-| `cursor` | string | No | Pagination cursor from previous response to get the next page of results |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `parentId` | string | ID of the parent page |
-| `children` | array | Array of child pages |
-|   ↳ `id` | string | Child page ID |
-|   ↳ `title` | string | Child page title |
-|   ↳ `status` | string | Page status |
-|   ↳ `spaceId` | string | Space ID |
-|   ↳ `childPosition` | number | Position among siblings |
-|   ↳ `webUrl` | string | URL to view the page |
-| `nextCursor` | string | Cursor for fetching the next page of results |
-
-### `confluence_get_page_ancestors`
-
-Get the ancestor (parent) pages of a specific Confluence page. Returns the full hierarchy from the page up to the root.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `pageId` | string | Yes | The ID of the page to get ancestors for |
-| `limit` | number | No | Maximum number of ancestors to return \(default: 25, max: 250\) |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `pageId` | string | ID of the page whose ancestors were retrieved |
-| `ancestors` | array | Array of ancestor pages, ordered from direct parent to root |
-|   ↳ `id` | string | Ancestor page ID |
-|   ↳ `title` | string | Ancestor page title |
-|   ↳ `status` | string | Page status |
-|   ↳ `spaceId` | string | Space ID |
-|   ↳ `webUrl` | string | URL to view the page |
-
-### `confluence_list_page_versions`
-
-List all versions (revision history) of a Confluence page.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `pageId` | string | Yes | The ID of the page to get versions for |
-| `limit` | number | No | Maximum number of versions to return \(default: 50, max: 250\) |
-| `cursor` | string | No | Pagination cursor from previous response |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `pageId` | string | ID of the page |
-| `versions` | array | Array of page versions |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-| `nextCursor` | string | Cursor for fetching the next page of results |
-
-### `confluence_get_page_version`
-
-Get details about a specific version of a Confluence page.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `pageId` | string | Yes | The ID of the page |
-| `versionNumber` | number | Yes | The version number to retrieve \(e.g., 1, 2, 3\) |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `pageId` | string | ID of the page |
-| `version` | object | Detailed version information |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-|   ↳ `contentTypeModified` | boolean | Whether the content type was modified in this version |
-|   ↳ `collaborators` | array | List of collaborator account IDs for this version |
-|   ↳ `prevVersion` | number | Previous version number |
-|   ↳ `nextVersion` | number | Next version number |
-
-### `confluence_list_page_properties`
-
-List all custom properties (metadata) attached to a Confluence page.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `pageId` | string | Yes | The ID of the page to list properties from |
-| `limit` | number | No | Maximum number of properties to return \(default: 50, max: 250\) |
-| `cursor` | string | No | Pagination cursor from previous response |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `pageId` | string | ID of the page |
-| `properties` | array | Array of content properties |
-|   ↳ `id` | string | Property ID |
-|   ↳ `key` | string | Property key |
-|   ↳ `value` | json | Property value \(can be any JSON\) |
-|   ↳ `version` | object | Version information |
-|     ↳ `number` | number | Version number |
-|     ↳ `message` | string | Version message |
-|     ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|     ↳ `authorId` | string | Account ID of the version author |
-|     ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-| `nextCursor` | string | Cursor for fetching the next page of results |
-
-### `confluence_create_page_property`
-
-Create a new custom property (metadata) on a Confluence page.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `pageId` | string | Yes | The ID of the page to add the property to |
-| `key` | string | Yes | The key/name for the property |
-| `value` | json | Yes | The value for the property \(can be any JSON value\) |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `pageId` | string | ID of the page |
-| `propertyId` | string | ID of the created property |
-| `key` | string | Property key |
-| `value` | json | Property value |
-| `version` | object | Version information |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-
 ### `confluence_search`

 Search for content across Confluence pages, blog posts, and other content.
@@ -432,211 +155,6 @@ Search for content across Confluence pages, blog posts, and other content.
 |   ↳ `lastModified` | string | ISO 8601 timestamp of last modification |
 |   ↳ `entityType` | string | Entity type identifier \(e.g., content, space\) |

-### `confluence_search_in_space`
-
-Search for content within a specific Confluence space. Optionally filter by text query and content type.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `spaceKey` | string | Yes | The key of the Confluence space to search in \(e.g., "ENG", "HR"\) |
-| `query` | string | No | Text search query. If not provided, returns all content in the space. |
-| `contentType` | string | No | Filter by content type: page, blogpost, attachment, or comment |
-| `limit` | number | No | Maximum number of results to return \(default: 25, max: 250\) |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `spaceKey` | string | The space key that was searched |
-| `totalSize` | number | Total number of matching results |
-| `results` | array | Array of search results |
-|   ↳ `id` | string | Unique content identifier |
-|   ↳ `title` | string | Content title |
-|   ↳ `type` | string | Content type \(e.g., page, blogpost, attachment, comment\) |
-|   ↳ `status` | string | Content status \(e.g., current\) |
-|   ↳ `url` | string | URL to view the content in Confluence |
-|   ↳ `excerpt` | string | Text excerpt matching the search query |
-|   ↳ `spaceKey` | string | Key of the space containing the content |
-|   ↳ `space` | object | Space information for the content |
-|     ↳ `id` | string | Space identifier |
-|     ↳ `key` | string | Space key |
-|     ↳ `name` | string | Space name |
-|   ↳ `lastModified` | string | ISO 8601 timestamp of last modification |
-|   ↳ `entityType` | string | Entity type identifier \(e.g., content, space\) |
-
-### `confluence_list_blogposts`
-
-List all blog posts across all accessible Confluence spaces.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `limit` | number | No | Maximum number of blog posts to return \(default: 25, max: 250\) |
-| `status` | string | No | Filter by status: current, archived, trashed, or draft |
-| `sort` | string | No | Sort order: created-date, -created-date, modified-date, -modified-date, title, -title |
-| `cursor` | string | No | Pagination cursor from previous response |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `blogPosts` | array | Array of blog posts |
-|   ↳ `id` | string | Blog post ID |
-|   ↳ `title` | string | Blog post title |
-|   ↳ `status` | string | Blog post status |
-|   ↳ `spaceId` | string | Space ID |
-|   ↳ `authorId` | string | Author account ID |
-|   ↳ `createdAt` | string | Creation timestamp |
-|   ↳ `version` | object | Version information |
-|     ↳ `number` | number | Version number |
-|     ↳ `message` | string | Version message |
-|     ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|     ↳ `authorId` | string | Account ID of the version author |
-|     ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-|   ↳ `webUrl` | string | URL to view the blog post |
-| `nextCursor` | string | Cursor for fetching the next page of results |
-
-### `confluence_get_blogpost`
-
-Get a specific Confluence blog post by ID, including its content.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `blogPostId` | string | Yes | The ID of the blog post to retrieve |
-| `bodyFormat` | string | No | Format for blog post body: storage, atlas_doc_format, or view |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `id` | string | Blog post ID |
-| `title` | string | Blog post title |
-| `status` | string | Blog post status |
-| `spaceId` | string | Space ID |
-| `authorId` | string | Author account ID |
-| `createdAt` | string | Creation timestamp |
-| `version` | object | Version information |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-| `body` | object | Blog post body content in requested format\(s\) |
-|   ↳ `storage` | object | Body in storage format \(Confluence markup\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `view` | object | Body in view format \(rendered HTML\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `atlas_doc_format` | object | Body in Atlassian Document Format \(ADF\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-| `webUrl` | string | URL to view the blog post |
-
-### `confluence_create_blogpost`
-
-Create a new blog post in a Confluence space.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `spaceId` | string | Yes | The ID of the space to create the blog post in |
-| `title` | string | Yes | Title of the blog post |
-| `content` | string | Yes | Blog post content in Confluence storage format \(HTML\) |
-| `status` | string | No | Blog post status: current \(default\) or draft |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `id` | string | Created blog post ID |
-| `title` | string | Blog post title |
-| `status` | string | Blog post status |
-| `spaceId` | string | Space ID |
-| `authorId` | string | Author account ID |
-| `body` | object | Blog post body content |
-|   ↳ `storage` | object | Body in storage format \(Confluence markup\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `view` | object | Body in view format \(rendered HTML\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-|   ↳ `atlas_doc_format` | object | Body in Atlassian Document Format \(ADF\) |
-|     ↳ `value` | string | The content value in the specified format |
-|     ↳ `representation` | string | Content representation type |
-| `version` | object | Blog post version information |
-|   ↳ `number` | number | Version number |
-|   ↳ `message` | string | Version message |
-|   ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|   ↳ `authorId` | string | Account ID of the version author |
-|   ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-| `webUrl` | string | URL to view the blog post |
-
-### `confluence_list_blogposts_in_space`
-
-List all blog posts within a specific Confluence space.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `spaceId` | string | Yes | The ID of the Confluence space to list blog posts from |
-| `limit` | number | No | Maximum number of blog posts to return \(default: 25, max: 250\) |
-| `status` | string | No | Filter by status: current, archived, trashed, or draft |
-| `bodyFormat` | string | No | Format for blog post body: storage, atlas_doc_format, or view |
-| `cursor` | string | No | Pagination cursor from previous response |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `blogPosts` | array | Array of blog posts in the space |
-|   ↳ `id` | string | Blog post ID |
-|   ↳ `title` | string | Blog post title |
-|   ↳ `status` | string | Blog post status |
-|   ↳ `spaceId` | string | Space ID |
-|   ↳ `authorId` | string | Author account ID |
-|   ↳ `createdAt` | string | Creation timestamp |
-|   ↳ `version` | object | Version information |
-|     ↳ `number` | number | Version number |
-|     ↳ `message` | string | Version message |
-|     ↳ `minorEdit` | boolean | Whether this is a minor edit |
-|     ↳ `authorId` | string | Account ID of the version author |
-|     ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-|   ↳ `body` | object | Blog post body content |
-|     ↳ `storage` | object | Body in storage format \(Confluence markup\) |
-|       ↳ `value` | string | The content value in the specified format |
-|       ↳ `representation` | string | Content representation type |
-|     ↳ `view` | object | Body in view format \(rendered HTML\) |
-|       ↳ `value` | string | The content value in the specified format |
-|       ↳ `representation` | string | Content representation type |
-|     ↳ `atlas_doc_format` | object | Body in Atlassian Document Format \(ADF\) |
-|       ↳ `value` | string | The content value in the specified format |
-|       ↳ `representation` | string | Content representation type |
-|   ↳ `webUrl` | string | URL to view the blog post |
-| `nextCursor` | string | Cursor for fetching the next page of results |
-
 ### `confluence_create_comment`

 Add a comment to a Confluence page.
@@ -669,8 +187,6 @@ List all comments on a Confluence page.
 | `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
 | `pageId` | string | Yes | Confluence page ID to list comments from |
 | `limit` | number | No | Maximum number of comments to return \(default: 25\) |
-| `bodyFormat` | string | No | Format for the comment body: storage, atlas_doc_format, view, or export_view \(default: storage\) |
-| `cursor` | string | No | Pagination cursor from previous response |
 | `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |

 #### Output
@@ -696,7 +212,6 @@ List all comments on a Confluence page.
 |     ↳ `minorEdit` | boolean | Whether this is a minor edit |
 |     ↳ `authorId` | string | Account ID of the version author |
 |     ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-| `nextCursor` | string | Cursor for fetching the next page of results |

 ### `confluence_update_comment`

@@ -776,8 +291,7 @@ List all attachments on a Confluence page.
 | --------- | ---- | -------- | ----------- |
 | `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
 | `pageId` | string | Yes | Confluence page ID to list attachments from |
-| `limit` | number | No | Maximum number of attachments to return \(default: 50, max: 250\) |
-| `cursor` | string | No | Pagination cursor from previous response |
+| `limit` | number | No | Maximum number of attachments to return \(default: 25\) |
 | `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |

 #### Output
@@ -802,7 +316,6 @@ List all attachments on a Confluence page.
 |     ↳ `minorEdit` | boolean | Whether this is a minor edit |
 |     ↳ `authorId` | string | Account ID of the version author |
 |     ↳ `createdAt` | string | ISO 8601 timestamp of version creation |
-| `nextCursor` | string | Cursor for fetching the next page of results |

 ### `confluence_delete_attachment`

@@ -834,8 +347,6 @@ List all labels on a Confluence page.
 | --------- | ---- | -------- | ----------- |
 | `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
 | `pageId` | string | Yes | Confluence page ID to list labels from |
-| `limit` | number | No | Maximum number of labels to return \(default: 25, max: 250\) |
-| `cursor` | string | No | Pagination cursor from previous response |
 | `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |

 #### Output
@@ -847,30 +358,6 @@ List all labels on a Confluence page.
 |   ↳ `id` | string | Unique label identifier |
 |   ↳ `name` | string | Label name |
 |   ↳ `prefix` | string | Label prefix/type \(e.g., global, my, team\) |
-| `nextCursor` | string | Cursor for fetching the next page of results |
-
-### `confluence_add_label`
-
-Add a label to a Confluence page for organization and categorization.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `pageId` | string | Yes | Confluence page ID to add the label to |
-| `labelName` | string | Yes | Name of the label to add |
-| `prefix` | string | No | Label prefix: global \(default\), my, team, or system |
-| `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
-| `pageId` | string | Page ID that the label was added to |
-| `labelName` | string | Name of the added label |
-| `labelId` | string | ID of the added label |

 ### `confluence_get_space`

@@ -888,19 +375,13 @@ Get details about a specific Confluence space.

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `ts` | string | ISO 8601 timestamp of the operation |
+| `ts` | string | Timestamp of retrieval |
 | `spaceId` | string | Space ID |
 | `name` | string | Space name |
 | `key` | string | Space key |
-| `type` | string | Space type \(global, personal\) |
-| `status` | string | Space status \(current, archived\) |
-| `url` | string | URL to view the space in Confluence |
-| `authorId` | string | Account ID of the space creator |
-| `createdAt` | string | ISO 8601 timestamp when the space was created |
-| `homepageId` | string | ID of the space homepage |
-| `description` | object | Space description content |
-|   ↳ `value` | string | Description text content |
-|   ↳ `representation` | string | Content representation format \(e.g., plain, view, storage\) |
+| `type` | string | Space type |
+| `status` | string | Space status |
+| `url` | string | Space URL |

 ### `confluence_list_spaces`

@@ -911,8 +392,7 @@ List all Confluence spaces accessible to the user.
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `domain` | string | Yes | Your Confluence domain \(e.g., yourcompany.atlassian.net\) |
-| `limit` | number | No | Maximum number of spaces to return \(default: 25, max: 250\) |
-| `cursor` | string | No | Pagination cursor from previous response |
+| `limit` | number | No | Maximum number of spaces to return \(default: 25\) |
 | `cloudId` | string | No | Confluence Cloud ID for the instance. If not provided, it will be fetched using the domain. |

 #### Output
@@ -932,6 +412,5 @@ List all Confluence spaces accessible to the user.
 |   ↳ `description` | object | Space description |
 |     ↳ `value` | string | Description text content |
 |     ↳ `representation` | string | Content representation format \(e.g., plain, view, storage\) |
-| `nextCursor` | string | Cursor for fetching the next page of results |


--- a/apps/docs/content/docs/en/tools/discord.mdx
+++ b/apps/docs/content/docs/en/tools/discord.mdx
@@ -63,7 +63,6 @@ Send a message to a Discord channel
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `message` | string | Success or error message |
-| `files` | file[] | Files attached to the message |
 | `data` | object | Discord message data |
 |   ↳ `id` | string | Message ID |
 |   ↳ `content` | string | Message content |
--- a/apps/docs/content/docs/en/tools/dropbox.mdx
+++ b/apps/docs/content/docs/en/tools/dropbox.mdx
@@ -43,8 +43,7 @@ Upload a file to Dropbox
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `path` | string | Yes | The path in Dropbox where the file should be saved \(e.g., /folder/document.pdf\) |
-| `file` | file | No | The file to upload \(UserFile object\) |
-| `fileContent` | string | No | Legacy: base64 encoded file content |
+| `fileContent` | string | Yes | The base64 encoded content of the file to upload |
 | `fileName` | string | No | Optional filename \(used if path is a folder\) |
 | `mode` | string | No | Write mode: add \(default\) or overwrite |
 | `autorename` | boolean | No | If true, rename the file if there is a conflict |
@@ -67,7 +66,7 @@ Upload a file to Dropbox

 ### `dropbox_download`

-Download a file from Dropbox with metadata and content
+Download a file from Dropbox and get a temporary link

 #### Input

@@ -79,8 +78,11 @@ Download a file from Dropbox with metadata and content

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `file` | file | Downloaded file stored in execution files |
-| `metadata` | json | The file metadata |
+| `file` | object | The file metadata |
+|   ↳ `id` | string | Unique identifier for the file |
+|   ↳ `name` | string | Name of the file |
+|   ↳ `path_display` | string | Display path of the file |
+|   ↳ `size` | number | Size of the file in bytes |
 | `temporaryLink` | string | Temporary link to download the file \(valid for ~4 hours\) |
 | `content` | string | Base64 encoded file content \(if fetched\) |

--- a/apps/docs/content/docs/en/tools/file.mdx
+++ b/apps/docs/content/docs/en/tools/file.mdx
@@ -6,7 +6,7 @@ description: Read and parse multiple files
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="file_v3"
+  type="file_v2"
  color="#40916C"
 />

@@ -27,7 +27,7 @@ The File Parser tool is particularly useful for scenarios where your agents need

 ## Usage Instructions

-Upload files directly or import from external URLs to get UserFile objects for use in other blocks.
+Integrate File into the workflow. Can upload a file manually or insert a file url.



@@ -41,15 +41,14 @@ Parse one or more uploaded files or files from URLs (text, PDF, CSV, images, etc

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `filePath` | string | No | Path to the file\(s\). Can be a single path, URL, or an array of paths. |
-| `file` | file | No | Uploaded file\(s\) to parse |
+| `filePath` | string | Yes | Path to the file\(s\). Can be a single path, URL, or an array of paths. |
 | `fileType` | string | No | Type of file to parse \(auto-detected if not specified\) |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `files` | file[] | Parsed files as UserFile objects |
-| `combinedContent` | string | Combined content of all parsed files |
+| `files` | array | Array of parsed files with content, metadata, and file properties |
+| `combinedContent` | string | All file contents merged into a single text string |


--- a/apps/docs/content/docs/en/tools/fireflies.mdx
+++ b/apps/docs/content/docs/en/tools/fireflies.mdx
@@ -6,7 +6,7 @@ description: Interact with Fireflies.ai meeting transcripts and recordings
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="fireflies_v2"
+  type="fireflies"
  color="#100730"
 />

--- a/apps/docs/content/docs/en/tools/github.mdx
+++ b/apps/docs/content/docs/en/tools/github.mdx
@@ -692,7 +692,6 @@ Get the content of a file from a GitHub repository. Supports files up to 1MB. Co
 | `download_url` | string | Direct download URL |
 | `git_url` | string | Git blob API URL |
 | `_links` | json | Related links |
-| `file` | file | Downloaded file stored in execution files |

 ### `github_create_file`

--- a/apps/docs/content/docs/en/tools/google_drive.mdx
+++ b/apps/docs/content/docs/en/tools/google_drive.mdx
@@ -291,7 +291,11 @@ Download a file from Google Drive with complete metadata (exports Google Workspa

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `file` | file | Downloaded file stored in execution files |
+| `file` | object | Downloaded file data |
+|   ↳ `name` | string | File name |
+|   ↳ `mimeType` | string | MIME type of the file |
+|   ↳ `data` | string | File content as base64-encoded string |
+|   ↳ `size` | number | File size in bytes |
 | `metadata` | object | Complete file metadata from Google Drive |
 |   ↳ `id` | string | Google Drive file ID |
 |   ↳ `kind` | string | Resource type identifier |
--- a/apps/docs/content/docs/en/tools/google_slides.mdx
+++ b/apps/docs/content/docs/en/tools/google_slides.mdx
@@ -6,7 +6,7 @@ description: Read, write, and create presentations
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="google_slides_v2"
+  type="google_slides"
  color="#E0E0E0"
 />

--- a/apps/docs/content/docs/en/tools/jira.mdx
+++ b/apps/docs/content/docs/en/tools/jira.mdx
@@ -333,28 +333,6 @@ Get all attachments from a Jira issue
 | `issueKey` | string | Issue key |
 | `attachments` | array | Array of attachments with id, filename, size, mimeType, created, author |

-### `jira_add_attachment`
-
-Add attachments to a Jira issue
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `domain` | string | Yes | Your Jira domain \(e.g., yourcompany.atlassian.net\) |
-| `issueKey` | string | Yes | Jira issue key to add attachments to \(e.g., PROJ-123\) |
-| `files` | file[] | Yes | Files to attach to the Jira issue |
-| `cloudId` | string | No | Jira Cloud ID for the instance. If not provided, it will be fetched using the domain. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `ts` | string | Timestamp of the operation |
-| `issueKey` | string | Issue key |
-| `attachmentIds` | json | IDs of uploaded attachments |
-| `files` | file[] | Uploaded attachment files |
-
 ### `jira_delete_attachment`

 Delete an attachment from a Jira issue
--- a/apps/docs/content/docs/en/tools/linear.mdx
+++ b/apps/docs/content/docs/en/tools/linear.mdx
@@ -1022,8 +1022,7 @@ Add an attachment to an issue in Linear
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `issueId` | string | Yes | Issue ID to attach to |
-| `url` | string | No | URL of the attachment |
-| `file` | file | No | File to attach |
+| `url` | string | Yes | URL of the attachment |
 | `title` | string | Yes | Attachment title |
 | `subtitle` | string | No | Attachment subtitle/description |

--- a/apps/docs/content/docs/en/tools/microsoft_teams.mdx
+++ b/apps/docs/content/docs/en/tools/microsoft_teams.mdx
@@ -81,7 +81,6 @@ Write or update content in a Microsoft Teams chat
 | `createdTime` | string | Timestamp when message was created |
 | `url` | string | Web URL to the message |
 | `updatedContent` | boolean | Whether content was successfully updated |
-| `files` | file[] | Files attached to the message |

 ### `microsoft_teams_read_channel`

@@ -133,7 +132,6 @@ Write or send a message to a Microsoft Teams channel
 | `createdTime` | string | Timestamp when message was created |
 | `url` | string | Web URL to the message |
 | `updatedContent` | boolean | Whether content was successfully updated |
-| `files` | file[] | Files attached to the message |

 ### `microsoft_teams_update_chat_message`

--- a/apps/docs/content/docs/en/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/en/tools/mistral_parse.mdx
@@ -6,7 +6,7 @@ description: Extract text from PDF documents
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="mistral_parse_v3"
+  type="mistral_parse_v2"
  color="#000000"
 />

@@ -35,12 +35,13 @@ Integrate Mistral Parse into the workflow. Can extract text from uploaded PDF do

 ### `mistral_parser`

+Parse PDF documents using Mistral OCR API
+
 #### Input

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `filePath` | string | No | URL to a PDF document to be processed |
-| `file` | file | No | Document file to be processed |
+| `filePath` | string | Yes | URL to a PDF document to be processed |
 | `fileUpload` | object | No | File upload data from file-upload component |
 | `resultType` | string | No | Type of parsed result \(markdown, text, or json\). Defaults to markdown. |
 | `includeImageBase64` | boolean | No | Include base64-encoded images in the response |
@@ -54,8 +55,27 @@ Integrate Mistral Parse into the workflow. Can extract text from uploaded PDF do
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `pages` | array | Array of page objects from Mistral OCR |
-| `model` | string | Mistral OCR model identifier |
-| `usage_info` | json | Usage statistics from the API |
-| `document_annotation` | string | Structured annotation data |
+|   ↳ `index` | number | Page index \(zero-based\) |
+|   ↳ `markdown` | string | Extracted markdown content |
+|   ↳ `images` | array | Images extracted from this page with bounding boxes |
+|     ↳ `id` | string | Image identifier \(e.g., img-0.jpeg\) |
+|     ↳ `top_left_x` | number | Top-left X coordinate in pixels |
+|     ↳ `top_left_y` | number | Top-left Y coordinate in pixels |
+|     ↳ `bottom_right_x` | number | Bottom-right X coordinate in pixels |
+|     ↳ `bottom_right_y` | number | Bottom-right Y coordinate in pixels |
+|     ↳ `image_base64` | string | Base64-encoded image data \(when include_image_base64=true\) |
+|   ↳ `dimensions` | object | Page dimensions |
+|     ↳ `dpi` | number | Dots per inch |
+|     ↳ `height` | number | Page height in pixels |
+|     ↳ `width` | number | Page width in pixels |
+|   ↳ `tables` | array | Extracted tables as HTML/markdown \(when table_format is set\). Referenced via placeholders like \[tbl-0.html\] |
+|   ↳ `hyperlinks` | array | Array of URL strings detected in the page \(e.g., \["https://...", "mailto:..."\]\) |
+|   ↳ `header` | string | Page header content \(when extract_header=true\) |
+|   ↳ `footer` | string | Page footer content \(when extract_footer=true\) |
+| `model` | string | Mistral OCR model identifier \(e.g., mistral-ocr-latest\) |
+| `usage_info` | object | Usage and processing statistics |
+|   ↳ `pages_processed` | number | Total number of pages processed |
+|   ↳ `doc_size_bytes` | number | Document file size in bytes |
+| `document_annotation` | string | Structured annotation data as JSON string \(when applicable\) |


--- a/apps/docs/content/docs/en/tools/notion.mdx
+++ b/apps/docs/content/docs/en/tools/notion.mdx
@@ -113,26 +113,6 @@ Create a new page in Notion
 | `last_edited_time` | string | ISO 8601 last edit timestamp |
 | `title` | string | Page title |

-### `notion_update_page`
-
-Update properties of a Notion page
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `pageId` | string | Yes | The UUID of the Notion page to update |
-| `properties` | json | Yes | JSON object of properties to update |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Page UUID |
-| `url` | string | Notion page URL |
-| `last_edited_time` | string | ISO 8601 last edit timestamp |
-| `title` | string | Page title |
-
 ### `notion_query_database`

 Query and filter Notion database entries with advanced filtering
--- a/apps/docs/content/docs/en/tools/pipedrive.mdx
+++ b/apps/docs/content/docs/en/tools/pipedrive.mdx
@@ -152,7 +152,6 @@ Retrieve files from Pipedrive with optional filters
 | `person_id` | string | No | Filter files by person ID \(e.g., "456"\) |
 | `org_id` | string | No | Filter files by organization ID \(e.g., "789"\) |
 | `limit` | string | No | Number of results to return \(e.g., "50", default: 100, max: 500\) |
-| `downloadFiles` | boolean | No | Download file contents into file outputs |

 #### Output

@@ -169,7 +168,6 @@ Retrieve files from Pipedrive with optional filters
 |   ↳ `person_id` | number | Associated person ID |
 |   ↳ `org_id` | number | Associated organization ID |
 |   ↳ `url` | string | File download URL |
-| `downloadedFiles` | file[] | Downloaded files from Pipedrive |
 | `total_items` | number | Total number of files returned |
 | `success` | boolean | Operation success status |

--- a/apps/docs/content/docs/en/tools/pulse.mdx
+++ b/apps/docs/content/docs/en/tools/pulse.mdx
@@ -6,7 +6,7 @@ description: Extract text from documents using Pulse OCR
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="pulse_v2"
+  type="pulse"
  color="#E0E0E0"
 />

@@ -31,7 +31,7 @@ If you need accurate, scalable, and developer-friendly document parsing capabili

 ## Usage Instructions

-Integrate Pulse into the workflow. Extract text from PDF documents, images, and Office files via upload or file references.
+Integrate Pulse into the workflow. Extract text from PDF documents, images, and Office files via URL or upload.



@@ -39,12 +39,13 @@ Integrate Pulse into the workflow. Extract text from PDF documents, images, and

 ### `pulse_parser`

+Parse documents (PDF, images, Office docs) using Pulse OCR API
+
 #### Input

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `filePath` | string | No | URL to a document to be processed |
-| `file` | file | No | Document file to be processed |
+| `filePath` | string | Yes | URL to a document to be processed |
 | `fileUpload` | object | No | File upload data from file-upload component |
 | `pages` | string | No | Page range to process \(1-indexed, e.g., "1-2,5"\) |
 | `extractFigure` | boolean | No | Enable figure extraction from the document |
@@ -56,6 +57,16 @@ Integrate Pulse into the workflow. Extract text from PDF documents, images, and

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `markdown` | string | Extracted content in markdown format |
+| `page_count` | number | Number of pages in the document |
+| `job_id` | string | Unique job identifier |
+| `bounding_boxes` | json | Bounding box layout information |
+| `extraction_url` | string | URL for extraction results \(for large documents\) |
+| `html` | string | HTML content if requested |
+| `structured_output` | json | Structured output if schema was provided |
+| `chunks` | json | Chunked content if chunking was enabled |
+| `figures` | json | Extracted figures if figure extraction was enabled |


--- a/apps/docs/content/docs/en/tools/reducto.mdx
+++ b/apps/docs/content/docs/en/tools/reducto.mdx
@@ -6,7 +6,7 @@ description: Extract text from PDF documents
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="reducto_v2"
+  type="reducto"
  color="#5c0c5c"
 />

@@ -29,7 +29,7 @@ Looking for reliable and scalable PDF parsing? Reducto is optimized for develope

 ## Usage Instructions

-Integrate Reducto Parse into the workflow. Can extract text from uploaded PDF documents or file references.
+Integrate Reducto Parse into the workflow. Can extract text from uploaded PDF documents, or from a URL.



@@ -37,12 +37,13 @@ Integrate Reducto Parse into the workflow. Can extract text from uploaded PDF do

 ### `reducto_parser`

+Parse PDF documents using Reducto OCR API
+
 #### Input

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `filePath` | string | No | URL to a PDF document to be processed |
-| `file` | file | No | Document file to be processed |
+| `filePath` | string | Yes | URL to a PDF document to be processed |
 | `fileUpload` | object | No | File upload data from file-upload component |
 | `pages` | array | No | Specific pages to process \(1-indexed page numbers\) |
 | `tableOutputFormat` | string | No | Table output format \(html or markdown\). Defaults to markdown. |
@@ -50,6 +51,13 @@ Integrate Reducto Parse into the workflow. Can extract text from uploaded PDF do

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `job_id` | string | Unique identifier for the processing job |
+| `duration` | number | Processing time in seconds |
+| `usage` | json | Resource consumption data |
+| `result` | json | Parsed document content with chunks and blocks |
+| `pdf_url` | string | Storage URL of converted PDF |
+| `studio_link` | string | Link to Reducto studio interface |


--- a/apps/docs/content/docs/en/tools/s3.mdx
+++ b/apps/docs/content/docs/en/tools/s3.mdx
@@ -78,7 +78,6 @@ Retrieve an object from an AWS S3 bucket
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `url` | string | Pre-signed URL for downloading the S3 object |
-| `file` | file | Downloaded file stored in execution files |
 | `metadata` | object | File metadata including type, size, name, and last modified date |

 ### `s3_list_objects`
--- a/apps/docs/content/docs/en/tools/sendgrid.mdx
+++ b/apps/docs/content/docs/en/tools/sendgrid.mdx
@@ -62,7 +62,7 @@ Send an email using SendGrid API
 | `bcc` | string | No | BCC email address |
 | `replyTo` | string | No | Reply-to email address |
 | `replyToName` | string | No | Reply-to name |
-| `attachments` | file[] | No | Files to attach to the email \(UserFile objects\) |
+| `attachments` | file[] | No | Files to attach to the email as an array of attachment objects |
 | `templateId` | string | No | SendGrid template ID to use |
 | `dynamicTemplateData` | json | No | JSON object of dynamic template data |

--- a/apps/docs/content/docs/en/tools/sftp.mdx
+++ b/apps/docs/content/docs/en/tools/sftp.mdx
@@ -97,7 +97,6 @@ Download a file from a remote SFTP server
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `success` | boolean | Whether the download was successful |
-| `file` | file | Downloaded file stored in execution files |
 | `fileName` | string | Name of the downloaded file |
 | `content` | string | File content \(text or base64 encoded\) |
 | `size` | number | File size in bytes |
--- a/apps/docs/content/docs/en/tools/slack.mdx
+++ b/apps/docs/content/docs/en/tools/slack.mdx
@@ -144,7 +144,6 @@ Send messages to Slack channels or direct messages. Supports Slack mrkdwn format
 | `ts` | string | Message timestamp |
 | `channel` | string | Channel ID where message was sent |
 | `fileCount` | number | Number of files uploaded \(when files are attached\) |
-| `files` | file[] | Files attached to the message |

 ### `slack_canvas`

--- a/apps/docs/content/docs/en/tools/ssh.mdx
+++ b/apps/docs/content/docs/en/tools/ssh.mdx
@@ -170,7 +170,6 @@ Download a file from a remote SSH server
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `downloaded` | boolean | Whether the file was downloaded successfully |
-| `file` | file | Downloaded file stored in execution files |
 | `fileContent` | string | File content \(base64 encoded for binary files\) |
 | `fileName` | string | Name of the downloaded file |
 | `remotePath` | string | Source path on the remote server |
--- a/apps/docs/content/docs/en/tools/stt.mdx
+++ b/apps/docs/content/docs/en/tools/stt.mdx
@@ -6,7 +6,7 @@ description: Convert speech to text using AI
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="stt_v2"
+  type="stt"
  color="#181C1E"
 />

@@ -50,6 +50,8 @@ Transcribe audio and video files to text using leading AI providers. Supports mu

 ### `stt_whisper`

+Transcribe audio to text using OpenAI Whisper
+
 #### Input

 | Parameter | Type | Required | Description |
@@ -69,10 +71,22 @@ Transcribe audio and video files to text using leading AI providers. Supports mu

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `transcript` | string | Full transcribed text |
+| `segments` | array | Timestamped segments |
+|   ↳ `text` | string | Transcribed text for this segment |
+|   ↳ `start` | number | Start time in seconds |
+|   ↳ `end` | number | End time in seconds |
+|   ↳ `speaker` | string | Speaker identifier \(if diarization enabled\) |
+|   ↳ `confidence` | number | Confidence score \(0-1\) |
+| `language` | string | Detected or specified language |
+| `duration` | number | Audio duration in seconds |

 ### `stt_deepgram`

+Transcribe audio to text using Deepgram
+
 #### Input

 | Parameter | Type | Required | Description |
@@ -89,10 +103,23 @@ This tool does not produce any outputs.

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `transcript` | string | Full transcribed text |
+| `segments` | array | Timestamped segments with speaker labels |
+|   ↳ `text` | string | Transcribed text for this segment |
+|   ↳ `start` | number | Start time in seconds |
+|   ↳ `end` | number | End time in seconds |
+|   ↳ `speaker` | string | Speaker identifier \(if diarization enabled\) |
+|   ↳ `confidence` | number | Confidence score \(0-1\) |
+| `language` | string | Detected or specified language |
+| `duration` | number | Audio duration in seconds |
+| `confidence` | number | Overall confidence score |

 ### `stt_elevenlabs`

+Transcribe audio to text using ElevenLabs
+
 #### Input

 | Parameter | Type | Required | Description |
@@ -108,10 +135,18 @@ This tool does not produce any outputs.

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `transcript` | string | Full transcribed text |
+| `segments` | array | Timestamped segments |
+| `language` | string | Detected or specified language |
+| `duration` | number | Audio duration in seconds |
+| `confidence` | number | Overall confidence score |

 ### `stt_assemblyai`

+Transcribe audio to text using AssemblyAI with advanced NLP features
+
 #### Input

 | Parameter | Type | Required | Description |
@@ -132,10 +167,35 @@ This tool does not produce any outputs.

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `transcript` | string | Full transcribed text |
+| `segments` | array | Timestamped segments with speaker labels |
+|   ↳ `text` | string | Transcribed text for this segment |
+|   ↳ `start` | number | Start time in seconds |
+|   ↳ `end` | number | End time in seconds |
+|   ↳ `speaker` | string | Speaker identifier \(if diarization enabled\) |
+|   ↳ `confidence` | number | Confidence score \(0-1\) |
+| `language` | string | Detected or specified language |
+| `duration` | number | Audio duration in seconds |
+| `confidence` | number | Overall confidence score |
+| `sentiment` | array | Sentiment analysis results |
+|   ↳ `text` | string | Text that was analyzed |
+|   ↳ `sentiment` | string | Sentiment \(POSITIVE, NEGATIVE, NEUTRAL\) |
+|   ↳ `confidence` | number | Confidence score |
+|   ↳ `start` | number | Start time in milliseconds |
+|   ↳ `end` | number | End time in milliseconds |
+| `entities` | array | Detected entities |
+|   ↳ `entity_type` | string | Entity type \(e.g., person_name, location, organization\) |
+|   ↳ `text` | string | Entity text |
+|   ↳ `start` | number | Start time in milliseconds |
+|   ↳ `end` | number | End time in milliseconds |
+| `summary` | string | Auto-generated summary |

 ### `stt_gemini`

+Transcribe audio to text using Google Gemini with multimodal capabilities
+
 #### Input

 | Parameter | Type | Required | Description |
@@ -151,6 +211,12 @@ This tool does not produce any outputs.

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `transcript` | string | Full transcribed text |
+| `segments` | array | Timestamped segments |
+| `language` | string | Detected or specified language |
+| `duration` | number | Audio duration in seconds |
+| `confidence` | number | Overall confidence score |


--- a/apps/docs/content/docs/en/tools/telegram.mdx
+++ b/apps/docs/content/docs/en/tools/telegram.mdx
@@ -354,7 +354,6 @@ Send documents (PDF, ZIP, DOC, etc.) to Telegram channels or users through the T
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `message` | string | Success or error message |
-| `files` | file[] | Files attached to the message |
 | `data` | object | Telegram message data including document |
 |   ↳ `message_id` | number | Unique Telegram message identifier |
 |   ↳ `from` | object | Information about the sender |
--- a/apps/docs/content/docs/en/tools/textract.mdx
+++ b/apps/docs/content/docs/en/tools/textract.mdx
@@ -6,7 +6,7 @@ description: Extract text, tables, and forms from documents
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="textract_v2"
+  type="textract"
  color="linear-gradient(135deg, #055F4E 0%, #56C0A7 100%)"
 />

@@ -35,6 +35,8 @@ Integrate AWS Textract into your workflow to extract text, tables, forms, and ke

 ### `textract_parser`

+Parse documents using AWS Textract OCR and document analysis
+
 #### Input

 | Parameter | Type | Required | Description |
@@ -44,8 +46,8 @@ Integrate AWS Textract into your workflow to extract text, tables, forms, and ke
 | `region` | string | Yes | AWS region for Textract service \(e.g., us-east-1\) |
 | `processingMode` | string | No | Document type: single-page or multi-page. Defaults to single-page. |
 | `filePath` | string | No | URL to a document to be processed \(JPEG, PNG, or single-page PDF\). |
-| `file` | file | No | Document file to be processed \(JPEG, PNG, or single-page PDF\). |
 | `s3Uri` | string | No | S3 URI for multi-page processing \(s3://bucket/key\). |
+| `fileUpload` | object | No | File upload data from file-upload component |
 | `featureTypes` | array | No | Feature types to detect: TABLES, FORMS, QUERIES, SIGNATURES, LAYOUT. If not specified, only text detection is performed. |
 | `items` | string | No | Feature type |
 | `queries` | array | No | Custom queries to extract specific information. Only used when featureTypes includes QUERIES. |
@@ -56,6 +58,39 @@ Integrate AWS Textract into your workflow to extract text, tables, forms, and ke

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `blocks` | array | Array of Block objects containing detected text, tables, forms, and other elements |
+|   ↳ `BlockType` | string | Type of block \(PAGE, LINE, WORD, TABLE, CELL, KEY_VALUE_SET, etc.\) |
+|   ↳ `Id` | string | Unique identifier for the block |
+|   ↳ `Text` | string | The text content \(for LINE and WORD blocks\) |
+|   ↳ `TextType` | string | Type of text \(PRINTED or HANDWRITING\) |
+|   ↳ `Confidence` | number | Confidence score \(0-100\) |
+|   ↳ `Page` | number | Page number |
+|   ↳ `Geometry` | object | Location and bounding box information |
+|     ↳ `BoundingBox` | object | Height as ratio of document height |
+|       ↳ `Height` | number | Height as ratio of document height |
+|       ↳ `Left` | number | Left position as ratio of document width |
+|       ↳ `Top` | number | Top position as ratio of document height |
+|       ↳ `Width` | number | Width as ratio of document width |
+|     ↳ `Polygon` | array | Polygon coordinates |
+|       ↳ `X` | number | X coordinate |
+|       ↳ `Y` | number | Y coordinate |
+|   ↳ `Relationships` | array | Relationships to other blocks |
+|     ↳ `Type` | string | Relationship type \(CHILD, VALUE, ANSWER, etc.\) |
+|     ↳ `Ids` | array | IDs of related blocks |
+|   ↳ `EntityTypes` | array | Entity types for KEY_VALUE_SET \(KEY or VALUE\) |
+|   ↳ `SelectionStatus` | string | For checkboxes: SELECTED or NOT_SELECTED |
+|   ↳ `RowIndex` | number | Row index for table cells |
+|   ↳ `ColumnIndex` | number | Column index for table cells |
+|   ↳ `RowSpan` | number | Row span for merged cells |
+|   ↳ `ColumnSpan` | number | Column span for merged cells |
+|   ↳ `Query` | object | Query information for QUERY blocks |
+|     ↳ `Text` | string | Query text |
+|     ↳ `Alias` | string | Query alias |
+|     ↳ `Pages` | array | Pages to search |
+| `documentMetadata` | object | Metadata about the analyzed document |
+|   ↳ `pages` | number | Number of pages in the document |
+| `modelVersion` | string | Version of the Textract model used for processing |


--- a/apps/docs/content/docs/en/tools/twilio_voice.mdx
+++ b/apps/docs/content/docs/en/tools/twilio_voice.mdx
@@ -122,7 +122,6 @@ Retrieve call recording information and transcription (if enabled via TwiML).
 | `channels` | number | Number of channels \(1 for mono, 2 for dual\) |
 | `source` | string | How the recording was created |
 | `mediaUrl` | string | URL to download the recording media file |
-| `file` | file | Downloaded recording media file |
 | `price` | string | Cost of the recording |
 | `priceUnit` | string | Currency of the price |
 | `uri` | string | Relative URI of the recording resource |
--- a/apps/docs/content/docs/en/tools/typeform.mdx
+++ b/apps/docs/content/docs/en/tools/typeform.mdx
@@ -75,7 +75,6 @@ Download files uploaded in Typeform responses
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `fileUrl` | string | Direct download URL for the uploaded file |
-| `file` | file | Downloaded file stored in execution files |
 | `contentType` | string | MIME type of the uploaded file |
 | `filename` | string | Original filename of the uploaded file |

--- a/apps/docs/content/docs/en/tools/video_generator.mdx
+++ b/apps/docs/content/docs/en/tools/video_generator.mdx
@@ -57,14 +57,14 @@ Generate videos using Runway Gen-4 with world consistency and visual references
 | `duration` | number | No | Video duration in seconds \(5 or 10, default: 5\) |
 | `aspectRatio` | string | No | Aspect ratio: 16:9 \(landscape\), 9:16 \(portrait\), or 1:1 \(square\) |
 | `resolution` | string | No | Video resolution \(720p output\). Note: Gen-4 Turbo outputs at 720p natively |
-| `visualReference` | file | Yes | Reference image REQUIRED for Gen-4 \(UserFile object\). Gen-4 only supports image-to-video, not text-only generation |
+| `visualReference` | json | Yes | Reference image REQUIRED for Gen-4 \(UserFile object\). Gen-4 only supports image-to-video, not text-only generation |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `videoUrl` | string | Generated video URL |
-| `videoFile` | file | Video file object with metadata |
+| `videoFile` | json | Video file object with metadata |
 | `duration` | number | Video duration in seconds |
 | `width` | number | Video width in pixels |
 | `height` | number | Video height in pixels |
@@ -93,7 +93,7 @@ Generate videos using Google Veo 3/3.1 with native audio generation
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `videoUrl` | string | Generated video URL |
-| `videoFile` | file | Video file object with metadata |
+| `videoFile` | json | Video file object with metadata |
 | `duration` | number | Video duration in seconds |
 | `width` | number | Video width in pixels |
 | `height` | number | Video height in pixels |
@@ -123,7 +123,7 @@ Generate videos using Luma Dream Machine with advanced camera controls
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `videoUrl` | string | Generated video URL |
-| `videoFile` | file | Video file object with metadata |
+| `videoFile` | json | Video file object with metadata |
 | `duration` | number | Video duration in seconds |
 | `width` | number | Video width in pixels |
 | `height` | number | Video height in pixels |
@@ -151,7 +151,7 @@ Generate videos using MiniMax Hailuo through MiniMax Platform API with advanced
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `videoUrl` | string | Generated video URL |
-| `videoFile` | file | Video file object with metadata |
+| `videoFile` | json | Video file object with metadata |
 | `duration` | number | Video duration in seconds |
 | `width` | number | Video width in pixels |
 | `height` | number | Video height in pixels |
@@ -181,7 +181,7 @@ Generate videos using Fal.ai platform with access to multiple models including V
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `videoUrl` | string | Generated video URL |
-| `videoFile` | file | Video file object with metadata |
+| `videoFile` | json | Video file object with metadata |
 | `duration` | number | Video duration in seconds |
 | `width` | number | Video width in pixels |
 | `height` | number | Video height in pixels |
--- a/apps/docs/content/docs/en/tools/vision.mdx
+++ b/apps/docs/content/docs/en/tools/vision.mdx
@@ -6,7 +6,7 @@ description: Analyze images with vision models
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="vision_v2"
+  type="vision"
  color="#4D5FFF"
 />

@@ -35,6 +35,8 @@ Integrate Vision into the workflow. Can analyze images with vision models.

 ### `vision_tool`

+Process and analyze images using advanced vision models. Capable of understanding image content, extracting text, identifying objects, and providing detailed visual descriptions.
+
 #### Input

 | Parameter | Type | Required | Description |
@@ -47,6 +49,14 @@ Integrate Vision into the workflow. Can analyze images with vision models.

 #### Output

-This tool does not produce any outputs.
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `content` | string | The analyzed content and description of the image |
+| `model` | string | The vision model that was used for analysis |
+| `tokens` | number | Total tokens used for the analysis |
+| `usage` | object | Detailed token usage breakdown |
+|   ↳ `input_tokens` | number | Tokens used for input processing |
+|   ↳ `output_tokens` | number | Tokens used for response generation |
+|   ↳ `total_tokens` | number | Total tokens consumed |


--- a/apps/docs/content/docs/en/tools/zoom.mdx
+++ b/apps/docs/content/docs/en/tools/zoom.mdx
@@ -335,7 +335,6 @@ Get all recordings for a specific Zoom meeting
 | `meetingId` | string | Yes | The meeting ID or meeting UUID \(e.g., "1234567890" or "4444AAABBBccccc12345=="\) |
 | `includeFolderItems` | boolean | No | Include items within a folder |
 | `ttl` | number | No | Time to live for download URLs in seconds \(max 604800\) |
-| `downloadFiles` | boolean | No | Download recording files into file outputs |

 #### Output

@@ -365,7 +364,6 @@ Get all recordings for a specific Zoom meeting
 |     ↳ `download_url` | string | URL to download the recording |
 |     ↳ `status` | string | Recording status |
 |     ↳ `recording_type` | string | Type of recording \(shared_screen, audio_only, etc.\) |
-| `files` | file[] | Downloaded recording files |

 ### `zoom_delete_recording`

--- a/apps/docs/content/docs/es/tools/file.mdx
+++ b/apps/docs/content/docs/es/tools/file.mdx
@@ -6,7 +6,7 @@ description: Leer y analizar múltiples archivos
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="file_v3"
+  type="file"
  color="#40916C"
 />

--- a/apps/docs/content/docs/es/tools/fireflies.mdx
+++ b/apps/docs/content/docs/es/tools/fireflies.mdx
@@ -6,7 +6,7 @@ description: Interactúa con transcripciones y grabaciones de reuniones de Firef
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="fireflies_v2"
+  type="fireflies"
  color="#100730"
 />

--- a/apps/docs/content/docs/es/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/es/tools/mistral_parse.mdx
@@ -6,7 +6,7 @@ description: Extraer texto de documentos PDF
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="mistral_parse_v3"
+  type="mistral_parse"
  color="#000000"
 />

--- a/apps/docs/content/docs/fr/tools/file.mdx
+++ b/apps/docs/content/docs/fr/tools/file.mdx
@@ -6,7 +6,7 @@ description: Lire et analyser plusieurs fichiers
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="file_v3"
+  type="file"
  color="#40916C"
 />

--- a/apps/docs/content/docs/fr/tools/fireflies.mdx
+++ b/apps/docs/content/docs/fr/tools/fireflies.mdx
@@ -7,7 +7,7 @@ description: Interagissez avec les transcriptions et enregistrements de réunion
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="fireflies_v2"
+  type="fireflies"
  color="#100730"
 />

--- a/apps/docs/content/docs/fr/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/fr/tools/mistral_parse.mdx
@@ -6,7 +6,7 @@ description: Extraire du texte à partir de documents PDF
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="mistral_parse_v3"
+  type="mistral_parse"
  color="#000000"
 />

--- a/apps/docs/content/docs/ja/tools/file.mdx
+++ b/apps/docs/content/docs/ja/tools/file.mdx
@@ -6,7 +6,7 @@ description: 複数のファイルを読み込んで解析する
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="file_v3"
+  type="file"
  color="#40916C"
 />

--- a/apps/docs/content/docs/ja/tools/fireflies.mdx
+++ b/apps/docs/content/docs/ja/tools/fireflies.mdx
@@ -6,7 +6,7 @@ description: Fireflies.aiの会議文字起こしと録画を操作
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="fireflies_v2"
+  type="fireflies"
  color="#100730"
 />

--- a/apps/docs/content/docs/ja/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/ja/tools/mistral_parse.mdx
@@ -6,7 +6,7 @@ description: PDFドキュメントからテキストを抽出する
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="mistral_parse_v3"
+  type="mistral_parse"
  color="#000000"
 />

--- a/apps/docs/content/docs/zh/tools/file.mdx
+++ b/apps/docs/content/docs/zh/tools/file.mdx
@@ -6,7 +6,7 @@ description: 读取并解析多个文件
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="file_v3"
+  type="file"
  color="#40916C"
 />

--- a/apps/docs/content/docs/zh/tools/fireflies.mdx
+++ b/apps/docs/content/docs/zh/tools/fireflies.mdx
@@ -6,7 +6,7 @@ description: 与 Fireflies.ai 会议转录和录音进行交互
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="fireflies_v2"
+  type="fireflies"
  color="#100730"
 />

--- a/apps/docs/content/docs/zh/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/zh/tools/mistral_parse.mdx
@@ -6,7 +6,7 @@ description: 从 PDF 文档中提取文本
 import { BlockInfoCard } from "@/components/ui/block-info-card"

 <BlockInfoCard 
-  type="mistral_parse_v3"
+  type="mistral_parse"
  color="#000000"
 />

--- a/apps/sim/app/(auth)/components/support-footer.tsx
+++ b/apps/sim/app/(auth)/components/support-footer.tsx
@@ -1,7 +1,7 @@
 'use client'

+import { useBrandConfig } from '@/lib/branding/branding'
 import { inter } from '@/app/_styles/fonts/inter/inter'
-import { useBrandConfig } from '@/ee/whitelabeling'

 export interface SupportFooterProps {
  /** Position style - 'fixed' for pages without AuthLayout, 'absolute' for pages with AuthLayout */
--- a/apps/sim/app/(landing)/components/nav/nav.tsx
+++ b/apps/sim/app/(landing)/components/nav/nav.tsx
@@ -7,10 +7,10 @@ import Image from 'next/image'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { GithubIcon } from '@/components/icons'
+import { useBrandConfig } from '@/lib/branding/branding'
 import { isHosted } from '@/lib/core/config/feature-flags'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'
-import { useBrandConfig } from '@/ee/whitelabeling'
 import { useBrandedButtonClass } from '@/hooks/use-branded-button-class'

 const logger = createLogger('nav')
--- a/apps/sim/app/api/a2a/serve/[agentId]/route.ts
+++ b/apps/sim/app/api/a2a/serve/[agentId]/route.ts
@@ -14,6 +14,7 @@ import {
  parseWorkflowSSEChunk,
 } from '@/lib/a2a/utils'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
+import { getBrandConfig } from '@/lib/branding/branding'
 import { acquireLock, getRedisClient, releaseLock } from '@/lib/core/config/redis'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
 import { SSE_HEADERS } from '@/lib/core/utils/sse'
@@ -34,7 +35,6 @@ import {
  type PushNotificationSetParams,
  type TaskIdParams,
 } from '@/app/api/a2a/serve/[agentId]/utils'
-import { getBrandConfig } from '@/ee/whitelabeling'

 const logger = createLogger('A2AServeAPI')

--- a/apps/sim/app/api/tools/confluence/attachments/route.ts
+++ b/apps/sim/app/api/tools/confluence/attachments/route.ts
@@ -21,8 +21,7 @@ export async function GET(request: NextRequest) {
    const accessToken = searchParams.get('accessToken')
    const pageId = searchParams.get('pageId')
    const providedCloudId = searchParams.get('cloudId')
-    const limit = searchParams.get('limit') || '50'
-    const cursor = searchParams.get('cursor')
+    const limit = searchParams.get('limit') || '25'

    if (!domain) {
      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
@@ -48,12 +47,7 @@ export async function GET(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(Number(limit), 250)))
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/attachments?${queryParams.toString()}`
+    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/attachments?limit=${limit}`

    const response = await fetch(url, {
      method: 'GET',
@@ -83,20 +77,9 @@ export async function GET(request: NextRequest) {
      fileSize: attachment.fileSize || 0,
      mediaType: attachment.mediaType || '',
      downloadUrl: attachment.downloadLink || attachment._links?.download || '',
-      status: attachment.status ?? null,
-      webuiUrl: attachment._links?.webui ?? null,
-      pageId: attachment.pageId ?? null,
-      blogPostId: attachment.blogPostId ?? null,
-      comment: attachment.comment ?? null,
-      version: attachment.version ?? null,
    }))

-    return NextResponse.json({
-      attachments,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
+    return NextResponse.json({ attachments })
  } catch (error) {
    logger.error('Error listing Confluence attachments:', error)
    return NextResponse.json(
--- a/apps/sim/app/api/tools/confluence/blogposts/route.ts
+++ b/apps/sim/app/api/tools/confluence/blogposts/route.ts
@@ -1,285 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluenceBlogPostsAPI')
-
-export const dynamic = 'force-dynamic'
-
-const getBlogPostSchema = z
-  .object({
-    domain: z.string().min(1, 'Domain is required'),
-    accessToken: z.string().min(1, 'Access token is required'),
-    cloudId: z.string().optional(),
-    blogPostId: z.string().min(1, 'Blog post ID is required'),
-    bodyFormat: z.string().optional(),
-  })
-  .refine(
-    (data) => {
-      const validation = validateAlphanumericId(data.blogPostId, 'blogPostId', 255)
-      return validation.isValid
-    },
-    (data) => {
-      const validation = validateAlphanumericId(data.blogPostId, 'blogPostId', 255)
-      return { message: validation.error || 'Invalid blog post ID', path: ['blogPostId'] }
-    }
-  )
-
-const createBlogPostSchema = z.object({
-  domain: z.string().min(1, 'Domain is required'),
-  accessToken: z.string().min(1, 'Access token is required'),
-  cloudId: z.string().optional(),
-  spaceId: z.string().min(1, 'Space ID is required'),
-  title: z.string().min(1, 'Title is required'),
-  content: z.string().min(1, 'Content is required'),
-  status: z.enum(['current', 'draft']).optional(),
-})
-
-/**
- * List all blog posts or get a specific blog post
- */
-export async function GET(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const domain = searchParams.get('domain')
-    const accessToken = searchParams.get('accessToken')
-    const providedCloudId = searchParams.get('cloudId')
-    const limit = searchParams.get('limit') || '25'
-    const status = searchParams.get('status')
-    const sortOrder = searchParams.get('sort')
-    const cursor = searchParams.get('cursor')
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(Number(limit), 250)))
-
-    if (status) {
-      queryParams.append('status', status)
-    }
-
-    if (sortOrder) {
-      queryParams.append('sort', sortOrder)
-    }
-
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/blogposts?${queryParams.toString()}`
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage = errorData?.message || `Failed to list blog posts (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const blogPosts = (data.results || []).map((post: any) => ({
-      id: post.id,
-      title: post.title,
-      status: post.status ?? null,
-      spaceId: post.spaceId ?? null,
-      authorId: post.authorId ?? null,
-      createdAt: post.createdAt ?? null,
-      version: post.version ?? null,
-      webUrl: post._links?.webui ?? null,
-    }))
-
-    return NextResponse.json({
-      blogPosts,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
-  } catch (error) {
-    logger.error('Error listing blog posts:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
-
-/**
- * Get a specific blog post by ID
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-
-    // Check if this is a create or get request
-    if (body.title && body.content && body.spaceId) {
-      // Create blog post
-      const validation = createBlogPostSchema.safeParse(body)
-      if (!validation.success) {
-        const firstError = validation.error.errors[0]
-        return NextResponse.json({ error: firstError.message }, { status: 400 })
-      }
-
-      const {
-        domain,
-        accessToken,
-        cloudId: providedCloudId,
-        spaceId,
-        title,
-        content,
-        status,
-      } = validation.data
-
-      const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-      const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-      if (!cloudIdValidation.isValid) {
-        return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-      }
-
-      const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/blogposts`
-
-      const createBody = {
-        spaceId,
-        status: status || 'current',
-        title,
-        body: {
-          representation: 'storage',
-          value: content,
-        },
-      }
-
-      const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${accessToken}`,
-        },
-        body: JSON.stringify(createBody),
-      })
-
-      if (!response.ok) {
-        const errorData = await response.json().catch(() => null)
-        logger.error('Confluence API error response:', {
-          status: response.status,
-          statusText: response.statusText,
-          error: JSON.stringify(errorData, null, 2),
-        })
-        const errorMessage = errorData?.message || `Failed to create blog post (${response.status})`
-        return NextResponse.json({ error: errorMessage }, { status: response.status })
-      }
-
-      const data = await response.json()
-      return NextResponse.json({
-        id: data.id,
-        title: data.title,
-        spaceId: data.spaceId,
-        webUrl: data._links?.webui ?? null,
-      })
-    }
-    // Get blog post by ID
-    const validation = getBlogPostSchema.safeParse(body)
-    if (!validation.success) {
-      const firstError = validation.error.errors[0]
-      return NextResponse.json({ error: firstError.message }, { status: 400 })
-    }
-
-    const {
-      domain,
-      accessToken,
-      cloudId: providedCloudId,
-      blogPostId,
-      bodyFormat,
-    } = validation.data
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const queryParams = new URLSearchParams()
-    if (bodyFormat) {
-      queryParams.append('body-format', bodyFormat)
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/blogposts/${blogPostId}${queryParams.toString() ? `?${queryParams.toString()}` : ''}`
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage = errorData?.message || `Failed to get blog post (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-    return NextResponse.json({
-      id: data.id,
-      title: data.title,
-      status: data.status ?? null,
-      spaceId: data.spaceId ?? null,
-      authorId: data.authorId ?? null,
-      createdAt: data.createdAt ?? null,
-      version: data.version ?? null,
-      body: data.body ?? null,
-      webUrl: data._links?.webui ?? null,
-    })
-  } catch (error) {
-    logger.error('Error with blog post operation:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/comments/route.ts
+++ b/apps/sim/app/api/tools/confluence/comments/route.ts
@@ -105,8 +105,6 @@ export async function GET(request: NextRequest) {
    const pageId = searchParams.get('pageId')
    const providedCloudId = searchParams.get('cloudId')
    const limit = searchParams.get('limit') || '25'
-    const bodyFormat = searchParams.get('bodyFormat') || 'storage'
-    const cursor = searchParams.get('cursor')

    if (!domain) {
      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
@@ -132,13 +130,7 @@ export async function GET(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(Number(limit), 250)))
-    queryParams.append('body-format', bodyFormat)
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/footer-comments?${queryParams.toString()}`
+    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/footer-comments?limit=${limit}`

    const response = await fetch(url, {
      method: 'GET',
@@ -162,31 +154,14 @@ export async function GET(request: NextRequest) {

    const data = await response.json()

-    const comments = (data.results || []).map((comment: any) => {
-      const bodyValue = comment.body?.storage?.value || comment.body?.view?.value || ''
-      return {
-        id: comment.id,
-        body: {
-          value: bodyValue,
-          representation: bodyFormat,
-        },
-        createdAt: comment.createdAt || '',
-        authorId: comment.authorId || '',
-        status: comment.status ?? null,
-        title: comment.title ?? null,
-        pageId: comment.pageId ?? null,
-        blogPostId: comment.blogPostId ?? null,
-        parentCommentId: comment.parentCommentId ?? null,
-        version: comment.version ?? null,
-      }
-    })
+    const comments = (data.results || []).map((comment: any) => ({
+      id: comment.id,
+      body: comment.body?.storage?.value || comment.body?.view?.value || '',
+      createdAt: comment.createdAt || '',
+      authorId: comment.authorId || '',
+    }))

-    return NextResponse.json({
-      comments,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
+    return NextResponse.json({ comments })
  } catch (error) {
    logger.error('Error listing Confluence comments:', error)
    return NextResponse.json(
--- a/apps/sim/app/api/tools/confluence/labels/route.ts
+++ b/apps/sim/app/api/tools/confluence/labels/route.ts
@@ -22,7 +22,6 @@ export async function POST(request: NextRequest) {
      cloudId: providedCloudId,
      pageId,
      labelName,
-      prefix: labelPrefix,
    } = await request.json()

    if (!domain) {
@@ -53,14 +52,12 @@ export async function POST(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/rest/api/content/${pageId}/label`
+    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/labels`

-    const body = [
-      {
-        prefix: labelPrefix || 'global',
-        name: labelName,
-      },
-    ]
+    const body = {
+      prefix: 'global',
+      name: labelName,
+    }

    const response = await fetch(url, {
      method: 'POST',
@@ -85,14 +82,7 @@ export async function POST(request: NextRequest) {
    }

    const data = await response.json()
-    const addedLabel = data.results?.[0] || data[0] || data
-    return NextResponse.json({
-      id: addedLabel.id ?? '',
-      name: addedLabel.name ?? labelName,
-      prefix: addedLabel.prefix ?? labelPrefix ?? 'global',
-      pageId,
-      labelName,
-    })
+    return NextResponse.json({ ...data, pageId, labelName })
  } catch (error) {
    logger.error('Error adding Confluence label:', error)
    return NextResponse.json(
@@ -115,8 +105,6 @@ export async function GET(request: NextRequest) {
    const accessToken = searchParams.get('accessToken')
    const pageId = searchParams.get('pageId')
    const providedCloudId = searchParams.get('cloudId')
-    const limit = searchParams.get('limit') || '25'
-    const cursor = searchParams.get('cursor')

    if (!domain) {
      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
@@ -142,12 +130,7 @@ export async function GET(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(Number(limit), 250)))
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/labels?${queryParams.toString()}`
+    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/labels`

    const response = await fetch(url, {
      method: 'GET',
@@ -177,12 +160,7 @@ export async function GET(request: NextRequest) {
      prefix: label.prefix || 'global',
    }))

-    return NextResponse.json({
-      labels,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
+    return NextResponse.json({ labels })
  } catch (error) {
    logger.error('Error listing Confluence labels:', error)
    return NextResponse.json(
--- a/apps/sim/app/api/tools/confluence/page-ancestors/route.ts
+++ b/apps/sim/app/api/tools/confluence/page-ancestors/route.ts
@@ -1,96 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluencePageAncestorsAPI')
-
-export const dynamic = 'force-dynamic'
-
-/**
- * Get ancestors (parent pages) of a specific Confluence page.
- * Uses GET /wiki/api/v2/pages/{id}/ancestors
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-    const { domain, accessToken, pageId, cloudId: providedCloudId, limit = 25 } = body
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    if (!pageId) {
-      return NextResponse.json({ error: 'Page ID is required' }, { status: 400 })
-    }
-
-    const pageIdValidation = validateAlphanumericId(pageId, 'pageId', 255)
-    if (!pageIdValidation.isValid) {
-      return NextResponse.json({ error: pageIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(limit, 250)))
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/ancestors?${queryParams.toString()}`
-
-    logger.info(`Fetching ancestors for page ${pageId}`)
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage = errorData?.message || `Failed to get page ancestors (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const ancestors = (data.results || []).map((page: any) => ({
-      id: page.id,
-      title: page.title,
-      status: page.status ?? null,
-      spaceId: page.spaceId ?? null,
-      webUrl: page._links?.webui ?? null,
-    }))
-
-    return NextResponse.json({
-      ancestors,
-      pageId,
-    })
-  } catch (error) {
-    logger.error('Error getting page ancestors:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/page-children/route.ts
+++ b/apps/sim/app/api/tools/confluence/page-children/route.ts
@@ -1,104 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluencePageChildrenAPI')
-
-export const dynamic = 'force-dynamic'
-
-/**
- * Get child pages of a specific Confluence page.
- * Uses GET /wiki/api/v2/pages/{id}/children
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-    const { domain, accessToken, pageId, cloudId: providedCloudId, limit = 50, cursor } = body
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    if (!pageId) {
-      return NextResponse.json({ error: 'Page ID is required' }, { status: 400 })
-    }
-
-    const pageIdValidation = validateAlphanumericId(pageId, 'pageId', 255)
-    if (!pageIdValidation.isValid) {
-      return NextResponse.json({ error: pageIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(limit, 250)))
-
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/children?${queryParams.toString()}`
-
-    logger.info(`Fetching child pages for page ${pageId}`)
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage = errorData?.message || `Failed to get child pages (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const children = (data.results || []).map((page: any) => ({
-      id: page.id,
-      title: page.title,
-      status: page.status ?? null,
-      spaceId: page.spaceId ?? null,
-      childPosition: page.childPosition ?? null,
-      webUrl: page._links?.webui ?? null,
-    }))
-
-    return NextResponse.json({
-      children,
-      parentId: pageId,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
-  } catch (error) {
-    logger.error('Error getting child pages:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/page-properties/route.ts
+++ b/apps/sim/app/api/tools/confluence/page-properties/route.ts
@@ -1,365 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluencePagePropertiesAPI')
-
-export const dynamic = 'force-dynamic'
-
-const createPropertySchema = z.object({
-  domain: z.string().min(1, 'Domain is required'),
-  accessToken: z.string().min(1, 'Access token is required'),
-  cloudId: z.string().optional(),
-  pageId: z.string().min(1, 'Page ID is required'),
-  key: z.string().min(1, 'Property key is required'),
-  value: z.any(),
-})
-
-const updatePropertySchema = z.object({
-  domain: z.string().min(1, 'Domain is required'),
-  accessToken: z.string().min(1, 'Access token is required'),
-  cloudId: z.string().optional(),
-  pageId: z.string().min(1, 'Page ID is required'),
-  propertyId: z.string().min(1, 'Property ID is required'),
-  key: z.string().min(1, 'Property key is required'),
-  value: z.any(),
-  versionNumber: z.number().min(1, 'Version number is required'),
-})
-
-const deletePropertySchema = z.object({
-  domain: z.string().min(1, 'Domain is required'),
-  accessToken: z.string().min(1, 'Access token is required'),
-  cloudId: z.string().optional(),
-  pageId: z.string().min(1, 'Page ID is required'),
-  propertyId: z.string().min(1, 'Property ID is required'),
-})
-
-/**
- * List all content properties on a page.
- */
-export async function GET(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const domain = searchParams.get('domain')
-    const accessToken = searchParams.get('accessToken')
-    const pageId = searchParams.get('pageId')
-    const providedCloudId = searchParams.get('cloudId')
-    const limit = searchParams.get('limit') || '50'
-    const cursor = searchParams.get('cursor')
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    if (!pageId) {
-      return NextResponse.json({ error: 'Page ID is required' }, { status: 400 })
-    }
-
-    const pageIdValidation = validateAlphanumericId(pageId, 'pageId', 255)
-    if (!pageIdValidation.isValid) {
-      return NextResponse.json({ error: pageIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(Number(limit), 250)))
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/properties?${queryParams.toString()}`
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage =
-        errorData?.message || `Failed to list page properties (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const properties = (data.results || []).map((prop: any) => ({
-      id: prop.id,
-      key: prop.key,
-      value: prop.value ?? null,
-      version: prop.version ?? null,
-    }))
-
-    return NextResponse.json({
-      properties,
-      pageId,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
-  } catch (error) {
-    logger.error('Error listing page properties:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
-
-/**
- * Create a new content property on a page.
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-
-    const validation = createPropertySchema.safeParse(body)
-    if (!validation.success) {
-      const firstError = validation.error.errors[0]
-      return NextResponse.json({ error: firstError.message }, { status: 400 })
-    }
-
-    const { domain, accessToken, cloudId: providedCloudId, pageId, key, value } = validation.data
-
-    const pageIdValidation = validateAlphanumericId(pageId, 'pageId', 255)
-    if (!pageIdValidation.isValid) {
-      return NextResponse.json({ error: pageIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/properties`
-
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-      body: JSON.stringify({ key, value }),
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage =
-        errorData?.message || `Failed to create page property (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-    return NextResponse.json({
-      id: data.id,
-      key: data.key,
-      value: data.value,
-      version: data.version,
-      pageId,
-    })
-  } catch (error) {
-    logger.error('Error creating page property:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
-
-/**
- * Update a content property on a page.
- */
-export async function PUT(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-
-    const validation = updatePropertySchema.safeParse(body)
-    if (!validation.success) {
-      const firstError = validation.error.errors[0]
-      return NextResponse.json({ error: firstError.message }, { status: 400 })
-    }
-
-    const {
-      domain,
-      accessToken,
-      cloudId: providedCloudId,
-      pageId,
-      propertyId,
-      key,
-      value,
-      versionNumber,
-    } = validation.data
-
-    const pageIdValidation = validateAlphanumericId(pageId, 'pageId', 255)
-    if (!pageIdValidation.isValid) {
-      return NextResponse.json({ error: pageIdValidation.error }, { status: 400 })
-    }
-
-    const propertyIdValidation = validateAlphanumericId(propertyId, 'propertyId', 255)
-    if (!propertyIdValidation.isValid) {
-      return NextResponse.json({ error: propertyIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/properties/${propertyId}`
-
-    const response = await fetch(url, {
-      method: 'PUT',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-      body: JSON.stringify({
-        key,
-        value,
-        version: { number: versionNumber },
-      }),
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage =
-        errorData?.message || `Failed to update page property (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-    return NextResponse.json({
-      id: data.id,
-      key: data.key,
-      value: data.value,
-      version: data.version,
-      pageId,
-    })
-  } catch (error) {
-    logger.error('Error updating page property:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
-
-/**
- * Delete a content property from a page.
- */
-export async function DELETE(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-
-    const validation = deletePropertySchema.safeParse(body)
-    if (!validation.success) {
-      const firstError = validation.error.errors[0]
-      return NextResponse.json({ error: firstError.message }, { status: 400 })
-    }
-
-    const { domain, accessToken, cloudId: providedCloudId, pageId, propertyId } = validation.data
-
-    const pageIdValidation = validateAlphanumericId(pageId, 'pageId', 255)
-    if (!pageIdValidation.isValid) {
-      return NextResponse.json({ error: pageIdValidation.error }, { status: 400 })
-    }
-
-    const propertyIdValidation = validateAlphanumericId(propertyId, 'propertyId', 255)
-    if (!propertyIdValidation.isValid) {
-      return NextResponse.json({ error: propertyIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/properties/${propertyId}`
-
-    const response = await fetch(url, {
-      method: 'DELETE',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage =
-        errorData?.message || `Failed to delete page property (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    return NextResponse.json({ propertyId, pageId, deleted: true })
-  } catch (error) {
-    logger.error('Error deleting page property:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/page-versions/route.ts
+++ b/apps/sim/app/api/tools/confluence/page-versions/route.ts
@@ -1,151 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluencePageVersionsAPI')
-
-export const dynamic = 'force-dynamic'
-
-/**
- * List all versions of a page or get a specific version.
- * Uses GET /wiki/api/v2/pages/{id}/versions
- * and GET /wiki/api/v2/pages/{page-id}/versions/{version-number}
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-    const {
-      domain,
-      accessToken,
-      pageId,
-      versionNumber,
-      cloudId: providedCloudId,
-      limit = 50,
-      cursor,
-    } = body
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    if (!pageId) {
-      return NextResponse.json({ error: 'Page ID is required' }, { status: 400 })
-    }
-
-    const pageIdValidation = validateAlphanumericId(pageId, 'pageId', 255)
-    if (!pageIdValidation.isValid) {
-      return NextResponse.json({ error: pageIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    // If versionNumber is provided, get specific version
-    if (versionNumber !== undefined && versionNumber !== null) {
-      const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/versions/${versionNumber}`
-
-      logger.info(`Fetching version ${versionNumber} for page ${pageId}`)
-
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Accept: 'application/json',
-          Authorization: `Bearer ${accessToken}`,
-        },
-      })
-
-      if (!response.ok) {
-        const errorData = await response.json().catch(() => null)
-        logger.error('Confluence API error response:', {
-          status: response.status,
-          statusText: response.statusText,
-          error: JSON.stringify(errorData, null, 2),
-        })
-        const errorMessage = errorData?.message || `Failed to get page version (${response.status})`
-        return NextResponse.json({ error: errorMessage }, { status: response.status })
-      }
-
-      const data = await response.json()
-
-      return NextResponse.json({
-        version: {
-          number: data.number,
-          message: data.message ?? null,
-          minorEdit: data.minorEdit ?? false,
-          authorId: data.authorId ?? null,
-          createdAt: data.createdAt ?? null,
-        },
-        pageId,
-      })
-    }
-    // List all versions
-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(limit, 250)))
-
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}/versions?${queryParams.toString()}`
-
-    logger.info(`Fetching versions for page ${pageId}`)
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage = errorData?.message || `Failed to list page versions (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const versions = (data.results || []).map((version: any) => ({
-      number: version.number,
-      message: version.message ?? null,
-      minorEdit: version.minorEdit ?? false,
-      authorId: version.authorId ?? null,
-      createdAt: version.createdAt ?? null,
-    }))
-
-    return NextResponse.json({
-      versions,
-      pageId,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
-  } catch (error) {
-    logger.error('Error with page versions:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/page/route.ts
+++ b/apps/sim/app/api/tools/confluence/page/route.ts
@@ -62,7 +62,6 @@ const deletePageSchema = z
    accessToken: z.string().min(1, 'Access token is required'),
    cloudId: z.string().optional(),
    pageId: z.string().min(1, 'Page ID is required'),
-    purge: z.boolean().optional(),
  })
  .refine(
    (data) => {
@@ -99,7 +98,7 @@ export async function POST(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}?body-format=storage`
+    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}?expand=body.storage,body.view,body.atlas_doc_format`

    const response = await fetch(url, {
      method: 'GET',
@@ -131,18 +130,16 @@ export async function POST(request: NextRequest) {
      id: data.id,
      title: data.title,
      body: {
-        storage: {
-          value: data.body?.storage?.value ?? null,
-          representation: 'storage',
+        view: {
+          value:
+            data.body?.storage?.value ||
+            data.body?.view?.value ||
+            data.body?.atlas_doc_format?.value ||
+            data.content || // try alternative fields
+            data.description ||
+            `Content for page ${data.title}`, // fallback content
        },
      },
-      status: data.status ?? null,
-      spaceId: data.spaceId ?? null,
-      parentId: data.parentId ?? null,
-      authorId: data.authorId ?? null,
-      createdAt: data.createdAt ?? null,
-      version: data.version ?? null,
-      _links: data._links ?? null,
    })
  } catch (error) {
    logger.error('Error fetching Confluence page:', error)
@@ -277,7 +274,7 @@ export async function DELETE(request: NextRequest) {
      return NextResponse.json({ error: firstError.message }, { status: 400 })
    }

-    const { domain, accessToken, cloudId: providedCloudId, pageId, purge } = validation.data
+    const { domain, accessToken, cloudId: providedCloudId, pageId } = validation.data

    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))

@@ -286,12 +283,7 @@ export async function DELETE(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const queryParams = new URLSearchParams()
-    if (purge) {
-      queryParams.append('purge', 'true')
-    }
-    const queryString = queryParams.toString()
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}${queryString ? `?${queryString}` : ''}`
+    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages/${pageId}`

    const response = await fetch(url, {
      method: 'DELETE',
--- a/apps/sim/app/api/tools/confluence/pages/route.ts
+++ b/apps/sim/app/api/tools/confluence/pages/route.ts
@@ -32,6 +32,7 @@ export async function POST(request: NextRequest) {
      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
    }

+    // Use provided cloudId or fetch it if not provided
    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))

    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
@@ -39,6 +40,7 @@ export async function POST(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

+    // Build the URL with query parameters
    const baseUrl = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/pages`
    const queryParams = new URLSearchParams()

@@ -55,6 +57,7 @@ export async function POST(request: NextRequest) {

    logger.info(`Fetching Confluence pages from: ${url}`)

+    // Make the request to Confluence API with OAuth Bearer token
    const response = await fetch(url, {
      method: 'GET',
      headers: {
@@ -76,6 +79,7 @@ export async function POST(request: NextRequest) {
      } catch (e) {
        logger.error('Could not parse error response as JSON:', e)

+        // Try to get the response text for more context
        try {
          const text = await response.text()
          logger.error('Response text:', text)
--- a/apps/sim/app/api/tools/confluence/search-in-space/route.ts
+++ b/apps/sim/app/api/tools/confluence/search-in-space/route.ts
@@ -1,120 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluenceSearchInSpaceAPI')
-
-export const dynamic = 'force-dynamic'
-
-/**
- * Search for content within a specific Confluence space using CQL.
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-    const {
-      domain,
-      accessToken,
-      spaceKey,
-      query,
-      cloudId: providedCloudId,
-      limit = 25,
-      contentType,
-    } = body
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    if (!spaceKey) {
-      return NextResponse.json({ error: 'Space key is required' }, { status: 400 })
-    }
-
-    const spaceKeyValidation = validateAlphanumericId(spaceKey, 'spaceKey', 255)
-    if (!spaceKeyValidation.isValid) {
-      return NextResponse.json({ error: spaceKeyValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const escapeCqlValue = (value: string) => value.replace(/"/g, '\\"')
-
-    let cql = `space = "${escapeCqlValue(spaceKey)}"`
-
-    if (query) {
-      cql += ` AND text ~ "${escapeCqlValue(query)}"`
-    }
-
-    if (contentType) {
-      cql += ` AND type = "${escapeCqlValue(contentType)}"`
-    }
-
-    const searchParams = new URLSearchParams({
-      cql,
-      limit: String(Math.min(limit, 250)),
-    })
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/rest/api/search?${searchParams.toString()}`
-
-    logger.info(`Searching in space ${spaceKey} with CQL: ${cql}`)
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage = errorData?.message || `Failed to search in space (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const results = (data.results || []).map((result: any) => ({
-      id: result.content?.id ?? result.id,
-      title: result.content?.title ?? result.title,
-      type: result.content?.type ?? result.type,
-      status: result.content?.status ?? null,
-      url: result.url ?? result._links?.webui ?? '',
-      excerpt: result.excerpt ?? '',
-      lastModified: result.lastModified ?? null,
-    }))
-
-    return NextResponse.json({
-      results,
-      spaceKey,
-      totalSize: data.totalSize ?? results.length,
-    })
-  } catch (error) {
-    logger.error('Error searching in space:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/search/route.ts
+++ b/apps/sim/app/api/tools/confluence/search/route.ts
@@ -42,10 +42,8 @@ export async function POST(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const escapeCqlValue = (value: string) => value.replace(/"/g, '\\"')
-
    const searchParams = new URLSearchParams({
-      cql: `text ~ "${escapeCqlValue(query)}"`,
+      cql: `text ~ "${query}"`,
      limit: limit.toString(),
    })

@@ -72,27 +70,13 @@ export async function POST(request: NextRequest) {

    const data = await response.json()

-    const results = (data.results || []).map((result: any) => {
-      const spaceData = result.resultGlobalContainer || result.content?.space
-      return {
-        id: result.content?.id || result.id,
-        title: result.content?.title || result.title,
-        type: result.content?.type || result.type,
-        url: result.url || result._links?.webui || '',
-        excerpt: result.excerpt || '',
-        status: result.content?.status ?? null,
-        spaceKey: result.resultGlobalContainer?.key ?? result.content?.space?.key ?? null,
-        space: spaceData
-          ? {
-              id: spaceData.id ?? null,
-              key: spaceData.key ?? null,
-              name: spaceData.name ?? spaceData.title ?? null,
-            }
-          : null,
-        lastModified: result.lastModified ?? result.content?.history?.lastUpdated?.when ?? null,
-        entityType: result.entityType ?? null,
-      }
-    })
+    const results = (data.results || []).map((result: any) => ({
+      id: result.content?.id || result.id,
+      title: result.content?.title || result.title,
+      type: result.content?.type || result.type,
+      url: result.url || result._links?.webui || '',
+      excerpt: result.excerpt || '',
+    }))

    return NextResponse.json({ results })
  } catch (error) {
--- a/apps/sim/app/api/tools/confluence/space-blogposts/route.ts
+++ b/apps/sim/app/api/tools/confluence/space-blogposts/route.ts
@@ -1,124 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluenceSpaceBlogPostsAPI')
-
-export const dynamic = 'force-dynamic'
-
-/**
- * List all blog posts in a specific Confluence space.
- * Uses GET /wiki/api/v2/spaces/{id}/blogposts
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-    const {
-      domain,
-      accessToken,
-      spaceId,
-      cloudId: providedCloudId,
-      limit = 25,
-      status,
-      bodyFormat,
-      cursor,
-    } = body
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    if (!spaceId) {
-      return NextResponse.json({ error: 'Space ID is required' }, { status: 400 })
-    }
-
-    const spaceIdValidation = validateAlphanumericId(spaceId, 'spaceId', 255)
-    if (!spaceIdValidation.isValid) {
-      return NextResponse.json({ error: spaceIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(limit, 250)))
-
-    if (status) {
-      queryParams.append('status', status)
-    }
-
-    if (bodyFormat) {
-      queryParams.append('body-format', bodyFormat)
-    }
-
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/spaces/${spaceId}/blogposts?${queryParams.toString()}`
-
-    logger.info(`Fetching blog posts in space ${spaceId}`)
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage =
-        errorData?.message || `Failed to list blog posts in space (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const blogPosts = (data.results || []).map((post: any) => ({
-      id: post.id,
-      title: post.title,
-      status: post.status ?? null,
-      spaceId: post.spaceId ?? null,
-      authorId: post.authorId ?? null,
-      createdAt: post.createdAt ?? null,
-      version: post.version ?? null,
-      body: post.body ?? null,
-      webUrl: post._links?.webui ?? null,
-    }))
-
-    return NextResponse.json({
-      blogPosts,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
-  } catch (error) {
-    logger.error('Error listing blog posts in space:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/space-pages/route.ts
+++ b/apps/sim/app/api/tools/confluence/space-pages/route.ts
@@ -1,125 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { validateAlphanumericId, validateJiraCloudId } from '@/lib/core/security/input-validation'
-import { getConfluenceCloudId } from '@/tools/confluence/utils'
-
-const logger = createLogger('ConfluenceSpacePagesAPI')
-
-export const dynamic = 'force-dynamic'
-
-/**
- * List all pages in a specific Confluence space.
- * Uses GET /wiki/api/v2/spaces/{id}/pages
- */
-export async function POST(request: NextRequest) {
-  try {
-    const auth = await checkSessionOrInternalAuth(request)
-    if (!auth.success || !auth.userId) {
-      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
-    }
-
-    const body = await request.json()
-    const {
-      domain,
-      accessToken,
-      spaceId,
-      cloudId: providedCloudId,
-      limit = 50,
-      status,
-      bodyFormat,
-      cursor,
-    } = body
-
-    if (!domain) {
-      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
-    }
-
-    if (!accessToken) {
-      return NextResponse.json({ error: 'Access token is required' }, { status: 400 })
-    }
-
-    if (!spaceId) {
-      return NextResponse.json({ error: 'Space ID is required' }, { status: 400 })
-    }
-
-    const spaceIdValidation = validateAlphanumericId(spaceId, 'spaceId', 255)
-    if (!spaceIdValidation.isValid) {
-      return NextResponse.json({ error: spaceIdValidation.error }, { status: 400 })
-    }
-
-    const cloudId = providedCloudId || (await getConfluenceCloudId(domain, accessToken))
-
-    const cloudIdValidation = validateJiraCloudId(cloudId, 'cloudId')
-    if (!cloudIdValidation.isValid) {
-      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
-    }
-
-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(limit, 250)))
-
-    if (status) {
-      queryParams.append('status', status)
-    }
-
-    if (bodyFormat) {
-      queryParams.append('body-format', bodyFormat)
-    }
-
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/spaces/${spaceId}/pages?${queryParams.toString()}`
-
-    logger.info(`Fetching pages in space ${spaceId}`)
-
-    const response = await fetch(url, {
-      method: 'GET',
-      headers: {
-        Accept: 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-      },
-    })
-
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => null)
-      logger.error('Confluence API error response:', {
-        status: response.status,
-        statusText: response.statusText,
-        error: JSON.stringify(errorData, null, 2),
-      })
-      const errorMessage =
-        errorData?.message || `Failed to list pages in space (${response.status})`
-      return NextResponse.json({ error: errorMessage }, { status: response.status })
-    }
-
-    const data = await response.json()
-
-    const pages = (data.results || []).map((page: any) => ({
-      id: page.id,
-      title: page.title,
-      status: page.status ?? null,
-      spaceId: page.spaceId ?? null,
-      parentId: page.parentId ?? null,
-      authorId: page.authorId ?? null,
-      createdAt: page.createdAt ?? null,
-      version: page.version ?? null,
-      body: page.body ?? null,
-      webUrl: page._links?.webui ?? null,
-    }))
-
-    return NextResponse.json({
-      pages,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
-  } catch (error) {
-    logger.error('Error listing pages in space:', error)
-    return NextResponse.json(
-      { error: (error as Error).message || 'Internal server error' },
-      { status: 500 }
-    )
-  }
-}
--- a/apps/sim/app/api/tools/confluence/spaces/route.ts
+++ b/apps/sim/app/api/tools/confluence/spaces/route.ts
@@ -21,7 +21,6 @@ export async function GET(request: NextRequest) {
    const accessToken = searchParams.get('accessToken')
    const providedCloudId = searchParams.get('cloudId')
    const limit = searchParams.get('limit') || '25'
-    const cursor = searchParams.get('cursor')

    if (!domain) {
      return NextResponse.json({ error: 'Domain is required' }, { status: 400 })
@@ -38,12 +37,7 @@ export async function GET(request: NextRequest) {
      return NextResponse.json({ error: cloudIdValidation.error }, { status: 400 })
    }

-    const queryParams = new URLSearchParams()
-    queryParams.append('limit', String(Math.min(Number(limit), 250)))
-    if (cursor) {
-      queryParams.append('cursor', cursor)
-    }
-    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/spaces?${queryParams.toString()}`
+    const url = `https://api.atlassian.com/ex/confluence/${cloudId}/wiki/api/v2/spaces?limit=${limit}`

    const response = await fetch(url, {
      method: 'GET',
@@ -73,18 +67,9 @@ export async function GET(request: NextRequest) {
      key: space.key,
      type: space.type,
      status: space.status,
-      authorId: space.authorId ?? null,
-      createdAt: space.createdAt ?? null,
-      homepageId: space.homepageId ?? null,
-      description: space.description ?? null,
    }))

-    return NextResponse.json({
-      spaces,
-      nextCursor: data._links?.next
-        ? new URL(data._links.next, 'https://placeholder').searchParams.get('cursor')
-        : null,
-    })
+    return NextResponse.json({ spaces })
  } catch (error) {
    logger.error('Error listing Confluence spaces:', error)
    return NextResponse.json(
--- a/apps/sim/app/chat/components/header/header.tsx
+++ b/apps/sim/app/chat/components/header/header.tsx
@@ -3,8 +3,8 @@
 import Image from 'next/image'
 import Link from 'next/link'
 import { GithubIcon } from '@/components/icons'
+import { useBrandConfig } from '@/lib/branding/branding'
 import { inter } from '@/app/_styles/fonts/inter/inter'
-import { useBrandConfig } from '@/ee/whitelabeling'

 interface ChatHeaderProps {
  chatConfig: {
--- a/apps/sim/app/form/[identifier]/components/powered-by-sim.tsx
+++ b/apps/sim/app/form/[identifier]/components/powered-by-sim.tsx
@@ -1,8 +1,8 @@
 'use client'

 import Image from 'next/image'
+import { useBrandConfig } from '@/lib/branding/branding'
 import { inter } from '@/app/_styles/fonts/inter/inter'
-import { useBrandConfig } from '@/ee/whitelabeling'

 export function PoweredBySim() {
  const brandConfig = useBrandConfig()
--- a/apps/sim/app/layout.tsx
+++ b/apps/sim/app/layout.tsx
@@ -2,12 +2,9 @@ import type { Metadata, Viewport } from 'next'
 import Script from 'next/script'
 import { PublicEnvScript } from 'next-runtime-env'
 import { BrandedLayout } from '@/components/branded-layout'
+import { generateThemeCSS } from '@/lib/branding/inject-theme'
+import { generateBrandedMetadata, generateStructuredData } from '@/lib/branding/metadata'
 import { PostHogProvider } from '@/app/_shell/providers/posthog-provider'
-import {
-  generateBrandedMetadata,
-  generateStructuredData,
-  generateThemeCSS,
-} from '@/ee/whitelabeling'
 import '@/app/_styles/globals.css'
 import { OneDollarStats } from '@/components/analytics/onedollarstats'
 import { isReactGrabEnabled, isReactScanEnabled } from '@/lib/core/config/feature-flags'
--- a/apps/sim/app/manifest.ts
+++ b/apps/sim/app/manifest.ts
@@ -1,5 +1,5 @@
 import type { MetadataRoute } from 'next'
-import { getBrandConfig } from '@/ee/whitelabeling'
+import { getBrandConfig } from '@/lib/branding/branding'

 export default function manifest(): MetadataRoute.Manifest {
  const brand = getBrandConfig()
--- a/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
+++ b/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
@@ -24,8 +24,8 @@ import {
  SelectTrigger,
  SelectValue,
 } from '@/components/ui/select'
+import { useBrandConfig } from '@/lib/branding/branding'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { useBrandConfig } from '@/ee/whitelabeling'
 import type { ResumeStatus } from '@/executor/types'

 interface ResumeLinks {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
@@ -74,12 +74,6 @@ const SCOPE_DESCRIPTIONS: Record<string, string> = {
  'write:label:confluence': 'Add and remove labels',
  'search:confluence': 'Search Confluence content',
  'readonly:content.attachment:confluence': 'View attachments',
-  'read:blogpost:confluence': 'View Confluence blog posts',
-  'write:blogpost:confluence': 'Create and update Confluence blog posts',
-  'read:content.property:confluence': 'View properties on Confluence content',
-  'write:content.property:confluence': 'Create and manage content properties',
-  'read:hierarchical-content:confluence': 'View page hierarchy (children and ancestors)',
-  'read:content.metadata:confluence': 'View content metadata (required for ancestors)',
  'read:me': 'Read profile information',
  'database.read': 'Read database',
  'database.write': 'Write to database',
@@ -364,7 +358,6 @@ export function OAuthRequiredModal({
      logger.info('Linking OAuth2:', {
        providerId,
        requiredScopes,
-        hasNewScopes: newScopes.length > 0,
      })

      if (providerId === 'trello') {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx
@@ -34,103 +34,6 @@ interface UploadedFile {
  type: string
 }

-interface SingleFileSelectorProps {
-  file: UploadedFile
-  options: Array<{ label: string; value: string; disabled?: boolean }>
-  selectedValue: string
-  inputValue: string
-  onInputChange: (value: string) => void
-  onClear: (e: React.MouseEvent) => void
-  onOpenChange: (open: boolean) => void
-  disabled: boolean
-  isLoading: boolean
-  formatFileSize: (bytes: number) => string
-  truncateMiddle: (text: string, start?: number, end?: number) => string
-  isDeleting: boolean
-}
-
-/**
- * Single file selector component that shows the selected file with both
- * a clear button (X) and a chevron to change the selection.
- * Follows the same pattern as SelectorCombobox for consistency.
- */
-function SingleFileSelector({
-  file,
-  options,
-  selectedValue,
-  inputValue,
-  onInputChange,
-  onClear,
-  onOpenChange,
-  disabled,
-  isLoading,
-  formatFileSize,
-  truncateMiddle,
-  isDeleting,
-}: SingleFileSelectorProps) {
-  const displayLabel = `${truncateMiddle(file.name, 20, 12)} (${formatFileSize(file.size)})`
-  const [localInputValue, setLocalInputValue] = useState(displayLabel)
-  const [isEditing, setIsEditing] = useState(false)
-
-  // Sync display label when file changes
-  useEffect(() => {
-    if (!isEditing) {
-      setLocalInputValue(displayLabel)
-    }
-  }, [displayLabel, isEditing])
-
-  return (
-    <div className='relative w-full'>
-      <Combobox
-        options={options}
-        value={localInputValue}
-        selectedValue={selectedValue}
-        onChange={(newValue) => {
-          // Check if user selected an option
-          const matched = options.find((opt) => opt.value === newValue || opt.label === newValue)
-          if (matched) {
-            setIsEditing(false)
-            setLocalInputValue(displayLabel)
-            onInputChange(matched.value)
-            return
-          }
-          // User is typing to search
-          setIsEditing(true)
-          setLocalInputValue(newValue)
-        }}
-        onOpenChange={(open) => {
-          if (!open) {
-            setIsEditing(false)
-            setLocalInputValue(displayLabel)
-          }
-          onOpenChange(open)
-        }}
-        placeholder={isLoading ? 'Loading files...' : 'Select or upload file'}
-        disabled={disabled || isDeleting}
-        editable={true}
-        filterOptions={isEditing}
-        isLoading={isLoading}
-        inputProps={{
-          className: 'pr-[60px]',
-        }}
-      />
-      <Button
-        type='button'
-        variant='ghost'
-        className='-translate-y-1/2 absolute top-1/2 right-[28px] z-10 h-6 w-6 p-0'
-        onClick={onClear}
-        disabled={isDeleting}
-      >
-        {isDeleting ? (
-          <div className='h-4 w-4 animate-spin rounded-full border-[1.5px] border-current border-t-transparent' />
-        ) : (
-          <X className='h-4 w-4 opacity-50 hover:opacity-100' />
-        )}
-      </Button>
-    </div>
-  )
-}
-
 interface UploadingFile {
  id: string
  name: string
@@ -597,7 +500,6 @@ export function FileUpload({
  const hasFiles = filesArray.length > 0
  const isUploading = uploadingFiles.length > 0

-  // Options for multiple file mode (filters out already selected files)
  const comboboxOptions = useMemo(
    () => [
      { label: 'Upload New File', value: '__upload_new__' },
@@ -614,43 +516,10 @@ export function FileUpload({
    [availableWorkspaceFiles, acceptedTypes]
  )

-  // Options for single file mode (includes all files, selected one will be highlighted)
-  const singleFileOptions = useMemo(
-    () => [
-      { label: 'Upload New File', value: '__upload_new__' },
-      ...workspaceFiles.map((file) => {
-        const isAccepted =
-          !acceptedTypes || acceptedTypes === '*' || isFileTypeAccepted(file.type, acceptedTypes)
-        return {
-          label: file.name,
-          value: file.id,
-          disabled: !isAccepted,
-        }
-      }),
-    ],
-    [workspaceFiles, acceptedTypes]
-  )
-
-  // Find the selected file's workspace ID for highlighting in single file mode
-  const selectedFileId = useMemo(() => {
-    if (!hasFiles || multiple) return ''
-    const currentFile = filesArray[0]
-    if (!currentFile) return ''
-    // Match by key or path
-    const matchedWorkspaceFile = workspaceFiles.find(
-      (wf) =>
-        wf.key === currentFile.key ||
-        wf.name === currentFile.name ||
-        currentFile.path?.includes(wf.key)
-    )
-    return matchedWorkspaceFile?.id || ''
-  }, [filesArray, workspaceFiles, hasFiles, multiple])
-
  const handleComboboxChange = (value: string) => {
    setInputValue(value)

-    // Look in full workspaceFiles list (not filtered) to allow re-selecting same file in single mode
-    const selectedFile = workspaceFiles.find((file) => file.id === value)
+    const selectedFile = availableWorkspaceFiles.find((file) => file.id === value)
    const isAcceptedType =
      selectedFile &&
      (!acceptedTypes ||
@@ -690,17 +559,16 @@ export function FileUpload({
      {/* Error message */}
      {uploadError && <div className='mb-2 text-red-600 text-sm'>{uploadError}</div>}

-      {/* File list with consistent spacing - only show for multiple mode or when uploading */}
-      {((hasFiles && multiple) || isUploading) && (
+      {/* File list with consistent spacing */}
+      {(hasFiles || isUploading) && (
        <div className={cn('space-y-2', multiple && 'mb-2')}>
-          {/* Only show files that aren't currently uploading (for multiple mode only) */}
-          {multiple &&
-            filesArray.map((file) => {
-              const isCurrentlyUploading = uploadingFiles.some(
-                (uploadingFile) => uploadingFile.name === file.name
-              )
-              return !isCurrentlyUploading && renderFileItem(file)
-            })}
+          {/* Only show files that aren't currently uploading */}
+          {filesArray.map((file) => {
+            const isCurrentlyUploading = uploadingFiles.some(
+              (uploadingFile) => uploadingFile.name === file.name
+            )
+            return !isCurrentlyUploading && renderFileItem(file)
+          })}
          {isUploading && (
            <>
              {uploadingFiles.map(renderUploadingItem)}
@@ -736,26 +604,6 @@ export function FileUpload({
        />
      )}

-      {/* Single file mode with file selected: show combobox-style UI with X and chevron */}
-      {hasFiles && !multiple && !isUploading && (
-        <SingleFileSelector
-          file={filesArray[0]}
-          options={singleFileOptions}
-          selectedValue={selectedFileId}
-          inputValue={inputValue}
-          onInputChange={handleComboboxChange}
-          onClear={(e) => handleRemoveFile(filesArray[0], e)}
-          onOpenChange={(open) => {
-            if (open) void loadWorkspaceFiles()
-          }}
-          disabled={disabled}
-          isLoading={loadingWorkspaceFiles}
-          formatFileSize={formatFileSize}
-          truncateMiddle={truncateMiddle}
-          isDeleting={deletingFiles[filesArray[0]?.path || '']}
-        />
-      )}
-
      {/* Show dropdown selector if no files and not uploading */}
      {!hasFiles && !isUploading && (
        <Combobox
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
@@ -1,7 +1,6 @@
 import type React from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { X } from 'lucide-react'
-import { Button, Combobox as EditableCombobox } from '@/components/emcn/components'
+import { Combobox as EditableCombobox } from '@/components/emcn/components'
 import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
@@ -109,20 +108,6 @@ export function SelectorCombobox({
    [setStoreValue, onOptionChange, readOnly, disabled]
  )

-  const handleClear = useCallback(
-    (e: React.MouseEvent) => {
-      e.preventDefault()
-      e.stopPropagation()
-      if (readOnly || disabled) return
-      setStoreValue(null)
-      setInputValue('')
-      onOptionChange?.('')
-    },
-    [setStoreValue, onOptionChange, readOnly, disabled]
-  )
-
-  const showClearButton = Boolean(activeValue) && !disabled && !readOnly
-
  return (
    <div className='w-full'>
      <SubBlockInputController
@@ -134,49 +119,36 @@ export function SelectorCombobox({
        isPreview={isPreview}
      >
        {({ ref, onDrop, onDragOver }) => (
-          <div className='relative w-full'>
-            <EditableCombobox
-              options={comboboxOptions}
-              value={allowSearch ? inputValue : selectedLabel}
-              selectedValue={activeValue ?? ''}
-              onChange={(newValue) => {
-                const matched = optionMap.get(newValue)
-                if (matched) {
-                  setInputValue(matched.label)
-                  setIsEditing(false)
-                  handleSelection(matched.id)
-                  return
-                }
-                if (allowSearch) {
-                  setInputValue(newValue)
-                  setIsEditing(true)
-                  setSearchTerm(newValue)
-                }
-              }}
-              placeholder={placeholder || subBlock.placeholder || 'Select an option'}
-              disabled={disabled || readOnly}
-              editable={allowSearch}
-              filterOptions={allowSearch}
-              inputRef={ref as React.RefObject<HTMLInputElement>}
-              inputProps={{
-                onDrop: onDrop as (e: React.DragEvent<HTMLInputElement>) => void,
-                onDragOver: onDragOver as (e: React.DragEvent<HTMLInputElement>) => void,
-                className: showClearButton ? 'pr-[60px]' : undefined,
-              }}
-              isLoading={isLoading}
-              error={error instanceof Error ? error.message : null}
-            />
-            {showClearButton && (
-              <Button
-                type='button'
-                variant='ghost'
-                className='-translate-y-1/2 absolute top-1/2 right-[28px] z-10 h-6 w-6 p-0'
-                onClick={handleClear}
-              >
-                <X className='h-4 w-4 opacity-50 hover:opacity-100' />
-              </Button>
-            )}
-          </div>
+          <EditableCombobox
+            options={comboboxOptions}
+            value={allowSearch ? inputValue : selectedLabel}
+            selectedValue={activeValue ?? ''}
+            onChange={(newValue) => {
+              const matched = optionMap.get(newValue)
+              if (matched) {
+                setInputValue(matched.label)
+                setIsEditing(false)
+                handleSelection(matched.id)
+                return
+              }
+              if (allowSearch) {
+                setInputValue(newValue)
+                setIsEditing(true)
+                setSearchTerm(newValue)
+              }
+            }}
+            placeholder={placeholder || subBlock.placeholder || 'Select an option'}
+            disabled={disabled || readOnly}
+            editable={allowSearch}
+            filterOptions={allowSearch}
+            inputRef={ref as React.RefObject<HTMLInputElement>}
+            inputProps={{
+              onDrop: onDrop as (e: React.DragEvent<HTMLInputElement>) => void,
+              onDragOver: onDragOver as (e: React.DragEvent<HTMLInputElement>) => void,
+            }}
+            isLoading={isLoading}
+            error={error instanceof Error ? error.message : null}
+          />
        )}
      </SubBlockInputController>
    </div>
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
@@ -100,7 +100,7 @@ const BlockRow = memo(function BlockRow({
    >
      <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
        <div
-          className='flex h-[14px] w-[14px] flex-shrink-0 items-center justify-center rounded-[4px]'
+          className='relative flex h-[14px] w-[14px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
          style={{ background: bgColor }}
        >
          {BlockIcon && <BlockIcon className='h-[9px] w-[9px] text-white' />}
@@ -276,7 +276,7 @@ const SubflowNodeRow = memo(function SubflowNodeRow({
      >
        <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
          <div
-            className='flex h-[14px] w-[14px] flex-shrink-0 items-center justify-center rounded-[4px]'
+            className='relative flex h-[14px] w-[14px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
            style={{ background: bgColor }}
          >
            {BlockIcon && <BlockIcon className='h-[9px] w-[9px] text-white' />}
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/general/general.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/general/general.tsx
@@ -19,11 +19,11 @@ import {
 import { Input, Skeleton } from '@/components/ui'
 import { signOut, useSession } from '@/lib/auth/auth-client'
 import { ANONYMOUS_USER_ID } from '@/lib/auth/constants'
+import { useBrandConfig } from '@/lib/branding/branding'
 import { getEnv, isTruthy } from '@/lib/core/config/env'
 import { isHosted } from '@/lib/core/config/feature-flags'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { useProfilePictureUpload } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/hooks/use-profile-picture-upload'
-import { useBrandConfig } from '@/ee/whitelabeling'
 import { useGeneralSettings, useUpdateGeneralSetting } from '@/hooks/queries/general-settings'
 import { useUpdateUserProfile, useUserProfile } from '@/hooks/queries/user-profile'
 import { clearUserData } from '@/stores'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/usage-indicator/usage-indicator.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/usage-indicator/usage-indicator.tsx
@@ -397,7 +397,7 @@ export function UsageIndicator({ onClick }: UsageIndicatorProps) {
    return () => window.clearInterval(interval)
  }, [isHovered, pillCount, startAnimationIndex])

-  if (isLoading && !subscriptionData) {
+  if (isLoading) {
    return (
      <div className='flex flex-shrink-0 flex-col gap-[8px] border-t px-[13.5px] pt-[8px] pb-[10px]'>
        <div className='flex h-[18px] items-center justify-between'>
--- a/apps/sim/blocks/blocks.test.ts
+++ b/apps/sim/blocks/blocks.test.ts
@@ -649,394 +649,4 @@ describe('Blocks Module', () => {
      }
    })
  })
-
-  describe('Canonical Param Validation', () => {
-    /**
-     * Helper to serialize a condition for comparison
-     */
-    function serializeCondition(condition: unknown): string {
-      if (!condition) return ''
-      return JSON.stringify(condition)
-    }
-
-    it('should not have canonicalParamId that matches any subBlock id within the same block', () => {
-      const blocks = getAllBlocks()
-      const errors: string[] = []
-
-      for (const block of blocks) {
-        const allSubBlockIds = new Set(block.subBlocks.map((sb) => sb.id))
-        const canonicalParamIds = new Set(
-          block.subBlocks.filter((sb) => sb.canonicalParamId).map((sb) => sb.canonicalParamId)
-        )
-
-        for (const canonicalId of canonicalParamIds) {
-          if (allSubBlockIds.has(canonicalId!)) {
-            // Check if the matching subBlock also has a canonicalParamId pointing to itself
-            const matchingSubBlock = block.subBlocks.find(
-              (sb) => sb.id === canonicalId && !sb.canonicalParamId
-            )
-            if (matchingSubBlock) {
-              errors.push(
-                `Block "${block.type}": canonicalParamId "${canonicalId}" clashes with subBlock id "${canonicalId}"`
-              )
-            }
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        throw new Error(`Canonical param ID clashes detected:\n${errors.join('\n')}`)
-      }
-    })
-
-    it('should have unique subBlock IDs within the same condition context', () => {
-      const blocks = getAllBlocks()
-      const errors: string[] = []
-
-      for (const block of blocks) {
-        // Group subBlocks by their condition (only for static/JSON conditions, not functions)
-        const subBlocksByCondition = new Map<
-          string,
-          Array<{ id: string; mode?: string; hasCanonical: boolean }>
-        >()
-
-        for (const subBlock of block.subBlocks) {
-          // Skip subBlocks with function conditions - we can't evaluate them statically
-          // These are valid when the function returns different conditions at runtime
-          if (typeof subBlock.condition === 'function') {
-            continue
-          }
-
-          const conditionKey = serializeCondition(subBlock.condition)
-          if (!subBlocksByCondition.has(conditionKey)) {
-            subBlocksByCondition.set(conditionKey, [])
-          }
-          subBlocksByCondition.get(conditionKey)!.push({
-            id: subBlock.id,
-            mode: subBlock.mode,
-            hasCanonical: Boolean(subBlock.canonicalParamId),
-          })
-        }
-
-        // Check for duplicate IDs within the same condition (excluding canonical pairs and mode swaps)
-        for (const [conditionKey, subBlocks] of subBlocksByCondition) {
-          const idCounts = new Map<string, number>()
-          for (const sb of subBlocks) {
-            idCounts.set(sb.id, (idCounts.get(sb.id) || 0) + 1)
-          }
-
-          for (const [id, count] of idCounts) {
-            if (count > 1) {
-              const duplicates = subBlocks.filter((sb) => sb.id === id)
-
-              // Categorize modes
-              const basicModes = duplicates.filter(
-                (sb) => !sb.mode || sb.mode === 'basic' || sb.mode === 'both'
-              )
-              const advancedModes = duplicates.filter((sb) => sb.mode === 'advanced')
-              const triggerModes = duplicates.filter((sb) => sb.mode === 'trigger')
-
-              // Valid pattern 1: basic/advanced mode swap (with or without canonicalParamId)
-              if (
-                basicModes.length === 1 &&
-                advancedModes.length === 1 &&
-                triggerModes.length === 0
-              ) {
-                continue // This is a valid basic/advanced mode swap pair
-              }
-
-              // Valid pattern 2: basic/trigger mode separation (trigger version for trigger mode)
-              // One basic/both + one or more trigger versions is valid
-              if (
-                basicModes.length <= 1 &&
-                advancedModes.length === 0 &&
-                triggerModes.length >= 1
-              ) {
-                continue // This is a valid pattern where trigger mode has its own subBlock
-              }
-
-              // Valid pattern 3: All duplicates have canonicalParamId (they form a canonical group)
-              const allHaveCanonical = duplicates.every((sb) => sb.hasCanonical)
-              if (allHaveCanonical) {
-                continue // Validated separately by canonical pair tests
-              }
-
-              // Invalid: duplicates without proper pairing
-              const condition = conditionKey || '(no condition)'
-              const modeBreakdown = duplicates.map((d) => d.mode || 'basic/both').join(', ')
-              errors.push(
-                `Block "${block.type}": Duplicate subBlock id "${id}" with condition ${condition} (count: ${count}, modes: ${modeBreakdown})`
-              )
-            }
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        throw new Error(`Duplicate subBlock IDs detected:\n${errors.join('\n')}`)
-      }
-    })
-
-    it('should have properly formed canonical pairs (matching conditions)', () => {
-      const blocks = getAllBlocks()
-      const errors: string[] = []
-
-      for (const block of blocks) {
-        // Group subBlocks by canonicalParamId
-        const canonicalGroups = new Map<
-          string,
-          Array<{ id: string; mode?: string; condition: unknown; isStaticCondition: boolean }>
-        >()
-
-        for (const subBlock of block.subBlocks) {
-          if (subBlock.canonicalParamId) {
-            if (!canonicalGroups.has(subBlock.canonicalParamId)) {
-              canonicalGroups.set(subBlock.canonicalParamId, [])
-            }
-            canonicalGroups.get(subBlock.canonicalParamId)!.push({
-              id: subBlock.id,
-              mode: subBlock.mode,
-              condition: subBlock.condition,
-              isStaticCondition: typeof subBlock.condition !== 'function',
-            })
-          }
-        }
-
-        // Validate each canonical group
-        for (const [canonicalId, members] of canonicalGroups) {
-          // Only validate condition matching for static conditions
-          const staticMembers = members.filter((m) => m.isStaticCondition)
-          if (staticMembers.length > 1) {
-            const conditions = staticMembers.map((m) => serializeCondition(m.condition))
-            const uniqueConditions = new Set(conditions)
-
-            if (uniqueConditions.size > 1) {
-              errors.push(
-                `Block "${block.type}": Canonical param "${canonicalId}" has members with different conditions: ${[...uniqueConditions].join(' vs ')}`
-              )
-            }
-          }
-
-          // Check for proper basic/advanced pairing
-          const basicMembers = members.filter((m) => !m.mode || m.mode === 'basic')
-          const advancedMembers = members.filter((m) => m.mode === 'advanced')
-
-          if (basicMembers.length > 1) {
-            errors.push(
-              `Block "${block.type}": Canonical param "${canonicalId}" has ${basicMembers.length} basic mode members (should have at most 1)`
-            )
-          }
-
-          if (basicMembers.length === 0 && advancedMembers.length === 0) {
-            errors.push(
-              `Block "${block.type}": Canonical param "${canonicalId}" has no basic or advanced mode members`
-            )
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        throw new Error(`Canonical pair validation errors:\n${errors.join('\n')}`)
-      }
-    })
-
-    it('should have unique canonicalParamIds per operation/condition context', () => {
-      const blocks = getAllBlocks()
-      const errors: string[] = []
-
-      for (const block of blocks) {
-        // Group by condition + canonicalParamId to detect same canonical used for different operations
-        const canonicalByCondition = new Map<string, Set<string>>()
-
-        for (const subBlock of block.subBlocks) {
-          if (subBlock.canonicalParamId) {
-            // Skip function conditions - we can't evaluate them statically
-            if (typeof subBlock.condition === 'function') {
-              continue
-            }
-            const conditionKey = serializeCondition(subBlock.condition)
-            if (!canonicalByCondition.has(subBlock.canonicalParamId)) {
-              canonicalByCondition.set(subBlock.canonicalParamId, new Set())
-            }
-            canonicalByCondition.get(subBlock.canonicalParamId)!.add(conditionKey)
-          }
-        }
-
-        // Check that each canonicalParamId is only used for one condition
-        for (const [canonicalId, conditions] of canonicalByCondition) {
-          if (conditions.size > 1) {
-            errors.push(
-              `Block "${block.type}": Canonical param "${canonicalId}" is used across ${conditions.size} different conditions. Each operation should have its own unique canonicalParamId.`
-            )
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        throw new Error(`Canonical param reuse across conditions:\n${errors.join('\n')}`)
-      }
-    })
-
-    it('should have inputs containing canonical param IDs instead of raw subBlock IDs', () => {
-      const blocks = getAllBlocks()
-      const errors: string[] = []
-
-      for (const block of blocks) {
-        if (!block.inputs) continue
-
-        // Find all canonical groups (subBlocks with canonicalParamId)
-        const canonicalGroups = new Map<string, string[]>()
-        for (const subBlock of block.subBlocks) {
-          if (subBlock.canonicalParamId) {
-            if (!canonicalGroups.has(subBlock.canonicalParamId)) {
-              canonicalGroups.set(subBlock.canonicalParamId, [])
-            }
-            canonicalGroups.get(subBlock.canonicalParamId)!.push(subBlock.id)
-          }
-        }
-
-        const inputKeys = Object.keys(block.inputs)
-
-        for (const [canonicalId, rawSubBlockIds] of canonicalGroups) {
-          // Check that the canonical param ID is in inputs
-          if (!inputKeys.includes(canonicalId)) {
-            errors.push(
-              `Block "${block.type}": inputs section is missing canonical param "${canonicalId}"`
-            )
-          }
-
-          // Check that raw subBlock IDs are NOT in inputs (they get deleted after transformation)
-          for (const rawId of rawSubBlockIds) {
-            if (rawId !== canonicalId && inputKeys.includes(rawId)) {
-              errors.push(
-                `Block "${block.type}": inputs section contains raw subBlock id "${rawId}" which should be replaced by canonical param "${canonicalId}"`
-              )
-            }
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        throw new Error(`Inputs section validation errors:\n${errors.join('\n')}`)
-      }
-    })
-
-    it('should have params function using canonical IDs instead of raw subBlock IDs', () => {
-      const blocks = getAllBlocks()
-      const errors: string[] = []
-
-      for (const block of blocks) {
-        // Check if block has a params function
-        const paramsFunc = block.tools?.config?.params
-        if (!paramsFunc || typeof paramsFunc !== 'function') continue
-
-        // Get the function source code, stripping comments to avoid false positives
-        const rawFuncSource = paramsFunc.toString()
-        // Remove single-line comments (// ...) and multi-line comments (/* ... */)
-        const funcSource = rawFuncSource
-          .replace(/\/\/[^\n]*/g, '') // Remove single-line comments
-          .replace(/\/\*[\s\S]*?\*\//g, '') // Remove multi-line comments
-
-        // Find all canonical groups (subBlocks with canonicalParamId)
-        const canonicalGroups = new Map<string, string[]>()
-        for (const subBlock of block.subBlocks) {
-          if (subBlock.canonicalParamId) {
-            if (!canonicalGroups.has(subBlock.canonicalParamId)) {
-              canonicalGroups.set(subBlock.canonicalParamId, [])
-            }
-            canonicalGroups.get(subBlock.canonicalParamId)!.push(subBlock.id)
-          }
-        }
-
-        // Check for raw subBlock IDs being used in the params function
-        for (const [canonicalId, rawSubBlockIds] of canonicalGroups) {
-          for (const rawId of rawSubBlockIds) {
-            // Skip if the rawId is the same as the canonicalId (self-referential, which is allowed in some cases)
-            if (rawId === canonicalId) continue
-
-            // Check if the params function references the raw subBlock ID
-            // Look for patterns like: params.rawId, { rawId }, destructuring rawId
-            const patterns = [
-              new RegExp(`params\\.${rawId}\\b`), // params.rawId
-              new RegExp(`\\{[^}]*\\b${rawId}\\b[^}]*\\}\\s*=\\s*params`), // { rawId } = params
-              new RegExp(`\\b${rawId}\\s*[,}]`), // rawId in destructuring
-            ]
-
-            for (const pattern of patterns) {
-              if (pattern.test(funcSource)) {
-                errors.push(
-                  `Block "${block.type}": params function references raw subBlock id "${rawId}" which is deleted after canonical transformation. Use canonical param "${canonicalId}" instead.`
-                )
-                break
-              }
-            }
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        throw new Error(`Params function validation errors:\n${errors.join('\n')}`)
-      }
-    })
-
-    it('should have consistent required status across canonical param groups', () => {
-      const blocks = getAllBlocks()
-      const errors: string[] = []
-
-      for (const block of blocks) {
-        // Find all canonical groups (subBlocks with canonicalParamId)
-        const canonicalGroups = new Map<string, typeof block.subBlocks>()
-        for (const subBlock of block.subBlocks) {
-          if (subBlock.canonicalParamId) {
-            if (!canonicalGroups.has(subBlock.canonicalParamId)) {
-              canonicalGroups.set(subBlock.canonicalParamId, [])
-            }
-            canonicalGroups.get(subBlock.canonicalParamId)!.push(subBlock)
-          }
-        }
-
-        // For each canonical group, check that required status is consistent
-        for (const [canonicalId, subBlocks] of canonicalGroups) {
-          if (subBlocks.length < 2) continue // Single subblock, no consistency check needed
-
-          // Get required status for each subblock (handling both boolean and condition object)
-          const requiredStatuses = subBlocks.map((sb) => {
-            // If required is a condition object or function, we can't statically determine it
-            // so we skip those cases
-            if (typeof sb.required === 'object' || typeof sb.required === 'function') {
-              return 'dynamic'
-            }
-            return sb.required === true ? 'required' : 'optional'
-          })
-
-          // Filter out dynamic cases
-          const staticStatuses = requiredStatuses.filter((s) => s !== 'dynamic')
-          if (staticStatuses.length < 2) continue // Not enough static statuses to compare
-
-          // Check if all static statuses are the same
-          const hasRequired = staticStatuses.includes('required')
-          const hasOptional = staticStatuses.includes('optional')
-
-          if (hasRequired && hasOptional) {
-            const requiredSubBlocks = subBlocks
-              .filter((sb, i) => requiredStatuses[i] === 'required')
-              .map((sb) => `${sb.id} (${sb.mode || 'both'})`)
-            const optionalSubBlocks = subBlocks
-              .filter((sb, i) => requiredStatuses[i] === 'optional')
-              .map((sb) => `${sb.id} (${sb.mode || 'both'})`)
-
-            errors.push(
-              `Block "${block.type}": canonical param "${canonicalId}" has inconsistent required status. ` +
-                `Required: [${requiredSubBlocks.join(', ')}], Optional: [${optionalSubBlocks.join(', ')}]. ` +
-                `All subBlocks in a canonical group should have the same required status.`
-            )
-          }
-        }
-      }
-
-      if (errors.length > 0) {
-        throw new Error(`Required status consistency errors:\n${errors.join('\n')}`)
-      }
-    })
-  })
 })
--- a/apps/sim/blocks/blocks/a2a.ts
+++ b/apps/sim/blocks/blocks/a2a.ts
@@ -216,8 +216,8 @@ export const A2ABlock: BlockConfig<A2AResponse> = {
    config: {
      tool: (params) => params.operation as string,
      params: (params) => {
-        const { files, ...rest } = params
-        const normalizedFiles = normalizeFileInput(files)
+        const { fileUpload, fileReference, ...rest } = params
+        const normalizedFiles = normalizeFileInput(fileUpload || fileReference || params.files)
        return {
          ...rest,
          ...(normalizedFiles && { files: normalizedFiles }),
@@ -252,7 +252,15 @@ export const A2ABlock: BlockConfig<A2AResponse> = {
    },
    files: {
      type: 'array',
-      description: 'Files to include with the message (canonical param)',
+      description: 'Files to include with the message',
+    },
+    fileUpload: {
+      type: 'array',
+      description: 'Uploaded files (basic mode)',
+    },
+    fileReference: {
+      type: 'json',
+      description: 'File reference from previous blocks (advanced mode)',
    },
    historyLength: {
      type: 'number',
--- a/apps/sim/blocks/blocks/confluence.ts
+++ b/apps/sim/blocks/blocks/confluence.ts
@@ -75,12 +75,6 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
        'search:confluence',
        'read:me',
        'offline_access',
-        'read:blogpost:confluence',
-        'write:blogpost:confluence',
-        'read:content.property:confluence',
-        'write:content.property:confluence',
-        'read:hierarchical-content:confluence',
-        'read:content.metadata:confluence',
      ],
      placeholder: 'Select Confluence account',
      required: true,
@@ -94,19 +88,6 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
      placeholder: 'Select Confluence page',
      dependsOn: ['credential', 'domain'],
      mode: 'basic',
-      required: {
-        field: 'operation',
-        value: [
-          'read',
-          'update',
-          'delete',
-          'create_comment',
-          'list_comments',
-          'list_attachments',
-          'list_labels',
-          'upload_attachment',
-        ],
-      },
    },
    {
      id: 'manualPageId',
@@ -115,26 +96,14 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
      canonicalParamId: 'pageId',
      placeholder: 'Enter Confluence page ID',
      mode: 'advanced',
-      required: {
-        field: 'operation',
-        value: [
-          'read',
-          'update',
-          'delete',
-          'create_comment',
-          'list_comments',
-          'list_attachments',
-          'list_labels',
-          'upload_attachment',
-        ],
-      },
    },
    {
      id: 'spaceId',
      title: 'Space ID',
      type: 'short-input',
      placeholder: 'Enter Confluence space ID',
-      required: { field: 'operation', value: ['create', 'get_space'] },
+      required: true,
+      condition: { field: 'operation', value: ['create', 'get_space'] },
    },
    {
      id: 'title',
@@ -289,6 +258,7 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
        const {
          credential,
          pageId,
+          manualPageId,
          operation,
          attachmentFile,
          attachmentFileName,
@@ -296,7 +266,28 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
          ...rest
        } = params

-        const effectivePageId = pageId ? String(pageId).trim() : ''
+        const effectivePageId = (pageId || manualPageId || '').trim()
+
+        const requiresPageId = [
+          'read',
+          'update',
+          'delete',
+          'create_comment',
+          'list_comments',
+          'list_attachments',
+          'list_labels',
+          'upload_attachment',
+        ]
+
+        const requiresSpaceId = ['create', 'get_space']
+
+        if (requiresPageId.includes(operation) && !effectivePageId) {
+          throw new Error('Page ID is required. Please select a page or enter a page ID manually.')
+        }
+
+        if (requiresSpaceId.includes(operation) && !rest.spaceId) {
+          throw new Error('Space ID is required for this operation.')
+        }

        if (operation === 'upload_attachment') {
          return {
@@ -323,7 +314,8 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
    operation: { type: 'string', description: 'Operation to perform' },
    domain: { type: 'string', description: 'Confluence domain' },
    credential: { type: 'string', description: 'Confluence access token' },
-    pageId: { type: 'string', description: 'Page identifier (canonical param)' },
+    pageId: { type: 'string', description: 'Page identifier' },
+    manualPageId: { type: 'string', description: 'Manual page identifier' },
    spaceId: { type: 'string', description: 'Space identifier' },
    title: { type: 'string', description: 'Page title' },
    content: { type: 'string', description: 'Page content' },
@@ -332,7 +324,7 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
    comment: { type: 'string', description: 'Comment text' },
    commentId: { type: 'string', description: 'Comment identifier' },
    attachmentId: { type: 'string', description: 'Attachment identifier' },
-    attachmentFile: { type: 'json', description: 'File to upload as attachment (canonical param)' },
+    attachmentFile: { type: 'json', description: 'File to upload as attachment' },
    attachmentFileName: { type: 'string', description: 'Custom file name for attachment' },
    attachmentComment: { type: 'string', description: 'Comment for the attachment' },
    labelName: { type: 'string', description: 'Label name' },
@@ -342,7 +334,6 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
    ts: { type: 'string', description: 'Timestamp' },
    pageId: { type: 'string', description: 'Page identifier' },
    content: { type: 'string', description: 'Page content' },
-    body: { type: 'json', description: 'Page body with storage format' },
    title: { type: 'string', description: 'Page title' },
    url: { type: 'string', description: 'Page or resource URL' },
    success: { type: 'boolean', description: 'Operation success status' },
@@ -380,46 +371,31 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      title: 'Operation',
      type: 'dropdown',
      options: [
-        // Page Operations
        { label: 'Read Page', id: 'read' },
        { label: 'Create Page', id: 'create' },
        { label: 'Update Page', id: 'update' },
        { label: 'Delete Page', id: 'delete' },
-        { label: 'List Pages in Space', id: 'list_pages_in_space' },
-        { label: 'Get Page Children', id: 'get_page_children' },
-        { label: 'Get Page Ancestors', id: 'get_page_ancestors' },
-        // Version Operations
-        { label: 'List Page Versions', id: 'list_page_versions' },
-        { label: 'Get Page Version', id: 'get_page_version' },
-        // Page Property Operations
-        { label: 'List Page Properties', id: 'list_page_properties' },
-        { label: 'Create Page Property', id: 'create_page_property' },
-        // Search Operations
        { label: 'Search Content', id: 'search' },
-        { label: 'Search in Space', id: 'search_in_space' },
-        // Blog Post Operations
-        { label: 'List Blog Posts', id: 'list_blogposts' },
-        { label: 'Get Blog Post', id: 'get_blogpost' },
-        { label: 'Create Blog Post', id: 'create_blogpost' },
-        { label: 'List Blog Posts in Space', id: 'list_blogposts_in_space' },
-        // Comment Operations
        { label: 'Create Comment', id: 'create_comment' },
        { label: 'List Comments', id: 'list_comments' },
        { label: 'Update Comment', id: 'update_comment' },
        { label: 'Delete Comment', id: 'delete_comment' },
-        // Attachment Operations
        { label: 'Upload Attachment', id: 'upload_attachment' },
        { label: 'List Attachments', id: 'list_attachments' },
        { label: 'Delete Attachment', id: 'delete_attachment' },
-        // Label Operations
        { label: 'List Labels', id: 'list_labels' },
-        { label: 'Add Label', id: 'add_label' },
-        // Space Operations
        { label: 'Get Space', id: 'get_space' },
        { label: 'List Spaces', id: 'list_spaces' },
      ],
      value: () => 'read',
    },
+    {
+      id: 'domain',
+      title: 'Domain',
+      type: 'short-input',
+      placeholder: 'Enter Confluence domain (e.g., simstudio.atlassian.net)',
+      required: true,
+    },
    {
      id: 'credential',
      title: 'Confluence Account',
@@ -448,23 +424,10 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
        'search:confluence',
        'read:me',
        'offline_access',
-        'read:blogpost:confluence',
-        'write:blogpost:confluence',
-        'read:content.property:confluence',
-        'write:content.property:confluence',
-        'read:hierarchical-content:confluence',
-        'read:content.metadata:confluence',
      ],
      placeholder: 'Select Confluence account',
      required: true,
    },
-    {
-      id: 'domain',
-      title: 'Domain',
-      type: 'short-input',
-      placeholder: 'Enter Confluence domain (e.g., simstudio.atlassian.net)',
-      required: true,
-    },
    {
      id: 'pageId',
      title: 'Select Page',
@@ -474,40 +437,6 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      placeholder: 'Select Confluence page',
      dependsOn: ['credential', 'domain'],
      mode: 'basic',
-      condition: {
-        field: 'operation',
-        value: [
-          'list_pages_in_space',
-          'list_blogposts',
-          'get_blogpost',
-          'list_blogposts_in_space',
-          'search',
-          'search_in_space',
-          'get_space',
-          'list_spaces',
-        ],
-        not: true,
-      },
-      required: {
-        field: 'operation',
-        value: [
-          'read',
-          'update',
-          'delete',
-          'create_comment',
-          'list_comments',
-          'list_attachments',
-          'list_labels',
-          'upload_attachment',
-          'add_label',
-          'get_page_children',
-          'get_page_ancestors',
-          'list_page_versions',
-          'get_page_version',
-          'list_page_properties',
-          'create_page_property',
-        ],
-      },
    },
    {
      id: 'manualPageId',
@@ -516,40 +445,6 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      canonicalParamId: 'pageId',
      placeholder: 'Enter Confluence page ID',
      mode: 'advanced',
-      condition: {
-        field: 'operation',
-        value: [
-          'list_pages_in_space',
-          'list_blogposts',
-          'get_blogpost',
-          'list_blogposts_in_space',
-          'search',
-          'search_in_space',
-          'get_space',
-          'list_spaces',
-        ],
-        not: true,
-      },
-      required: {
-        field: 'operation',
-        value: [
-          'read',
-          'update',
-          'delete',
-          'create_comment',
-          'list_comments',
-          'list_attachments',
-          'list_labels',
-          'upload_attachment',
-          'add_label',
-          'get_page_children',
-          'get_page_ancestors',
-          'list_page_versions',
-          'get_page_version',
-          'list_page_properties',
-          'create_page_property',
-        ],
-      },
    },
    {
      id: 'spaceId',
@@ -557,63 +452,21 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      type: 'short-input',
      placeholder: 'Enter Confluence space ID',
      required: true,
-      condition: {
-        field: 'operation',
-        value: [
-          'create',
-          'get_space',
-          'list_pages_in_space',
-          'search_in_space',
-          'create_blogpost',
-          'list_blogposts_in_space',
-        ],
-      },
-    },
-    {
-      id: 'blogPostId',
-      title: 'Blog Post ID',
-      type: 'short-input',
-      placeholder: 'Enter blog post ID',
-      required: true,
-      condition: { field: 'operation', value: 'get_blogpost' },
-    },
-    {
-      id: 'versionNumber',
-      title: 'Version Number',
-      type: 'short-input',
-      placeholder: 'Enter version number',
-      required: true,
-      condition: { field: 'operation', value: 'get_page_version' },
-    },
-    {
-      id: 'propertyKey',
-      title: 'Property Key',
-      type: 'short-input',
-      placeholder: 'Enter property key/name',
-      required: true,
-      condition: { field: 'operation', value: 'create_page_property' },
-    },
-    {
-      id: 'propertyValue',
-      title: 'Property Value',
-      type: 'long-input',
-      placeholder: 'Enter property value (JSON supported)',
-      required: true,
-      condition: { field: 'operation', value: 'create_page_property' },
+      condition: { field: 'operation', value: ['create', 'get_space'] },
    },
    {
      id: 'title',
      title: 'Title',
      type: 'short-input',
-      placeholder: 'Enter title',
-      condition: { field: 'operation', value: ['create', 'update', 'create_blogpost'] },
+      placeholder: 'Enter title for the page',
+      condition: { field: 'operation', value: ['create', 'update'] },
    },
    {
      id: 'content',
      title: 'Content',
      type: 'long-input',
-      placeholder: 'Enter content',
-      condition: { field: 'operation', value: ['create', 'update', 'create_blogpost'] },
+      placeholder: 'Enter content for the page',
+      condition: { field: 'operation', value: ['create', 'update'] },
    },
    {
      id: 'parentId',
@@ -628,7 +481,7 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      type: 'short-input',
      placeholder: 'Enter search query',
      required: true,
-      condition: { field: 'operation', value: ['search', 'search_in_space'] },
+      condition: { field: 'operation', value: 'search' },
    },
    {
      id: 'comment',
@@ -662,7 +515,6 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      placeholder: 'Select file to upload',
      condition: { field: 'operation', value: 'upload_attachment' },
      mode: 'basic',
-      required: { field: 'operation', value: 'upload_attachment' },
    },
    {
      id: 'attachmentFileReference',
@@ -672,7 +524,6 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      placeholder: 'Reference file from previous blocks',
      condition: { field: 'operation', value: 'upload_attachment' },
      mode: 'advanced',
-      required: { field: 'operation', value: 'upload_attachment' },
    },
    {
      id: 'attachmentFileName',
@@ -694,140 +545,40 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
      type: 'short-input',
      placeholder: 'Enter label name',
      required: true,
-      condition: { field: 'operation', value: 'add_label' },
-    },
-    {
-      id: 'labelPrefix',
-      title: 'Label Prefix',
-      type: 'dropdown',
-      options: [
-        { label: 'Global (default)', id: 'global' },
-        { label: 'My', id: 'my' },
-        { label: 'Team', id: 'team' },
-        { label: 'System', id: 'system' },
-      ],
-      value: () => 'global',
-      condition: { field: 'operation', value: 'add_label' },
-    },
-    {
-      id: 'blogPostStatus',
-      title: 'Status',
-      type: 'dropdown',
-      options: [
-        { label: 'Published (current)', id: 'current' },
-        { label: 'Draft', id: 'draft' },
-      ],
-      value: () => 'current',
-      condition: { field: 'operation', value: 'create_blogpost' },
-    },
-    {
-      id: 'purge',
-      title: 'Permanently Delete',
-      type: 'switch',
-      condition: { field: 'operation', value: 'delete' },
-    },
-    {
-      id: 'bodyFormat',
-      title: 'Body Format',
-      type: 'dropdown',
-      options: [
-        { label: 'Storage (default)', id: 'storage' },
-        { label: 'Atlas Doc Format', id: 'atlas_doc_format' },
-        { label: 'View', id: 'view' },
-        { label: 'Export View', id: 'export_view' },
-      ],
-      value: () => 'storage',
-      condition: { field: 'operation', value: 'list_comments' },
+      condition: { field: 'operation', value: ['add_label', 'remove_label'] },
    },
    {
      id: 'limit',
      title: 'Limit',
      type: 'short-input',
-      placeholder: 'Enter maximum number of results (default: 50, max: 250)',
+      placeholder: 'Enter maximum number of results (default: 25)',
      condition: {
        field: 'operation',
-        value: [
-          'search',
-          'search_in_space',
-          'list_comments',
-          'list_attachments',
-          'list_spaces',
-          'list_pages_in_space',
-          'list_blogposts',
-          'list_blogposts_in_space',
-          'get_page_children',
-          'list_page_versions',
-          'list_page_properties',
-          'list_labels',
-        ],
-      },
-    },
-    {
-      id: 'cursor',
-      title: 'Pagination Cursor',
-      type: 'short-input',
-      placeholder: 'Enter cursor from previous response (optional)',
-      condition: {
-        field: 'operation',
-        value: [
-          'list_comments',
-          'list_attachments',
-          'list_spaces',
-          'list_pages_in_space',
-          'list_blogposts',
-          'list_blogposts_in_space',
-          'get_page_children',
-          'list_page_versions',
-          'list_page_properties',
-          'list_labels',
-        ],
+        value: ['search', 'list_comments', 'list_attachments', 'list_spaces'],
      },
    },
  ],
  tools: {
    access: [
-      // Page Tools
      'confluence_retrieve',
      'confluence_update',
      'confluence_create_page',
      'confluence_delete_page',
-      'confluence_list_pages_in_space',
-      'confluence_get_page_children',
-      'confluence_get_page_ancestors',
-      // Version Tools
-      'confluence_list_page_versions',
-      'confluence_get_page_version',
-      // Property Tools
-      'confluence_list_page_properties',
-      'confluence_create_page_property',
-      // Search Tools
      'confluence_search',
-      'confluence_search_in_space',
-      // Blog Post Tools
-      'confluence_list_blogposts',
-      'confluence_get_blogpost',
-      'confluence_create_blogpost',
-      'confluence_list_blogposts_in_space',
-      // Comment Tools
      'confluence_create_comment',
      'confluence_list_comments',
      'confluence_update_comment',
      'confluence_delete_comment',
-      // Attachment Tools
      'confluence_upload_attachment',
      'confluence_list_attachments',
      'confluence_delete_attachment',
-      // Label Tools
      'confluence_list_labels',
-      'confluence_add_label',
-      // Space Tools
      'confluence_get_space',
      'confluence_list_spaces',
    ],
    config: {
      tool: (params) => {
        switch (params.operation) {
-          // Page Operations
          case 'read':
            return 'confluence_retrieve'
          case 'create':
@@ -836,37 +587,8 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
            return 'confluence_update'
          case 'delete':
            return 'confluence_delete_page'
-          case 'list_pages_in_space':
-            return 'confluence_list_pages_in_space'
-          case 'get_page_children':
-            return 'confluence_get_page_children'
-          case 'get_page_ancestors':
-            return 'confluence_get_page_ancestors'
-          // Version Operations
-          case 'list_page_versions':
-            return 'confluence_list_page_versions'
-          case 'get_page_version':
-            return 'confluence_get_page_version'
-          // Property Operations
-          case 'list_page_properties':
-            return 'confluence_list_page_properties'
-          case 'create_page_property':
-            return 'confluence_create_page_property'
-          // Search Operations
          case 'search':
            return 'confluence_search'
-          case 'search_in_space':
-            return 'confluence_search_in_space'
-          // Blog Post Operations
-          case 'list_blogposts':
-            return 'confluence_list_blogposts'
-          case 'get_blogpost':
-            return 'confluence_get_blogpost'
-          case 'create_blogpost':
-            return 'confluence_create_blogpost'
-          case 'list_blogposts_in_space':
-            return 'confluence_list_blogposts_in_space'
-          // Comment Operations
          case 'create_comment':
            return 'confluence_create_comment'
          case 'list_comments':
@@ -875,19 +597,14 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
            return 'confluence_update_comment'
          case 'delete_comment':
            return 'confluence_delete_comment'
-          // Attachment Operations
          case 'upload_attachment':
            return 'confluence_upload_attachment'
          case 'list_attachments':
            return 'confluence_list_attachments'
          case 'delete_attachment':
            return 'confluence_delete_attachment'
-          // Label Operations
          case 'list_labels':
            return 'confluence_list_labels'
-          case 'add_label':
-            return 'confluence_add_label'
-          // Space Operations
          case 'get_space':
            return 'confluence_get_space'
          case 'list_spaces':
@@ -900,104 +617,42 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
        const {
          credential,
          pageId,
+          manualPageId,
          operation,
+          attachmentFileUpload,
+          attachmentFileReference,
          attachmentFile,
          attachmentFileName,
          attachmentComment,
-          blogPostId,
-          versionNumber,
-          propertyKey,
-          propertyValue,
-          labelPrefix,
-          blogPostStatus,
-          purge,
-          bodyFormat,
-          cursor,
          ...rest
        } = params

-        // Use canonical param (serializer already handles basic/advanced mode)
-        const effectivePageId = pageId ? String(pageId).trim() : ''
+        const effectivePageId = (pageId || manualPageId || '').trim()

-        if (operation === 'add_label') {
-          return {
-            credential,
-            pageId: effectivePageId,
-            operation,
-            prefix: labelPrefix || 'global',
-            ...rest,
-          }
-        }
-
-        if (operation === 'create_blogpost') {
-          return {
-            credential,
-            operation,
-            status: blogPostStatus || 'current',
-            ...rest,
-          }
-        }
-
-        if (operation === 'delete') {
-          return {
-            credential,
-            pageId: effectivePageId,
-            operation,
-            purge: purge || false,
-            ...rest,
-          }
-        }
-
-        if (operation === 'list_comments') {
-          return {
-            credential,
-            pageId: effectivePageId,
-            operation,
-            bodyFormat: bodyFormat || 'storage',
-            cursor: cursor || undefined,
-            ...rest,
-          }
-        }
-
-        // Operations that support cursor pagination
-        const supportsCursor = [
+        const requiresPageId = [
+          'read',
+          'update',
+          'delete',
+          'create_comment',
+          'list_comments',
          'list_attachments',
-          'list_spaces',
-          'list_pages_in_space',
-          'list_blogposts',
-          'list_blogposts_in_space',
-          'get_page_children',
-          'list_page_versions',
-          'list_page_properties',
          'list_labels',
+          'upload_attachment',
        ]

-        if (supportsCursor.includes(operation) && cursor) {
-          return {
-            credential,
-            pageId: effectivePageId || undefined,
-            operation,
-            cursor,
-            ...rest,
-          }
+        const requiresSpaceId = ['create', 'get_space']
+
+        if (requiresPageId.includes(operation) && !effectivePageId) {
+          throw new Error('Page ID is required. Please select a page or enter a page ID manually.')
        }

-        if (operation === 'create_page_property') {
-          if (!propertyKey) {
-            throw new Error('Property key is required for this operation.')
-          }
-          return {
-            credential,
-            pageId: effectivePageId,
-            operation,
-            key: propertyKey,
-            value: propertyValue,
-            ...rest,
-          }
+        if (requiresSpaceId.includes(operation) && !rest.spaceId) {
+          throw new Error('Space ID is required for this operation.')
        }

        if (operation === 'upload_attachment') {
-          const normalizedFile = normalizeFileInput(attachmentFile, { single: true })
+          const fileInput = attachmentFileUpload || attachmentFileReference || attachmentFile
+          const normalizedFile = normalizeFileInput(fileInput, { single: true })
          if (!normalizedFile) {
            throw new Error('File is required for upload attachment operation.')
          }
@@ -1015,8 +670,6 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
        return {
          credential,
          pageId: effectivePageId || undefined,
-          blogPostId: blogPostId || undefined,
-          versionNumber: versionNumber ? Number.parseInt(String(versionNumber), 10) : undefined,
          operation,
          ...rest,
        }
@@ -1027,79 +680,22 @@ export const ConfluenceV2Block: BlockConfig<ConfluenceResponse> = {
    operation: { type: 'string', description: 'Operation to perform' },
    domain: { type: 'string', description: 'Confluence domain' },
    credential: { type: 'string', description: 'Confluence access token' },
-    pageId: { type: 'string', description: 'Page identifier (canonical param)' },
+    pageId: { type: 'string', description: 'Page identifier' },
+    manualPageId: { type: 'string', description: 'Manual page identifier' },
    spaceId: { type: 'string', description: 'Space identifier' },
-    blogPostId: { type: 'string', description: 'Blog post identifier' },
-    versionNumber: { type: 'number', description: 'Page version number' },
-    propertyKey: { type: 'string', description: 'Property key/name' },
-    propertyValue: { type: 'json', description: 'Property value (JSON)' },
-    title: { type: 'string', description: 'Page or blog post title' },
-    content: { type: 'string', description: 'Page or blog post content' },
+    title: { type: 'string', description: 'Page title' },
+    content: { type: 'string', description: 'Page content' },
    parentId: { type: 'string', description: 'Parent page identifier' },
    query: { type: 'string', description: 'Search query' },
    comment: { type: 'string', description: 'Comment text' },
    commentId: { type: 'string', description: 'Comment identifier' },
    attachmentId: { type: 'string', description: 'Attachment identifier' },
-    attachmentFile: { type: 'json', description: 'File to upload as attachment (canonical param)' },
+    attachmentFile: { type: 'json', description: 'File to upload as attachment' },
+    attachmentFileUpload: { type: 'json', description: 'Uploaded file (basic mode)' },
+    attachmentFileReference: { type: 'json', description: 'File reference (advanced mode)' },
    attachmentFileName: { type: 'string', description: 'Custom file name for attachment' },
    attachmentComment: { type: 'string', description: 'Comment for the attachment' },
    labelName: { type: 'string', description: 'Label name' },
-    labelPrefix: { type: 'string', description: 'Label prefix (global, my, team, system)' },
-    blogPostStatus: { type: 'string', description: 'Blog post status (current or draft)' },
-    purge: { type: 'boolean', description: 'Permanently delete instead of moving to trash' },
-    bodyFormat: { type: 'string', description: 'Body format for comments' },
    limit: { type: 'number', description: 'Maximum number of results' },
-    cursor: { type: 'string', description: 'Pagination cursor from previous response' },
-  },
-  outputs: {
-    ts: { type: 'string', description: 'Timestamp' },
-    pageId: { type: 'string', description: 'Page identifier' },
-    content: { type: 'string', description: 'Page content' },
-    body: { type: 'json', description: 'Page body with storage format' },
-    title: { type: 'string', description: 'Page title' },
-    url: { type: 'string', description: 'Page or resource URL' },
-    success: { type: 'boolean', description: 'Operation success status' },
-    deleted: { type: 'boolean', description: 'Deletion status' },
-    added: { type: 'boolean', description: 'Addition status' },
-    removed: { type: 'boolean', description: 'Removal status' },
-    updated: { type: 'boolean', description: 'Update status' },
-    // Search & List Results
-    results: { type: 'array', description: 'Search results' },
-    pages: { type: 'array', description: 'List of pages' },
-    children: { type: 'array', description: 'List of child pages' },
-    ancestors: { type: 'array', description: 'List of ancestor pages' },
-    // Comment Results
-    comments: { type: 'array', description: 'List of comments' },
-    commentId: { type: 'string', description: 'Comment identifier' },
-    // Attachment Results
-    attachments: { type: 'array', description: 'List of attachments' },
-    attachmentId: { type: 'string', description: 'Attachment identifier' },
-    fileSize: { type: 'number', description: 'Attachment file size in bytes' },
-    mediaType: { type: 'string', description: 'Attachment MIME type' },
-    downloadUrl: { type: 'string', description: 'Attachment download URL' },
-    // Label Results
-    labels: { type: 'array', description: 'List of labels' },
-    labelName: { type: 'string', description: 'Label name' },
-    // Space Results
-    spaces: { type: 'array', description: 'List of spaces' },
-    spaceId: { type: 'string', description: 'Space identifier' },
-    name: { type: 'string', description: 'Space name' },
-    key: { type: 'string', description: 'Space key' },
-    type: { type: 'string', description: 'Space or content type' },
-    status: { type: 'string', description: 'Space status' },
-    // Blog Post Results
-    blogPosts: { type: 'array', description: 'List of blog posts' },
-    blogPostId: { type: 'string', description: 'Blog post identifier' },
-    // Version Results
-    versions: { type: 'array', description: 'List of page versions' },
-    version: { type: 'json', description: 'Version information' },
-    versionNumber: { type: 'number', description: 'Version number' },
-    // Property Results
-    properties: { type: 'array', description: 'List of page properties' },
-    propertyId: { type: 'string', description: 'Property identifier' },
-    propertyKey: { type: 'string', description: 'Property key' },
-    propertyValue: { type: 'json', description: 'Property value' },
-    // Pagination
-    nextCursor: { type: 'string', description: 'Cursor for fetching next page of results' },
  },
 }
--- a/apps/sim/blocks/blocks/discord.ts
+++ b/apps/sim/blocks/blocks/discord.ts
@@ -584,7 +584,7 @@ export const DiscordBlock: BlockConfig<DiscordResponse> = {
              ...commonParams,
              channelId: params.channelId,
              content: params.content,
-              files: normalizeFileInput(params.files),
+              files: normalizeFileInput(params.attachmentFiles || params.files),
            }
          }
          case 'discord_get_messages':
@@ -773,7 +773,8 @@ export const DiscordBlock: BlockConfig<DiscordResponse> = {
    nick: { type: 'string', description: 'Member nickname' },
    reason: { type: 'string', description: 'Reason for moderation action' },
    archived: { type: 'string', description: 'Archive status (true/false)' },
-    files: { type: 'array', description: 'Files to attach (canonical param)' },
+    attachmentFiles: { type: 'json', description: 'Files to attach (UI upload)' },
+    files: { type: 'array', description: 'Files to attach (UserFile array)' },
    limit: { type: 'number', description: 'Message limit' },
    autoArchiveDuration: { type: 'number', description: 'Thread auto-archive duration in minutes' },
    channelType: { type: 'number', description: 'Discord channel type (0=text, 2=voice, etc.)' },
--- a/apps/sim/blocks/blocks/dropbox.ts
+++ b/apps/sim/blocks/blocks/dropbox.ts
@@ -317,8 +317,12 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
          params.maxResults = Number(params.maxResults)
        }

-        // Normalize file input for upload operation - use canonical 'file' param
-        const normalizedFile = normalizeFileInput(params.file, { single: true })
+        // Normalize file input for upload operation
+        // Check all possible field IDs: uploadFile (basic), fileRef (advanced), fileContent (legacy)
+        const normalizedFile = normalizeFileInput(
+          params.uploadFile || params.fileRef || params.fileContent,
+          { single: true }
+        )
        if (normalizedFile) {
          params.file = normalizedFile
        }
@@ -357,7 +361,10 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
    path: { type: 'string', description: 'Path in Dropbox' },
    autorename: { type: 'boolean', description: 'Auto-rename on conflict' },
    // Upload inputs
-    file: { type: 'json', description: 'File to upload (canonical param)' },
+    uploadFile: { type: 'json', description: 'Uploaded file (UserFile)' },
+    file: { type: 'json', description: 'File to upload (UserFile object)' },
+    fileRef: { type: 'json', description: 'File reference from previous block' },
+    fileContent: { type: 'string', description: 'Legacy: base64 encoded file content' },
    fileName: { type: 'string', description: 'Optional filename' },
    mode: { type: 'string', description: 'Write mode: add or overwrite' },
    mute: { type: 'boolean', description: 'Mute notifications' },
--- a/apps/sim/blocks/blocks/file.ts
+++ b/apps/sim/blocks/blocks/file.ts
@@ -194,8 +194,7 @@ export const FileV2Block: BlockConfig<FileParserOutput> = {
        fallbackToolId: 'file_parser_v2',
      }),
      params: (params) => {
-        // Use canonical 'fileInput' param directly
-        const fileInput = params.fileInput
+        const fileInput = params.file || params.filePath || params.fileInput
        if (!fileInput) {
          logger.error('No file input provided')
          throw new Error('File is required')
@@ -229,7 +228,9 @@ export const FileV2Block: BlockConfig<FileParserOutput> = {
    },
  },
  inputs: {
-    fileInput: { type: 'json', description: 'File input (canonical param)' },
+    fileInput: { type: 'json', description: 'File input (upload or URL reference)' },
+    filePath: { type: 'string', description: 'File URL (advanced mode)' },
+    file: { type: 'json', description: 'Uploaded file data (basic mode)' },
    fileType: { type: 'string', description: 'File type' },
  },
  outputs: {
@@ -282,8 +283,7 @@ export const FileV3Block: BlockConfig<FileParserV3Output> = {
    config: {
      tool: () => 'file_parser_v3',
      params: (params) => {
-        // Use canonical 'fileInput' param directly
-        const fileInput = params.fileInput
+        const fileInput = params.fileInput ?? params.file ?? params.fileUrl ?? params.filePath
        if (!fileInput) {
          logger.error('No file input provided')
          throw new Error('File input is required')
@@ -321,7 +321,9 @@ export const FileV3Block: BlockConfig<FileParserV3Output> = {
    },
  },
  inputs: {
-    fileInput: { type: 'json', description: 'File input (canonical param)' },
+    fileInput: { type: 'json', description: 'File input (upload or URL)' },
+    fileUrl: { type: 'string', description: 'External file URL (advanced mode)' },
+    file: { type: 'json', description: 'Uploaded file data (basic mode)' },
    fileType: { type: 'string', description: 'File type' },
  },
  outputs: {
--- a/apps/sim/blocks/blocks/fireflies.ts
+++ b/apps/sim/blocks/blocks/fireflies.ts
@@ -461,11 +461,12 @@ Return ONLY the summary text - no quotes, no labels.`,
            return baseParams

          case 'fireflies_upload_audio': {
-            // Support both file upload and URL - use canonical 'audioFile' param
+            // Support both file upload and URL
            const audioUrl = params.audioUrl?.trim()
            const audioFile = params.audioFile
+            const audioFileReference = params.audioFileReference

-            if (!audioUrl && !audioFile) {
+            if (!audioUrl && !audioFile && !audioFileReference) {
              throw new Error('Either audio file or audio URL is required.')
            }

@@ -473,6 +474,7 @@ Return ONLY the summary text - no quotes, no labels.`,
              ...baseParams,
              audioUrl: audioUrl || undefined,
              audioFile: audioFile || undefined,
+              audioFileReference: audioFileReference || undefined,
              title: params.title?.trim() || undefined,
              language: params.language?.trim() || undefined,
              attendees: params.attendees?.trim() || undefined,
@@ -546,7 +548,8 @@ Return ONLY the summary text - no quotes, no labels.`,
    hostEmail: { type: 'string', description: 'Filter by host email' },
    participants: { type: 'string', description: 'Filter by participants (comma-separated)' },
    limit: { type: 'number', description: 'Maximum results to return' },
-    audioFile: { type: 'json', description: 'Audio/video file (canonical param)' },
+    audioFile: { type: 'json', description: 'Audio/video file (UserFile)' },
+    audioFileReference: { type: 'json', description: 'Audio/video file reference' },
    audioUrl: { type: 'string', description: 'Public URL to audio file' },
    title: { type: 'string', description: 'Meeting title' },
    language: { type: 'string', description: 'Language code for transcription' },
@@ -617,8 +620,9 @@ export const FirefliesV2Block: BlockConfig<FirefliesResponse> = {
        }

        if (params.operation === 'fireflies_upload_audio') {
-          // Use canonical 'audioFile' param directly
-          const audioFile = normalizeFileInput(params.audioFile, { single: true })
+          const audioFile = normalizeFileInput(params.audioFile || params.audioFileReference, {
+            single: true,
+          })
          if (!audioFile) {
            throw new Error('Audio file is required.')
          }
@@ -631,6 +635,7 @@ export const FirefliesV2Block: BlockConfig<FirefliesResponse> = {
            ...params,
            audioUrl,
            audioFile: undefined,
+            audioFileReference: undefined,
          })
        }

@@ -638,5 +643,8 @@ export const FirefliesV2Block: BlockConfig<FirefliesResponse> = {
      },
    },
  },
-  inputs: firefliesV2Inputs,
+  inputs: {
+    ...firefliesV2Inputs,
+    audioFileReference: { type: 'json', description: 'Audio/video file reference' },
+  },
 }
--- a/apps/sim/blocks/blocks/gmail.ts
+++ b/apps/sim/blocks/blocks/gmail.ts
@@ -362,10 +362,10 @@ Return ONLY the search query - no explanations, no extra text.`,
    },
    // Add/Remove Label - Label selector (basic mode)
    {
-      id: 'labelSelector',
+      id: 'labelManagement',
      title: 'Label',
      type: 'folder-selector',
-      canonicalParamId: 'manageLabelId',
+      canonicalParamId: 'labelIds',
      serviceId: 'gmail',
      requiredScopes: ['https://www.googleapis.com/auth/gmail.labels'],
      placeholder: 'Select label',
@@ -376,10 +376,10 @@ Return ONLY the search query - no explanations, no extra text.`,
    },
    // Add/Remove Label - Manual label input (advanced mode)
    {
-      id: 'manualLabelId',
+      id: 'manualLabelManagement',
      title: 'Label',
      type: 'short-input',
-      canonicalParamId: 'manageLabelId',
+      canonicalParamId: 'labelIds',
      placeholder: 'Enter label ID (e.g., INBOX, Label_123)',
      mode: 'advanced',
      condition: { field: 'operation', value: ['add_label_gmail', 'remove_label_gmail'] },
@@ -408,33 +408,38 @@ Return ONLY the search query - no explanations, no extra text.`,
        const {
          credential,
          folder,
-          addLabelIds,
-          removeLabelIds,
+          manualFolder,
+          destinationLabel,
+          manualDestinationLabel,
+          sourceLabel,
+          manualSourceLabel,
          moveMessageId,
          actionMessageId,
          labelActionMessageId,
-          manageLabelId,
+          labelManagement,
+          manualLabelManagement,
+          attachmentFiles,
          attachments,
          ...rest
        } = params

-        // Use canonical 'folder' param directly
-        const effectiveFolder = folder ? String(folder).trim() : ''
+        // Handle both selector and manual folder input
+        const effectiveFolder = (folder || manualFolder || '').trim()

        if (rest.operation === 'read_gmail') {
          rest.folder = effectiveFolder || 'INBOX'
        }

-        // Handle move operation - use canonical params addLabelIds and removeLabelIds
+        // Handle move operation
        if (rest.operation === 'move_gmail') {
          if (moveMessageId) {
            rest.messageId = moveMessageId
          }
-          if (addLabelIds) {
-            rest.addLabelIds = String(addLabelIds).trim()
+          if (!rest.addLabelIds) {
+            rest.addLabelIds = (destinationLabel || manualDestinationLabel || '').trim()
          }
-          if (removeLabelIds) {
-            rest.removeLabelIds = String(removeLabelIds).trim()
+          if (!rest.removeLabelIds) {
+            rest.removeLabelIds = (sourceLabel || manualSourceLabel || '').trim()
          }
        }

@@ -457,13 +462,13 @@ Return ONLY the search query - no explanations, no extra text.`,
          if (labelActionMessageId) {
            rest.messageId = labelActionMessageId
          }
-          if (manageLabelId) {
-            rest.labelIds = String(manageLabelId).trim()
+          if (!rest.labelIds) {
+            rest.labelIds = (labelManagement || manualLabelManagement || '').trim()
          }
        }

-        // Normalize attachments for send/draft operations - use canonical 'attachments' param
-        const normalizedAttachments = normalizeFileInput(attachments)
+        // Normalize attachments for send/draft operations
+        const normalizedAttachments = normalizeFileInput(attachmentFiles || attachments)

        return {
          ...rest,
@@ -488,9 +493,10 @@ Return ONLY the search query - no explanations, no extra text.`,
    },
    cc: { type: 'string', description: 'CC recipients (comma-separated)' },
    bcc: { type: 'string', description: 'BCC recipients (comma-separated)' },
-    attachments: { type: 'array', description: 'Files to attach (canonical param)' },
+    attachments: { type: 'array', description: 'Files to attach (UserFile array)' },
    // Read operation inputs
-    folder: { type: 'string', description: 'Gmail folder (canonical param)' },
+    folder: { type: 'string', description: 'Gmail folder' },
+    manualFolder: { type: 'string', description: 'Manual folder name' },
    readMessageId: { type: 'string', description: 'Message identifier for reading specific email' },
    unreadOnly: { type: 'boolean', description: 'Unread messages only' },
    includeAttachments: { type: 'boolean', description: 'Include email attachments' },
@@ -499,16 +505,18 @@ Return ONLY the search query - no explanations, no extra text.`,
    maxResults: { type: 'number', description: 'Maximum results' },
    // Move operation inputs
    moveMessageId: { type: 'string', description: 'Message ID to move' },
-    addLabelIds: { type: 'string', description: 'Label IDs to add (canonical param)' },
-    removeLabelIds: { type: 'string', description: 'Label IDs to remove (canonical param)' },
+    destinationLabel: { type: 'string', description: 'Destination label ID' },
+    manualDestinationLabel: { type: 'string', description: 'Manual destination label ID' },
+    sourceLabel: { type: 'string', description: 'Source label ID to remove' },
+    manualSourceLabel: { type: 'string', description: 'Manual source label ID' },
+    addLabelIds: { type: 'string', description: 'Label IDs to add' },
+    removeLabelIds: { type: 'string', description: 'Label IDs to remove' },
    // Action operation inputs
    actionMessageId: { type: 'string', description: 'Message ID for actions' },
    labelActionMessageId: { type: 'string', description: 'Message ID for label actions' },
-    manageLabelId: {
-      type: 'string',
-      description: 'Label ID for add/remove operations (canonical param)',
-    },
-    labelIds: { type: 'string', description: 'Label IDs to monitor (trigger)' },
+    labelManagement: { type: 'string', description: 'Label ID for management' },
+    manualLabelManagement: { type: 'string', description: 'Manual label ID' },
+    labelIds: { type: 'string', description: 'Label IDs for add/remove operations' },
  },
  outputs: {
    // Tool outputs
--- a/apps/sim/blocks/blocks/google_calendar.ts
+++ b/apps/sim/blocks/blocks/google_calendar.ts
@@ -517,17 +517,21 @@ Return ONLY the natural language event text - no explanations.`,
          attendees,
          replaceExisting,
          calendarId,
-          destinationCalendarId,
+          manualCalendarId,
+          destinationCalendar,
+          manualDestinationCalendarId,
          ...rest
        } = params

-        // Use canonical 'calendarId' param directly
-        const effectiveCalendarId = calendarId ? String(calendarId).trim() : ''
+        // Handle calendar ID (selector or manual)
+        const effectiveCalendarId = (calendarId || manualCalendarId || '').trim()

-        // Use canonical 'destinationCalendarId' param directly
-        const effectiveDestinationCalendarId = destinationCalendarId
-          ? String(destinationCalendarId).trim()
-          : ''
+        // Handle destination calendar ID for move operation (selector or manual)
+        const effectiveDestinationCalendarId = (
+          destinationCalendar ||
+          manualDestinationCalendarId ||
+          ''
+        ).trim()

        const processedParams: Record<string, any> = {
          ...rest,
@@ -585,7 +589,8 @@ Return ONLY the natural language event text - no explanations.`,
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Google Calendar access token' },
-    calendarId: { type: 'string', description: 'Calendar identifier (canonical param)' },
+    calendarId: { type: 'string', description: 'Calendar identifier' },
+    manualCalendarId: { type: 'string', description: 'Manual calendar identifier' },

    // Create/Update operation inputs
    summary: { type: 'string', description: 'Event title' },
@@ -604,10 +609,8 @@ Return ONLY the natural language event text - no explanations.`,
    eventId: { type: 'string', description: 'Event identifier' },

    // Move operation inputs
-    destinationCalendarId: {
-      type: 'string',
-      description: 'Destination calendar ID (canonical param)',
-    },
+    destinationCalendar: { type: 'string', description: 'Destination calendar selector' },
+    manualDestinationCalendarId: { type: 'string', description: 'Manual destination calendar ID' },

    // List Calendars operation inputs
    minAccessRole: { type: 'string', description: 'Minimum access role filter' },
--- a/apps/sim/blocks/blocks/google_docs.ts
+++ b/apps/sim/blocks/blocks/google_docs.ts
@@ -157,10 +157,11 @@ Return ONLY the document content - no explanations, no extra text.`,
        }
      },
      params: (params) => {
-        const { credential, documentId, folderId, ...rest } = params
+        const { credential, documentId, manualDocumentId, folderSelector, folderId, ...rest } =
+          params

-        const effectiveDocumentId = documentId ? String(documentId).trim() : ''
-        const effectiveFolderId = folderId ? String(folderId).trim() : ''
+        const effectiveDocumentId = (documentId || manualDocumentId || '').trim()
+        const effectiveFolderId = (folderSelector || folderId || '').trim()

        return {
          ...rest,
@@ -174,9 +175,11 @@ Return ONLY the document content - no explanations, no extra text.`,
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Google Docs access token' },
-    documentId: { type: 'string', description: 'Document identifier (canonical param)' },
+    documentId: { type: 'string', description: 'Document identifier' },
+    manualDocumentId: { type: 'string', description: 'Manual document identifier' },
    title: { type: 'string', description: 'Document title' },
-    folderId: { type: 'string', description: 'Parent folder identifier (canonical param)' },
+    folderSelector: { type: 'string', description: 'Selected folder' },
+    folderId: { type: 'string', description: 'Folder identifier' },
    content: { type: 'string', description: 'Document content' },
  },
  outputs: {
--- a/apps/sim/blocks/blocks/google_drive.ts
+++ b/apps/sim/blocks/blocks/google_drive.ts
@@ -121,10 +121,10 @@ Return ONLY the file content - no explanations, no markdown code blocks, no extr
      required: false,
    },
    {
-      id: 'uploadFolderSelector',
+      id: 'folderSelector',
      title: 'Select Parent Folder',
      type: 'file-selector',
-      canonicalParamId: 'uploadFolderId',
+      canonicalParamId: 'folderId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -137,10 +137,10 @@ Return ONLY the file content - no explanations, no markdown code blocks, no extr
      condition: { field: 'operation', value: ['create_file', 'upload'] },
    },
    {
-      id: 'uploadManualFolderId',
+      id: 'manualFolderId',
      title: 'Parent Folder ID',
      type: 'short-input',
-      canonicalParamId: 'uploadFolderId',
+      canonicalParamId: 'folderId',
      placeholder: 'Enter parent folder ID (leave empty for root folder)',
      mode: 'advanced',
      condition: { field: 'operation', value: ['create_file', 'upload'] },
@@ -193,10 +193,10 @@ Return ONLY the file content - no explanations, no markdown code blocks, no extr
      required: true,
    },
    {
-      id: 'createFolderParentSelector',
+      id: 'folderSelector',
      title: 'Select Parent Folder',
      type: 'file-selector',
-      canonicalParamId: 'createFolderParentId',
+      canonicalParamId: 'folderId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -210,20 +210,20 @@ Return ONLY the file content - no explanations, no markdown code blocks, no extr
    },
    // Manual Folder ID input (advanced mode)
    {
-      id: 'createFolderManualParentId',
+      id: 'manualFolderId',
      title: 'Parent Folder ID',
      type: 'short-input',
-      canonicalParamId: 'createFolderParentId',
+      canonicalParamId: 'folderId',
      placeholder: 'Enter parent folder ID (leave empty for root folder)',
      mode: 'advanced',
      condition: { field: 'operation', value: 'create_folder' },
    },
    // List Fields - Folder Selector (basic mode)
    {
-      id: 'listFolderSelector',
+      id: 'folderSelector',
      title: 'Select Folder',
      type: 'file-selector',
-      canonicalParamId: 'listFolderId',
+      canonicalParamId: 'folderId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -237,10 +237,10 @@ Return ONLY the file content - no explanations, no markdown code blocks, no extr
    },
    // Manual Folder ID input (advanced mode)
    {
-      id: 'listManualFolderId',
+      id: 'manualFolderId',
      title: 'Folder ID',
      type: 'short-input',
-      canonicalParamId: 'listFolderId',
+      canonicalParamId: 'folderId',
      placeholder: 'Enter folder ID (leave empty for root folder)',
      mode: 'advanced',
      condition: { field: 'operation', value: 'list' },
@@ -279,10 +279,10 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
    },
    // Download File Fields - File Selector (basic mode)
    {
-      id: 'downloadFileSelector',
+      id: 'fileSelector',
      title: 'Select File',
      type: 'file-selector',
-      canonicalParamId: 'downloadFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -292,14 +292,13 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'download' },
-      required: true,
    },
    // Manual File ID input (advanced mode)
    {
-      id: 'downloadManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'downloadFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID',
      mode: 'advanced',
      condition: { field: 'operation', value: 'download' },
@@ -340,10 +339,10 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
    },
    // Get File Info Fields
    {
-      id: 'getFileSelector',
+      id: 'fileSelector',
      title: 'Select File',
      type: 'file-selector',
-      canonicalParamId: 'getFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -353,13 +352,12 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'get_file' },
-      required: true,
    },
    {
-      id: 'getManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'getFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID',
      mode: 'advanced',
      condition: { field: 'operation', value: 'get_file' },
@@ -367,10 +365,10 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
    },
    // Copy File Fields
    {
-      id: 'copyFileSelector',
+      id: 'fileSelector',
      title: 'Select File to Copy',
      type: 'file-selector',
-      canonicalParamId: 'copyFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -380,13 +378,12 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'copy' },
-      required: true,
    },
    {
-      id: 'copyManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'copyFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID to copy',
      mode: 'advanced',
      condition: { field: 'operation', value: 'copy' },
@@ -400,10 +397,10 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
      condition: { field: 'operation', value: 'copy' },
    },
    {
-      id: 'copyDestFolderSelector',
+      id: 'folderSelector',
      title: 'Destination Folder',
      type: 'file-selector',
-      canonicalParamId: 'copyDestFolderId',
+      canonicalParamId: 'destinationFolderId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -416,20 +413,20 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
      condition: { field: 'operation', value: 'copy' },
    },
    {
-      id: 'copyManualDestFolderId',
+      id: 'manualDestinationFolderId',
      title: 'Destination Folder ID',
      type: 'short-input',
-      canonicalParamId: 'copyDestFolderId',
+      canonicalParamId: 'destinationFolderId',
      placeholder: 'Enter destination folder ID (optional)',
      mode: 'advanced',
      condition: { field: 'operation', value: 'copy' },
    },
    // Update File Fields
    {
-      id: 'updateFileSelector',
+      id: 'fileSelector',
      title: 'Select File to Update',
      type: 'file-selector',
-      canonicalParamId: 'updateFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -439,13 +436,12 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'update' },
-      required: true,
    },
    {
-      id: 'updateManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'updateFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID to update',
      mode: 'advanced',
      condition: { field: 'operation', value: 'update' },
@@ -504,10 +500,10 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
    },
    // Trash File Fields
    {
-      id: 'trashFileSelector',
+      id: 'fileSelector',
      title: 'Select File to Trash',
      type: 'file-selector',
-      canonicalParamId: 'trashFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -517,13 +513,12 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'trash' },
-      required: true,
    },
    {
-      id: 'trashManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'trashFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID to trash',
      mode: 'advanced',
      condition: { field: 'operation', value: 'trash' },
@@ -531,10 +526,10 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
    },
    // Delete File Fields
    {
-      id: 'deleteFileSelector',
+      id: 'fileSelector',
      title: 'Select File to Delete',
      type: 'file-selector',
-      canonicalParamId: 'deleteFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -544,13 +539,12 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'delete' },
-      required: true,
    },
    {
-      id: 'deleteManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'deleteFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID to permanently delete',
      mode: 'advanced',
      condition: { field: 'operation', value: 'delete' },
@@ -558,10 +552,10 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
    },
    // Share File Fields
    {
-      id: 'shareFileSelector',
+      id: 'fileSelector',
      title: 'Select File to Share',
      type: 'file-selector',
-      canonicalParamId: 'shareFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -571,13 +565,12 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'share' },
-      required: true,
    },
    {
-      id: 'shareManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'shareFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID to share',
      mode: 'advanced',
      condition: { field: 'operation', value: 'share' },
@@ -672,10 +665,10 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
    },
    // Unshare (Remove Permission) Fields
    {
-      id: 'unshareFileSelector',
+      id: 'fileSelector',
      title: 'Select File',
      type: 'file-selector',
-      canonicalParamId: 'unshareFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -685,13 +678,12 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'unshare' },
-      required: true,
    },
    {
-      id: 'unshareManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'unshareFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID',
      mode: 'advanced',
      condition: { field: 'operation', value: 'unshare' },
@@ -707,10 +699,10 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
    },
    // List Permissions Fields
    {
-      id: 'listPermissionsFileSelector',
+      id: 'fileSelector',
      title: 'Select File',
      type: 'file-selector',
-      canonicalParamId: 'listPermissionsFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'google-drive',
      requiredScopes: [
        'https://www.googleapis.com/auth/drive.file',
@@ -720,13 +712,12 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'list_permissions' },
-      required: true,
    },
    {
-      id: 'listPermissionsManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'listPermissionsFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID',
      mode: 'advanced',
      condition: { field: 'operation', value: 'list_permissions' },
@@ -787,23 +778,13 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
      params: (params) => {
        const {
          credential,
-          // Folder canonical params (per-operation)
-          uploadFolderId,
-          createFolderParentId,
-          listFolderId,
-          copyDestFolderId,
-          // File canonical params (per-operation)
-          downloadFileId,
-          getFileId,
-          copyFileId,
-          updateFileId,
-          trashFileId,
-          deleteFileId,
-          shareFileId,
-          unshareFileId,
-          listPermissionsFileId,
-          // File upload
+          folderSelector,
+          manualFolderId,
+          manualDestinationFolderId,
+          fileSelector,
+          manualFileId,
          file,
+          fileUpload,
          mimeType,
          shareType,
          starred,
@@ -812,58 +793,19 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
        } = params

        // Normalize file input - handles both basic (file-upload) and advanced (short-input) modes
-        const normalizedFile = normalizeFileInput(file, { single: true })
+        const normalizedFile = normalizeFileInput(file ?? fileUpload, { single: true })

-        // Resolve folderId based on operation
-        let effectiveFolderId: string | undefined
-        switch (params.operation) {
-          case 'create_file':
-          case 'upload':
-            effectiveFolderId = uploadFolderId?.trim() || undefined
-            break
-          case 'create_folder':
-            effectiveFolderId = createFolderParentId?.trim() || undefined
-            break
-          case 'list':
-            effectiveFolderId = listFolderId?.trim() || undefined
-            break
-        }
+        // Use folderSelector if provided, otherwise use manualFolderId
+        const effectiveFolderId = (folderSelector || manualFolderId || '').trim()

-        // Resolve fileId based on operation
-        let effectiveFileId: string | undefined
-        switch (params.operation) {
-          case 'download':
-            effectiveFileId = downloadFileId?.trim() || undefined
-            break
-          case 'get_file':
-            effectiveFileId = getFileId?.trim() || undefined
-            break
-          case 'copy':
-            effectiveFileId = copyFileId?.trim() || undefined
-            break
-          case 'update':
-            effectiveFileId = updateFileId?.trim() || undefined
-            break
-          case 'trash':
-            effectiveFileId = trashFileId?.trim() || undefined
-            break
-          case 'delete':
-            effectiveFileId = deleteFileId?.trim() || undefined
-            break
-          case 'share':
-            effectiveFileId = shareFileId?.trim() || undefined
-            break
-          case 'unshare':
-            effectiveFileId = unshareFileId?.trim() || undefined
-            break
-          case 'list_permissions':
-            effectiveFileId = listPermissionsFileId?.trim() || undefined
-            break
-        }
+        // Use fileSelector if provided, otherwise use manualFileId
+        const effectiveFileId = (fileSelector || manualFileId || '').trim()

-        // Resolve destinationFolderId for copy operation
+        // Use folderSelector for destination or manualDestinationFolderId for copy operation
        const effectiveDestinationFolderId =
-          params.operation === 'copy' ? copyDestFolderId?.trim() || undefined : undefined
+          params.operation === 'copy'
+            ? (folderSelector || manualDestinationFolderId || '').trim()
+            : undefined

        // Convert starred dropdown to boolean
        const starredValue = starred === 'true' ? true : starred === 'false' ? false : undefined
@@ -874,9 +816,9 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr

        return {
          credential,
-          folderId: effectiveFolderId,
-          fileId: effectiveFileId,
-          destinationFolderId: effectiveDestinationFolderId,
+          folderId: effectiveFolderId || undefined,
+          fileId: effectiveFileId || undefined,
+          destinationFolderId: effectiveDestinationFolderId || undefined,
          file: normalizedFile,
          pageSize: rest.pageSize ? Number.parseInt(rest.pageSize as string, 10) : undefined,
          mimeType: mimeType,
@@ -892,21 +834,13 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Google Drive access token' },
-    // Folder canonical params (per-operation)
-    uploadFolderId: { type: 'string', description: 'Parent folder for upload/create' },
-    createFolderParentId: { type: 'string', description: 'Parent folder for create folder' },
-    listFolderId: { type: 'string', description: 'Folder to list files from' },
-    copyDestFolderId: { type: 'string', description: 'Destination folder for copy' },
-    // File canonical params (per-operation)
-    downloadFileId: { type: 'string', description: 'File to download' },
-    getFileId: { type: 'string', description: 'File to get info for' },
-    copyFileId: { type: 'string', description: 'File to copy' },
-    updateFileId: { type: 'string', description: 'File to update' },
-    trashFileId: { type: 'string', description: 'File to trash' },
-    deleteFileId: { type: 'string', description: 'File to delete' },
-    shareFileId: { type: 'string', description: 'File to share' },
-    unshareFileId: { type: 'string', description: 'File to unshare' },
-    listPermissionsFileId: { type: 'string', description: 'File to list permissions for' },
+    // File selection inputs
+    fileSelector: { type: 'string', description: 'Selected file' },
+    manualFileId: { type: 'string', description: 'Manual file identifier' },
+    // Folder selection inputs
+    folderSelector: { type: 'string', description: 'Selected folder' },
+    manualFolderId: { type: 'string', description: 'Manual folder identifier' },
+    manualDestinationFolderId: { type: 'string', description: 'Destination folder for copy' },
    // Upload and Create inputs
    fileName: { type: 'string', description: 'File or folder name' },
    file: { type: 'json', description: 'File to upload (UserFile object)' },
--- a/apps/sim/blocks/blocks/google_forms.ts
+++ b/apps/sim/blocks/blocks/google_forms.ts
@@ -47,11 +47,10 @@ export const GoogleFormsBlock: BlockConfig = {
    },
    // Form selector (basic mode)
    {
-      id: 'formSelector',
+      id: 'formId',
      title: 'Select Form',
      type: 'file-selector',
      canonicalParamId: 'formId',
-      required: true,
      serviceId: 'google-forms',
      requiredScopes: [],
      mimeType: 'application/vnd.google-apps.form',
@@ -235,7 +234,8 @@ Example for "Add a required multiple choice question about favorite color":
        const {
          credential,
          operation,
-          formId, // Canonical param from formSelector (basic) or manualFormId (advanced)
+          formId,
+          manualFormId,
          responseId,
          pageSize,
          title,
@@ -252,10 +252,11 @@ Example for "Add a required multiple choice question about favorite color":
        } = params

        const baseParams = { ...rest, credential }
-        const effectiveFormId = formId ? String(formId).trim() : undefined
+        const effectiveFormId = (formId || manualFormId || '').toString().trim() || undefined

        switch (operation) {
          case 'get_responses':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
            return {
              ...baseParams,
              formId: effectiveFormId,
@@ -264,8 +265,10 @@ Example for "Add a required multiple choice question about favorite color":
            }
          case 'get_form':
          case 'list_watches':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
            return { ...baseParams, formId: effectiveFormId }
          case 'create_form':
+            if (!title) throw new Error('Form title is required.')
            return {
              ...baseParams,
              title: String(title).trim(),
@@ -273,6 +276,8 @@ Example for "Add a required multiple choice question about favorite color":
              unpublished: unpublished ?? false,
            }
          case 'batch_update':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            if (!requests) throw new Error('Update requests are required.')
            return {
              ...baseParams,
              formId: effectiveFormId,
@@ -280,6 +285,7 @@ Example for "Add a required multiple choice question about favorite color":
              includeFormInResponse: includeFormInResponse ?? false,
            }
          case 'set_publish_settings':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
            return {
              ...baseParams,
              formId: effectiveFormId,
@@ -287,6 +293,9 @@ Example for "Add a required multiple choice question about favorite color":
              isAcceptingResponses: isAcceptingResponses,
            }
          case 'create_watch':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            if (!eventType) throw new Error('Event type is required.')
+            if (!topicName) throw new Error('Pub/Sub topic is required.')
            return {
              ...baseParams,
              formId: effectiveFormId,
@@ -296,6 +305,8 @@ Example for "Add a required multiple choice question about favorite color":
            }
          case 'delete_watch':
          case 'renew_watch':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            if (!watchId) throw new Error('Watch ID is required.')
            return {
              ...baseParams,
              formId: effectiveFormId,
@@ -310,7 +321,8 @@ Example for "Add a required multiple choice question about favorite color":
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Google OAuth credential' },
-    formId: { type: 'string', description: 'Google Form ID' },
+    formId: { type: 'string', description: 'Google Form ID (from selector)' },
+    manualFormId: { type: 'string', description: 'Google Form ID (manual entry)' },
    responseId: { type: 'string', description: 'Specific response ID' },
    pageSize: { type: 'string', description: 'Max responses to retrieve' },
    title: { type: 'string', description: 'Form title for creation' },
--- a/apps/sim/blocks/blocks/google_sheets.ts
+++ b/apps/sim/blocks/blocks/google_sheets.ts
@@ -246,11 +246,11 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
        }
      },
      params: (params) => {
-        const { credential, values, spreadsheetId, ...rest } = params
+        const { credential, values, spreadsheetId, manualSpreadsheetId, ...rest } = params

        const parsedValues = values ? JSON.parse(values as string) : undefined

-        const effectiveSpreadsheetId = spreadsheetId ? String(spreadsheetId).trim() : ''
+        const effectiveSpreadsheetId = (spreadsheetId || manualSpreadsheetId || '').trim()

        if (!effectiveSpreadsheetId) {
          throw new Error('Spreadsheet ID is required.')
@@ -268,7 +268,8 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Google Sheets access token' },
-    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier (canonical param)' },
+    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
+    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
    range: { type: 'string', description: 'Cell range' },
    values: { type: 'string', description: 'Cell values data' },
    valueInputOption: { type: 'string', description: 'Value input option' },
@@ -718,7 +719,9 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
          credential,
          values,
          spreadsheetId,
+          manualSpreadsheetId,
          sheetName,
+          manualSheetName,
          cellRange,
          title,
          sheetTitles,
@@ -743,7 +746,9 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
          }
        }

-        const effectiveSpreadsheetId = spreadsheetId ? String(spreadsheetId).trim() : ''
+        const effectiveSpreadsheetId = (
+          (spreadsheetId || manualSpreadsheetId || '') as string
+        ).trim()

        if (!effectiveSpreadsheetId) {
          throw new Error('Spreadsheet ID is required.')
@@ -799,7 +804,7 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
        }

        // Handle read/write/update/append/clear operations (require sheet name)
-        const effectiveSheetName = sheetName ? String(sheetName).trim() : ''
+        const effectiveSheetName = ((sheetName || manualSheetName || '') as string).trim()

        if (!effectiveSheetName) {
          throw new Error('Sheet name is required. Please select or enter a sheet name.')
@@ -821,8 +826,10 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Google Sheets access token' },
-    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier (canonical param)' },
-    sheetName: { type: 'string', description: 'Name of the sheet/tab (canonical param)' },
+    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
+    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
+    sheetName: { type: 'string', description: 'Name of the sheet/tab' },
+    manualSheetName: { type: 'string', description: 'Manual sheet name entry' },
    cellRange: { type: 'string', description: 'Cell range (e.g., A1:D10)' },
    values: { type: 'string', description: 'Cell values data' },
    valueInputOption: { type: 'string', description: 'Value input option' },
--- a/apps/sim/blocks/blocks/google_slides.ts
+++ b/apps/sim/blocks/blocks/google_slides.ts
@@ -664,6 +664,8 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
        const {
          credential,
          presentationId,
+          manualPresentationId,
+          folderSelector,
          folderId,
          slideIndex,
          createContent,
@@ -673,8 +675,8 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
          ...rest
        } = params

-        const effectivePresentationId = presentationId ? String(presentationId).trim() : ''
-        const effectiveFolderId = folderId ? String(folderId).trim() : ''
+        const effectivePresentationId = (presentationId || manualPresentationId || '').trim()
+        const effectiveFolderId = (folderSelector || folderId || '').trim()

        const result: Record<string, any> = {
          ...rest,
@@ -800,13 +802,15 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Google Slides access token' },
-    presentationId: { type: 'string', description: 'Presentation identifier (canonical param)' },
+    presentationId: { type: 'string', description: 'Presentation identifier' },
+    manualPresentationId: { type: 'string', description: 'Manual presentation identifier' },
    // Write operation
    slideIndex: { type: 'number', description: 'Slide index to write to' },
    content: { type: 'string', description: 'Slide content' },
    // Create operation
    title: { type: 'string', description: 'Presentation title' },
-    folderId: { type: 'string', description: 'Parent folder identifier (canonical param)' },
+    folderSelector: { type: 'string', description: 'Selected folder' },
+    folderId: { type: 'string', description: 'Folder identifier' },
    createContent: { type: 'string', description: 'Initial slide content' },
    // Replace all text operation
    findText: { type: 'string', description: 'Text to find' },
@@ -822,6 +826,8 @@ Return ONLY the text content - no explanations, no markdown formatting markers,
    placeholderIdMappings: { type: 'string', description: 'JSON array of placeholder ID mappings' },
    // Add image operation
    pageObjectId: { type: 'string', description: 'Slide object ID for image' },
+    imageFile: { type: 'json', description: 'Uploaded image (UserFile)' },
+    imageUrl: { type: 'string', description: 'Image URL or reference' },
    imageSource: { type: 'json', description: 'Image source (file or URL)' },
    imageWidth: { type: 'number', description: 'Image width in points' },
    imageHeight: { type: 'number', description: 'Image height in points' },
@@ -930,12 +936,11 @@ const googleSlidesV2SubBlocks = (GoogleSlidesBlock.subBlocks || []).flatMap((sub
 })

 const googleSlidesV2Inputs = GoogleSlidesBlock.inputs
-  ? {
-      ...Object.fromEntries(
-        Object.entries(GoogleSlidesBlock.inputs).filter(([key]) => key !== 'imageSource')
-      ),
-      imageFile: { type: 'json', description: 'Image source (file or URL)' },
-    }
+  ? Object.fromEntries(
+      Object.entries(GoogleSlidesBlock.inputs).filter(
+        ([key]) => key !== 'imageUrl' && key !== 'imageSource'
+      )
+    )
  : {}

 export const GoogleSlidesV2Block: BlockConfig<GoogleSlidesResponse> = {
@@ -956,7 +961,8 @@ export const GoogleSlidesV2Block: BlockConfig<GoogleSlidesResponse> = {
        }

        if (params.operation === 'add_image') {
-          const fileObject = normalizeFileInput(params.imageFile, { single: true })
+          const imageInput = params.imageFile || params.imageFileReference || params.imageSource
+          const fileObject = normalizeFileInput(imageInput, { single: true })
          if (!fileObject) {
            throw new Error('Image file is required.')
          }
@@ -968,6 +974,8 @@ export const GoogleSlidesV2Block: BlockConfig<GoogleSlidesResponse> = {
          return baseParams({
            ...params,
            imageUrl,
+            imageFileReference: undefined,
+            imageSource: undefined,
          })
        }

@@ -975,5 +983,8 @@ export const GoogleSlidesV2Block: BlockConfig<GoogleSlidesResponse> = {
      },
    },
  },
-  inputs: googleSlidesV2Inputs,
+  inputs: {
+    ...googleSlidesV2Inputs,
+    imageFileReference: { type: 'json', description: 'Image file reference' },
+  },
 }
--- a/apps/sim/blocks/blocks/jira.ts
+++ b/apps/sim/blocks/blocks/jira.ts
@@ -106,7 +106,6 @@ export const JiraBlock: BlockConfig<JiraResponse> = {
      placeholder: 'Select Jira project',
      dependsOn: ['credential', 'domain'],
      mode: 'basic',
-      required: { field: 'operation', value: ['write', 'update', 'read-bulk'] },
    },
    // Manual project ID input (advanced mode)
    {
@@ -117,7 +116,6 @@ export const JiraBlock: BlockConfig<JiraResponse> = {
      placeholder: 'Enter Jira project ID',
      dependsOn: ['credential', 'domain'],
      mode: 'advanced',
-      required: { field: 'operation', value: ['write', 'update', 'read-bulk'] },
    },
    // Issue selector (basic mode)
    {
@@ -150,28 +148,6 @@ export const JiraBlock: BlockConfig<JiraResponse> = {
          'remove_watcher',
        ],
      },
-      required: {
-        field: 'operation',
-        value: [
-          'read',
-          'update',
-          'delete',
-          'assign',
-          'transition',
-          'add_comment',
-          'get_comments',
-          'update_comment',
-          'delete_comment',
-          'get_attachments',
-          'add_attachment',
-          'add_worklog',
-          'get_worklogs',
-          'update_worklog',
-          'delete_worklog',
-          'add_watcher',
-          'remove_watcher',
-        ],
-      },
      mode: 'basic',
    },
    // Manual issue key input (advanced mode)
@@ -204,28 +180,6 @@ export const JiraBlock: BlockConfig<JiraResponse> = {
          'remove_watcher',
        ],
      },
-      required: {
-        field: 'operation',
-        value: [
-          'read',
-          'update',
-          'delete',
-          'assign',
-          'transition',
-          'add_comment',
-          'get_comments',
-          'update_comment',
-          'delete_comment',
-          'get_attachments',
-          'add_attachment',
-          'add_worklog',
-          'get_worklogs',
-          'update_worklog',
-          'delete_worklog',
-          'add_watcher',
-          'remove_watcher',
-        ],
-      },
      mode: 'advanced',
    },
    {
@@ -661,9 +615,8 @@ Return ONLY the comment text - no explanations.`,
    ],
    config: {
      tool: (params) => {
-        // Use canonical param IDs (raw subBlock IDs are deleted after serialization)
-        const effectiveProjectId = params.projectId ? String(params.projectId).trim() : ''
-        const effectiveIssueKey = params.issueKey ? String(params.issueKey).trim() : ''
+        const effectiveProjectId = (params.projectId || params.manualProjectId || '').trim()
+        const effectiveIssueKey = (params.issueKey || params.manualIssueKey || '').trim()

        switch (params.operation) {
          case 'read':
@@ -723,11 +676,11 @@ Return ONLY the comment text - no explanations.`,
        }
      },
      params: (params) => {
-        const { credential, projectId, issueKey, ...rest } = params
+        const { credential, projectId, manualProjectId, issueKey, manualIssueKey, ...rest } = params

-        // Use canonical param IDs (raw subBlock IDs are deleted after serialization)
-        const effectiveProjectId = projectId ? String(projectId).trim() : ''
-        const effectiveIssueKey = issueKey ? String(issueKey).trim() : ''
+        // Use the selected IDs or the manually entered ones
+        const effectiveProjectId = (projectId || manualProjectId || '').trim()
+        const effectiveIssueKey = (issueKey || manualIssueKey || '').trim()

        const baseParams = {
          credential,
@@ -736,6 +689,11 @@ Return ONLY the comment text - no explanations.`,

        switch (params.operation) {
          case 'write': {
+            if (!effectiveProjectId) {
+              throw new Error(
+                'Project ID is required. Please select a project or enter a project ID manually.'
+              )
+            }
            // Parse comma-separated strings into arrays
            const parseCommaSeparated = (value: string | undefined): string[] | undefined => {
              if (!value || value.trim() === '') return undefined
@@ -768,6 +726,16 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'update': {
+            if (!effectiveProjectId) {
+              throw new Error(
+                'Project ID is required. Please select a project or enter a project ID manually.'
+              )
+            }
+            if (!effectiveIssueKey) {
+              throw new Error(
+                'Issue Key is required. Please select an issue or enter an issue key manually.'
+              )
+            }
            const updateParams = {
              projectId: effectiveProjectId,
              issueKey: effectiveIssueKey,
@@ -780,20 +748,40 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'read': {
+            // Check for project ID from either source
+            const projectForRead = (params.projectId || params.manualProjectId || '').trim()
+            const issueForRead = (params.issueKey || params.manualIssueKey || '').trim()
+
+            if (!issueForRead) {
+              throw new Error(
+                'Select a project to read issues, or provide an issue key to read a single issue.'
+              )
+            }
            return {
              ...baseParams,
-              issueKey: effectiveIssueKey,
+              issueKey: issueForRead,
              // Include projectId if available for context
-              ...(effectiveProjectId && { projectId: effectiveProjectId }),
+              ...(projectForRead && { projectId: projectForRead }),
            }
          }
          case 'read-bulk': {
+            // Check both projectId and manualProjectId directly from params
+            const finalProjectId = params.projectId || params.manualProjectId || ''
+
+            if (!finalProjectId) {
+              throw new Error(
+                'Project ID is required. Please select a project or enter a project ID manually.'
+              )
+            }
            return {
              ...baseParams,
-              projectId: effectiveProjectId.trim(),
+              projectId: finalProjectId.trim(),
            }
          }
          case 'delete': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to delete an issue.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -801,6 +789,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'assign': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to assign an issue.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -808,6 +799,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'transition': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to transition an issue.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -823,6 +817,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'add_comment': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to add a comment.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -830,6 +827,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'get_comments': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to get comments.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -837,6 +837,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'update_comment': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to update a comment.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -845,6 +848,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'delete_comment': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to delete a comment.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -852,13 +858,19 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'get_attachments': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to get attachments.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
            }
          }
          case 'add_attachment': {
-            const normalizedFiles = normalizeFileInput(params.files)
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to add attachments.')
+            }
+            const normalizedFiles = normalizeFileInput(params.attachmentFiles || params.files)
            if (!normalizedFiles || normalizedFiles.length === 0) {
              throw new Error('At least one attachment file is required.')
            }
@@ -875,6 +887,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'add_worklog': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to add a worklog.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -886,6 +901,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'get_worklogs': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to get worklogs.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -893,6 +911,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'update_worklog': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to update a worklog.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -905,6 +926,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'delete_worklog': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to delete a worklog.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -927,6 +951,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'add_watcher': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to add a watcher.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -934,6 +961,9 @@ Return ONLY the comment text - no explanations.`,
            }
          }
          case 'remove_watcher': {
+            if (!effectiveIssueKey) {
+              throw new Error('Issue Key is required to remove a watcher.')
+            }
            return {
              ...baseParams,
              issueKey: effectiveIssueKey,
@@ -960,8 +990,10 @@ Return ONLY the comment text - no explanations.`,
    operation: { type: 'string', description: 'Operation to perform' },
    domain: { type: 'string', description: 'Jira domain' },
    credential: { type: 'string', description: 'Jira access token' },
-    issueKey: { type: 'string', description: 'Issue key identifier (canonical param)' },
-    projectId: { type: 'string', description: 'Project identifier (canonical param)' },
+    issueKey: { type: 'string', description: 'Issue key identifier' },
+    projectId: { type: 'string', description: 'Project identifier' },
+    manualProjectId: { type: 'string', description: 'Manual project identifier' },
+    manualIssueKey: { type: 'string', description: 'Manual issue key' },
    // Update/Write operation inputs
    summary: { type: 'string', description: 'Issue summary' },
    description: { type: 'string', description: 'Issue description' },
@@ -992,7 +1024,8 @@ Return ONLY the comment text - no explanations.`,
    commentBody: { type: 'string', description: 'Text content for comment operations' },
    commentId: { type: 'string', description: 'Comment ID for update/delete operations' },
    // Attachment operation inputs
-    files: { type: 'array', description: 'Files to attach (canonical param)' },
+    attachmentFiles: { type: 'json', description: 'Files to attach (UI upload)' },
+    files: { type: 'array', description: 'Files to attach (UserFile array)' },
    attachmentId: { type: 'string', description: 'Attachment ID for delete operation' },
    // Worklog operation inputs
    timeSpentSeconds: {
--- a/apps/sim/blocks/blocks/linear.ts
+++ b/apps/sim/blocks/blocks/linear.ts
@@ -1476,9 +1476,9 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
        return params.operation || 'linear_read_issues'
      },
      params: (params) => {
-        // Use canonical param IDs (raw subBlock IDs are deleted after serialization)
-        const effectiveTeamId = params.teamId ? String(params.teamId).trim() : ''
-        const effectiveProjectId = params.projectId ? String(params.projectId).trim() : ''
+        // Handle both selector and manual inputs
+        const effectiveTeamId = (params.teamId || params.manualTeamId || '').trim()
+        const effectiveProjectId = (params.projectId || params.manualProjectId || '').trim()

        // Base params that most operations need
        const baseParams: Record<string, any> = {
@@ -1774,11 +1774,16 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            if (!params.issueId?.trim()) {
              throw new Error('Issue ID is required.')
            }
-            // Normalize file input - use canonical param 'file' (raw subBlock IDs are deleted after serialization)
-            const attachmentFile = normalizeFileInput(params.file, {
-              single: true,
-              errorMessage: 'Attachment file must be a single file.',
-            })
+            // Normalize file inputs - handles JSON stringified values from advanced mode
+            const attachmentFile =
+              normalizeFileInput(params.attachmentFileUpload, {
+                single: true,
+                errorMessage: 'Attachment file must be a single file.',
+              }) ||
+              normalizeFileInput(params.file, {
+                single: true,
+                errorMessage: 'Attachment file must be a single file.',
+              })
            const attachmentUrl =
              params.url?.trim() ||
              (attachmentFile ? (attachmentFile as { url?: string }).url : undefined)
@@ -2256,8 +2261,10 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Linear access token' },
-    teamId: { type: 'string', description: 'Linear team identifier (canonical param)' },
-    projectId: { type: 'string', description: 'Linear project identifier (canonical param)' },
+    teamId: { type: 'string', description: 'Linear team identifier' },
+    projectId: { type: 'string', description: 'Linear project identifier' },
+    manualTeamId: { type: 'string', description: 'Manual team identifier' },
+    manualProjectId: { type: 'string', description: 'Manual project identifier' },
    issueId: { type: 'string', description: 'Issue identifier' },
    title: { type: 'string', description: 'Title' },
    description: { type: 'string', description: 'Description' },
@@ -2287,7 +2294,8 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
    endDate: { type: 'string', description: 'End date' },
    targetDate: { type: 'string', description: 'Target date' },
    url: { type: 'string', description: 'URL' },
-    file: { type: 'json', description: 'File to attach (canonical param)' },
+    attachmentFileUpload: { type: 'json', description: 'File to attach (UI upload)' },
+    file: { type: 'json', description: 'File to attach (UserFile)' },
    attachmentTitle: { type: 'string', description: 'Attachment title' },
    attachmentId: { type: 'string', description: 'Attachment identifier' },
    relationType: { type: 'string', description: 'Relation type' },
--- a/apps/sim/blocks/blocks/microsoft_excel.ts
+++ b/apps/sim/blocks/blocks/microsoft_excel.ts
@@ -241,10 +241,17 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
        }
      },
      params: (params) => {
-        const { credential, values, spreadsheetId, tableName, worksheetName, ...rest } = params
+        const {
+          credential,
+          values,
+          spreadsheetId,
+          manualSpreadsheetId,
+          tableName,
+          worksheetName,
+          ...rest
+        } = params

-        // Use canonical param ID (raw subBlock IDs are deleted after serialization)
-        const effectiveSpreadsheetId = spreadsheetId ? String(spreadsheetId).trim() : ''
+        const effectiveSpreadsheetId = (spreadsheetId || manualSpreadsheetId || '').trim()

        let parsedValues
        try {
@@ -293,7 +300,8 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Microsoft Excel access token' },
-    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier (canonical param)' },
+    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
+    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
    range: { type: 'string', description: 'Cell range' },
    tableName: { type: 'string', description: 'Table name' },
    worksheetName: { type: 'string', description: 'Worksheet name' },
@@ -497,13 +505,21 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
        fallbackToolId: 'microsoft_excel_read_v2',
      }),
      params: (params) => {
-        const { credential, values, spreadsheetId, sheetName, cellRange, ...rest } = params
+        const {
+          credential,
+          values,
+          spreadsheetId,
+          manualSpreadsheetId,
+          sheetName,
+          manualSheetName,
+          cellRange,
+          ...rest
+        } = params

        const parsedValues = values ? JSON.parse(values as string) : undefined

-        // Use canonical param IDs (raw subBlock IDs are deleted after serialization)
-        const effectiveSpreadsheetId = spreadsheetId ? String(spreadsheetId).trim() : ''
-        const effectiveSheetName = sheetName ? String(sheetName).trim() : ''
+        const effectiveSpreadsheetId = (spreadsheetId || manualSpreadsheetId || '').trim()
+        const effectiveSheetName = ((sheetName || manualSheetName || '') as string).trim()

        if (!effectiveSpreadsheetId) {
          throw new Error('Spreadsheet ID is required.')
@@ -527,8 +543,10 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Microsoft Excel access token' },
-    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier (canonical param)' },
-    sheetName: { type: 'string', description: 'Name of the sheet/tab (canonical param)' },
+    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
+    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
+    sheetName: { type: 'string', description: 'Name of the sheet/tab' },
+    manualSheetName: { type: 'string', description: 'Manual sheet name entry' },
    cellRange: { type: 'string', description: 'Cell range (e.g., A1:D10)' },
    values: { type: 'string', description: 'Cell values data' },
    valueInputOption: { type: 'string', description: 'Value input option' },
--- a/apps/sim/blocks/blocks/microsoft_planner.ts
+++ b/apps/sim/blocks/blocks/microsoft_planner.ts
@@ -84,16 +84,12 @@ export const MicrosoftPlannerBlock: BlockConfig<MicrosoftPlannerResponse> = {
        field: 'operation',
        value: ['create_task', 'read_task', 'read_plan', 'list_buckets', 'create_bucket'],
      },
-      required: {
-        field: 'operation',
-        value: ['read_plan', 'list_buckets', 'create_bucket', 'create_task'],
-      },
      dependsOn: ['credential'],
    },

-    // Task ID selector - for read_task (basic mode)
+    // Task ID selector - for read_task
    {
-      id: 'taskSelector',
+      id: 'taskId',
      title: 'Task ID',
      type: 'file-selector',
      placeholder: 'Select a task',
@@ -101,24 +97,24 @@ export const MicrosoftPlannerBlock: BlockConfig<MicrosoftPlannerResponse> = {
      condition: { field: 'operation', value: ['read_task'] },
      dependsOn: ['credential', 'planId'],
      mode: 'basic',
-      canonicalParamId: 'readTaskId',
+      canonicalParamId: 'taskId',
    },

-    // Manual Task ID - for read_task (advanced mode)
+    // Manual Task ID - for read_task advanced mode
    {
-      id: 'manualReadTaskId',
+      id: 'manualTaskId',
      title: 'Manual Task ID',
      type: 'short-input',
      placeholder: 'Enter the task ID',
      condition: { field: 'operation', value: ['read_task'] },
      dependsOn: ['credential', 'planId'],
      mode: 'advanced',
-      canonicalParamId: 'readTaskId',
+      canonicalParamId: 'taskId',
    },

-    // Task ID for update/delete operations (no basic/advanced split, just one input)
+    // Task ID for update/delete operations
    {
-      id: 'updateTaskId',
+      id: 'taskIdForUpdate',
      title: 'Task ID',
      type: 'short-input',
      placeholder: 'Enter the task ID',
@@ -126,8 +122,8 @@ export const MicrosoftPlannerBlock: BlockConfig<MicrosoftPlannerResponse> = {
        field: 'operation',
        value: ['update_task', 'delete_task', 'get_task_details', 'update_task_details'],
      },
-      required: true,
      dependsOn: ['credential'],
+      canonicalParamId: 'taskId',
    },

    // Bucket ID for bucket operations
@@ -137,7 +133,6 @@ export const MicrosoftPlannerBlock: BlockConfig<MicrosoftPlannerResponse> = {
      type: 'short-input',
      placeholder: 'Enter the bucket ID',
      condition: { field: 'operation', value: ['read_bucket', 'update_bucket', 'delete_bucket'] },
-      required: true,
      dependsOn: ['credential'],
    },

@@ -168,7 +163,6 @@ export const MicrosoftPlannerBlock: BlockConfig<MicrosoftPlannerResponse> = {
      type: 'short-input',
      placeholder: 'Enter the task title',
      condition: { field: 'operation', value: ['create_task', 'update_task'] },
-      required: { field: 'operation', value: 'create_task' },
    },

    // Name for bucket operations
@@ -178,7 +172,6 @@ export const MicrosoftPlannerBlock: BlockConfig<MicrosoftPlannerResponse> = {
      type: 'short-input',
      placeholder: 'Enter the bucket name',
      condition: { field: 'operation', value: ['create_bucket', 'update_bucket'] },
-      required: { field: 'operation', value: 'create_bucket' },
    },

    // Description for task details
@@ -354,8 +347,9 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
          operation,
          groupId,
          planId,
-          readTaskId, // Canonical param from taskSelector (basic) or manualReadTaskId (advanced) for read_task
-          updateTaskId, // Task ID for update/delete operations
+          taskId,
+          manualTaskId,
+          taskIdForUpdate,
          bucketId,
          bucketIdForRead,
          title,
@@ -378,9 +372,8 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
          credential,
        }

-        // Handle different task ID fields based on operation
-        const effectiveReadTaskId = readTaskId ? String(readTaskId).trim() : ''
-        const effectiveUpdateTaskId = updateTaskId ? String(updateTaskId).trim() : ''
+        // Handle different task ID fields
+        const effectiveTaskId = (taskIdForUpdate || taskId || manualTaskId || '').trim()
        const effectiveBucketId = (bucketIdForRead || bucketId || '').trim()

        // List Plans
@@ -390,22 +383,31 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,

        // Read Plan
        if (operation === 'read_plan') {
+          if (!planId?.trim()) {
+            throw new Error('Plan ID is required to read a plan.')
+          }
          return {
            ...baseParams,
-            planId: planId?.trim(),
+            planId: planId.trim(),
          }
        }

        // List Buckets
        if (operation === 'list_buckets') {
+          if (!planId?.trim()) {
+            throw new Error('Plan ID is required to list buckets.')
+          }
          return {
            ...baseParams,
-            planId: planId?.trim(),
+            planId: planId.trim(),
          }
        }

        // Read Bucket
        if (operation === 'read_bucket') {
+          if (!effectiveBucketId) {
+            throw new Error('Bucket ID is required to read a bucket.')
+          }
          return {
            ...baseParams,
            bucketId: effectiveBucketId,
@@ -414,19 +416,31 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,

        // Create Bucket
        if (operation === 'create_bucket') {
+          if (!planId?.trim()) {
+            throw new Error('Plan ID is required to create a bucket.')
+          }
+          if (!name?.trim()) {
+            throw new Error('Bucket name is required to create a bucket.')
+          }
          return {
            ...baseParams,
-            planId: planId?.trim(),
-            name: name?.trim(),
+            planId: planId.trim(),
+            name: name.trim(),
          }
        }

        // Update Bucket
        if (operation === 'update_bucket') {
+          if (!effectiveBucketId) {
+            throw new Error('Bucket ID is required to update a bucket.')
+          }
+          if (!etag?.trim()) {
+            throw new Error('ETag is required to update a bucket.')
+          }
          const updateBucketParams: MicrosoftPlannerBlockParams = {
            ...baseParams,
            bucketId: effectiveBucketId,
-            etag: etag?.trim(),
+            etag: etag.trim(),
          }
          if (name?.trim()) {
            updateBucketParams.name = name.trim()
@@ -436,19 +450,26 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,

        // Delete Bucket
        if (operation === 'delete_bucket') {
+          if (!effectiveBucketId) {
+            throw new Error('Bucket ID is required to delete a bucket.')
+          }
+          if (!etag?.trim()) {
+            throw new Error('ETag is required to delete a bucket.')
+          }
          return {
            ...baseParams,
            bucketId: effectiveBucketId,
-            etag: etag?.trim(),
+            etag: etag.trim(),
          }
        }

        // Read Task
        if (operation === 'read_task') {
          const readParams: MicrosoftPlannerBlockParams = { ...baseParams }
+          const readTaskId = (taskId || manualTaskId || '').trim()

-          if (effectiveReadTaskId) {
-            readParams.taskId = effectiveReadTaskId
+          if (readTaskId) {
+            readParams.taskId = readTaskId
          } else if (planId?.trim()) {
            readParams.planId = planId.trim()
          }
@@ -458,10 +479,17 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,

        // Create Task
        if (operation === 'create_task') {
+          if (!planId?.trim()) {
+            throw new Error('Plan ID is required to create a task.')
+          }
+          if (!title?.trim()) {
+            throw new Error('Task title is required to create a task.')
+          }
+
          const createParams: MicrosoftPlannerBlockParams = {
            ...baseParams,
-            planId: planId?.trim(),
-            title: title?.trim(),
+            planId: planId.trim(),
+            title: title.trim(),
          }

          if (description?.trim()) {
@@ -482,10 +510,17 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,

        // Update Task
        if (operation === 'update_task') {
+          if (!effectiveTaskId) {
+            throw new Error('Task ID is required to update a task.')
+          }
+          if (!etag?.trim()) {
+            throw new Error('ETag is required to update a task.')
+          }
+
          const updateParams: MicrosoftPlannerBlockParams = {
            ...baseParams,
-            taskId: effectiveUpdateTaskId,
-            etag: etag?.trim(),
+            taskId: effectiveTaskId,
+            etag: etag.trim(),
          }

          if (title?.trim()) {
@@ -515,27 +550,43 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,

        // Delete Task
        if (operation === 'delete_task') {
+          if (!effectiveTaskId) {
+            throw new Error('Task ID is required to delete a task.')
+          }
+          if (!etag?.trim()) {
+            throw new Error('ETag is required to delete a task.')
+          }
          return {
            ...baseParams,
-            taskId: effectiveUpdateTaskId,
-            etag: etag?.trim(),
+            taskId: effectiveTaskId,
+            etag: etag.trim(),
          }
        }

        // Get Task Details
        if (operation === 'get_task_details') {
+          if (!effectiveTaskId) {
+            throw new Error('Task ID is required to get task details.')
+          }
          return {
            ...baseParams,
-            taskId: effectiveUpdateTaskId,
+            taskId: effectiveTaskId,
          }
        }

        // Update Task Details
        if (operation === 'update_task_details') {
+          if (!effectiveTaskId) {
+            throw new Error('Task ID is required to update task details.')
+          }
+          if (!etag?.trim()) {
+            throw new Error('ETag is required to update task details.')
+          }
+
          const updateDetailsParams: MicrosoftPlannerBlockParams = {
            ...baseParams,
-            taskId: effectiveUpdateTaskId,
-            etag: etag?.trim(),
+            taskId: effectiveTaskId,
+            etag: etag.trim(),
          }

          if (description?.trim()) {
@@ -563,8 +614,9 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
    credential: { type: 'string', description: 'Microsoft account credential' },
    groupId: { type: 'string', description: 'Microsoft 365 group ID' },
    planId: { type: 'string', description: 'Plan ID' },
-    readTaskId: { type: 'string', description: 'Task ID for read operation' },
-    updateTaskId: { type: 'string', description: 'Task ID for update/delete operations' },
+    taskId: { type: 'string', description: 'Task ID' },
+    manualTaskId: { type: 'string', description: 'Manual Task ID' },
+    taskIdForUpdate: { type: 'string', description: 'Task ID for update operations' },
    bucketId: { type: 'string', description: 'Bucket ID' },
    bucketIdForRead: { type: 'string', description: 'Bucket ID for read operations' },
    title: { type: 'string', description: 'Task title' },
--- a/apps/sim/blocks/blocks/microsoft_teams.ts
+++ b/apps/sim/blocks/blocks/microsoft_teams.ts
@@ -71,7 +71,7 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
      required: true,
    },
    {
-      id: 'teamSelector',
+      id: 'teamId',
      title: 'Select Team',
      type: 'file-selector',
      canonicalParamId: 'teamId',
@@ -92,7 +92,6 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
          'list_channel_members',
        ],
      },
-      required: true,
    },
    {
      id: 'manualTeamId',
@@ -113,10 +112,9 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
          'list_channel_members',
        ],
      },
-      required: true,
    },
    {
-      id: 'chatSelector',
+      id: 'chatId',
      title: 'Select Chat',
      type: 'file-selector',
      canonicalParamId: 'chatId',
@@ -129,7 +127,6 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
        field: 'operation',
        value: ['read_chat', 'write_chat', 'update_chat_message', 'delete_chat_message'],
      },
-      required: true,
    },
    {
      id: 'manualChatId',
@@ -142,17 +139,16 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
        field: 'operation',
        value: ['read_chat', 'write_chat', 'update_chat_message', 'delete_chat_message'],
      },
-      required: true,
    },
    {
-      id: 'channelSelector',
+      id: 'channelId',
      title: 'Select Channel',
      type: 'file-selector',
      canonicalParamId: 'channelId',
      serviceId: 'microsoft-teams',
      requiredScopes: [],
      placeholder: 'Select a channel',
-      dependsOn: ['credential', 'teamSelector'],
+      dependsOn: ['credential', 'teamId'],
      mode: 'basic',
      condition: {
        field: 'operation',
@@ -165,7 +161,6 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
          'list_channel_members',
        ],
      },
-      required: true,
    },
    {
      id: 'manualChannelId',
@@ -185,7 +180,6 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
          'list_channel_members',
        ],
      },
-      required: true,
    },
    {
      id: 'messageId',
@@ -255,7 +249,7 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
    },
    // Variable reference (advanced mode)
    {
-      id: 'fileReferences',
+      id: 'files',
      title: 'File Attachments',
      type: 'short-input',
      canonicalParamId: 'files',
@@ -323,19 +317,23 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
        const {
          credential,
          operation,
-          teamId, // Canonical param from teamSelector (basic) or manualTeamId (advanced)
-          chatId, // Canonical param from chatSelector (basic) or manualChatId (advanced)
-          channelId, // Canonical param from channelSelector (basic) or manualChannelId (advanced)
-          files, // Canonical param from attachmentFiles (basic) or fileReferences (advanced)
+          teamId,
+          manualTeamId,
+          chatId,
+          manualChatId,
+          channelId,
+          manualChannelId,
+          attachmentFiles,
+          files,
          messageId,
          reactionType,
          includeAttachments,
          ...rest
        } = params

-        const effectiveTeamId = teamId ? String(teamId).trim() : ''
-        const effectiveChatId = chatId ? String(chatId).trim() : ''
-        const effectiveChannelId = channelId ? String(channelId).trim() : ''
+        const effectiveTeamId = (teamId || manualTeamId || '').trim()
+        const effectiveChatId = (chatId || manualChatId || '').trim()
+        const effectiveChannelId = (channelId || manualChannelId || '').trim()

        const baseParams: Record<string, any> = {
          ...rest,
@@ -346,9 +344,9 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
          baseParams.includeAttachments = true
        }

-        // Add files if provided (canonical param from attachmentFiles or fileReferences)
+        // Add files if provided
        if (operation === 'write_chat' || operation === 'write_channel') {
-          const normalizedFiles = normalizeFileInput(files)
+          const normalizedFiles = normalizeFileInput(attachmentFiles || files)
          if (normalizedFiles) {
            baseParams.files = normalizedFiles
          }
@@ -371,6 +369,9 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
          operation === 'update_chat_message' ||
          operation === 'delete_chat_message'
        ) {
+          if (!effectiveChatId) {
+            throw new Error('Chat ID is required. Please select a chat or enter a chat ID.')
+          }
          return { ...baseParams, chatId: effectiveChatId }
        }

@@ -382,16 +383,31 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
          operation === 'delete_channel_message' ||
          operation === 'reply_to_message'
        ) {
+          if (!effectiveTeamId) {
+            throw new Error('Team ID is required for channel operations.')
+          }
+          if (!effectiveChannelId) {
+            throw new Error('Channel ID is required for channel operations.')
+          }
          return { ...baseParams, teamId: effectiveTeamId, channelId: effectiveChannelId }
        }

        // Team member operations
        if (operation === 'list_team_members') {
+          if (!effectiveTeamId) {
+            throw new Error('Team ID is required for team member operations.')
+          }
          return { ...baseParams, teamId: effectiveTeamId }
        }

        // Channel member operations
        if (operation === 'list_channel_members') {
+          if (!effectiveTeamId) {
+            throw new Error('Team ID is required for channel member operations.')
+          }
+          if (!effectiveChannelId) {
+            throw new Error('Channel ID is required for channel member operations.')
+          }
          return { ...baseParams, teamId: effectiveTeamId, channelId: effectiveChannelId }
        }

@@ -424,11 +440,12 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
      type: 'string',
      description: 'Message identifier for update/delete/reply/reaction operations',
    },
-    // Canonical params (used by params function)
-    teamId: { type: 'string', description: 'Team identifier' },
    chatId: { type: 'string', description: 'Chat identifier' },
+    manualChatId: { type: 'string', description: 'Manual chat identifier' },
    channelId: { type: 'string', description: 'Channel identifier' },
-    files: { type: 'array', description: 'Files to attach' },
+    manualChannelId: { type: 'string', description: 'Manual channel identifier' },
+    teamId: { type: 'string', description: 'Team identifier' },
+    manualTeamId: { type: 'string', description: 'Manual team identifier' },
    content: {
      type: 'string',
      description: 'Message content. Mention users with <at>userName</at>',
@@ -438,6 +455,8 @@ export const MicrosoftTeamsBlock: BlockConfig<MicrosoftTeamsResponse> = {
      type: 'boolean',
      description: 'Download and include message attachments',
    },
+    attachmentFiles: { type: 'json', description: 'Files to attach (UI upload)' },
+    files: { type: 'array', description: 'Files to attach (UserFile array)' },
  },
  outputs: {
    content: { type: 'string', description: 'Formatted message content from chat/channel' },
--- a/apps/sim/blocks/blocks/mistral_parse.ts
+++ b/apps/sim/blocks/blocks/mistral_parse.ts
@@ -215,8 +215,8 @@ export const MistralParseV2Block: BlockConfig<MistralParserOutput> = {
          resultType: params.resultType || 'markdown',
        }

-        // Use canonical document param directly
-        const documentInput = params.document
+        // Original V2 pattern: fileUpload (basic) or filePath (advanced) or document (wired)
+        const documentInput = params.fileUpload || params.filePath || params.document
        if (!documentInput) {
          throw new Error('PDF document is required')
        }
@@ -261,6 +261,8 @@ export const MistralParseV2Block: BlockConfig<MistralParserOutput> = {
  },
  inputs: {
    document: { type: 'json', description: 'Document input (file upload or URL reference)' },
+    filePath: { type: 'string', description: 'PDF document URL (advanced mode)' },
+    fileUpload: { type: 'json', description: 'Uploaded PDF file (basic mode)' },
    apiKey: { type: 'string', description: 'Mistral API key' },
    resultType: { type: 'string', description: 'Output format type' },
    pages: { type: 'string', description: 'Page selection' },
@@ -343,8 +345,11 @@ export const MistralParseV3Block: BlockConfig<MistralParserOutput> = {
          resultType: params.resultType || 'markdown',
        }

-        // V3 pattern: use canonical document param directly
-        const documentInput = normalizeFileInput(params.document, { single: true })
+        // V3 pattern: normalize file inputs from basic/advanced modes
+        const documentInput = normalizeFileInput(
+          params.fileUpload || params.fileReference || params.document,
+          { single: true }
+        )
        if (!documentInput) {
          throw new Error('PDF document is required')
        }
@@ -384,6 +389,8 @@ export const MistralParseV3Block: BlockConfig<MistralParserOutput> = {
  },
  inputs: {
    document: { type: 'json', description: 'Document input (file upload or file reference)' },
+    fileReference: { type: 'json', description: 'File reference (advanced mode)' },
+    fileUpload: { type: 'json', description: 'Uploaded PDF file (basic mode)' },
    apiKey: { type: 'string', description: 'Mistral API key' },
    resultType: { type: 'string', description: 'Output format type' },
    pages: { type: 'string', description: 'Page selection' },
--- a/apps/sim/blocks/blocks/onedrive.ts
+++ b/apps/sim/blocks/blocks/onedrive.ts
@@ -140,10 +140,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
    },

    {
-      id: 'uploadFolderSelector',
+      id: 'folderSelector',
      title: 'Select Parent Folder',
      type: 'file-selector',
-      canonicalParamId: 'uploadFolderId',
+      canonicalParamId: 'folderId',
      serviceId: 'onedrive',
      requiredScopes: [
        'openid',
@@ -160,10 +160,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
      condition: { field: 'operation', value: ['create_file', 'upload'] },
    },
    {
-      id: 'uploadManualFolderId',
+      id: 'manualFolderId',
      title: 'Parent Folder ID',
      type: 'short-input',
-      canonicalParamId: 'uploadFolderId',
+      canonicalParamId: 'folderId',
      placeholder: 'Enter parent folder ID (leave empty for root folder)',
      dependsOn: ['credential'],
      mode: 'advanced',
@@ -177,10 +177,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
      condition: { field: 'operation', value: 'create_folder' },
    },
    {
-      id: 'createFolderParentSelector',
+      id: 'folderSelector',
      title: 'Select Parent Folder',
      type: 'file-selector',
-      canonicalParamId: 'createFolderParentId',
+      canonicalParamId: 'folderId',
      serviceId: 'onedrive',
      requiredScopes: [
        'openid',
@@ -198,10 +198,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
    },
    // Manual Folder ID input (advanced mode)
    {
-      id: 'createFolderManualParentId',
+      id: 'manualFolderId',
      title: 'Parent Folder ID',
      type: 'short-input',
-      canonicalParamId: 'createFolderParentId',
+      canonicalParamId: 'folderId',
      placeholder: 'Enter parent folder ID (leave empty for root folder)',
      dependsOn: ['credential'],
      mode: 'advanced',
@@ -209,10 +209,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
    },
    // List Fields - Folder Selector (basic mode)
    {
-      id: 'listFolderSelector',
+      id: 'folderSelector',
      title: 'Select Folder',
      type: 'file-selector',
-      canonicalParamId: 'listFolderId',
+      canonicalParamId: 'folderId',
      serviceId: 'onedrive',
      requiredScopes: [
        'openid',
@@ -230,10 +230,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
    },
    // Manual Folder ID input (advanced mode)
    {
-      id: 'listManualFolderId',
+      id: 'manualFolderId',
      title: 'Folder ID',
      type: 'short-input',
-      canonicalParamId: 'listFolderId',
+      canonicalParamId: 'folderId',
      placeholder: 'Enter folder ID (leave empty for root folder)',
      dependsOn: ['credential'],
      mode: 'advanced',
@@ -255,10 +255,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
    },
    // Download File Fields - File Selector (basic mode)
    {
-      id: 'downloadFileSelector',
+      id: 'fileSelector',
      title: 'Select File',
      type: 'file-selector',
-      canonicalParamId: 'downloadFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'onedrive',
      requiredScopes: [
        'openid',
@@ -273,14 +273,13 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
      mode: 'basic',
      dependsOn: ['credential'],
      condition: { field: 'operation', value: 'download' },
-      required: true,
    },
    // Manual File ID input (advanced mode)
    {
-      id: 'downloadManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'downloadFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file ID',
      mode: 'advanced',
      condition: { field: 'operation', value: 'download' },
@@ -295,10 +294,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
    },
    // Delete File Fields - File Selector (basic mode)
    {
-      id: 'deleteFileSelector',
+      id: 'fileSelector',
      title: 'Select File to Delete',
      type: 'file-selector',
-      canonicalParamId: 'deleteFileId',
+      canonicalParamId: 'fileId',
      serviceId: 'onedrive',
      requiredScopes: [
        'openid',
@@ -317,10 +316,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
    },
    // Manual File ID input (advanced mode)
    {
-      id: 'deleteManualFileId',
+      id: 'manualFileId',
      title: 'File ID',
      type: 'short-input',
-      canonicalParamId: 'deleteFileId',
+      canonicalParamId: 'fileId',
      placeholder: 'Enter file or folder ID to delete',
      mode: 'advanced',
      condition: { field: 'operation', value: 'delete' },
@@ -356,17 +355,13 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
      params: (params) => {
        const {
          credential,
-          // Folder canonical params (per-operation)
-          uploadFolderId,
-          createFolderParentId,
-          listFolderId,
-          // File canonical params (per-operation)
-          downloadFileId,
-          deleteFileId,
+          folderId,
+          fileId,
          mimeType,
          values,
          downloadFileName,
          file,
+          fileReference,
          ...rest
        } = params

@@ -375,42 +370,16 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
          normalizedValues = normalizeExcelValuesForToolParams(values)
        }

-        // Normalize file input from the canonical param
-        const normalizedFile = normalizeFileInput(file, { single: true })
-
-        // Resolve folderId based on operation
-        let resolvedFolderId: string | undefined
-        switch (params.operation) {
-          case 'create_file':
-          case 'upload':
-            resolvedFolderId = uploadFolderId?.trim() || undefined
-            break
-          case 'create_folder':
-            resolvedFolderId = createFolderParentId?.trim() || undefined
-            break
-          case 'list':
-            resolvedFolderId = listFolderId?.trim() || undefined
-            break
-        }
-
-        // Resolve fileId based on operation
-        let resolvedFileId: string | undefined
-        switch (params.operation) {
-          case 'download':
-            resolvedFileId = downloadFileId?.trim() || undefined
-            break
-          case 'delete':
-            resolvedFileId = deleteFileId?.trim() || undefined
-            break
-        }
+        // Normalize file input from both basic (file-upload) and advanced (short-input) modes
+        const normalizedFile = normalizeFileInput(file || fileReference, { single: true })

        return {
          credential,
          ...rest,
          values: normalizedValues,
          file: normalizedFile,
-          folderId: resolvedFolderId,
-          fileId: resolvedFileId,
+          folderId: folderId || undefined,
+          fileId: fileId || undefined,
          pageSize: rest.pageSize ? Number.parseInt(rest.pageSize as string, 10) : undefined,
          mimeType: mimeType,
          ...(downloadFileName && { fileName: downloadFileName }),
@@ -421,22 +390,16 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
  inputs: {
    operation: { type: 'string', description: 'Operation to perform' },
    credential: { type: 'string', description: 'Microsoft account credential' },
-    // Upload and Create operation inputs
+    // Upload and Create Folder operation inputs
    fileName: { type: 'string', description: 'File name' },
    file: { type: 'json', description: 'File to upload (UserFile object)' },
+    fileReference: { type: 'json', description: 'File reference from previous block' },
    content: { type: 'string', description: 'Text content to upload' },
    mimeType: { type: 'string', description: 'MIME type of file to create' },
    values: { type: 'json', description: 'Cell values for new Excel as JSON' },
-    // Folder canonical params (per-operation)
-    uploadFolderId: { type: 'string', description: 'Parent folder for upload/create file' },
-    createFolderParentId: { type: 'string', description: 'Parent folder for create folder' },
-    listFolderId: { type: 'string', description: 'Folder to list files from' },
-    // File canonical params (per-operation)
-    downloadFileId: { type: 'string', description: 'File to download' },
-    deleteFileId: { type: 'string', description: 'File to delete' },
+    fileId: { type: 'string', description: 'File ID to download' },
    downloadFileName: { type: 'string', description: 'File name override for download' },
-    folderName: { type: 'string', description: 'Folder name for create_folder' },
-    // List operation inputs
+    folderId: { type: 'string', description: 'Folder ID' },
    query: { type: 'string', description: 'Search query' },
    pageSize: { type: 'number', description: 'Results per page' },
  },
--- a/apps/sim/blocks/blocks/outlook.ts
+++ b/apps/sim/blocks/blocks/outlook.ts
@@ -122,7 +122,7 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
    },
    // Variable reference (advanced mode)
    {
-      id: 'attachmentReference',
+      id: 'attachments',
      title: 'Attachments',
      type: 'short-input',
      canonicalParamId: 'attachments',
@@ -171,7 +171,7 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
    },
    // Read Email Fields - Add folder selector (basic mode)
    {
-      id: 'folderSelector',
+      id: 'folder',
      title: 'Folder',
      type: 'folder-selector',
      canonicalParamId: 'folder',
@@ -328,20 +328,24 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
        const {
          credential,
          folder,
-          destinationId,
-          copyDestinationId,
-          attachments,
+          manualFolder,
+          destinationFolder,
+          manualDestinationFolder,
          moveMessageId,
          actionMessageId,
          copyMessageId,
+          copyDestinationFolder,
+          manualCopyDestinationFolder,
+          attachmentFiles,
+          attachments,
          ...rest
        } = params

-        // folder is already the canonical param - use it directly
-        const effectiveFolder = folder ? String(folder).trim() : ''
+        // Handle both selector and manual folder input
+        const effectiveFolder = (folder || manualFolder || '').trim()

-        // Normalize file attachments from the canonical attachments param
-        const normalizedAttachments = normalizeFileInput(attachments)
+        // Normalize file attachments from either basic (file-upload) or advanced (short-input) mode
+        const normalizedAttachments = normalizeFileInput(attachmentFiles || attachments)
        if (normalizedAttachments) {
          rest.attachments = normalizedAttachments
        }
@@ -355,10 +359,8 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
          if (moveMessageId) {
            rest.messageId = moveMessageId
          }
-          // destinationId is already the canonical param
-          const effectiveDestinationId = destinationId ? String(destinationId).trim() : ''
-          if (effectiveDestinationId) {
-            rest.destinationId = effectiveDestinationId
+          if (!rest.destinationId) {
+            rest.destinationId = (destinationFolder || manualDestinationFolder || '').trim()
          }
        }

@@ -374,12 +376,12 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
          if (copyMessageId) {
            rest.messageId = copyMessageId
          }
-          // copyDestinationId is the canonical param - map it to destinationId for the tool
-          const effectiveCopyDestinationId = copyDestinationId
-            ? String(copyDestinationId).trim()
-            : ''
-          if (effectiveCopyDestinationId) {
-            rest.destinationId = effectiveCopyDestinationId
+          // Handle copyDestinationId (from UI canonical param) or destinationId (from trigger)
+          if (rest.copyDestinationId) {
+            rest.destinationId = rest.copyDestinationId
+            rest.copyDestinationId = undefined
+          } else if (!rest.destinationId) {
+            rest.destinationId = (copyDestinationFolder || manualCopyDestinationFolder || '').trim()
          }
        }

@@ -398,24 +400,30 @@ export const OutlookBlock: BlockConfig<OutlookResponse> = {
    subject: { type: 'string', description: 'Email subject' },
    body: { type: 'string', description: 'Email content' },
    contentType: { type: 'string', description: 'Content type (Text or HTML)' },
-    attachments: { type: 'array', description: 'Files to attach (canonical param)' },
+    attachmentFiles: { type: 'json', description: 'Files to attach (UI upload)' },
+    attachments: { type: 'array', description: 'Files to attach (UserFile array)' },
    // Forward operation inputs
    messageId: { type: 'string', description: 'Message ID to forward' },
    comment: { type: 'string', description: 'Optional comment for forwarding' },
    // Read operation inputs
-    folder: { type: 'string', description: 'Email folder (canonical param)' },
+    folder: { type: 'string', description: 'Email folder' },
+    manualFolder: { type: 'string', description: 'Manual folder name' },
    maxResults: { type: 'number', description: 'Maximum emails' },
    includeAttachments: { type: 'boolean', description: 'Include email attachments' },
    // Move operation inputs
    moveMessageId: { type: 'string', description: 'Message ID to move' },
-    destinationId: { type: 'string', description: 'Destination folder ID (canonical param)' },
+    destinationFolder: { type: 'string', description: 'Destination folder ID' },
+    manualDestinationFolder: { type: 'string', description: 'Manual destination folder ID' },
+    destinationId: { type: 'string', description: 'Destination folder ID for move' },
    // Action operation inputs
    actionMessageId: { type: 'string', description: 'Message ID for actions' },
    copyMessageId: { type: 'string', description: 'Message ID to copy' },
-    copyDestinationId: {
+    copyDestinationFolder: { type: 'string', description: 'Copy destination folder ID' },
+    manualCopyDestinationFolder: {
      type: 'string',
-      description: 'Destination folder ID for copy (canonical param)',
+      description: 'Manual copy destination folder ID',
    },
+    copyDestinationId: { type: 'string', description: 'Destination folder ID for copy' },
  },
  outputs: {
    // Common outputs
--- a/apps/sim/blocks/blocks/pulse.ts
+++ b/apps/sim/blocks/blocks/pulse.ts
@@ -25,7 +25,6 @@ export const PulseBlock: BlockConfig<PulseParserOutput> = {
      placeholder: 'Upload a document',
      mode: 'basic',
      maxSize: 50,
-      required: true,
    },
    {
      id: 'filePath',
@@ -34,7 +33,6 @@ export const PulseBlock: BlockConfig<PulseParserOutput> = {
      canonicalParamId: 'document',
      placeholder: 'Document URL',
      mode: 'advanced',
-      required: true,
    },
    {
      id: 'pages',
@@ -68,12 +66,18 @@ export const PulseBlock: BlockConfig<PulseParserOutput> = {
    config: {
      tool: () => 'pulse_parser',
      params: (params) => {
+        if (!params || !params.apiKey || params.apiKey.trim() === '') {
+          throw new Error('Pulse API key is required')
+        }
+
        const parameters: Record<string, unknown> = {
          apiKey: params.apiKey.trim(),
        }

-        // document is the canonical param from fileUpload (basic) or filePath (advanced)
-        const documentInput = params.document
+        const documentInput = params.fileUpload || params.filePath || params.document
+        if (!documentInput) {
+          throw new Error('Document is required')
+        }
        if (typeof documentInput === 'object') {
          parameters.file = documentInput
        } else if (typeof documentInput === 'string') {
@@ -100,10 +104,9 @@ export const PulseBlock: BlockConfig<PulseParserOutput> = {
    },
  },
  inputs: {
-    document: {
-      type: 'json',
-      description: 'Document input (canonical param for file upload or URL)',
-    },
+    document: { type: 'json', description: 'Document input (file upload or URL reference)' },
+    filePath: { type: 'string', description: 'Document URL (advanced mode)' },
+    fileUpload: { type: 'json', description: 'Uploaded document file (basic mode)' },
    apiKey: { type: 'string', description: 'Pulse API key' },
    pages: { type: 'string', description: 'Page range selection' },
    chunking: {
@@ -126,8 +129,14 @@ export const PulseBlock: BlockConfig<PulseParserOutput> = {
  },
 }

-// PulseV2Block uses the same canonical param 'document' for both basic and advanced modes
 const pulseV2Inputs = PulseBlock.inputs
+  ? {
+      ...Object.fromEntries(
+        Object.entries(PulseBlock.inputs).filter(([key]) => key !== 'filePath')
+      ),
+      fileReference: { type: 'json', description: 'File reference (advanced mode)' },
+    }
+  : {}
 const pulseV2SubBlocks = (PulseBlock.subBlocks || []).flatMap((subBlock) => {
  if (subBlock.id === 'filePath') {
    return [] // Remove the old filePath subblock
@@ -143,7 +152,6 @@ const pulseV2SubBlocks = (PulseBlock.subBlocks || []).flatMap((subBlock) => {
        canonicalParamId: 'document',
        placeholder: 'File reference',
        mode: 'advanced' as const,
-        required: true,
      },
    ]
  }
@@ -167,12 +175,18 @@ export const PulseV2Block: BlockConfig<PulseParserOutput> = {
        fallbackToolId: 'pulse_parser_v2',
      }),
      params: (params) => {
+        if (!params || !params.apiKey || params.apiKey.trim() === '') {
+          throw new Error('Pulse API key is required')
+        }
+
        const parameters: Record<string, unknown> = {
          apiKey: params.apiKey.trim(),
        }

-        // document is the canonical param from fileUpload (basic) or fileReference (advanced)
-        const normalizedFile = normalizeFileInput(params.document, { single: true })
+        const normalizedFile = normalizeFileInput(
+          params.fileUpload || params.fileReference || params.document,
+          { single: true }
+        )
        if (!normalizedFile) {
          throw new Error('Document file is required')
        }
--- a/Show More
+++ b/Show More