diff --git a/.claude/commands/add-block.md b/.claude/commands/add-block.md
new file mode 100644
index 0000000000..40f15e772f
--- /dev/null
+++ b/.claude/commands/add-block.md
@@ -0,0 +1,591 @@
+---
+description: Create a block configuration for a Sim Studio integration with proper subBlocks, conditions, and tool wiring
+argument-hint: <service-name>
+---
+
+# Add Block Skill
+
+You are an expert at creating block configurations for Sim Studio. You understand the serializer, subBlock types, conditions, dependsOn, modes, and all UI patterns.
+
+## Your Task
+
+When the user asks you to create a block:
+1. Create the block file in `apps/sim/blocks/blocks/{service}.ts`
+2. Configure all subBlocks with proper types, conditions, and dependencies
+3. Wire up tools correctly
+
+## Block Configuration Structure
+
+```typescript
+import { {ServiceName}Icon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import { AuthMode } from '@/blocks/types'
+
+export const {ServiceName}Block: BlockConfig = {
+  type: '{service}',                    // snake_case identifier
+  name: '{Service Name}',               // Human readable
+  description: 'Brief description',     // One sentence
+  longDescription: 'Detailed description for docs',
+  docsLink: 'https://docs.sim.ai/tools/{service}',
+  category: 'tools',                    // 'tools' | 'blocks' | 'triggers'
+  bgColor: '#HEXCOLOR',                 // Brand color
+  icon: {ServiceName}Icon,
+
+  // Auth mode
+  authMode: AuthMode.OAuth,             // or AuthMode.ApiKey
+
+  subBlocks: [
+    // Define all UI fields here
+  ],
+
+  tools: {
+    access: ['tool_id_1', 'tool_id_2'], // Array of tool IDs this block can use
+    config: {
+      tool: (params) => `{service}_${params.operation}`,  // Tool selector function
+      params: (params) => ({
+        // Transform subBlock values to tool params
+      }),
+    },
+  },
+
+  inputs: {
+    // Optional: define expected inputs from other blocks
+  },
+
+  outputs: {
+    // Define outputs available to downstream blocks
+  },
+}
+```
+
+## SubBlock Types Reference
+
+**Critical:** Every subblock `id` must be unique within the block. Duplicate IDs cause conflicts even with different conditions.
+
+### Text Inputs
+```typescript
+// Single-line input
+{ id: 'field', title: 'Label', type: 'short-input', placeholder: '...' }
+
+// Multi-line input
+{ id: 'field', title: 'Label', type: 'long-input', placeholder: '...', rows: 6 }
+
+// Password input
+{ id: 'apiKey', title: 'API Key', type: 'short-input', password: true }
+```
+
+### Selection Inputs
+```typescript
+// Dropdown (static options)
+{
+  id: 'operation',
+  title: 'Operation',
+  type: 'dropdown',
+  options: [
+    { label: 'Create', id: 'create' },
+    { label: 'Update', id: 'update' },
+  ],
+  value: () => 'create',  // Default value function
+}
+
+// Combobox (searchable dropdown)
+{
+  id: 'field',
+  title: 'Label',
+  type: 'combobox',
+  options: [...],
+  searchable: true,
+}
+```
+
+### Code/JSON Inputs
+```typescript
+{
+  id: 'code',
+  title: 'Code',
+  type: 'code',
+  language: 'javascript',  // 'javascript' | 'json' | 'python'
+  placeholder: '// Enter code...',
+}
+```
+
+### OAuth/Credentials
+```typescript
+{
+  id: 'credential',
+  title: 'Account',
+  type: 'oauth-input',
+  serviceId: '{service}',  // Must match OAuth provider
+  placeholder: 'Select account',
+  required: true,
+}
+```
+
+### Selectors (with dynamic options)
+```typescript
+// Channel selector (Slack, Discord, etc.)
+{
+  id: 'channel',
+  title: 'Channel',
+  type: 'channel-selector',
+  serviceId: '{service}',
+  placeholder: 'Select channel',
+  dependsOn: ['credential'],
+}
+
+// Project selector (Jira, etc.)
+{
+  id: 'project',
+  title: 'Project',
+  type: 'project-selector',
+  serviceId: '{service}',
+  dependsOn: ['credential'],
+}
+
+// File selector (Google Drive, etc.)
+{
+  id: 'file',
+  title: 'File',
+  type: 'file-selector',
+  serviceId: '{service}',
+  mimeType: 'application/pdf',
+  dependsOn: ['credential'],
+}
+
+// User selector
+{
+  id: 'user',
+  title: 'User',
+  type: 'user-selector',
+  serviceId: '{service}',
+  dependsOn: ['credential'],
+}
+```
+
+### Other Types
+```typescript
+// Switch/toggle
+{ id: 'enabled', type: 'switch' }
+
+// Slider
+{ id: 'temperature', title: 'Temperature', type: 'slider', min: 0, max: 2, step: 0.1 }
+
+// Table (key-value pairs)
+{ id: 'headers', title: 'Headers', type: 'table', columns: ['Key', 'Value'] }
+
+// File upload
+{
+  id: 'files',
+  title: 'Attachments',
+  type: 'file-upload',
+  multiple: true,
+  acceptedTypes: 'image/*,application/pdf',
+}
+```
+
+## Condition Syntax
+
+Controls when a field is shown based on other field values.
+
+### Simple Condition
+```typescript
+condition: { field: 'operation', value: 'create' }
+// Shows when operation === 'create'
+```
+
+### Multiple Values (OR)
+```typescript
+condition: { field: 'operation', value: ['create', 'update'] }
+// Shows when operation is 'create' OR 'update'
+```
+
+### Negation
+```typescript
+condition: { field: 'operation', value: 'delete', not: true }
+// Shows when operation !== 'delete'
+```
+
+### Compound (AND)
+```typescript
+condition: {
+  field: 'operation',
+  value: 'send',
+  and: {
+    field: 'type',
+    value: 'dm',
+    not: true,
+  }
+}
+// Shows when operation === 'send' AND type !== 'dm'
+```
+
+### Complex Example
+```typescript
+condition: {
+  field: 'operation',
+  value: ['list', 'search'],
+  not: true,
+  and: {
+    field: 'authMethod',
+    value: 'oauth',
+  }
+}
+// Shows when operation NOT in ['list', 'search'] AND authMethod === 'oauth'
+```
+
+## DependsOn Pattern
+
+Controls when a field is enabled and when its options are refetched.
+
+### Simple Array (all must be set)
+```typescript
+dependsOn: ['credential']
+// Enabled only when credential has a value
+// Options refetch when credential changes
+
+dependsOn: ['credential', 'projectId']
+// Enabled only when BOTH have values
+```
+
+### Complex (all + any)
+```typescript
+dependsOn: {
+  all: ['authMethod'],           // All must be set
+  any: ['credential', 'apiKey']  // At least one must be set
+}
+// Enabled when authMethod is set AND (credential OR apiKey is set)
+```
+
+## Required Pattern
+
+Can be boolean or condition-based.
+
+### Simple Boolean
+```typescript
+required: true
+required: false
+```
+
+### Conditional Required
+```typescript
+required: { field: 'operation', value: 'create' }
+// Required only when operation === 'create'
+
+required: { field: 'operation', value: ['create', 'update'] }
+// Required when operation is 'create' OR 'update'
+```
+
+## Mode Pattern (Basic vs Advanced)
+
+Controls which UI view shows the field.
+
+### Mode Options
+- `'basic'` - Only in basic view (default UI)
+- `'advanced'` - Only in advanced view
+- `'both'` - Both views (default if not specified)
+- `'trigger'` - Only in trigger configuration
+
+### canonicalParamId Pattern
+
+Maps multiple UI fields to a single serialized parameter:
+
+```typescript
+// Basic mode: Visual selector
+{
+  id: 'channel',
+  title: 'Channel',
+  type: 'channel-selector',
+  mode: 'basic',
+  canonicalParamId: 'channel',  // Both map to 'channel' param
+  dependsOn: ['credential'],
+}
+
+// Advanced mode: Manual input
+{
+  id: 'channelId',
+  title: 'Channel ID',
+  type: 'short-input',
+  mode: 'advanced',
+  canonicalParamId: 'channel',  // Both map to 'channel' param
+  placeholder: 'Enter channel ID manually',
+}
+```
+
+**How it works:**
+- In basic mode: `channel` selector value → `params.channel`
+- In advanced mode: `channelId` input value → `params.channel`
+- The serializer consolidates based on current mode
+
+**Critical constraints:**
+- `canonicalParamId` must NOT match any other subblock's `id` in the same block (causes conflicts)
+- `canonicalParamId` must be unique per block (only one basic/advanced pair per canonicalParamId)
+- ONLY use `canonicalParamId` to link basic/advanced mode alternatives for the same logical parameter
+- Do NOT use it for any other purpose
+
+## WandConfig Pattern
+
+Enables AI-assisted field generation.
+
+```typescript
+{
+  id: 'query',
+  title: 'Query',
+  type: 'code',
+  language: 'json',
+  wandConfig: {
+    enabled: true,
+    prompt: 'Generate a query based on the user request. Return ONLY the JSON.',
+    placeholder: 'Describe what you want to query...',
+    generationType: 'json-object',  // Optional: affects AI behavior
+    maintainHistory: true,          // Optional: keeps conversation context
+  },
+}
+```
+
+### Generation Types
+- `'javascript-function-body'` - JS code generation
+- `'json-object'` - Raw JSON (adds "no markdown" instruction)
+- `'json-schema'` - JSON Schema definitions
+- `'sql-query'` - SQL statements
+- `'timestamp'` - Adds current date/time context
+
+## Tools Configuration
+
+### Simple Tool Selector
+```typescript
+tools: {
+  access: ['service_create', 'service_read', 'service_update'],
+  config: {
+    tool: (params) => `service_${params.operation}`,
+  },
+}
+```
+
+### With Parameter Transformation
+```typescript
+tools: {
+  access: ['service_action'],
+  config: {
+    tool: (params) => 'service_action',
+    params: (params) => ({
+      id: params.resourceId,
+      data: typeof params.data === 'string' ? JSON.parse(params.data) : params.data,
+    }),
+  },
+}
+```
+
+### V2 Versioned Tool Selector
+```typescript
+import { createVersionedToolSelector } from '@/blocks/utils'
+
+tools: {
+  access: [
+    'service_create_v2',
+    'service_read_v2',
+    'service_update_v2',
+  ],
+  config: {
+    tool: createVersionedToolSelector({
+      baseToolSelector: (params) => `service_${params.operation}`,
+      suffix: '_v2',
+      fallbackToolId: 'service_create_v2',
+    }),
+  },
+}
+```
+
+## Outputs Definition
+
+**IMPORTANT:** Block outputs have a simpler schema than tool outputs. Block outputs do NOT support:
+- `optional: true` - This is only for tool outputs
+- `items` property - This is only for tool outputs with array types
+
+Block outputs only support:
+- `type` - The data type ('string', 'number', 'boolean', 'json', 'array')
+- `description` - Human readable description
+- Nested object structure (for complex types)
+
+```typescript
+outputs: {
+  // Simple outputs
+  id: { type: 'string', description: 'Resource ID' },
+  success: { type: 'boolean', description: 'Whether operation succeeded' },
+
+  // Use type: 'json' for complex objects or arrays (NOT type: 'array' with items)
+  items: { type: 'json', description: 'List of items' },
+  metadata: { type: 'json', description: 'Response metadata' },
+
+  // Nested outputs (for structured data)
+  user: {
+    id: { type: 'string', description: 'User ID' },
+    name: { type: 'string', description: 'User name' },
+    email: { type: 'string', description: 'User email' },
+  },
+}
+```
+
+## V2 Block Pattern
+
+When creating V2 blocks (alongside legacy V1):
+
+```typescript
+// V1 Block - mark as legacy
+export const ServiceBlock: BlockConfig = {
+  type: 'service',
+  name: 'Service (Legacy)',
+  hideFromToolbar: true,  // Hide from toolbar
+  // ... rest of config
+}
+
+// V2 Block - visible, uses V2 tools
+export const ServiceV2Block: BlockConfig = {
+  type: 'service_v2',
+  name: 'Service',              // Clean name
+  hideFromToolbar: false,       // Visible
+  subBlocks: ServiceBlock.subBlocks,  // Reuse UI
+  tools: {
+    access: ServiceBlock.tools?.access?.map(id => `${id}_v2`) || [],
+    config: {
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => (ServiceBlock.tools?.config as any)?.tool(params),
+        suffix: '_v2',
+        fallbackToolId: 'service_default_v2',
+      }),
+      params: ServiceBlock.tools?.config?.params,
+    },
+  },
+  outputs: {
+    // Flat, API-aligned outputs (not wrapped in content/metadata)
+  },
+}
+```
+
+## Registering Blocks
+
+After creating the block, remind the user to:
+1. Import in `apps/sim/blocks/registry.ts`
+2. Add to the `registry` object (alphabetically):
+
+```typescript
+import { ServiceBlock } from '@/blocks/blocks/service'
+
+export const registry: Record<string, BlockConfig> = {
+  // ... existing blocks ...
+  service: ServiceBlock,
+}
+```
+
+## Complete Example
+
+```typescript
+import { ServiceIcon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import { AuthMode } from '@/blocks/types'
+
+export const ServiceBlock: BlockConfig = {
+  type: 'service',
+  name: 'Service',
+  description: 'Integrate with Service API',
+  longDescription: 'Full description for documentation...',
+  docsLink: 'https://docs.sim.ai/tools/service',
+  category: 'tools',
+  bgColor: '#FF6B6B',
+  icon: ServiceIcon,
+  authMode: AuthMode.OAuth,
+
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Create', id: 'create' },
+        { label: 'Read', id: 'read' },
+        { label: 'Update', id: 'update' },
+        { label: 'Delete', id: 'delete' },
+      ],
+      value: () => 'create',
+    },
+    {
+      id: 'credential',
+      title: 'Service Account',
+      type: 'oauth-input',
+      serviceId: 'service',
+      placeholder: 'Select account',
+      required: true,
+    },
+    {
+      id: 'resourceId',
+      title: 'Resource ID',
+      type: 'short-input',
+      placeholder: 'Enter resource ID',
+      condition: { field: 'operation', value: ['read', 'update', 'delete'] },
+      required: { field: 'operation', value: ['read', 'update', 'delete'] },
+    },
+    {
+      id: 'name',
+      title: 'Name',
+      type: 'short-input',
+      placeholder: 'Resource name',
+      condition: { field: 'operation', value: ['create', 'update'] },
+      required: { field: 'operation', value: 'create' },
+    },
+  ],
+
+  tools: {
+    access: ['service_create', 'service_read', 'service_update', 'service_delete'],
+    config: {
+      tool: (params) => `service_${params.operation}`,
+    },
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Resource ID' },
+    name: { type: 'string', description: 'Resource name' },
+    createdAt: { type: 'string', description: 'Creation timestamp' },
+  },
+}
+```
+
+## Connecting Blocks with Triggers
+
+If the service supports webhooks, connect the block to its triggers.
+
+```typescript
+import { getTrigger } from '@/triggers'
+
+export const ServiceBlock: BlockConfig = {
+  // ... basic config ...
+
+  triggers: {
+    enabled: true,
+    available: ['service_event_a', 'service_event_b', 'service_webhook'],
+  },
+
+  subBlocks: [
+    // Tool subBlocks first...
+    { id: 'operation', /* ... */ },
+
+    // Then spread trigger subBlocks
+    ...getTrigger('service_event_a').subBlocks,
+    ...getTrigger('service_event_b').subBlocks,
+    ...getTrigger('service_webhook').subBlocks,
+  ],
+}
+```
+
+See the `/add-trigger` skill for creating triggers.
+
+## Checklist Before Finishing
+
+- [ ] All subBlocks have `id`, `title` (except switch), and `type`
+- [ ] Conditions use correct syntax (field, value, not, and)
+- [ ] DependsOn set for fields that need other values
+- [ ] Required fields marked correctly (boolean or condition)
+- [ ] OAuth inputs have correct `serviceId`
+- [ ] Tools.access lists all tool IDs
+- [ ] Tools.config.tool returns correct tool ID
+- [ ] Outputs match tool outputs
+- [ ] Block registered in registry.ts
+- [ ] If triggers exist: `triggers` config set, trigger subBlocks spread
diff --git a/.claude/commands/add-integration.md b/.claude/commands/add-integration.md
new file mode 100644
index 0000000000..017bebcffb
--- /dev/null
+++ b/.claude/commands/add-integration.md
@@ -0,0 +1,450 @@
+---
+description: Add a complete integration to Sim Studio (tools, block, icon, registration)
+argument-hint: <service-name> [api-docs-url]
+---
+
+# Add Integration Skill
+
+You are an expert at adding complete integrations to Sim Studio. This skill orchestrates the full process of adding a new service integration.
+
+## Overview
+
+Adding an integration involves these steps in order:
+1. **Research** - Read the service's API documentation
+2. **Create Tools** - Build tool configurations for each API operation
+3. **Create Block** - Build the block UI configuration
+4. **Add Icon** - Add the service's brand icon
+5. **Create Triggers** (optional) - If the service supports webhooks
+6. **Register** - Register tools, block, and triggers in their registries
+7. **Generate Docs** - Run the docs generation script
+
+## Step 1: Research the API
+
+Before writing any code:
+1. Use Context7 to find official documentation: `mcp__plugin_context7_context7__resolve-library-id`
+2. Or use WebFetch to read API docs directly
+3. Identify:
+   - Authentication method (OAuth, API Key, both)
+   - Available operations (CRUD, search, etc.)
+   - Required vs optional parameters
+   - Response structures
+
+## Step 2: Create Tools
+
+### Directory Structure
+```
+apps/sim/tools/{service}/
+├── index.ts          # Barrel exports
+├── types.ts          # TypeScript interfaces
+├── {action1}.ts      # Tool for action 1
+├── {action2}.ts      # Tool for action 2
+└── ...
+```
+
+### Key Patterns
+
+**types.ts:**
+```typescript
+import type { ToolResponse } from '@/tools/types'
+
+export interface {Service}{Action}Params {
+  accessToken: string      // For OAuth services
+  // OR
+  apiKey: string          // For API key services
+
+  requiredParam: string
+  optionalParam?: string
+}
+
+export interface {Service}Response extends ToolResponse {
+  output: {
+    // Define output structure
+  }
+}
+```
+
+**Tool file pattern:**
+```typescript
+export const {service}{Action}Tool: ToolConfig<Params, Response> = {
+  id: '{service}_{action}',
+  name: '{Service} {Action}',
+  description: '...',
+  version: '1.0.0',
+
+  oauth: { required: true, provider: '{service}' },  // If OAuth
+
+  params: {
+    accessToken: { type: 'string', required: true, visibility: 'hidden', description: '...' },
+    // ... other params
+  },
+
+  request: { url, method, headers, body },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        field: data.field ?? null,  // Always handle nullables
+      },
+    }
+  },
+
+  outputs: { /* ... */ },
+}
+```
+
+### Critical Rules
+- `visibility: 'hidden'` for OAuth tokens
+- `visibility: 'user-only'` for API keys and user credentials
+- `visibility: 'user-or-llm'` for operation parameters
+- Always use `?? null` for nullable API response fields
+- Always use `?? []` for optional array fields
+- Set `optional: true` for outputs that may not exist
+- Never output raw JSON dumps - extract meaningful fields
+
+## Step 3: Create Block
+
+### File Location
+`apps/sim/blocks/blocks/{service}.ts`
+
+### Block Structure
+```typescript
+import { {Service}Icon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import { AuthMode } from '@/blocks/types'
+
+export const {Service}Block: BlockConfig = {
+  type: '{service}',
+  name: '{Service}',
+  description: '...',
+  longDescription: '...',
+  docsLink: 'https://docs.sim.ai/tools/{service}',
+  category: 'tools',
+  bgColor: '#HEXCOLOR',
+  icon: {Service}Icon,
+  authMode: AuthMode.OAuth,  // or AuthMode.ApiKey
+
+  subBlocks: [
+    // Operation dropdown
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Operation 1', id: 'action1' },
+        { label: 'Operation 2', id: 'action2' },
+      ],
+      value: () => 'action1',
+    },
+    // Credential field
+    {
+      id: 'credential',
+      title: '{Service} Account',
+      type: 'oauth-input',
+      serviceId: '{service}',
+      required: true,
+    },
+    // Conditional fields per operation
+    // ...
+  ],
+
+  tools: {
+    access: ['{service}_action1', '{service}_action2'],
+    config: {
+      tool: (params) => `{service}_${params.operation}`,
+    },
+  },
+
+  outputs: { /* ... */ },
+}
+```
+
+### Key SubBlock Patterns
+
+**Condition-based visibility:**
+```typescript
+{
+  id: 'resourceId',
+  title: 'Resource ID',
+  type: 'short-input',
+  condition: { field: 'operation', value: ['read', 'update', 'delete'] },
+  required: { field: 'operation', value: ['read', 'update', 'delete'] },
+}
+```
+
+**DependsOn for cascading selectors:**
+```typescript
+{
+  id: 'project',
+  type: 'project-selector',
+  dependsOn: ['credential'],
+},
+{
+  id: 'issue',
+  type: 'file-selector',
+  dependsOn: ['credential', 'project'],
+}
+```
+
+**Basic/Advanced mode for dual UX:**
+```typescript
+// Basic: Visual selector
+{
+  id: 'channel',
+  type: 'channel-selector',
+  mode: 'basic',
+  canonicalParamId: 'channel',
+  dependsOn: ['credential'],
+},
+// Advanced: Manual input
+{
+  id: 'channelId',
+  type: 'short-input',
+  mode: 'advanced',
+  canonicalParamId: 'channel',
+}
+```
+
+**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
+
+### File Location
+`apps/sim/components/icons.tsx`
+
+### Pattern
+```typescript
+export function {Service}Icon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      {/* SVG paths from brand assets */}
+    </svg>
+  )
+}
+```
+
+### Finding Icons
+1. Check the service's brand/press kit page
+2. Download SVG logo
+3. Convert to React component
+4. Ensure it accepts and spreads props
+
+## Step 5: Create Triggers (Optional)
+
+If the service supports webhooks, create triggers using the generic `buildTriggerSubBlocks` helper.
+
+### Directory Structure
+```
+apps/sim/triggers/{service}/
+├── index.ts      # Barrel exports
+├── utils.ts      # Trigger options, setup instructions, extra fields
+├── {event_a}.ts  # Primary trigger (includes dropdown)
+├── {event_b}.ts  # Secondary triggers (no dropdown)
+└── webhook.ts    # Generic webhook (optional)
+```
+
+### Key Pattern
+
+```typescript
+import { buildTriggerSubBlocks } from '@/triggers'
+import { {service}TriggerOptions, {service}SetupInstructions, build{Service}ExtraFields } from './utils'
+
+// Primary trigger - includeDropdown: true
+export const {service}EventATrigger: TriggerConfig = {
+  id: '{service}_event_a',
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: '{service}_event_a',
+    triggerOptions: {service}TriggerOptions,
+    includeDropdown: true,  // Only for primary trigger!
+    setupInstructions: {service}SetupInstructions('Event A'),
+    extraFields: build{Service}ExtraFields('{service}_event_a'),
+  }),
+  // ...
+}
+
+// Secondary triggers - no dropdown
+export const {service}EventBTrigger: TriggerConfig = {
+  id: '{service}_event_b',
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: '{service}_event_b',
+    triggerOptions: {service}TriggerOptions,
+    // No includeDropdown!
+    setupInstructions: {service}SetupInstructions('Event B'),
+    extraFields: build{Service}ExtraFields('{service}_event_b'),
+  }),
+  // ...
+}
+```
+
+### Connect to Block
+```typescript
+import { getTrigger } from '@/triggers'
+
+export const {Service}Block: BlockConfig = {
+  triggers: {
+    enabled: true,
+    available: ['{service}_event_a', '{service}_event_b'],
+  },
+  subBlocks: [
+    // Tool fields...
+    ...getTrigger('{service}_event_a').subBlocks,
+    ...getTrigger('{service}_event_b').subBlocks,
+  ],
+}
+```
+
+See `/add-trigger` skill for complete documentation.
+
+## Step 6: Register Everything
+
+### Tools Registry (`apps/sim/tools/registry.ts`)
+
+```typescript
+// Add import (alphabetically)
+import {
+  {service}Action1Tool,
+  {service}Action2Tool,
+} from '@/tools/{service}'
+
+// Add to tools object (alphabetically)
+export const tools: Record<string, ToolConfig> = {
+  // ... existing tools ...
+  {service}_action1: {service}Action1Tool,
+  {service}_action2: {service}Action2Tool,
+}
+```
+
+### Block Registry (`apps/sim/blocks/registry.ts`)
+
+```typescript
+// Add import (alphabetically)
+import { {Service}Block } from '@/blocks/blocks/{service}'
+
+// Add to registry (alphabetically)
+export const registry: Record<string, BlockConfig> = {
+  // ... existing blocks ...
+  {service}: {Service}Block,
+}
+```
+
+### Trigger Registry (`apps/sim/triggers/registry.ts`) - If triggers exist
+
+```typescript
+// Add import (alphabetically)
+import {
+  {service}EventATrigger,
+  {service}EventBTrigger,
+  {service}WebhookTrigger,
+} from '@/triggers/{service}'
+
+// Add to TRIGGER_REGISTRY (alphabetically)
+export const TRIGGER_REGISTRY: TriggerRegistry = {
+  // ... existing triggers ...
+  {service}_event_a: {service}EventATrigger,
+  {service}_event_b: {service}EventBTrigger,
+  {service}_webhook: {service}WebhookTrigger,
+}
+```
+
+## Step 7: Generate Docs
+
+Run the documentation generator:
+```bash
+bun run scripts/generate-docs.ts
+```
+
+This creates `apps/docs/content/docs/en/tools/{service}.mdx`
+
+## V2 Integration Pattern
+
+If creating V2 versions (API-aligned outputs):
+
+1. **V2 Tools** - Add `_v2` suffix, version `2.0.0`, flat outputs
+2. **V2 Block** - Add `_v2` type, use `createVersionedToolSelector`
+3. **V1 Block** - Add `(Legacy)` to name, set `hideFromToolbar: true`
+4. **Registry** - Register both versions
+
+```typescript
+// In registry
+{service}: {Service}Block,        // V1 (legacy, hidden)
+{service}_v2: {Service}V2Block,   // V2 (visible)
+```
+
+## Complete Checklist
+
+### Tools
+- [ ] Created `tools/{service}/` directory
+- [ ] Created `types.ts` with all interfaces
+- [ ] Created tool file for each operation
+- [ ] All params have correct visibility
+- [ ] All nullable fields use `?? null`
+- [ ] All optional outputs have `optional: true`
+- [ ] Created `index.ts` barrel export
+- [ ] Registered all tools in `tools/registry.ts`
+
+### Block
+- [ ] Created `blocks/blocks/{service}.ts`
+- [ ] Defined operation dropdown with all operations
+- [ ] Added credential field (oauth-input or short-input)
+- [ ] Added conditional fields per operation
+- [ ] Set up dependsOn for cascading selectors
+- [ ] Configured tools.access with all tool IDs
+- [ ] Configured tools.config.tool selector
+- [ ] Defined outputs matching tool outputs
+- [ ] Registered block in `blocks/registry.ts`
+- [ ] If triggers: set `triggers.enabled` and `triggers.available`
+- [ ] If triggers: spread trigger subBlocks with `getTrigger()`
+
+### Icon
+- [ ] Added icon to `components/icons.tsx`
+- [ ] Icon spreads props correctly
+
+### Triggers (if service supports webhooks)
+- [ ] Created `triggers/{service}/` directory
+- [ ] Created `utils.ts` with options, instructions, and extra fields helpers
+- [ ] Primary trigger uses `includeDropdown: true`
+- [ ] Secondary triggers do NOT have `includeDropdown`
+- [ ] All triggers use `buildTriggerSubBlocks` helper
+- [ ] Created `index.ts` barrel export
+- [ ] Registered all triggers in `triggers/registry.ts`
+
+### Docs
+- [ ] Ran `bun run scripts/generate-docs.ts`
+- [ ] Verified docs file created
+
+## Example Command
+
+When the user asks to add an integration:
+
+```
+User: Add a Stripe integration
+
+You: I'll add the Stripe integration. Let me:
+
+1. First, research the Stripe API using Context7
+2. Create the tools for key operations (payments, subscriptions, etc.)
+3. Create the block with operation dropdown
+4. Add the Stripe icon
+5. Register everything
+6. Generate docs
+
+[Proceed with implementation...]
+```
+
+## Common Gotchas
+
+1. **OAuth serviceId must match** - The `serviceId` in oauth-input must match the OAuth provider configuration
+2. **Tool IDs are snake_case** - `stripe_create_payment`, not `stripeCreatePayment`
+3. **Block type is snake_case** - `type: 'stripe'`, not `type: 'Stripe'`
+4. **Alphabetical ordering** - Keep imports and registry entries alphabetically sorted
+5. **Required can be conditional** - Use `required: { field: 'op', value: 'create' }` instead of always true
+6. **DependsOn clears options** - When a dependency changes, selector options are refetched
diff --git a/.claude/commands/add-tools.md b/.claude/commands/add-tools.md
new file mode 100644
index 0000000000..d4dfee8706
--- /dev/null
+++ b/.claude/commands/add-tools.md
@@ -0,0 +1,284 @@
+---
+description: Create tool configurations for a Sim Studio integration by reading API docs
+argument-hint: <service-name> [api-docs-url]
+---
+
+# Add Tools Skill
+
+You are an expert at creating tool configurations for Sim Studio integrations. Your job is to read API documentation and create properly structured tool files.
+
+## Your Task
+
+When the user asks you to create tools for a service:
+1. Use Context7 or WebFetch to read the service's API documentation
+2. Create the tools directory structure
+3. Generate properly typed tool configurations
+
+## Directory Structure
+
+Create files in `apps/sim/tools/{service}/`:
+```
+tools/{service}/
+├── index.ts      # Barrel export
+├── types.ts      # Parameter & response types
+└── {action}.ts   # Individual tool files (one per operation)
+```
+
+## Tool Configuration Structure
+
+Every tool MUST follow this exact structure:
+
+```typescript
+import type { {ServiceName}{Action}Params } from '@/tools/{service}/types'
+import type { ToolConfig } from '@/tools/types'
+
+interface {ServiceName}{Action}Response {
+  success: boolean
+  output: {
+    // Define output structure here
+  }
+}
+
+export const {serviceName}{Action}Tool: ToolConfig<
+  {ServiceName}{Action}Params,
+  {ServiceName}{Action}Response
+> = {
+  id: '{service}_{action}',           // snake_case, matches tool name
+  name: '{Service} {Action}',         // Human readable
+  description: 'Brief description',   // One sentence
+  version: '1.0.0',
+
+  // OAuth config (if service uses OAuth)
+  oauth: {
+    required: true,
+    provider: '{service}',            // Must match OAuth provider ID
+  },
+
+  params: {
+    // Hidden params (system-injected)
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    // User-only params (credentials, IDs user must provide)
+    someId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the resource',
+    },
+    // User-or-LLM params (can be provided by user OR computed by LLM)
+    query: {
+      type: 'string',
+      required: false,                // Use false for optional
+      visibility: 'user-or-llm',
+      description: 'Search query',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.service.com/v1/resource/${params.id}`,
+    method: 'POST',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      // Request body - only for POST/PUT/PATCH
+      // Trim ID fields to prevent copy-paste whitespace errors:
+      // userId: params.userId?.trim(),
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        // Map API response to output
+        // Use ?? null for nullable fields
+        // Use ?? [] for optional arrays
+      },
+    }
+  },
+
+  outputs: {
+    // Define each output field
+  },
+}
+```
+
+## Critical Rules for Parameters
+
+### Visibility Options
+- `'hidden'` - System-injected (OAuth tokens, internal params). User never sees.
+- `'user-only'` - User must provide (credentials, account-specific IDs)
+- `'user-or-llm'` - User provides OR LLM can compute (search queries, content, filters)
+
+### Parameter Types
+- `'string'` - Text values
+- `'number'` - Numeric values
+- `'boolean'` - True/false
+- `'json'` - Complex objects (NOT 'object', use 'json')
+- `'file'` - Single file
+- `'file[]'` - Multiple files
+
+### Required vs Optional
+- Always explicitly set `required: true` or `required: false`
+- Optional params should have `required: false`
+
+## Critical Rules for Outputs
+
+### Output Types
+- `'string'`, `'number'`, `'boolean'` - Primitives
+- `'json'` - Complex objects (use this, NOT 'object')
+- `'array'` - Arrays with `items` property
+- `'object'` - Objects with `properties` property
+
+### Optional Outputs
+Add `optional: true` for fields that may not exist in the response:
+```typescript
+closedAt: {
+  type: 'string',
+  description: 'When the issue was closed',
+  optional: true,
+},
+```
+
+### Nested Properties
+For complex outputs, define nested structure:
+```typescript
+metadata: {
+  type: 'json',
+  description: 'Response metadata',
+  properties: {
+    id: { type: 'string', description: 'Unique ID' },
+    status: { type: 'string', description: 'Current status' },
+    count: { type: 'number', description: 'Total count' },
+  },
+},
+
+items: {
+  type: 'array',
+  description: 'List of items',
+  items: {
+    type: 'object',
+    properties: {
+      id: { type: 'string', description: 'Item ID' },
+      name: { type: 'string', description: 'Item name' },
+    },
+  },
+},
+```
+
+## Critical Rules for transformResponse
+
+### Handle Nullable Fields
+ALWAYS use `?? null` for fields that may be undefined:
+```typescript
+transformResponse: async (response: Response) => {
+  const data = await response.json()
+  return {
+    success: true,
+    output: {
+      id: data.id,
+      title: data.title,
+      body: data.body ?? null,           // May be undefined
+      assignee: data.assignee ?? null,   // May be undefined
+      labels: data.labels ?? [],         // Default to empty array
+      closedAt: data.closed_at ?? null,  // May be undefined
+    },
+  }
+}
+```
+
+### Never Output Raw JSON Dumps
+DON'T do this:
+```typescript
+output: {
+  data: data,  // BAD - raw JSON dump
+}
+```
+
+DO this instead - extract meaningful fields:
+```typescript
+output: {
+  id: data.id,
+  name: data.name,
+  status: data.status,
+  metadata: {
+    createdAt: data.created_at,
+    updatedAt: data.updated_at,
+  },
+}
+```
+
+## Types File Pattern
+
+Create `types.ts` with interfaces for all params and responses:
+
+```typescript
+import type { ToolResponse } from '@/tools/types'
+
+// Parameter interfaces
+export interface {Service}{Action}Params {
+  accessToken: string
+  requiredField: string
+  optionalField?: string
+}
+
+// Response interfaces (extend ToolResponse)
+export interface {Service}{Action}Response extends ToolResponse {
+  output: {
+    field1: string
+    field2: number
+    optionalField?: string | null
+  }
+}
+```
+
+## Index.ts Barrel Export Pattern
+
+```typescript
+// Export all tools
+export { serviceTool1 } from './{action1}'
+export { serviceTool2 } from './{action2}'
+
+// Export types
+export * from './types'
+```
+
+## Registering Tools
+
+After creating tools, remind the user to:
+1. Import tools in `apps/sim/tools/registry.ts`
+2. Add to the `tools` object with snake_case keys:
+```typescript
+import { serviceActionTool } from '@/tools/{service}'
+
+export const tools = {
+  // ... existing tools ...
+  {service}_{action}: serviceActionTool,
+}
+```
+
+## V2 Tool Pattern
+
+If creating V2 tools (API-aligned outputs), use `_v2` suffix:
+- Tool ID: `{service}_{action}_v2`
+- Variable name: `{action}V2Tool`
+- Version: `'2.0.0'`
+- Outputs: Flat, API-aligned (no content/metadata wrapper)
+
+## Checklist Before Finishing
+
+- [ ] All params have explicit `required: true` or `required: false`
+- [ ] All params have appropriate `visibility`
+- [ ] All nullable response fields use `?? null`
+- [ ] All optional outputs have `optional: true`
+- [ ] No raw JSON dumps in outputs
+- [ ] Types file has all interfaces
+- [ ] Index.ts exports all tools
+- [ ] Tool IDs use snake_case
diff --git a/.claude/commands/add-trigger.md b/.claude/commands/add-trigger.md
new file mode 100644
index 0000000000..461563ab0c
--- /dev/null
+++ b/.claude/commands/add-trigger.md
@@ -0,0 +1,656 @@
+---
+description: Create webhook triggers for a Sim Studio integration using the generic trigger builder
+argument-hint: <service-name>
+---
+
+# Add Trigger Skill
+
+You are an expert at creating webhook triggers for Sim Studio. You understand the trigger system, the generic `buildTriggerSubBlocks` helper, and how triggers connect to blocks.
+
+## Your Task
+
+When the user asks you to create triggers for a service:
+1. Research what webhook events the service supports
+2. Create the trigger files using the generic builder
+3. Register triggers and connect them to the block
+
+## Directory Structure
+
+```
+apps/sim/triggers/{service}/
+├── index.ts              # Barrel exports
+├── utils.ts              # Service-specific helpers (trigger options, setup instructions, extra fields)
+├── {event_a}.ts          # Primary trigger (includes dropdown)
+├── {event_b}.ts          # Secondary trigger (no dropdown)
+├── {event_c}.ts          # Secondary trigger (no dropdown)
+└── webhook.ts            # Generic webhook trigger (optional, for "all events")
+```
+
+## Step 1: Create utils.ts
+
+This file contains service-specific helpers used by all triggers.
+
+```typescript
+import type { SubBlockConfig } from '@/blocks/types'
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Dropdown options for the trigger type selector.
+ * These appear in the primary trigger's dropdown.
+ */
+export const {service}TriggerOptions = [
+  { label: 'Event A', id: '{service}_event_a' },
+  { label: 'Event B', id: '{service}_event_b' },
+  { label: 'Event C', id: '{service}_event_c' },
+  { label: 'Generic Webhook (All Events)', id: '{service}_webhook' },
+]
+
+/**
+ * Generates HTML setup instructions for the trigger.
+ * Displayed to users to help them configure webhooks in the external service.
+ */
+export function {service}SetupInstructions(eventType: string): string {
+  const instructions = [
+    'Copy the <strong>Webhook URL</strong> above',
+    'Go to <strong>{Service} Settings > Webhooks</strong>',
+    'Click <strong>Add Webhook</strong>',
+    'Paste the webhook URL',
+    `Select the <strong>${eventType}</strong> event type`,
+    'Save the webhook configuration',
+    'Click "Save" above to activate your trigger',
+  ]
+
+  return instructions
+    .map((instruction, index) =>
+      `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Service-specific extra fields to add to triggers.
+ * These are inserted between webhookUrl and triggerSave.
+ */
+export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
+  return [
+    {
+      id: 'projectId',
+      title: 'Project ID (Optional)',
+      type: 'short-input',
+      placeholder: 'Leave empty for all projects',
+      description: 'Optionally filter to a specific project',
+      mode: 'trigger',
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+/**
+ * Build outputs for this trigger type.
+ * Outputs define what data is available to downstream blocks.
+ */
+export function build{Service}Outputs(): Record<string, TriggerOutput> {
+  return {
+    eventType: { type: 'string', description: 'The type of event that triggered this workflow' },
+    resourceId: { type: 'string', description: 'ID of the affected resource' },
+    timestamp: { type: 'string', description: 'When the event occurred (ISO 8601)' },
+    // Nested outputs for complex data
+    resource: {
+      id: { type: 'string', description: 'Resource ID' },
+      name: { type: 'string', description: 'Resource name' },
+      status: { type: 'string', description: 'Current status' },
+    },
+    webhook: { type: 'json', description: 'Full webhook payload' },
+  }
+}
+```
+
+## Step 2: Create the Primary Trigger
+
+The **primary trigger** is the first one listed. It MUST include `includeDropdown: true` so users can switch between trigger types.
+
+```typescript
+import { {Service}Icon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  build{Service}ExtraFields,
+  build{Service}Outputs,
+  {service}SetupInstructions,
+  {service}TriggerOptions,
+} from '@/triggers/{service}/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * {Service} Event A Trigger
+ *
+ * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
+ */
+export const {service}EventATrigger: TriggerConfig = {
+  id: '{service}_event_a',
+  name: '{Service} Event A',
+  provider: '{service}',
+  description: 'Trigger workflow when Event A occurs',
+  version: '1.0.0',
+  icon: {Service}Icon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: '{service}_event_a',
+    triggerOptions: {service}TriggerOptions,
+    includeDropdown: true,  // PRIMARY TRIGGER - includes dropdown
+    setupInstructions: {service}SetupInstructions('Event A'),
+    extraFields: build{Service}ExtraFields('{service}_event_a'),
+  }),
+
+  outputs: build{Service}Outputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
+```
+
+## Step 3: Create Secondary Triggers
+
+Secondary triggers do NOT include the dropdown (it's already in the primary trigger).
+
+```typescript
+import { {Service}Icon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  build{Service}ExtraFields,
+  build{Service}Outputs,
+  {service}SetupInstructions,
+  {service}TriggerOptions,
+} from '@/triggers/{service}/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * {Service} Event B Trigger
+ */
+export const {service}EventBTrigger: TriggerConfig = {
+  id: '{service}_event_b',
+  name: '{Service} Event B',
+  provider: '{service}',
+  description: 'Trigger workflow when Event B occurs',
+  version: '1.0.0',
+  icon: {Service}Icon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: '{service}_event_b',
+    triggerOptions: {service}TriggerOptions,
+    // NO includeDropdown - secondary trigger
+    setupInstructions: {service}SetupInstructions('Event B'),
+    extraFields: build{Service}ExtraFields('{service}_event_b'),
+  }),
+
+  outputs: build{Service}Outputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
+```
+
+## Step 4: Create index.ts Barrel Export
+
+```typescript
+export { {service}EventATrigger } from './event_a'
+export { {service}EventBTrigger } from './event_b'
+export { {service}EventCTrigger } from './event_c'
+export { {service}WebhookTrigger } from './webhook'
+```
+
+## Step 5: Register Triggers
+
+### Trigger Registry (`apps/sim/triggers/registry.ts`)
+
+```typescript
+// Add import
+import {
+  {service}EventATrigger,
+  {service}EventBTrigger,
+  {service}EventCTrigger,
+  {service}WebhookTrigger,
+} from '@/triggers/{service}'
+
+// Add to TRIGGER_REGISTRY
+export const TRIGGER_REGISTRY: TriggerRegistry = {
+  // ... existing triggers ...
+  {service}_event_a: {service}EventATrigger,
+  {service}_event_b: {service}EventBTrigger,
+  {service}_event_c: {service}EventCTrigger,
+  {service}_webhook: {service}WebhookTrigger,
+}
+```
+
+## Step 6: Connect Triggers to Block
+
+In the block file (`apps/sim/blocks/blocks/{service}.ts`):
+
+```typescript
+import { {Service}Icon } from '@/components/icons'
+import { getTrigger } from '@/triggers'
+import type { BlockConfig } from '@/blocks/types'
+
+export const {Service}Block: BlockConfig = {
+  type: '{service}',
+  name: '{Service}',
+  // ... other config ...
+
+  // Enable triggers and list available trigger IDs
+  triggers: {
+    enabled: true,
+    available: [
+      '{service}_event_a',
+      '{service}_event_b',
+      '{service}_event_c',
+      '{service}_webhook',
+    ],
+  },
+
+  subBlocks: [
+    // Regular tool subBlocks first
+    { id: 'operation', /* ... */ },
+    { id: 'credential', /* ... */ },
+    // ... other tool fields ...
+
+    // Then spread ALL trigger subBlocks
+    ...getTrigger('{service}_event_a').subBlocks,
+    ...getTrigger('{service}_event_b').subBlocks,
+    ...getTrigger('{service}_event_c').subBlocks,
+    ...getTrigger('{service}_webhook').subBlocks,
+  ],
+
+  // ... tools config ...
+}
+```
+
+## Automatic Webhook Registration (Preferred)
+
+If the service's API supports programmatic webhook creation, implement automatic webhook registration instead of requiring users to manually configure webhooks. This provides a much better user experience.
+
+### When to Use Automatic Registration
+
+Check the service's API documentation for endpoints like:
+- `POST /webhooks` or `POST /hooks` - Create webhook
+- `DELETE /webhooks/{id}` - Delete webhook
+
+Services that support this pattern include: Grain, Lemlist, Calendly, Airtable, Webflow, Typeform, etc.
+
+### Implementation Steps
+
+#### 1. Add API Key to Extra Fields
+
+Update your `build{Service}ExtraFields` function to include an API key field:
+
+```typescript
+export function build{Service}ExtraFields(triggerId: string): SubBlockConfig[] {
+  return [
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input',
+      placeholder: 'Enter your {Service} API key',
+      description: 'Required to create the webhook in {Service}.',
+      password: true,
+      required: true,
+      mode: 'trigger',
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+    // Other optional fields (e.g., campaign filter, project filter)
+    {
+      id: 'projectId',
+      title: 'Project ID (Optional)',
+      type: 'short-input',
+      placeholder: 'Leave empty for all projects',
+      mode: 'trigger',
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+```
+
+#### 2. Update Setup Instructions for Automatic Creation
+
+Change instructions to indicate automatic webhook creation:
+
+```typescript
+export function {service}SetupInstructions(eventType: string): string {
+  const instructions = [
+    'Enter your {Service} API Key above.',
+    'You can find your API key in {Service} at <strong>Settings > API</strong>.',
+    `Click <strong>"Save Configuration"</strong> to automatically create the webhook in {Service} for <strong>${eventType}</strong> events.`,
+    'The webhook will be automatically deleted when you remove this trigger.',
+  ]
+
+  return instructions
+    .map((instruction, index) =>
+      `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+```
+
+#### 3. Add Webhook Creation to API Route
+
+In `apps/sim/app/api/webhooks/route.ts`, add provider-specific logic after the database save:
+
+```typescript
+// --- {Service} specific logic ---
+if (savedWebhook && provider === '{service}') {
+  logger.info(`[${requestId}] {Service} provider detected. Creating webhook subscription.`)
+  try {
+    const result = await create{Service}WebhookSubscription(
+      {
+        id: savedWebhook.id,
+        path: savedWebhook.path,
+        providerConfig: savedWebhook.providerConfig,
+      },
+      requestId
+    )
+
+    if (result) {
+      // Update the webhook record with the external webhook ID
+      const updatedConfig = {
+        ...(savedWebhook.providerConfig as Record<string, any>),
+        externalId: result.id,
+      }
+      await db
+        .update(webhook)
+        .set({
+          providerConfig: updatedConfig,
+          updatedAt: new Date(),
+        })
+        .where(eq(webhook.id, savedWebhook.id))
+
+      savedWebhook.providerConfig = updatedConfig
+      logger.info(`[${requestId}] Successfully created {Service} webhook`, {
+        externalHookId: result.id,
+        webhookId: savedWebhook.id,
+      })
+    }
+  } catch (err) {
+    logger.error(
+      `[${requestId}] Error creating {Service} webhook subscription, rolling back webhook`,
+      err
+    )
+    await db.delete(webhook).where(eq(webhook.id, savedWebhook.id))
+    return NextResponse.json(
+      {
+        error: 'Failed to create webhook in {Service}',
+        details: err instanceof Error ? err.message : 'Unknown error',
+      },
+      { status: 500 }
+    )
+  }
+}
+// --- End {Service} specific logic ---
+```
+
+Then add the helper function at the end of the file:
+
+```typescript
+async function create{Service}WebhookSubscription(
+  webhookData: any,
+  requestId: string
+): Promise<{ id: string } | undefined> {
+  try {
+    const { path, providerConfig } = webhookData
+    const { apiKey, triggerId, projectId } = providerConfig || {}
+
+    if (!apiKey) {
+      throw new Error('{Service} API Key is required.')
+    }
+
+    // Map trigger IDs to service event types
+    const eventTypeMap: Record<string, string | undefined> = {
+      {service}_event_a: 'eventA',
+      {service}_event_b: 'eventB',
+      {service}_webhook: undefined, // Generic - no filter
+    }
+
+    const eventType = eventTypeMap[triggerId]
+    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
+
+    const requestBody: Record<string, any> = {
+      url: notificationUrl,
+    }
+
+    if (eventType) {
+      requestBody.eventType = eventType
+    }
+
+    if (projectId) {
+      requestBody.projectId = projectId
+    }
+
+    const response = await fetch('https://api.{service}.com/webhooks', {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(requestBody),
+    })
+
+    const responseBody = await response.json()
+
+    if (!response.ok) {
+      const errorMessage = responseBody.message || 'Unknown API error'
+      let userFriendlyMessage = 'Failed to create webhook in {Service}'
+
+      if (response.status === 401) {
+        userFriendlyMessage = 'Invalid API Key. Please verify and try again.'
+      } else if (errorMessage) {
+        userFriendlyMessage = `{Service} error: ${errorMessage}`
+      }
+
+      throw new Error(userFriendlyMessage)
+    }
+
+    return { id: responseBody.id }
+  } catch (error: any) {
+    logger.error(`Exception during {Service} webhook creation`, { error: error.message })
+    throw error
+  }
+}
+```
+
+#### 4. Add Webhook Deletion to Provider Subscriptions
+
+In `apps/sim/lib/webhooks/provider-subscriptions.ts`:
+
+1. Add a logger:
+```typescript
+const {service}Logger = createLogger('{Service}Webhook')
+```
+
+2. Add the delete function:
+```typescript
+export async function delete{Service}Webhook(webhook: any, requestId: string): Promise<void> {
+  try {
+    const config = getProviderConfig(webhook)
+    const apiKey = config.apiKey as string | undefined
+    const externalId = config.externalId as string | undefined
+
+    if (!apiKey || !externalId) {
+      {service}Logger.warn(`[${requestId}] Missing apiKey or externalId, skipping cleanup`)
+      return
+    }
+
+    const response = await fetch(`https://api.{service}.com/webhooks/${externalId}`, {
+      method: 'DELETE',
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+      },
+    })
+
+    if (!response.ok && response.status !== 404) {
+      {service}Logger.warn(`[${requestId}] Failed to delete webhook (non-fatal): ${response.status}`)
+    } else {
+      {service}Logger.info(`[${requestId}] Successfully deleted webhook ${externalId}`)
+    }
+  } catch (error) {
+    {service}Logger.warn(`[${requestId}] Error deleting webhook (non-fatal)`, error)
+  }
+}
+```
+
+3. Add to `cleanupExternalWebhook`:
+```typescript
+export async function cleanupExternalWebhook(...): Promise<void> {
+  // ... existing providers ...
+  } else if (webhook.provider === '{service}') {
+    await delete{Service}Webhook(webhook, requestId)
+  }
+}
+```
+
+### Key Points for Automatic Registration
+
+- **API Key visibility**: Always use `password: true` for API key fields
+- **Error handling**: Roll back the database webhook if external creation fails
+- **External ID storage**: Save the external webhook ID in `providerConfig.externalId`
+- **Graceful cleanup**: Don't fail webhook deletion if cleanup fails (use non-fatal logging)
+- **User-friendly errors**: Map HTTP status codes to helpful error messages
+
+## The buildTriggerSubBlocks Helper
+
+This is the generic helper from `@/triggers` that creates consistent trigger subBlocks.
+
+### Function Signature
+
+```typescript
+interface BuildTriggerSubBlocksOptions {
+  triggerId: string                              // e.g., 'service_event_a'
+  triggerOptions: Array<{ label: string; id: string }>  // Dropdown options
+  includeDropdown?: boolean                      // true only for primary trigger
+  setupInstructions: string                      // HTML instructions
+  extraFields?: SubBlockConfig[]                 // Service-specific fields
+  webhookPlaceholder?: string                    // Custom placeholder text
+}
+
+function buildTriggerSubBlocks(options: BuildTriggerSubBlocksOptions): SubBlockConfig[]
+```
+
+### What It Creates
+
+The helper creates this structure:
+1. **Dropdown** (only if `includeDropdown: true`) - Trigger type selector
+2. **Webhook URL** - Read-only field with copy button
+3. **Extra Fields** - Your service-specific fields (filters, options, etc.)
+4. **Save Button** - Activates the trigger
+5. **Instructions** - Setup guide for users
+
+All fields automatically have:
+- `mode: 'trigger'` - Only shown in trigger mode
+- `condition: { field: 'selectedTriggerId', value: triggerId }` - Only shown when this trigger is selected
+
+## Trigger Outputs
+
+Trigger outputs use the same schema as block outputs (NOT tool outputs).
+
+**Supported:**
+- `type` and `description` for simple fields
+- Nested object structure for complex data
+
+**NOT Supported:**
+- `optional: true` (tool outputs only)
+- `items` property (tool outputs only)
+
+```typescript
+export function buildOutputs(): Record<string, TriggerOutput> {
+  return {
+    // Simple fields
+    eventType: { type: 'string', description: 'Event type' },
+    timestamp: { type: 'string', description: 'When it occurred' },
+
+    // Complex data - use type: 'json'
+    payload: { type: 'json', description: 'Full event payload' },
+
+    // Nested structure
+    resource: {
+      id: { type: 'string', description: 'Resource ID' },
+      name: { type: 'string', description: 'Resource name' },
+    },
+  }
+}
+```
+
+## Generic Webhook Trigger Pattern
+
+For services with many event types, create a generic webhook that accepts all events:
+
+```typescript
+export const {service}WebhookTrigger: TriggerConfig = {
+  id: '{service}_webhook',
+  name: '{Service} Webhook (All Events)',
+  // ...
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: '{service}_webhook',
+    triggerOptions: {service}TriggerOptions,
+    setupInstructions: {service}SetupInstructions('All Events'),
+    extraFields: [
+      // Event type filter (optional)
+      {
+        id: 'eventTypes',
+        title: 'Event Types',
+        type: 'dropdown',
+        multiSelect: true,
+        options: [
+          { label: 'Event A', id: 'event_a' },
+          { label: 'Event B', id: 'event_b' },
+        ],
+        placeholder: 'Leave empty for all events',
+        mode: 'trigger',
+        condition: { field: 'selectedTriggerId', value: '{service}_webhook' },
+      },
+      // Plus any other service-specific fields
+      ...build{Service}ExtraFields('{service}_webhook'),
+    ],
+  }),
+}
+```
+
+## Checklist Before Finishing
+
+### Utils
+- [ ] Created `{service}TriggerOptions` array with all trigger IDs
+- [ ] Created `{service}SetupInstructions` function with clear steps
+- [ ] Created `build{Service}ExtraFields` for service-specific fields
+- [ ] Created output builders for each trigger type
+
+### Triggers
+- [ ] Primary trigger has `includeDropdown: true`
+- [ ] Secondary triggers do NOT have `includeDropdown`
+- [ ] All triggers use `buildTriggerSubBlocks` helper
+- [ ] All triggers have proper outputs defined
+- [ ] Created `index.ts` barrel export
+
+### Registration
+- [ ] All triggers imported in `triggers/registry.ts`
+- [ ] All triggers added to `TRIGGER_REGISTRY`
+- [ ] Block has `triggers.enabled: true`
+- [ ] Block has all trigger IDs in `triggers.available`
+- [ ] Block spreads all trigger subBlocks: `...getTrigger('id').subBlocks`
+
+### Automatic Webhook Registration (if supported)
+- [ ] Added API key field to `build{Service}ExtraFields` with `password: true`
+- [ ] Updated setup instructions for automatic webhook creation
+- [ ] Added provider-specific logic to `apps/sim/app/api/webhooks/route.ts`
+- [ ] Added `create{Service}WebhookSubscription` helper function
+- [ ] Added `delete{Service}Webhook` function to `provider-subscriptions.ts`
+- [ ] Added provider to `cleanupExternalWebhook` function
+
+### Testing
+- [ ] Run `bun run type-check` to verify no TypeScript errors
+- [ ] Restart dev server to pick up new triggers
+- [ ] Test trigger UI shows correctly in the block
+- [ ] Test automatic webhook creation works (if applicable)
diff --git a/apps/docs/components/icons.tsx b/apps/docs/components/icons.tsx
index de0ab92021..2c46036dbf 100644
--- a/apps/docs/components/icons.tsx
+++ b/apps/docs/components/icons.tsx
@@ -1853,6 +1853,23 @@ export function LinearIcon(props: React.SVGProps<SVGSVGElement>) {
   )
 }
 
+export function LemlistIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      xmlns='http://www.w3.org/2000/svg'
+      viewBox='0 0 24 24'
+      width='24'
+      height='24'
+      fill='none'
+    >
+      <rect width='24' height='24' rx='4' fill='#316BFF' />
+      <path d='M7 6h2v9h5v2H7V6Z' fill='white' />
+      <circle cx='17' cy='8' r='2' fill='white' />
+    </svg>
+  )
+}
+
 export function TelegramIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
diff --git a/apps/docs/components/ui/icon-mapping.ts b/apps/docs/components/ui/icon-mapping.ts
index 60d0351e57..2258f7189e 100644
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -54,6 +54,7 @@ import {
   JiraIcon,
   JiraServiceManagementIcon,
   KalshiIcon,
+  LemlistIcon,
   LinearIcon,
   LinkedInIcon,
   LinkupIcon,
@@ -137,7 +138,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   circleback: CirclebackIcon,
   clay: ClayIcon,
   confluence: ConfluenceIcon,
-  cursor: CursorIcon,
+  cursor_v2: CursorIcon,
   datadog: DatadogIcon,
   discord: DiscordIcon,
   dropbox: DropboxIcon,
@@ -149,10 +150,10 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   file: DocumentIcon,
   firecrawl: FirecrawlIcon,
   fireflies: FirefliesIcon,
-  github: GithubIcon,
+  github_v2: GithubIcon,
   gitlab: GitLabIcon,
-  gmail: GmailIcon,
-  google_calendar: GoogleCalendarIcon,
+  gmail_v2: GmailIcon,
+  google_calendar_v2: GoogleCalendarIcon,
   google_docs: GoogleDocsIcon,
   google_drive: GoogleDriveIcon,
   google_forms: GoogleFormsIcon,
@@ -170,12 +171,13 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   image_generator: ImageIcon,
   imap: MailServerIcon,
   incidentio: IncidentioIcon,
-  intercom: IntercomIcon,
+  intercom_v2: IntercomIcon,
   jina: JinaAIIcon,
   jira: JiraIcon,
   jira_service_management: JiraServiceManagementIcon,
   kalshi: KalshiIcon,
   knowledge: PackageSearchIcon,
+  lemlist: LemlistIcon,
   linear: LinearIcon,
   linkedin: LinkedInIcon,
   linkup: LinkupIcon,
@@ -190,7 +192,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   mongodb: MongoDBIcon,
   mysql: MySQLIcon,
   neo4j: Neo4jIcon,
-  notion: NotionIcon,
+  notion_v2: NotionIcon,
   onedrive: MicrosoftOneDriveIcon,
   openai: OpenAIIcon,
   outlook: OutlookIcon,
@@ -226,7 +228,6 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   supabase: SupabaseIcon,
   tavily: TavilyIcon,
   telegram: TelegramIcon,
-  thinking: BrainIcon,
   translate: TranslateIcon,
   trello: TrelloIcon,
   tts: TTSIcon,
diff --git a/apps/docs/content/docs/de/enterprise/index.mdx b/apps/docs/content/docs/de/enterprise/index.mdx
index 109b196491..82682f260b 100644
--- a/apps/docs/content/docs/de/enterprise/index.mdx
+++ b/apps/docs/content/docs/de/enterprise/index.mdx
@@ -70,6 +70,7 @@ Für selbst gehostete Bereitstellungen können Enterprise-Funktionen über Umgeb
 |----------|-------------|
 | `SSO_ENABLED`, `NEXT_PUBLIC_SSO_ENABLED` | Single Sign-On mit SAML/OIDC |
 | `CREDENTIAL_SETS_ENABLED`, `NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED` | Polling-Gruppen für E-Mail-Trigger |
+| `DISABLE_INVITATIONS`, `NEXT_PUBLIC_DISABLE_INVITATIONS` | Workspace-/Organisations-Einladungen global deaktivieren |
 
 <Callout type="warn">
   BYOK ist nur im gehosteten Sim Studio verfügbar. Selbst gehostete Deployments konfigurieren AI-Provider-Schlüssel direkt über Umgebungsvariablen.
diff --git a/apps/docs/content/docs/en/enterprise/index.mdx b/apps/docs/content/docs/en/enterprise/index.mdx
index 3e5acdf5e2..29abe99844 100644
--- a/apps/docs/content/docs/en/enterprise/index.mdx
+++ b/apps/docs/content/docs/en/enterprise/index.mdx
@@ -17,7 +17,7 @@ Define permission groups to control what features and integrations team members
 
 - **Allowed Model Providers** - Restrict which AI providers users can access (OpenAI, Anthropic, Google, etc.)
 - **Allowed Blocks** - Control which workflow blocks are available
-- **Platform Settings** - Hide Knowledge Base, disable MCP tools, or disable custom tools
+- **Platform Settings** - Hide Knowledge Base, disable MCP tools, disable custom tools, or disable invitations
 
 ### Setup
 
@@ -31,33 +31,6 @@ Define permission groups to control what features and integrations team members
 
 ---
 
-## Bring Your Own Key (BYOK)
-
-Use your own API keys for AI model providers instead of Sim Studio's hosted keys.
-
-### Supported Providers
-
-| Provider | Usage |
-|----------|-------|
-| OpenAI | Knowledge Base embeddings, Agent block |
-| Anthropic | Agent block |
-| Google | Agent block |
-| Mistral | Knowledge Base OCR |
-
-### Setup
-
-1. Navigate to **Settings** → **BYOK** in your workspace
-2. Click **Add Key** for your provider
-3. Enter your API key and save
-
-<Callout type="warn">
-  BYOK keys are encrypted at rest. Only organization admins and owners can manage keys.
-</Callout>
-
-When configured, workflows use your key instead of Sim Studio's hosted keys. If removed, workflows automatically fall back to hosted keys.
-
----
-
 ## Single Sign-On (SSO)
 
 Enterprise authentication with SAML 2.0 and OIDC support for centralized identity management.
@@ -95,6 +68,7 @@ For self-hosted deployments, enterprise features can be enabled via environment
 | `ACCESS_CONTROL_ENABLED`, `NEXT_PUBLIC_ACCESS_CONTROL_ENABLED` | Permission groups for access restrictions |
 | `SSO_ENABLED`, `NEXT_PUBLIC_SSO_ENABLED` | Single Sign-On with SAML/OIDC |
 | `CREDENTIAL_SETS_ENABLED`, `NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED` | Polling Groups for email triggers |
+| `DISABLE_INVITATIONS`, `NEXT_PUBLIC_DISABLE_INVITATIONS` | Globally disable workspace/organization invitations |
 
 ### Organization Management
 
@@ -114,7 +88,23 @@ curl -X POST https://your-instance/api/v1/admin/organizations/{orgId}/members \
   -d '{"userId": "user-id-here", "role": "admin"}'
 ```
 
+### Workspace Members
+
+When invitations are disabled, use the Admin API to manage workspace memberships directly:
+
+```bash
+# Add a user to a workspace
+curl -X POST https://your-instance/api/v1/admin/workspaces/{workspaceId}/members \
+  -H "x-admin-key: YOUR_ADMIN_API_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{"userId": "user-id-here", "permissions": "write"}'
+
+# Remove a user from a workspace
+curl -X DELETE "https://your-instance/api/v1/admin/workspaces/{workspaceId}/members?userId=user-id-here" \
+  -H "x-admin-key: YOUR_ADMIN_API_KEY"
+```
+
 ### Notes
 
 - Enabling `ACCESS_CONTROL_ENABLED` automatically enables organizations, as access control requires organization membership.
-- BYOK is only available on hosted Sim Studio. Self-hosted deployments configure AI provider keys directly via environment variables.
+- When `DISABLE_INVITATIONS` is set, users cannot send invitations. Use the Admin API to manage workspace and organization memberships instead.
diff --git a/apps/docs/content/docs/en/execution/costs.mdx b/apps/docs/content/docs/en/execution/costs.mdx
index dce00ace96..a376a97bb7 100644
--- a/apps/docs/content/docs/en/execution/costs.mdx
+++ b/apps/docs/content/docs/en/execution/costs.mdx
@@ -106,7 +106,28 @@ The model breakdown shows:
 
 ## Bring Your Own Key (BYOK)
 
-You can use your own API keys for hosted models (OpenAI, Anthropic, Google, Mistral) in **Settings → BYOK** to pay base prices. Keys are encrypted and apply workspace-wide.
+Use your own API keys for AI model providers instead of Sim Studio's hosted keys to pay base prices with no markup.
+
+### Supported Providers
+
+| Provider | Usage |
+|----------|-------|
+| OpenAI | Knowledge Base embeddings, Agent block |
+| Anthropic | Agent block |
+| Google | Agent block |
+| Mistral | Knowledge Base OCR |
+
+### Setup
+
+1. Navigate to **Settings** → **BYOK** in your workspace
+2. Click **Add Key** for your provider
+3. Enter your API key and save
+
+<Callout type="info">
+  BYOK keys are encrypted at rest. Only workspace admins can manage keys.
+</Callout>
+
+When configured, workflows use your key instead of Sim Studio's hosted keys. If removed, workflows automatically fall back to hosted keys with the multiplier.
 
 ## Cost Optimization Strategies
 
diff --git a/apps/docs/content/docs/en/tools/ahrefs.mdx b/apps/docs/content/docs/en/tools/ahrefs.mdx
index 82941def99..1ad2148757 100644
--- a/apps/docs/content/docs/en/tools/ahrefs.mdx
+++ b/apps/docs/content/docs/en/tools/ahrefs.mdx
@@ -198,8 +198,3 @@ Get a list of broken backlinks pointing to a target domain or URL. Useful for id
 | `brokenBacklinks` | array | List of broken backlinks |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `ahrefs`
diff --git a/apps/docs/content/docs/en/tools/airtable.mdx b/apps/docs/content/docs/en/tools/airtable.mdx
index cf924cd53d..8986c0e2f5 100644
--- a/apps/docs/content/docs/en/tools/airtable.mdx
+++ b/apps/docs/content/docs/en/tools/airtable.mdx
@@ -128,8 +128,3 @@ Update multiple existing records in an Airtable table
 | `records` | json | Array of updated Airtable records |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `airtable`
diff --git a/apps/docs/content/docs/en/tools/apify.mdx b/apps/docs/content/docs/en/tools/apify.mdx
index 2ba9276b1c..518bb0a7fb 100644
--- a/apps/docs/content/docs/en/tools/apify.mdx
+++ b/apps/docs/content/docs/en/tools/apify.mdx
@@ -86,8 +86,3 @@ Run an APIFY actor asynchronously with polling for long-running tasks
 | `items` | array | Dataset items \(if completed\) |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `apify`
diff --git a/apps/docs/content/docs/en/tools/apollo.mdx b/apps/docs/content/docs/en/tools/apollo.mdx
index 4b9e7b1483..7fc5863ee1 100644
--- a/apps/docs/content/docs/en/tools/apollo.mdx
+++ b/apps/docs/content/docs/en/tools/apollo.mdx
@@ -61,7 +61,9 @@ Search Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `people` | json | Array of people matching the search criteria |
-| `metadata` | json | Pagination information including page, per_page, and total_entries |
+| `page` | number | Current page number |
+| `per_page` | number | Results per page |
+| `total_entries` | number | Total matching entries |
 
 ### `apollo_people_enrich`
 
@@ -86,7 +88,7 @@ Enrich data for a single person using Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `person` | json | Enriched person data from Apollo |
-| `metadata` | json | Enrichment metadata including enriched status |
+| `enriched` | boolean | Whether the person was successfully enriched |
 
 ### `apollo_people_bulk_enrich`
 
@@ -106,7 +108,8 @@ Enrich data for up to 10 people at once using Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `people` | json | Array of enriched people data |
-| `metadata` | json | Bulk enrichment metadata including total and enriched counts |
+| `total` | number | Total number of people processed |
+| `enriched` | number | Number of people successfully enriched |
 
 ### `apollo_organization_search`
 
@@ -129,7 +132,9 @@ Search Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `organizations` | json | Array of organizations matching the search criteria |
-| `metadata` | json | Pagination information including page, per_page, and total_entries |
+| `page` | number | Current page number |
+| `per_page` | number | Results per page |
+| `total_entries` | number | Total matching entries |
 
 ### `apollo_organization_enrich`
 
@@ -148,7 +153,7 @@ Enrich data for a single organization using Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `organization` | json | Enriched organization data from Apollo |
-| `metadata` | json | Enrichment metadata including enriched status |
+| `enriched` | boolean | Whether the organization was successfully enriched |
 
 ### `apollo_organization_bulk_enrich`
 
@@ -166,7 +171,8 @@ Enrich data for up to 10 organizations at once using Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `organizations` | json | Array of enriched organization data |
-| `metadata` | json | Bulk enrichment metadata including total and enriched counts |
+| `total` | number | Total number of organizations processed |
+| `enriched` | number | Number of organizations successfully enriched |
 
 ### `apollo_contact_create`
 
@@ -189,7 +195,7 @@ Create a new contact in your Apollo database
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `contact` | json | Created contact data from Apollo |
-| `metadata` | json | Creation metadata including created status |
+| `created` | boolean | Whether the contact was successfully created |
 
 ### `apollo_contact_update`
 
@@ -213,7 +219,7 @@ Update an existing contact in your Apollo database
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `contact` | json | Updated contact data from Apollo |
-| `metadata` | json | Update metadata including updated status |
+| `updated` | boolean | Whether the contact was successfully updated |
 
 ### `apollo_contact_search`
 
@@ -234,7 +240,7 @@ Search your team
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `contacts` | json | Array of contacts matching the search criteria |
-| `metadata` | json | Pagination information including page, per_page, and total_entries |
+| `pagination` | json | Pagination information |
 
 ### `apollo_contact_bulk_create`
 
@@ -254,7 +260,9 @@ Create up to 100 contacts at once in your Apollo database. Supports deduplicatio
 | --------- | ---- | ----------- |
 | `created_contacts` | json | Array of newly created contacts |
 | `existing_contacts` | json | Array of existing contacts \(when deduplication is enabled\) |
-| `metadata` | json | Bulk creation metadata including counts of created and existing contacts |
+| `total_submitted` | number | Total number of contacts submitted |
+| `created` | number | Number of contacts successfully created |
+| `existing` | number | Number of existing contacts found |
 
 ### `apollo_contact_bulk_update`
 
@@ -273,7 +281,9 @@ Update up to 100 existing contacts at once in your Apollo database. Each contact
 | --------- | ---- | ----------- |
 | `updated_contacts` | json | Array of successfully updated contacts |
 | `failed_contacts` | json | Array of contacts that failed to update |
-| `metadata` | json | Bulk update metadata including counts of updated and failed contacts |
+| `total_submitted` | number | Total number of contacts submitted |
+| `updated` | number | Number of contacts successfully updated |
+| `failed` | number | Number of contacts that failed to update |
 
 ### `apollo_account_create`
 
@@ -294,7 +304,7 @@ Create a new account (company) in your Apollo database
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `account` | json | Created account data from Apollo |
-| `metadata` | json | Creation metadata including created status |
+| `created` | boolean | Whether the account was successfully created |
 
 ### `apollo_account_update`
 
@@ -316,7 +326,7 @@ Update an existing account in your Apollo database
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `account` | json | Updated account data from Apollo |
-| `metadata` | json | Update metadata including updated status |
+| `updated` | boolean | Whether the account was successfully updated |
 
 ### `apollo_account_search`
 
@@ -338,7 +348,7 @@ Search your team
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `accounts` | json | Array of accounts matching the search criteria |
-| `metadata` | json | Pagination information including page, per_page, and total_entries |
+| `pagination` | json | Pagination information |
 
 ### `apollo_account_bulk_create`
 
@@ -357,7 +367,9 @@ Create up to 100 accounts at once in your Apollo database. Note: Apollo does not
 | --------- | ---- | ----------- |
 | `created_accounts` | json | Array of newly created accounts |
 | `failed_accounts` | json | Array of accounts that failed to create |
-| `metadata` | json | Bulk creation metadata including counts of created and failed accounts |
+| `total_submitted` | number | Total number of accounts submitted |
+| `created` | number | Number of accounts successfully created |
+| `failed` | number | Number of accounts that failed to create |
 
 ### `apollo_account_bulk_update`
 
@@ -376,7 +388,9 @@ Update up to 1000 existing accounts at once in your Apollo database (higher limi
 | --------- | ---- | ----------- |
 | `updated_accounts` | json | Array of successfully updated accounts |
 | `failed_accounts` | json | Array of accounts that failed to update |
-| `metadata` | json | Bulk update metadata including counts of updated and failed accounts |
+| `total_submitted` | number | Total number of accounts submitted |
+| `updated` | number | Number of accounts successfully updated |
+| `failed` | number | Number of accounts that failed to update |
 
 ### `apollo_opportunity_create`
 
@@ -400,7 +414,7 @@ Create a new deal for an account in your Apollo database (master key required)
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `opportunity` | json | Created opportunity data from Apollo |
-| `metadata` | json | Creation metadata including created status |
+| `created` | boolean | Whether the opportunity was successfully created |
 
 ### `apollo_opportunity_search`
 
@@ -423,7 +437,9 @@ Search and list all deals/opportunities in your team
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `opportunities` | json | Array of opportunities matching the search criteria |
-| `metadata` | json | Pagination information including page, per_page, and total_entries |
+| `page` | number | Current page number |
+| `per_page` | number | Results per page |
+| `total_entries` | number | Total matching entries |
 
 ### `apollo_opportunity_get`
 
@@ -441,7 +457,7 @@ Retrieve complete details of a specific deal/opportunity by ID
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `opportunity` | json | Complete opportunity data from Apollo |
-| `metadata` | json | Retrieval metadata including found status |
+| `found` | boolean | Whether the opportunity was found |
 
 ### `apollo_opportunity_update`
 
@@ -465,7 +481,7 @@ Update an existing deal/opportunity in your Apollo database
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `opportunity` | json | Updated opportunity data from Apollo |
-| `metadata` | json | Update metadata including updated status |
+| `updated` | boolean | Whether the opportunity was successfully updated |
 
 ### `apollo_sequence_search`
 
@@ -486,7 +502,9 @@ Search for sequences/campaigns in your team
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `sequences` | json | Array of sequences/campaigns matching the search criteria |
-| `metadata` | json | Pagination information including page, per_page, and total_entries |
+| `page` | number | Current page number |
+| `per_page` | number | Results per page |
+| `total_entries` | number | Total matching entries |
 
 ### `apollo_sequence_add_contacts`
 
@@ -507,7 +525,8 @@ Add contacts to an Apollo sequence
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `contacts_added` | json | Array of contact IDs added to the sequence |
-| `metadata` | json | Sequence metadata including sequence_id and total_added count |
+| `sequence_id` | string | ID of the sequence contacts were added to |
+| `total_added` | number | Total number of contacts added |
 
 ### `apollo_task_create`
 
@@ -530,7 +549,7 @@ Create a new task in Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `task` | json | Created task data from Apollo |
-| `metadata` | json | Creation metadata including created status |
+| `created` | boolean | Whether the task was successfully created |
 
 ### `apollo_task_search`
 
@@ -552,7 +571,7 @@ Search for tasks in Apollo
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `tasks` | json | Array of tasks matching the search criteria |
-| `metadata` | json | Pagination information including page, per_page, and total_entries |
+| `pagination` | json | Pagination information |
 
 ### `apollo_email_accounts`
 
@@ -569,11 +588,6 @@ Get list of team
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `email_accounts` | json | Array of team email accounts linked in Apollo |
-| `metadata` | json | Metadata including total count of email accounts |
+| `total` | number | Total count of email accounts |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `apollo`
diff --git a/apps/docs/content/docs/en/tools/arxiv.mdx b/apps/docs/content/docs/en/tools/arxiv.mdx
index 0baf62b67c..acb1e6b0f3 100644
--- a/apps/docs/content/docs/en/tools/arxiv.mdx
+++ b/apps/docs/content/docs/en/tools/arxiv.mdx
@@ -87,8 +87,3 @@ Search for papers by a specific author on ArXiv.
 | `authorPapers` | json | Array of papers authored by the specified author |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `arxiv`
diff --git a/apps/docs/content/docs/en/tools/asana.mdx b/apps/docs/content/docs/en/tools/asana.mdx
index 87686e065c..0c3823c93d 100644
--- a/apps/docs/content/docs/en/tools/asana.mdx
+++ b/apps/docs/content/docs/en/tools/asana.mdx
@@ -162,8 +162,3 @@ Add a comment (story) to an Asana task
 | `created_by` | object | Comment author details |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `asana`
diff --git a/apps/docs/content/docs/en/tools/browser_use.mdx b/apps/docs/content/docs/en/tools/browser_use.mdx
index 7e2b0f680c..6510894dce 100644
--- a/apps/docs/content/docs/en/tools/browser_use.mdx
+++ b/apps/docs/content/docs/en/tools/browser_use.mdx
@@ -58,8 +58,3 @@ Runs a browser automation task using BrowserUse
 | `steps` | json | Execution steps taken |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `browser_use`
diff --git a/apps/docs/content/docs/en/tools/calendly.mdx b/apps/docs/content/docs/en/tools/calendly.mdx
index d1772f84cd..ac6fdbb70c 100644
--- a/apps/docs/content/docs/en/tools/calendly.mdx
+++ b/apps/docs/content/docs/en/tools/calendly.mdx
@@ -170,8 +170,3 @@ Cancel a scheduled event
 | `resource` | object | Cancellation details |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `calendly`
diff --git a/apps/docs/content/docs/en/tools/circleback.mdx b/apps/docs/content/docs/en/tools/circleback.mdx
index 04810df96d..662ac1561f 100644
--- a/apps/docs/content/docs/en/tools/circleback.mdx
+++ b/apps/docs/content/docs/en/tools/circleback.mdx
@@ -57,8 +57,3 @@ Receive meeting notes, action items, transcripts, and recordings when meetings a
 
 
 
-
-## Notes
-
-- Category: `triggers`
-- Type: `circleback`
diff --git a/apps/docs/content/docs/en/tools/clay.mdx b/apps/docs/content/docs/en/tools/clay.mdx
index 97ea882cd4..2dca8e9390 100644
--- a/apps/docs/content/docs/en/tools/clay.mdx
+++ b/apps/docs/content/docs/en/tools/clay.mdx
@@ -63,8 +63,3 @@ Populate Clay with data from a JSON file. Enables direct communication and notif
 | `metadata` | object | Webhook response metadata |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `clay`
diff --git a/apps/docs/content/docs/en/tools/confluence.mdx b/apps/docs/content/docs/en/tools/confluence.mdx
index 031ef7f908..bb8453eceb 100644
--- a/apps/docs/content/docs/en/tools/confluence.mdx
+++ b/apps/docs/content/docs/en/tools/confluence.mdx
@@ -354,8 +354,3 @@ List all Confluence spaces accessible to the user.
 | `spaces` | array | List of spaces |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `confluence`
diff --git a/apps/docs/content/docs/en/tools/cursor.mdx b/apps/docs/content/docs/en/tools/cursor.mdx
index 77bab828b0..00c82c5f26 100644
--- a/apps/docs/content/docs/en/tools/cursor.mdx
+++ b/apps/docs/content/docs/en/tools/cursor.mdx
@@ -1,49 +1,22 @@
 ---
 title: Cursor
-description: Launch and manage Cursor cloud agents to work on GitHub repositories
+description: Agent identifier
 ---
 
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="cursor"
-  color="#1E1E1E"
+  type="cursor_v2"
+  color="#F5F5F5"
 />
 
-{/* MANUAL-CONTENT-START:intro */}
-[Cursor](https://www.cursor.so/) is an AI IDE and cloud-based platform that lets you launch and manage powerful AI agents able to work directly on your GitHub repositories. Cursor agents can automate development tasks, enhance your team's productivity, and collaborate with you by making code changes, responding to natural language instructions, and maintaining conversation history about their activities.
-
-With Cursor, you can:
-
-- **Launch cloud agents for codebases**: Instantly create new AI agents that work on your repositories in the cloud
-- **Delegate coding tasks using natural language**: Guide agents with written instructions, amendments, and clarifications
-- **Monitor progress and outputs**: Retrieve agent status, view detailed results, and inspect current or completed tasks
-- **Access full conversation history**: Review all prompts and AI responses for transparency and auditability
-- **Control and manage agent lifecycle**: List active agents, terminate agents, and manage API-based agent launches and follow-ups
-
-In Sim, the Cursor integration enables your agents and workflows to interact programmatically with Cursor cloud agents. This means you can use Sim to:
-
-- List all cloud agents and browse their current state (`cursor_list_agents`)
-- Retrieve up-to-date status and outputs for any agent (`cursor_get_agent`)
-- View the full conversation history for any coding agent (`cursor_get_conversation`)
-- Add follow-up instructions or new prompts to a running agent
-- Manage and terminate agents as needed
-
-This integration helps you combine the flexible intelligence of Sim agents with the powerful development automation capabilities of Cursor, making it possible to scale AI-driven development across your projects.
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Interact with Cursor Cloud Agents API to launch AI agents that can work on your GitHub repositories. Supports launching agents, adding follow-up instructions, checking status, viewing conversations, and managing agent lifecycle.
-
 
 
 ## Tools
 
 ### `cursor_list_agents`
 
-List all cloud agents for the authenticated user with optional pagination.
+List all cloud agents for the authenticated user with optional pagination. Returns API-aligned fields only.
 
 #### Input
 
@@ -57,12 +30,12 @@ List all cloud agents for the authenticated user with optional pagination.
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Human-readable list of agents |
-| `metadata` | object | Agent list metadata |
+| `agents` | array | Array of agent objects |
+| `nextCursor` | string | Pagination cursor for next page |
 
 ### `cursor_get_agent`
 
-Retrieve the current status and results of a cloud agent.
+Retrieve the current status and results of a cloud agent. Returns API-aligned fields only.
 
 #### Input
 
@@ -75,12 +48,17 @@ Retrieve the current status and results of a cloud agent.
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Human-readable agent details |
-| `metadata` | object | Agent metadata |
+| `id` | string | Agent ID |
+| `name` | string | Agent name |
+| `status` | string | Agent status |
+| `source` | json | Source repository info |
+| `target` | json | Target branch/PR info |
+| `summary` | string | Agent summary |
+| `createdAt` | string | Creation timestamp |
 
 ### `cursor_get_conversation`
 
-Retrieve the conversation history of a cloud agent, including all user prompts and assistant responses.
+Retrieve the conversation history of a cloud agent, including all user prompts and assistant responses. Returns API-aligned fields only.
 
 #### Input
 
@@ -93,12 +71,12 @@ Retrieve the conversation history of a cloud agent, including all user prompts a
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Human-readable conversation history |
-| `metadata` | object | Conversation metadata |
+| `id` | string | Agent ID |
+| `messages` | array | Array of conversation messages |
 
 ### `cursor_launch_agent`
 
-Start a new cloud agent to work on a GitHub repository with the given instructions.
+Start a new cloud agent to work on a GitHub repository with the given instructions. Returns API-aligned fields only.
 
 #### Input
 
@@ -119,12 +97,12 @@ Start a new cloud agent to work on a GitHub repository with the given instructio
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message with agent details |
-| `metadata` | object | Launch result metadata |
+| `id` | string | Agent ID |
+| `url` | string | Agent URL |
 
 ### `cursor_add_followup`
 
-Add a follow-up instruction to an existing cloud agent.
+Add a follow-up instruction to an existing cloud agent. Returns API-aligned fields only.
 
 #### Input
 
@@ -139,12 +117,11 @@ Add a follow-up instruction to an existing cloud agent.
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Result metadata |
+| `id` | string | Agent ID |
 
 ### `cursor_stop_agent`
 
-Stop a running cloud agent. This pauses the agent without deleting it.
+Stop a running cloud agent. Returns API-aligned fields only.
 
 #### Input
 
@@ -157,12 +134,11 @@ Stop a running cloud agent. This pauses the agent without deleting it.
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Result metadata |
+| `id` | string | Agent ID |
 
 ### `cursor_delete_agent`
 
-Permanently delete a cloud agent. This action cannot be undone.
+Permanently delete a cloud agent. Returns API-aligned fields only.
 
 #### Input
 
@@ -175,12 +151,6 @@ Permanently delete a cloud agent. This action cannot be undone.
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Result metadata |
-
-
+| `id` | string | Agent ID |
 
-## Notes
 
-- Category: `tools`
-- Type: `cursor`
diff --git a/apps/docs/content/docs/en/tools/datadog.mdx b/apps/docs/content/docs/en/tools/datadog.mdx
index 45978068a8..25c9fe784f 100644
--- a/apps/docs/content/docs/en/tools/datadog.mdx
+++ b/apps/docs/content/docs/en/tools/datadog.mdx
@@ -300,8 +300,3 @@ Cancel a scheduled downtime.
 | `success` | boolean | Whether the downtime was successfully canceled |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `datadog`
diff --git a/apps/docs/content/docs/en/tools/discord.mdx b/apps/docs/content/docs/en/tools/discord.mdx
index 208f962713..27c77f10f5 100644
--- a/apps/docs/content/docs/en/tools/discord.mdx
+++ b/apps/docs/content/docs/en/tools/discord.mdx
@@ -735,8 +735,3 @@ Delete a Discord webhook
 | `message` | string | Success or error message |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `discord`
diff --git a/apps/docs/content/docs/en/tools/dropbox.mdx b/apps/docs/content/docs/en/tools/dropbox.mdx
index 399d06a002..49a6ce22e8 100644
--- a/apps/docs/content/docs/en/tools/dropbox.mdx
+++ b/apps/docs/content/docs/en/tools/dropbox.mdx
@@ -217,8 +217,3 @@ Search for files and folders in Dropbox
 | `matches` | array | Search results |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `dropbox`
diff --git a/apps/docs/content/docs/en/tools/duckduckgo.mdx b/apps/docs/content/docs/en/tools/duckduckgo.mdx
index baf9f7d6e8..3530d15339 100644
--- a/apps/docs/content/docs/en/tools/duckduckgo.mdx
+++ b/apps/docs/content/docs/en/tools/duckduckgo.mdx
@@ -61,8 +61,3 @@ Search the web using DuckDuckGo Instant Answers API. Returns instant answers, ab
 | `relatedTopics` | array | Array of related topics with URLs and descriptions |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `duckduckgo`
diff --git a/apps/docs/content/docs/en/tools/dynamodb.mdx b/apps/docs/content/docs/en/tools/dynamodb.mdx
index ff0c9efd2a..03550a30d5 100644
--- a/apps/docs/content/docs/en/tools/dynamodb.mdx
+++ b/apps/docs/content/docs/en/tools/dynamodb.mdx
@@ -37,7 +37,7 @@ This integration empowers Sim agents to automate data management tasks within yo
 
 ## Usage Instructions
 
-Integrate Amazon DynamoDB into workflows. Supports Get, Put, Query, Scan, Update, and Delete operations on DynamoDB tables.
+Integrate Amazon DynamoDB into workflows. Supports Get, Put, Query, Scan, Update, Delete, and Introspect operations on DynamoDB tables.
 
 
 
@@ -185,9 +185,25 @@ Delete an item from a DynamoDB table
 | --------- | ---- | ----------- |
 | `message` | string | Operation status message |
 
+### `dynamodb_introspect`
 
+Introspect DynamoDB to list tables or get detailed schema information for a specific table
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `region` | string | Yes | AWS region \(e.g., us-east-1\) |
+| `accessKeyId` | string | Yes | AWS access key ID |
+| `secretAccessKey` | string | Yes | AWS secret access key |
+| `tableName` | string | No | Optional table name to get detailed schema. If not provided, lists all tables. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `tables` | array | List of table names in the region |
+| `tableDetails` | object | Detailed schema information for a specific table |
 
-## Notes
 
-- Category: `tools`
-- Type: `dynamodb`
diff --git a/apps/docs/content/docs/en/tools/elasticsearch.mdx b/apps/docs/content/docs/en/tools/elasticsearch.mdx
index 6c2fd618f6..d806a37586 100644
--- a/apps/docs/content/docs/en/tools/elasticsearch.mdx
+++ b/apps/docs/content/docs/en/tools/elasticsearch.mdx
@@ -362,9 +362,27 @@ Get comprehensive statistics about the Elasticsearch cluster.
 | `nodes` | object | Node statistics including count and versions |
 | `indices` | object | Index statistics including document count and store size |
 
+### `elasticsearch_list_indices`
 
+List all indices in the Elasticsearch cluster with their health, status, and statistics.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `deploymentType` | string | Yes | Deployment type: self_hosted or cloud |
+| `host` | string | No | Elasticsearch host URL \(for self-hosted\) |
+| `cloudId` | string | No | Elastic Cloud ID \(for cloud deployments\) |
+| `authMethod` | string | Yes | Authentication method: api_key or basic_auth |
+| `apiKey` | string | No | Elasticsearch API key |
+| `username` | string | No | Username for basic auth |
+| `password` | string | No | Password for basic auth |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Summary message about the indices |
+| `indices` | json | Array of index information objects |
 
-## Notes
 
-- Category: `tools`
-- Type: `elasticsearch`
diff --git a/apps/docs/content/docs/en/tools/elevenlabs.mdx b/apps/docs/content/docs/en/tools/elevenlabs.mdx
index 5c7515d5f0..108bce0f3f 100644
--- a/apps/docs/content/docs/en/tools/elevenlabs.mdx
+++ b/apps/docs/content/docs/en/tools/elevenlabs.mdx
@@ -54,8 +54,3 @@ Convert TTS using ElevenLabs voices
 | `audioFile` | file | The generated audio file |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `elevenlabs`
diff --git a/apps/docs/content/docs/en/tools/exa.mdx b/apps/docs/content/docs/en/tools/exa.mdx
index a864a2fdda..b9200f332d 100644
--- a/apps/docs/content/docs/en/tools/exa.mdx
+++ b/apps/docs/content/docs/en/tools/exa.mdx
@@ -148,8 +148,3 @@ Perform comprehensive research using AI to generate detailed reports with citati
 | `research` | array | Comprehensive research findings with citations and summaries |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `exa`
diff --git a/apps/docs/content/docs/en/tools/file.mdx b/apps/docs/content/docs/en/tools/file.mdx
index feb0021b63..b90c163bdb 100644
--- a/apps/docs/content/docs/en/tools/file.mdx
+++ b/apps/docs/content/docs/en/tools/file.mdx
@@ -52,8 +52,3 @@ Parse one or more uploaded files or files from URLs (text, PDF, CSV, images, etc
 | `combinedContent` | string | Combined content of all parsed files |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `file`
diff --git a/apps/docs/content/docs/en/tools/firecrawl.mdx b/apps/docs/content/docs/en/tools/firecrawl.mdx
index b38686bc11..ab76814c8f 100644
--- a/apps/docs/content/docs/en/tools/firecrawl.mdx
+++ b/apps/docs/content/docs/en/tools/firecrawl.mdx
@@ -176,8 +176,3 @@ Autonomous web data extraction agent. Searches and gathers information based on
 | `sources` | object | Array of source URLs used by the agent |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `firecrawl`
diff --git a/apps/docs/content/docs/en/tools/fireflies.mdx b/apps/docs/content/docs/en/tools/fireflies.mdx
index 6eb599337f..cdc57bc9fa 100644
--- a/apps/docs/content/docs/en/tools/fireflies.mdx
+++ b/apps/docs/content/docs/en/tools/fireflies.mdx
@@ -231,8 +231,3 @@ List all contacts from your Fireflies.ai meetings
 | `contacts` | array | List of contacts from meetings |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `fireflies`
diff --git a/apps/docs/content/docs/en/tools/github.mdx b/apps/docs/content/docs/en/tools/github.mdx
index 09ed416f87..bd08207b07 100644
--- a/apps/docs/content/docs/en/tools/github.mdx
+++ b/apps/docs/content/docs/en/tools/github.mdx
@@ -1,1177 +1,15 @@
 ---
 title: GitHub
-description: Interact with GitHub or trigger workflows from GitHub events
+description: Operation result data (API-aligned)
 ---
 
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="github"
-  color="#181C1E"
+  type="github_v2"
+  color="#F5F5F5"
 />
 
-{/* MANUAL-CONTENT-START:intro */}
-[GitHub](https://github.com/) is the world's leading platform for software development and version control using Git. It provides a collaborative environment where developers can host and review code, manage projects, and build software together.
 
-With GitHub, you can:
 
-- **Host repositories**: Store your code in public or private repositories with version control
-- **Collaborate on code**: Use pull requests to propose changes, review code, and merge contributions
-- **Track issues**: Create, assign, and manage issues to organize work and track bugs
-- **Automate workflows**: Use GitHub Actions to build, test, and deploy code automatically
-- **Manage projects**: Organize work with project boards, milestones, and task tracking
-- **Document code**: Create and maintain documentation with GitHub Pages and wikis
 
-In Sim, the GitHub integration enables your agents to interact directly with GitHub repositories and workflows. This allows for powerful automation scenarios such as code review assistance, pull request management, issue tracking, and repository exploration. Your agents can fetch repository data, analyze code changes, post comments on pull requests, and perform other GitHub operations programmatically. This integration bridges the gap between your AI workflows and your development processes, enabling seamless collaboration between your agents and your development team.
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Integrate Github into the workflow. Can get get PR details, create PR comment, get repository info, and get latest commit. Can be used in trigger mode to trigger a workflow when a PR is created, commented on, or a commit is pushed.
-
-
-
-## Tools
-
-### `github_pr`
-
-Fetch PR details including diff and files changed
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `pullNumber` | number | Yes | Pull request number |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable PR summary |
-| `metadata` | object | Detailed PR metadata including file changes |
-
-### `github_comment`
-
-Create comments on GitHub PRs
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `body` | string | Yes | Comment content |
-| `pullNumber` | number | Yes | Pull request number |
-| `path` | string | No | File path for review comment |
-| `position` | number | No | Line number for review comment |
-| `commentType` | string | No | Type of comment \(pr_comment or file_comment\) |
-| `line` | number | No | Line number for review comment |
-| `side` | string | No | Side of the diff \(LEFT or RIGHT\) |
-| `commitId` | string | No | The SHA of the commit to comment on |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable comment confirmation |
-| `metadata` | object | Comment metadata |
-
-### `github_repo_info`
-
-Retrieve comprehensive GitHub repository metadata including stars, forks, issues, and primary language. Supports both public and private repositories with optional authentication.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable repository summary |
-| `metadata` | object | Repository metadata |
-
-### `github_latest_commit`
-
-Retrieve the latest commit from a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `branch` | string | No | Branch name \(defaults to the repository's default branch\) |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable commit summary |
-| `metadata` | object | Commit metadata |
-
-### `github_issue_comment`
-
-Create a comment on a GitHub issue
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `body` | string | Yes | Comment content |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable comment confirmation |
-| `metadata` | object | Comment metadata |
-
-### `github_list_issue_comments`
-
-List all comments on a GitHub issue
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `since` | string | No | Only show comments updated after this ISO 8601 timestamp |
-| `per_page` | number | No | Number of results per page \(max 100\) |
-| `page` | number | No | Page number |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable comments summary |
-| `metadata` | object | Comments list metadata |
-
-### `github_update_comment`
-
-Update an existing comment on a GitHub issue or pull request
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `comment_id` | number | Yes | Comment ID |
-| `body` | string | Yes | Updated comment content |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable update confirmation |
-| `metadata` | object | Updated comment metadata |
-
-### `github_delete_comment`
-
-Delete a comment on a GitHub issue or pull request
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `comment_id` | number | Yes | Comment ID |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable deletion confirmation |
-| `metadata` | object | Deletion result metadata |
-
-### `github_list_pr_comments`
-
-List all review comments on a GitHub pull request
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `pullNumber` | number | Yes | Pull request number |
-| `sort` | string | No | Sort by created or updated |
-| `direction` | string | No | Sort direction \(asc or desc\) |
-| `since` | string | No | Only show comments updated after this ISO 8601 timestamp |
-| `per_page` | number | No | Number of results per page \(max 100\) |
-| `page` | number | No | Page number |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable review comments summary |
-| `metadata` | object | Review comments list metadata |
-
-### `github_create_pr`
-
-Create a new pull request in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `title` | string | Yes | Pull request title |
-| `head` | string | Yes | The name of the branch where your changes are implemented |
-| `base` | string | Yes | The name of the branch you want the changes pulled into |
-| `body` | string | No | Pull request description \(Markdown\) |
-| `draft` | boolean | No | Create as draft pull request |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable PR creation confirmation |
-| `metadata` | object | Pull request metadata |
-
-### `github_update_pr`
-
-Update an existing pull request in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `pullNumber` | number | Yes | Pull request number |
-| `title` | string | No | New pull request title |
-| `body` | string | No | New pull request description \(Markdown\) |
-| `state` | string | No | New state \(open or closed\) |
-| `base` | string | No | New base branch name |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable PR update confirmation |
-| `metadata` | object | Updated pull request metadata |
-
-### `github_merge_pr`
-
-Merge a pull request in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `pullNumber` | number | Yes | Pull request number |
-| `commit_title` | string | No | Title for the merge commit |
-| `commit_message` | string | No | Extra detail to append to merge commit message |
-| `merge_method` | string | No | Merge method: merge, squash, or rebase |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable merge confirmation |
-| `metadata` | object | Merge result metadata |
-
-### `github_list_prs`
-
-List pull requests in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `state` | string | No | Filter by state: open, closed, or all |
-| `head` | string | No | Filter by head user or branch name \(format: user:ref-name or organization:ref-name\) |
-| `base` | string | No | Filter by base branch name |
-| `sort` | string | No | Sort by: created, updated, popularity, or long-running |
-| `direction` | string | No | Sort direction: asc or desc |
-| `per_page` | number | No | Results per page \(max 100\) |
-| `page` | number | No | Page number |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable list of pull requests |
-| `metadata` | object | Pull requests list metadata |
-
-### `github_get_pr_files`
-
-Get the list of files changed in a pull request
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `pullNumber` | number | Yes | Pull request number |
-| `per_page` | number | No | Results per page \(max 100\) |
-| `page` | number | No | Page number |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable list of files changed in PR |
-| `metadata` | object | PR files metadata |
-
-### `github_close_pr`
-
-Close a pull request in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `pullNumber` | number | Yes | Pull request number |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable PR close confirmation |
-| `metadata` | object | Closed pull request metadata |
-
-### `github_request_reviewers`
-
-Request reviewers for a pull request
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `pullNumber` | number | Yes | Pull request number |
-| `reviewers` | string | Yes | Comma-separated list of user logins to request reviews from |
-| `team_reviewers` | string | No | Comma-separated list of team slugs to request reviews from |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable reviewer request confirmation |
-| `metadata` | object | Requested reviewers metadata |
-
-### `github_get_file_content`
-
-Get the content of a file from a GitHub repository. Supports files up to 1MB. Content is returned decoded and human-readable.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `path` | string | Yes | Path to the file in the repository \(e.g., "src/index.ts"\) |
-| `ref` | string | No | Branch name, tag, or commit SHA \(defaults to repository default branch\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable file information with content preview |
-| `metadata` | object | File metadata including name, path, SHA, size, and URLs |
-
-### `github_create_file`
-
-Create a new file in a GitHub repository. The file content will be automatically Base64 encoded. Supports files up to 1MB.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `path` | string | Yes | Path where the file will be created \(e.g., "src/newfile.ts"\) |
-| `message` | string | Yes | Commit message for this file creation |
-| `content` | string | Yes | File content \(plain text, will be Base64 encoded automatically\) |
-| `branch` | string | No | Branch to create the file in \(defaults to repository default branch\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable file creation confirmation |
-| `metadata` | object | File and commit metadata |
-
-### `github_update_file`
-
-Update an existing file in a GitHub repository. Requires the file SHA. Content will be automatically Base64 encoded. Supports files up to 1MB.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `path` | string | Yes | Path to the file to update \(e.g., "src/index.ts"\) |
-| `message` | string | Yes | Commit message for this file update |
-| `content` | string | Yes | New file content \(plain text, will be Base64 encoded automatically\) |
-| `sha` | string | Yes | The blob SHA of the file being replaced \(get from github_get_file_content\) |
-| `branch` | string | No | Branch to update the file in \(defaults to repository default branch\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable file update confirmation |
-| `metadata` | object | Updated file and commit metadata |
-
-### `github_delete_file`
-
-Delete a file from a GitHub repository. Requires the file SHA. This operation cannot be undone through the API.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `path` | string | Yes | Path to the file to delete \(e.g., "src/oldfile.ts"\) |
-| `message` | string | Yes | Commit message for this file deletion |
-| `sha` | string | Yes | The blob SHA of the file being deleted \(get from github_get_file_content\) |
-| `branch` | string | No | Branch to delete the file from \(defaults to repository default branch\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable file deletion confirmation |
-| `metadata` | object | Deletion confirmation and commit metadata |
-
-### `github_get_tree`
-
-Get the contents of a directory in a GitHub repository. Returns a list of files and subdirectories. Use empty path or omit to get root directory contents.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `path` | string | No | Directory path \(e.g., "src/components"\). Leave empty for root directory. |
-| `ref` | string | No | Branch name, tag, or commit SHA \(defaults to repository default branch\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable directory tree listing |
-| `metadata` | object | Directory contents metadata |
-
-### `github_list_branches`
-
-List all branches in a GitHub repository. Optionally filter by protected status and control pagination.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `protected` | boolean | No | Filter branches by protection status |
-| `per_page` | number | No | Number of results per page \(max 100, default 30\) |
-| `page` | number | No | Page number for pagination \(default 1\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable list of branches |
-| `metadata` | object | Branch list metadata |
-
-### `github_get_branch`
-
-Get detailed information about a specific branch in a GitHub repository, including commit details and protection status.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `branch` | string | Yes | Branch name |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable branch details |
-| `metadata` | object | Branch metadata |
-
-### `github_create_branch`
-
-Create a new branch in a GitHub repository by creating a git reference pointing to a specific commit SHA.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `branch` | string | Yes | Name of the branch to create |
-| `sha` | string | Yes | Commit SHA to point the branch to |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable branch creation confirmation |
-| `metadata` | object | Git reference metadata |
-
-### `github_delete_branch`
-
-Delete a branch from a GitHub repository by removing its git reference. Protected branches cannot be deleted.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `branch` | string | Yes | Name of the branch to delete |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable deletion confirmation |
-| `metadata` | object | Deletion metadata |
-
-### `github_get_branch_protection`
-
-Get the branch protection rules for a specific branch, including status checks, review requirements, and restrictions.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `branch` | string | Yes | Branch name |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable branch protection summary |
-| `metadata` | object | Branch protection configuration |
-
-### `github_update_branch_protection`
-
-Update branch protection rules for a specific branch, including status checks, review requirements, admin enforcement, and push restrictions.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `branch` | string | Yes | Branch name |
-| `required_status_checks` | object | Yes | Required status check configuration \(null to disable\). Object with strict \(boolean\) and contexts \(string array\) |
-| `enforce_admins` | boolean | Yes | Whether to enforce restrictions for administrators |
-| `required_pull_request_reviews` | object | Yes | PR review requirements \(null to disable\). Object with optional required_approving_review_count, dismiss_stale_reviews, require_code_owner_reviews |
-| `restrictions` | object | Yes | Push restrictions \(null to disable\). Object with users \(string array\) and teams \(string array\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable branch protection update summary |
-| `metadata` | object | Updated branch protection configuration |
-
-### `github_create_issue`
-
-Create a new issue in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `title` | string | Yes | Issue title |
-| `body` | string | No | Issue description/body |
-| `assignees` | string | No | Comma-separated list of usernames to assign to this issue |
-| `labels` | string | No | Comma-separated list of label names to add to this issue |
-| `milestone` | number | No | Milestone number to associate with this issue |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable issue creation confirmation |
-| `metadata` | object | Issue metadata |
-
-### `github_update_issue`
-
-Update an existing issue in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `title` | string | No | New issue title |
-| `body` | string | No | New issue description/body |
-| `state` | string | No | Issue state \(open or closed\) |
-| `labels` | array | No | Array of label names \(replaces all existing labels\) |
-| `assignees` | array | No | Array of usernames \(replaces all existing assignees\) |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable issue update confirmation |
-| `metadata` | object | Updated issue metadata |
-
-### `github_list_issues`
-
-List issues in a GitHub repository. Note: This includes pull requests as PRs are considered issues in GitHub
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `state` | string | No | Filter by state: open, closed, or all \(default: open\) |
-| `assignee` | string | No | Filter by assignee username |
-| `creator` | string | No | Filter by creator username |
-| `labels` | string | No | Comma-separated list of label names to filter by |
-| `sort` | string | No | Sort by: created, updated, or comments \(default: created\) |
-| `direction` | string | No | Sort direction: asc or desc \(default: desc\) |
-| `per_page` | number | No | Results per page \(max 100, default: 30\) |
-| `page` | number | No | Page number \(default: 1\) |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable list of issues |
-| `metadata` | object | Issues list metadata |
-
-### `github_get_issue`
-
-Get detailed information about a specific issue in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable issue details |
-| `metadata` | object | Detailed issue metadata |
-
-### `github_close_issue`
-
-Close an issue in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `state_reason` | string | No | Reason for closing: completed or not_planned |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable issue close confirmation |
-| `metadata` | object | Closed issue metadata |
-
-### `github_add_labels`
-
-Add labels to an issue in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `labels` | string | Yes | Comma-separated list of label names to add to the issue |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable labels confirmation |
-| `metadata` | object | Labels metadata |
-
-### `github_remove_label`
-
-Remove a label from an issue in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `name` | string | Yes | Label name to remove |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable label removal confirmation |
-| `metadata` | object | Remaining labels metadata |
-
-### `github_add_assignees`
-
-Add assignees to an issue in a GitHub repository
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner |
-| `repo` | string | Yes | Repository name |
-| `issue_number` | number | Yes | Issue number |
-| `assignees` | string | Yes | Comma-separated list of usernames to assign to the issue |
-| `apiKey` | string | Yes | GitHub API token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable assignees confirmation |
-| `metadata` | object | Updated issue metadata with assignees |
-
-### `github_create_release`
-
-Create a new release for a GitHub repository. Specify tag name, target commit, title, description, and whether it should be a draft or prerelease.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `tag_name` | string | Yes | The name of the tag for this release |
-| `target_commitish` | string | No | Specifies the commitish value that determines where the Git tag is created from. Can be any branch or commit SHA. Defaults to the repository default branch. |
-| `name` | string | No | The name of the release |
-| `body` | string | No | Text describing the contents of the release \(markdown supported\) |
-| `draft` | boolean | No | true to create a draft \(unpublished\) release, false to create a published one |
-| `prerelease` | boolean | No | true to identify the release as a prerelease, false to identify as a full release |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable release creation summary |
-| `metadata` | object | Release metadata including download URLs |
-
-### `github_update_release`
-
-Update an existing GitHub release. Modify tag name, target commit, title, description, draft status, or prerelease status.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `release_id` | number | Yes | The unique identifier of the release |
-| `tag_name` | string | No | The name of the tag |
-| `target_commitish` | string | No | Specifies the commitish value for where the tag is created from |
-| `name` | string | No | The name of the release |
-| `body` | string | No | Text describing the contents of the release \(markdown supported\) |
-| `draft` | boolean | No | true to set as draft, false to publish |
-| `prerelease` | boolean | No | true to identify as a prerelease, false for a full release |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable release update summary |
-| `metadata` | object | Updated release metadata including download URLs |
-
-### `github_list_releases`
-
-List all releases for a GitHub repository. Returns release information including tags, names, and download URLs.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `per_page` | number | No | Number of results per page \(max 100\) |
-| `page` | number | No | Page number of the results to fetch |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable list of releases with summary |
-| `metadata` | object | Releases metadata |
-
-### `github_get_release`
-
-Get detailed information about a specific GitHub release by ID. Returns release metadata including assets and download URLs.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `release_id` | number | Yes | The unique identifier of the release |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable release details |
-| `metadata` | object | Release metadata including download URLs |
-
-### `github_delete_release`
-
-Delete a GitHub release by ID. This permanently removes the release but does not delete the associated Git tag.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `release_id` | number | Yes | The unique identifier of the release to delete |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable deletion confirmation |
-| `metadata` | object | Deletion result metadata |
-
-### `github_list_workflows`
-
-List all workflows in a GitHub repository. Returns workflow details including ID, name, path, state, and badge URL.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `per_page` | number | No | Number of results per page \(default: 30, max: 100\) |
-| `page` | number | No | Page number of results to fetch \(default: 1\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable workflows summary |
-| `metadata` | object | Workflows metadata |
-
-### `github_get_workflow`
-
-Get details of a specific GitHub Actions workflow by ID or filename. Returns workflow information including name, path, state, and badge URL.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `workflow_id` | string | Yes | Workflow ID \(number\) or workflow filename \(e.g., "main.yaml"\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable workflow details |
-| `metadata` | object | Workflow metadata |
-
-### `github_trigger_workflow`
-
-Trigger a workflow dispatch event for a GitHub Actions workflow. The workflow must have a workflow_dispatch trigger configured. Returns 204 No Content on success.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `workflow_id` | string | Yes | Workflow ID \(number\) or workflow filename \(e.g., "main.yaml"\) |
-| `ref` | string | Yes | Git reference \(branch or tag name\) to run the workflow on |
-| `inputs` | object | No | Input keys and values configured in the workflow file |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Confirmation message |
-| `metadata` | object | Empty metadata object \(204 No Content response\) |
-
-### `github_list_workflow_runs`
-
-List workflow runs for a repository. Supports filtering by actor, branch, event, and status. Returns run details including status, conclusion, and links.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `actor` | string | No | Filter by user who triggered the workflow |
-| `branch` | string | No | Filter by branch name |
-| `event` | string | No | Filter by event type \(e.g., push, pull_request, workflow_dispatch\) |
-| `status` | string | No | Filter by status \(queued, in_progress, completed, waiting, requested, pending\) |
-| `per_page` | number | No | Number of results per page \(default: 30, max: 100\) |
-| `page` | number | No | Page number of results to fetch \(default: 1\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable workflow runs summary |
-| `metadata` | object | Workflow runs metadata |
-
-### `github_get_workflow_run`
-
-Get detailed information about a specific workflow run by ID. Returns status, conclusion, timing, and links to the run.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `run_id` | number | Yes | Workflow run ID |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable workflow run details |
-| `metadata` | object | Workflow run metadata |
-
-### `github_cancel_workflow_run`
-
-Cancel a workflow run. Returns 202 Accepted if cancellation is initiated, or 409 Conflict if the run cannot be cancelled (already completed).
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `run_id` | number | Yes | Workflow run ID to cancel |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Cancellation status message |
-| `metadata` | object | Cancellation metadata |
-
-### `github_rerun_workflow`
-
-Rerun a workflow run. Optionally enable debug logging for the rerun. Returns 201 Created on success.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner` | string | Yes | Repository owner \(user or organization\) |
-| `repo` | string | Yes | Repository name |
-| `run_id` | number | Yes | Workflow run ID to rerun |
-| `enable_debug_logging` | boolean | No | Enable debug logging for the rerun \(default: false\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Rerun confirmation message |
-| `metadata` | object | Rerun metadata |
-
-### `github_list_projects`
-
-List GitHub Projects V2 for an organization or user. Returns up to 20 projects with their details including ID, title, number, URL, and status.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner_type` | string | Yes | Owner type: "org" for organization or "user" for user |
-| `owner_login` | string | Yes | Organization or user login name |
-| `apiKey` | string | Yes | GitHub Personal Access Token with project read permissions |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable list of projects |
-| `metadata` | object | Projects metadata |
-
-### `github_get_project`
-
-Get detailed information about a specific GitHub Project V2 by its number. Returns project details including ID, title, description, URL, and status.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner_type` | string | Yes | Owner type: "org" for organization or "user" for user |
-| `owner_login` | string | Yes | Organization or user login name |
-| `project_number` | number | Yes | Project number |
-| `apiKey` | string | Yes | GitHub Personal Access Token with project read permissions |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable project details |
-| `metadata` | object | Project metadata |
-
-### `github_create_project`
-
-Create a new GitHub Project V2. Requires the owner Node ID (not login name). Returns the created project with ID, title, and URL.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `owner_id` | string | Yes | Owner Node ID \(format: PVT_... or MDQ6...\). Use GitHub GraphQL API to get this ID from organization or user login. |
-| `title` | string | Yes | Project title |
-| `apiKey` | string | Yes | GitHub Personal Access Token with project write permissions |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable confirmation message |
-| `metadata` | object | Created project metadata |
-
-### `github_update_project`
-
-Update an existing GitHub Project V2. Can update title, description, visibility (public), or status (closed). Requires the project Node ID.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `project_id` | string | Yes | Project Node ID \(format: PVT_...\) |
-| `title` | string | No | New project title |
-| `shortDescription` | string | No | New project short description |
-| `project_public` | boolean | No | Set project visibility \(true = public, false = private\) |
-| `closed` | boolean | No | Set project status \(true = closed, false = open\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token with project write permissions |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable confirmation message |
-| `metadata` | object | Updated project metadata |
-
-### `github_delete_project`
-
-Delete a GitHub Project V2. This action is permanent and cannot be undone. Requires the project Node ID.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `project_id` | string | Yes | Project Node ID \(format: PVT_...\) |
-| `apiKey` | string | Yes | GitHub Personal Access Token with project admin permissions |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `content` | string | Human-readable confirmation message |
-| `metadata` | object | Deleted project metadata |
-
-
-
-## Notes
-
-- Category: `tools`
-- Type: `github`
diff --git a/apps/docs/content/docs/en/tools/gitlab.mdx b/apps/docs/content/docs/en/tools/gitlab.mdx
index f5b71f443d..e1b68a35ef 100644
--- a/apps/docs/content/docs/en/tools/gitlab.mdx
+++ b/apps/docs/content/docs/en/tools/gitlab.mdx
@@ -427,8 +427,3 @@ Cancel a running GitLab pipeline
 | `pipeline` | object | The cancelled GitLab pipeline |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `gitlab`
diff --git a/apps/docs/content/docs/en/tools/gmail.mdx b/apps/docs/content/docs/en/tools/gmail.mdx
index 6b01273671..3accf3bbee 100644
--- a/apps/docs/content/docs/en/tools/gmail.mdx
+++ b/apps/docs/content/docs/en/tools/gmail.mdx
@@ -1,50 +1,22 @@
 ---
 title: Gmail
-description: Send, read, search, and move Gmail messages or trigger workflows from Gmail events
+description: Gmail message ID
 ---
 
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="gmail"
-  color="#E0E0E0"
+  type="gmail_v2"
+  color="#F5F5F5"
 />
 
-{/* MANUAL-CONTENT-START:intro */}
-[Gmail](https://gmail.com) is Google's popular email service that provides a robust platform for sending, receiving, and managing email communications. With over 1.8 billion active users worldwide, Gmail offers a feature-rich experience with powerful search capabilities, organizational tools, and integration options.
-
-With Gmail, you can:
-
-- **Send and receive emails**: Communicate with contacts through a clean, intuitive interface
-- **Organize messages**: Use labels, folders, and filters to keep your inbox organized
-- **Search efficiently**: Find specific messages quickly with Google's powerful search technology
-- **Automate workflows**: Create filters and rules to automatically process incoming emails
-- **Access from anywhere**: Use Gmail across devices with synchronized content and settings
-- **Integrate with other services**: Connect with Google Calendar, Drive, and other productivity tools
-
-In Sim, the Gmail integration enables your agents to fully manage emails programmatically with comprehensive automation capabilities. This allows for powerful automation scenarios such as sending notifications, processing incoming messages, extracting information from emails, and managing communication workflows at scale. Your agents can:
-
-- **Compose and send**: Create personalized emails with attachments and send to recipients
-- **Read and search**: Find specific messages using Gmail's query syntax and extract content
-- **Organize intelligently**: Mark messages as read/unread, archive or unarchive emails, and manage labels
-- **Clean up inbox**: Delete messages, move emails between labels, and maintain inbox zero
-- **Trigger workflows**: Listen for new emails in real-time, enabling responsive workflows that react to incoming messages
-
-This integration bridges the gap between your AI workflows and email communications, enabling seamless interaction with one of the world's most widely used communication platforms. Whether you're automating customer support responses, processing receipts, managing subscriptions, or coordinating team communications, the Gmail integration provides all the tools you need for comprehensive email automation.
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Integrate Gmail into the workflow. Can send, read, search, and move emails. Can be used in trigger mode to trigger a workflow when a new email is received.
-
 
 
 ## Tools
 
 ### `gmail_send`
 
-Send emails using Gmail
+Send emails using Gmail. Returns API-aligned fields only.
 
 #### Input
 
@@ -64,12 +36,13 @@ Send emails using Gmail
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Email labels |
 
 ### `gmail_draft`
 
-Draft emails using Gmail
+Draft emails using Gmail. Returns API-aligned fields only.
 
 #### Input
 
@@ -89,12 +62,14 @@ Draft emails using Gmail
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Draft metadata |
+| `draftId` | string | Draft ID |
+| `messageId` | string | Gmail message ID for the draft |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Email labels |
 
 ### `gmail_read`
 
-Read emails from Gmail
+Read emails from Gmail. Returns API-aligned fields only.
 
 #### Input
 
@@ -110,13 +85,22 @@ Read emails from Gmail
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Text content of the email |
-| `metadata` | json | Metadata of the email |
-| `attachments` | file[] | Attachments of the email |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Email labels |
+| `from` | string | Sender email address |
+| `to` | string | Recipient email address |
+| `subject` | string | Email subject |
+| `date` | string | Email date |
+| `body` | string | Email body text \(best-effort plain text\) |
+| `hasAttachments` | boolean | Whether the email has attachments |
+| `attachmentCount` | number | Number of attachments |
+| `attachments` | file[] | Downloaded attachments \(if enabled\) |
+| `results` | json | Summary results when reading multiple messages |
 
 ### `gmail_search`
 
-Search emails in Gmail
+Search emails in Gmail. Returns API-aligned fields only.
 
 #### Input
 
@@ -129,12 +113,11 @@ Search emails in Gmail
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Search results summary |
-| `metadata` | object | Search metadata |
+| `results` | json | Array of search results |
 
 ### `gmail_move`
 
-Move emails between Gmail labels/folders
+Move emails between labels/folders in Gmail. Returns API-aligned fields only.
 
 #### Input
 
@@ -148,12 +131,13 @@ Move emails between Gmail labels/folders
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Email labels |
 
 ### `gmail_mark_read`
 
-Mark a Gmail message as read
+Mark a Gmail message as read. Returns API-aligned fields only.
 
 #### Input
 
@@ -165,12 +149,13 @@ Mark a Gmail message as read
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Updated email labels |
 
 ### `gmail_mark_unread`
 
-Mark a Gmail message as unread
+Mark a Gmail message as unread. Returns API-aligned fields only.
 
 #### Input
 
@@ -182,12 +167,13 @@ Mark a Gmail message as unread
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Updated email labels |
 
 ### `gmail_archive`
 
-Archive a Gmail message (remove from inbox)
+Archive a Gmail message (remove from inbox). Returns API-aligned fields only.
 
 #### Input
 
@@ -199,12 +185,13 @@ Archive a Gmail message (remove from inbox)
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Updated email labels |
 
 ### `gmail_unarchive`
 
-Unarchive a Gmail message (move back to inbox)
+Unarchive a Gmail message (move back to inbox). Returns API-aligned fields only.
 
 #### Input
 
@@ -216,12 +203,13 @@ Unarchive a Gmail message (move back to inbox)
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Updated email labels |
 
 ### `gmail_delete`
 
-Delete a Gmail message (move to trash)
+Delete a Gmail message (move to trash). Returns API-aligned fields only.
 
 #### Input
 
@@ -233,12 +221,13 @@ Delete a Gmail message (move to trash)
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Updated email labels |
 
 ### `gmail_add_label`
 
-Add label(s) to a Gmail message
+Add label(s) to a Gmail message. Returns API-aligned fields only.
 
 #### Input
 
@@ -251,12 +240,13 @@ Add label(s) to a Gmail message
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Updated email labels |
 
 ### `gmail_remove_label`
 
-Remove label(s) from a Gmail message
+Remove label(s) from a Gmail message. Returns API-aligned fields only.
 
 #### Input
 
@@ -269,12 +259,8 @@ Remove label(s) from a Gmail message
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message |
-| `metadata` | object | Email metadata |
-
-
+| `id` | string | Gmail message ID |
+| `threadId` | string | Gmail thread ID |
+| `labelIds` | array | Updated email labels |
 
-## Notes
 
-- Category: `tools`
-- Type: `gmail`
diff --git a/apps/docs/content/docs/en/tools/google_calendar.mdx b/apps/docs/content/docs/en/tools/google_calendar.mdx
index b38eb3d995..8a6523a8dd 100644
--- a/apps/docs/content/docs/en/tools/google_calendar.mdx
+++ b/apps/docs/content/docs/en/tools/google_calendar.mdx
@@ -1,41 +1,22 @@
 ---
 title: Google Calendar
-description: Manage Google Calendar events
+description: Event ID
 ---
 
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="google_calendar"
-  color="#E0E0E0"
+  type="google_calendar_v2"
+  color="#F5F5F5"
 />
 
-{/* MANUAL-CONTENT-START:intro */}
-[Google Calendar](https://calendar.google.com) is Google's powerful calendar and scheduling service that provides a comprehensive platform for managing events, meetings, and appointments. With seamless integration across Google's ecosystem and widespread adoption, Google Calendar offers robust features for both personal and professional scheduling needs.
-
-With Google Calendar, you can:
-
-- **Create and manage events**: Schedule meetings, appointments, and reminders with detailed information
-- **Send calendar invites**: Automatically notify and coordinate with attendees through email invitations
-- **Natural language event creation**: Quickly add events using conversational language like "Meeting with John tomorrow at 3pm"
-- **View and search events**: Easily find and access your scheduled events across multiple calendars
-- **Manage multiple calendars**: Organize different types of events across various calendars
-
-In Sim, the Google Calendar integration enables your agents to programmatically create, read, and manage calendar events. This allows for powerful automation scenarios such as scheduling meetings, sending calendar invites, checking availability, and managing event details. Your agents can create events with natural language input, send automated calendar invitations to attendees, retrieve event information, and list upcoming events. This integration bridges the gap between your AI workflows and calendar management, enabling seamless scheduling automation and coordination with one of the world's most widely used calendar platforms.
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Integrate Google Calendar into the workflow. Can create, read, update, and list calendar events.
-
 
 
 ## Tools
 
 ### `google_calendar_create`
 
-Create a new event in Google Calendar
+Create a new event in Google Calendar. Returns API-aligned fields only.
 
 #### Input
 
@@ -55,12 +36,21 @@ Create a new event in Google Calendar
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Event creation confirmation message |
-| `metadata` | json | Created event metadata including ID, status, and details |
+| `id` | string | Event ID |
+| `htmlLink` | string | Event link |
+| `status` | string | Event status |
+| `summary` | string | Event title |
+| `description` | string | Event description |
+| `location` | string | Event location |
+| `start` | json | Event start |
+| `end` | json | Event end |
+| `attendees` | json | Event attendees |
+| `creator` | json | Event creator |
+| `organizer` | json | Event organizer |
 
 ### `google_calendar_list`
 
-List events from Google Calendar
+List events from Google Calendar. Returns API-aligned fields only.
 
 #### Input
 
@@ -76,12 +66,13 @@ List events from Google Calendar
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Summary of found events count |
-| `metadata` | json | List of events with pagination tokens and event details |
+| `nextPageToken` | string | Next page token |
+| `timeZone` | string | Calendar time zone |
+| `events` | json | List of events |
 
 ### `google_calendar_get`
 
-Get a specific event from Google Calendar
+Get a specific event from Google Calendar. Returns API-aligned fields only.
 
 #### Input
 
@@ -94,12 +85,21 @@ Get a specific event from Google Calendar
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Event retrieval confirmation message |
-| `metadata` | json | Event details including ID, status, times, and attendees |
+| `id` | string | Event ID |
+| `htmlLink` | string | Event link |
+| `status` | string | Event status |
+| `summary` | string | Event title |
+| `description` | string | Event description |
+| `location` | string | Event location |
+| `start` | json | Event start |
+| `end` | json | Event end |
+| `attendees` | json | Event attendees |
+| `creator` | json | Event creator |
+| `organizer` | json | Event organizer |
 
 ### `google_calendar_quick_add`
 
-Create events from natural language text
+Create events from natural language text. Returns API-aligned fields only.
 
 #### Input
 
@@ -114,12 +114,21 @@ Create events from natural language text
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Event creation confirmation message from natural language |
-| `metadata` | json | Created event metadata including parsed details |
+| `id` | string | Event ID |
+| `htmlLink` | string | Event link |
+| `status` | string | Event status |
+| `summary` | string | Event title |
+| `description` | string | Event description |
+| `location` | string | Event location |
+| `start` | json | Event start |
+| `end` | json | Event end |
+| `attendees` | json | Event attendees |
+| `creator` | json | Event creator |
+| `organizer` | json | Event organizer |
 
 ### `google_calendar_invite`
 
-Invite attendees to an existing Google Calendar event
+Invite attendees to an existing Google Calendar event. Returns API-aligned fields only.
 
 #### Input
 
@@ -135,12 +144,16 @@ Invite attendees to an existing Google Calendar event
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Attendee invitation confirmation message with email delivery status |
-| `metadata` | json | Updated event metadata including attendee list and details |
-
-
+| `id` | string | Event ID |
+| `htmlLink` | string | Event link |
+| `status` | string | Event status |
+| `summary` | string | Event title |
+| `description` | string | Event description |
+| `location` | string | Event location |
+| `start` | json | Event start |
+| `end` | json | Event end |
+| `attendees` | json | Event attendees |
+| `creator` | json | Event creator |
+| `organizer` | json | Event organizer |
 
-## Notes
 
-- Category: `tools`
-- Type: `google_calendar`
diff --git a/apps/docs/content/docs/en/tools/google_docs.mdx b/apps/docs/content/docs/en/tools/google_docs.mdx
index 06973e14c0..e9b9af71b9 100644
--- a/apps/docs/content/docs/en/tools/google_docs.mdx
+++ b/apps/docs/content/docs/en/tools/google_docs.mdx
@@ -126,8 +126,3 @@ Create a new Google Docs document
 | `metadata` | json | Created document metadata including ID, title, and URL |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_docs`
diff --git a/apps/docs/content/docs/en/tools/google_drive.mdx b/apps/docs/content/docs/en/tools/google_drive.mdx
index 54b3ed3bc3..15c184e0a0 100644
--- a/apps/docs/content/docs/en/tools/google_drive.mdx
+++ b/apps/docs/content/docs/en/tools/google_drive.mdx
@@ -96,13 +96,13 @@ Download a file from Google Drive with complete metadata (exports Google Workspa
 | `fileId` | string | Yes | The ID of the file to download |
 | `mimeType` | string | No | The MIME type to export Google Workspace files to \(optional\) |
 | `fileName` | string | No | Optional filename override |
-| `includeRevisions` | boolean | No | Whether to include revision history in the metadata \(default: true\) |
+| `includeRevisions` | boolean | No | Whether to include revision history in the metadata \(default: true, returns first 100 revisions\) |
 
 #### Output
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `file` | object | Downloaded file stored in execution files |
+| `file` | object | Downloaded file data |
 
 ### `google_drive_list`
 
@@ -125,8 +125,3 @@ List files and folders in Google Drive with complete metadata
 | `files` | array | Array of file metadata objects from Google Drive |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_drive`
diff --git a/apps/docs/content/docs/en/tools/google_forms.mdx b/apps/docs/content/docs/en/tools/google_forms.mdx
index f5f84e9158..52ee3053ab 100644
--- a/apps/docs/content/docs/en/tools/google_forms.mdx
+++ b/apps/docs/content/docs/en/tools/google_forms.mdx
@@ -49,8 +49,3 @@ Integrate Google Forms into your workflow. Provide a Form ID to list responses,
 | `data` | json | Response or list of responses |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_forms`
diff --git a/apps/docs/content/docs/en/tools/google_groups.mdx b/apps/docs/content/docs/en/tools/google_groups.mdx
index e6dc141c4a..793bc90134 100644
--- a/apps/docs/content/docs/en/tools/google_groups.mdx
+++ b/apps/docs/content/docs/en/tools/google_groups.mdx
@@ -216,8 +216,3 @@ Check if a user is a member of a Google Group
 | `isMember` | boolean | Whether the user is a member of the group |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_groups`
diff --git a/apps/docs/content/docs/en/tools/google_search.mdx b/apps/docs/content/docs/en/tools/google_search.mdx
index 43cf08eee3..17a599c9d6 100644
--- a/apps/docs/content/docs/en/tools/google_search.mdx
+++ b/apps/docs/content/docs/en/tools/google_search.mdx
@@ -65,8 +65,3 @@ Search the web with the Custom Search API
 | `items` | array | Array of search results from Google |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_search`
diff --git a/apps/docs/content/docs/en/tools/google_sheets.mdx b/apps/docs/content/docs/en/tools/google_sheets.mdx
index 7efd523066..8d93c7a045 100644
--- a/apps/docs/content/docs/en/tools/google_sheets.mdx
+++ b/apps/docs/content/docs/en/tools/google_sheets.mdx
@@ -176,8 +176,3 @@ Append data to the end of a Google Sheets spreadsheet
 | `metadata` | json | Spreadsheet metadata including ID and URL |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_sheets`
diff --git a/apps/docs/content/docs/en/tools/google_slides.mdx b/apps/docs/content/docs/en/tools/google_slides.mdx
index ebe08628f9..b8a290b01b 100644
--- a/apps/docs/content/docs/en/tools/google_slides.mdx
+++ b/apps/docs/content/docs/en/tools/google_slides.mdx
@@ -178,8 +178,3 @@ Generate a thumbnail image of a specific slide in a Google Slides presentation
 | `metadata` | json | Operation metadata including presentation ID and page object ID |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_slides`
diff --git a/apps/docs/content/docs/en/tools/google_vault.mdx b/apps/docs/content/docs/en/tools/google_vault.mdx
index 39714d1122..a9b39df483 100644
--- a/apps/docs/content/docs/en/tools/google_vault.mdx
+++ b/apps/docs/content/docs/en/tools/google_vault.mdx
@@ -157,8 +157,3 @@ List matters, or get a specific matter if matterId is provided
 | `nextPageToken` | string | Token for fetching next page of results |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `google_vault`
diff --git a/apps/docs/content/docs/en/tools/grafana.mdx b/apps/docs/content/docs/en/tools/grafana.mdx
index 6654b1c127..656370efd5 100644
--- a/apps/docs/content/docs/en/tools/grafana.mdx
+++ b/apps/docs/content/docs/en/tools/grafana.mdx
@@ -502,8 +502,3 @@ Create a new folder in Grafana
 | `version` | number | Version number of the folder |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `grafana`
diff --git a/apps/docs/content/docs/en/tools/grain.mdx b/apps/docs/content/docs/en/tools/grain.mdx
index 7df544d8ae..8d223acb16 100644
--- a/apps/docs/content/docs/en/tools/grain.mdx
+++ b/apps/docs/content/docs/en/tools/grain.mdx
@@ -218,8 +218,3 @@ Delete a webhook by ID
 | `success` | boolean | True when webhook was successfully deleted |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `grain`
diff --git a/apps/docs/content/docs/en/tools/greptile.mdx b/apps/docs/content/docs/en/tools/greptile.mdx
index ba775dd2ae..726243bfcc 100644
--- a/apps/docs/content/docs/en/tools/greptile.mdx
+++ b/apps/docs/content/docs/en/tools/greptile.mdx
@@ -134,8 +134,3 @@ Check the indexing status of a repository. Use this to verify if a repository is
 | `sha` | string | Git commit SHA of the indexed version |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `greptile`
diff --git a/apps/docs/content/docs/en/tools/hubspot.mdx b/apps/docs/content/docs/en/tools/hubspot.mdx
index a1e64a9cec..b7029b819a 100644
--- a/apps/docs/content/docs/en/tools/hubspot.mdx
+++ b/apps/docs/content/docs/en/tools/hubspot.mdx
@@ -51,7 +51,7 @@ Retrieve all users from HubSpot account
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `users` | array | Array of HubSpot user objects |
-| `metadata` | object | Operation metadata |
+| `totalItems` | number | Total number of users returned |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_list_contacts`
@@ -73,7 +73,7 @@ Retrieve all contacts from HubSpot account with pagination support
 | --------- | ---- | ----------- |
 | `contacts` | array | Array of HubSpot contact objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
+| `metadata` | object | Metadata with totalReturned and hasMore |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_get_contact`
@@ -94,7 +94,7 @@ Retrieve a single contact by ID or email from HubSpot
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `contact` | object | HubSpot contact object with properties |
-| `metadata` | object | Operation metadata |
+| `contactId` | string | The retrieved contact ID |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_create_contact`
@@ -113,7 +113,7 @@ Create a new contact in HubSpot. Requires at least one of: email, firstname, or
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `contact` | object | Created HubSpot contact object |
-| `metadata` | object | Operation metadata |
+| `contactId` | string | The created contact ID |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_update_contact`
@@ -133,7 +133,7 @@ Update an existing contact in HubSpot by ID or email
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `contact` | object | Updated HubSpot contact object |
-| `metadata` | object | Operation metadata |
+| `contactId` | string | The updated contact ID |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_search_contacts`
@@ -158,7 +158,7 @@ Search for contacts in HubSpot using filters, sorting, and queries
 | `contacts` | array | Array of matching HubSpot contact objects |
 | `total` | number | Total number of matching contacts |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
+| `metadata` | object | Metadata with totalReturned and hasMore |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_list_companies`
@@ -180,7 +180,7 @@ Retrieve all companies from HubSpot account with pagination support
 | --------- | ---- | ----------- |
 | `companies` | array | Array of HubSpot company objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
+| `metadata` | object | Metadata with totalReturned and hasMore |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_get_company`
@@ -201,7 +201,7 @@ Retrieve a single company by ID or domain from HubSpot
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `company` | object | HubSpot company object with properties |
-| `metadata` | object | Operation metadata |
+| `companyId` | string | The retrieved company ID |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_create_company`
@@ -220,7 +220,7 @@ Create a new company in HubSpot
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `company` | object | Created HubSpot company object |
-| `metadata` | object | Operation metadata |
+| `companyId` | string | The created company ID |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_update_company`
@@ -240,7 +240,7 @@ Update an existing company in HubSpot by ID or domain
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `company` | object | Updated HubSpot company object |
-| `metadata` | object | Operation metadata |
+| `companyId` | string | The updated company ID |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_search_companies`
@@ -265,7 +265,7 @@ Search for companies in HubSpot using filters, sorting, and queries
 | `companies` | array | Array of matching HubSpot company objects |
 | `total` | number | Total number of matching companies |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
+| `metadata` | object | Metadata with totalReturned and hasMore |
 | `success` | boolean | Operation success status |
 
 ### `hubspot_list_deals`
@@ -287,12 +287,7 @@ Retrieve all deals from HubSpot account with pagination support
 | --------- | ---- | ----------- |
 | `deals` | array | Array of HubSpot deal objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
+| `metadata` | object | Metadata with totalReturned and hasMore |
 | `success` | boolean | Operation success status |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `hubspot`
diff --git a/apps/docs/content/docs/en/tools/huggingface.mdx b/apps/docs/content/docs/en/tools/huggingface.mdx
index 1a3a30976b..c6b0cafecb 100644
--- a/apps/docs/content/docs/en/tools/huggingface.mdx
+++ b/apps/docs/content/docs/en/tools/huggingface.mdx
@@ -56,8 +56,3 @@ Generate completions using Hugging Face Inference API
 | `output` | object | Chat completion results |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `huggingface`
diff --git a/apps/docs/content/docs/en/tools/hunter.mdx b/apps/docs/content/docs/en/tools/hunter.mdx
index c654af1a3e..6b837329bd 100644
--- a/apps/docs/content/docs/en/tools/hunter.mdx
+++ b/apps/docs/content/docs/en/tools/hunter.mdx
@@ -190,8 +190,3 @@ Returns the total number of email addresses found for a domain or company.
 | `seniority` | object | Breakdown of email addresses by seniority level \(junior, senior, executive\) |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `hunter`
diff --git a/apps/docs/content/docs/en/tools/image_generator.mdx b/apps/docs/content/docs/en/tools/image_generator.mdx
index 8d068ef23a..3d59c450c9 100644
--- a/apps/docs/content/docs/en/tools/image_generator.mdx
+++ b/apps/docs/content/docs/en/tools/image_generator.mdx
@@ -60,8 +60,3 @@ Generate images using OpenAI
 | `output` | object | Generated image data |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `image_generator`
diff --git a/apps/docs/content/docs/en/tools/imap.mdx b/apps/docs/content/docs/en/tools/imap.mdx
index af53c8200f..37bb0016a8 100644
--- a/apps/docs/content/docs/en/tools/imap.mdx
+++ b/apps/docs/content/docs/en/tools/imap.mdx
@@ -33,8 +33,3 @@ Connect to any email server via IMAP protocol to trigger workflows when new emai
 
 
 
-
-## Notes
-
-- Category: `triggers`
-- Type: `imap`
diff --git a/apps/docs/content/docs/en/tools/incidentio.mdx b/apps/docs/content/docs/en/tools/incidentio.mdx
index 9c0edaf4bc..ee44247b5f 100644
--- a/apps/docs/content/docs/en/tools/incidentio.mdx
+++ b/apps/docs/content/docs/en/tools/incidentio.mdx
@@ -841,8 +841,3 @@ Delete an escalation path in incident.io
 | `message` | string | Success message |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `incidentio`
diff --git a/apps/docs/content/docs/en/tools/intercom.mdx b/apps/docs/content/docs/en/tools/intercom.mdx
index 760e4f46e1..b84c02d974 100644
--- a/apps/docs/content/docs/en/tools/intercom.mdx
+++ b/apps/docs/content/docs/en/tools/intercom.mdx
@@ -1,41 +1,22 @@
 ---
 title: Intercom
-description: Manage contacts, companies, conversations, tickets, and messages in Intercom
+description: Contact object with id, type, role, email, phone, name, external_id, created_at, updated_at
 ---
 
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="intercom"
-  color="#E0E0E0"
+  type="intercom_v2"
+  color="#F5F5F5"
 />
 
-{/* MANUAL-CONTENT-START:intro */}
-[Intercom](https://www.intercom.com/) is a leading customer communications platform that enables you to manage and automate your interactions with contacts, companies, conversations, tickets, and messages—all in one place. The Intercom integration in Sim lets your agents programmatically manage customer relationships, support requests, and conversations directly from your automated workflows.
-
-With the Intercom tools, you can:
-
-- **Contacts Management:** Create, get, update, list, search, and delete contacts—automate your CRM processes and keep your customer records up-to-date.
-- **Company Management:** Create new companies, retrieve company details, and list all companies related to your users or business clients.
-- **Conversation Handling:** Get, list, reply to, and search through conversations—allowing agents to track ongoing support threads, provide answers, and automate follow-up actions.
-- **Ticket Management:** Create and retrieve tickets programmatically, helping you automate customer service, support issue tracking, and workflow escalations.
-- **Send Messages:** Trigger messages to users or leads for onboarding, support, or marketing, all from within your workflow automation.
-
-By integrating Intercom tools into Sim, you empower your workflows to communicate directly with your users, automate customer support processes, manage leads, and streamline communications at scale. Whether you need to create new contacts, keep customer data synchronized, manage support tickets, or send personalized engagement messages, the Intercom tools provide a comprehensive way to manage customer interactions as part of your intelligent automations.
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Integrate Intercom into the workflow. Can create, get, update, list, search, and delete contacts; create, get, and list companies; get, list, reply, and search conversations; create and get tickets; and create messages.
-
 
 
 ## Tools
 
 ### `intercom_create_contact`
 
-Create a new contact in Intercom with email, external_id, or role
+Create a new contact in Intercom with email, external_id, or role. Returns API-aligned fields only.
 
 #### Input
 
@@ -62,7 +43,7 @@ Create a new contact in Intercom with email, external_id, or role
 
 ### `intercom_get_contact`
 
-Get a single contact by ID from Intercom
+Get a single contact by ID from Intercom. Returns API-aligned fields only.
 
 #### Input
 
@@ -78,7 +59,7 @@ Get a single contact by ID from Intercom
 
 ### `intercom_update_contact`
 
-Update an existing contact in Intercom
+Update an existing contact in Intercom. Returns API-aligned fields only.
 
 #### Input
 
@@ -143,7 +124,7 @@ Search for contacts in Intercom using a query
 
 ### `intercom_delete_contact`
 
-Delete a contact from Intercom by ID
+Delete a contact from Intercom by ID. Returns API-aligned fields only.
 
 #### Input
 
@@ -157,7 +138,6 @@ Delete a contact from Intercom by ID
 | --------- | ---- | ----------- |
 | `id` | string | ID of deleted contact |
 | `deleted` | boolean | Whether the contact was deleted |
-| `metadata` | object | Operation metadata |
 
 ### `intercom_create_company`
 
@@ -277,7 +257,7 @@ Reply to a conversation as an admin in Intercom
 
 ### `intercom_search_conversations`
 
-Search for conversations in Intercom using a query
+Search for conversations in Intercom using a query. Returns API-aligned fields only.
 
 #### Input
 
@@ -297,7 +277,7 @@ Search for conversations in Intercom using a query
 
 ### `intercom_create_ticket`
 
-Create a new ticket in Intercom
+Create a new ticket in Intercom. Returns API-aligned fields only.
 
 #### Input
 
@@ -319,7 +299,7 @@ Create a new ticket in Intercom
 
 ### `intercom_get_ticket`
 
-Retrieve a single ticket by ID from Intercom
+Retrieve a single ticket by ID from Intercom. Returns API-aligned fields only.
 
 #### Input
 
@@ -335,7 +315,7 @@ Retrieve a single ticket by ID from Intercom
 
 ### `intercom_create_message`
 
-Create and send a new admin-initiated message in Intercom
+Create and send a new admin-initiated message in Intercom. Returns API-aligned fields only.
 
 #### Input
 
@@ -358,8 +338,3 @@ Create and send a new admin-initiated message in Intercom
 | `message` | object | Created message object |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `intercom`
diff --git a/apps/docs/content/docs/en/tools/jina.mdx b/apps/docs/content/docs/en/tools/jina.mdx
index ec20f9ff85..c037d00817 100644
--- a/apps/docs/content/docs/en/tools/jina.mdx
+++ b/apps/docs/content/docs/en/tools/jina.mdx
@@ -93,8 +93,3 @@ Search the web and return top 5 results with LLM-friendly content. Each result i
 | `results` | array | Array of search results, each containing title, description, url, and LLM-friendly content |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `jina`
diff --git a/apps/docs/content/docs/en/tools/jira.mdx b/apps/docs/content/docs/en/tools/jira.mdx
index 7018f79b6e..b2a296e3e8 100644
--- a/apps/docs/content/docs/en/tools/jira.mdx
+++ b/apps/docs/content/docs/en/tools/jira.mdx
@@ -555,8 +555,3 @@ Get Jira users. If an account ID is provided, returns a single user. Otherwise,
 | `maxResults` | number | Maximum results per page |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `jira`
diff --git a/apps/docs/content/docs/en/tools/jira_service_management.mdx b/apps/docs/content/docs/en/tools/jira_service_management.mdx
index 2b3d57a2b1..a068f3a65b 100644
--- a/apps/docs/content/docs/en/tools/jira_service_management.mdx
+++ b/apps/docs/content/docs/en/tools/jira_service_management.mdx
@@ -483,8 +483,3 @@ Approve or decline an approval request in Jira Service Management
 | `success` | boolean | Whether the operation succeeded |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `jira_service_management`
diff --git a/apps/docs/content/docs/en/tools/kalshi.mdx b/apps/docs/content/docs/en/tools/kalshi.mdx
index 199ec05425..0757348b18 100644
--- a/apps/docs/content/docs/en/tools/kalshi.mdx
+++ b/apps/docs/content/docs/en/tools/kalshi.mdx
@@ -382,8 +382,3 @@ Modify the price or quantity of an existing order on Kalshi
 | `order` | object | The amended order object |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `kalshi`
diff --git a/apps/docs/content/docs/en/tools/knowledge.mdx b/apps/docs/content/docs/en/tools/knowledge.mdx
index fa5208cf33..00aca66cd8 100644
--- a/apps/docs/content/docs/en/tools/knowledge.mdx
+++ b/apps/docs/content/docs/en/tools/knowledge.mdx
@@ -108,8 +108,3 @@ Create a new document in a knowledge base
 | `data` | object | Information about the created document |
 
 
-
-## Notes
-
-- Category: `blocks`
-- Type: `knowledge`
diff --git a/apps/docs/content/docs/en/tools/lemlist.mdx b/apps/docs/content/docs/en/tools/lemlist.mdx
new file mode 100644
index 0000000000..c3b38bb720
--- /dev/null
+++ b/apps/docs/content/docs/en/tools/lemlist.mdx
@@ -0,0 +1,95 @@
+---
+title: Lemlist
+description: Manage outreach activities, leads, and send emails via Lemlist
+---
+
+import { BlockInfoCard } from "@/components/ui/block-info-card"
+
+<BlockInfoCard 
+  type="lemlist"
+  color="#316BFF"
+/>
+
+## Usage Instructions
+
+Integrate Lemlist into your workflow. Retrieve campaign activities and replies, get lead information, and send emails through the Lemlist inbox.
+
+
+
+## Tools
+
+### `lemlist_get_activities`
+
+Retrieves campaign activities and steps performed, including email opens, clicks, replies, and other events.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Lemlist API key |
+| `type` | string | No | Filter by activity type \(e.g., emailOpened, emailClicked, emailReplied, paused\) |
+| `campaignId` | string | No | Filter by campaign ID |
+| `leadId` | string | No | Filter by lead ID |
+| `isFirst` | boolean | No | Filter for first activity only |
+| `limit` | number | No | Number of results per request \(max 100, default 100\) |
+| `offset` | number | No | Number of records to skip for pagination |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `activities` | array | List of activities |
+
+### `lemlist_get_lead`
+
+Retrieves lead information by email address or lead ID.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Lemlist API key |
+| `email` | string | No | Lead email address \(use either email or id\) |
+| `id` | string | No | Lead ID \(use either email or id\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `_id` | string | Lead ID |
+| `email` | string | Lead email address |
+| `firstName` | string | Lead first name |
+| `lastName` | string | Lead last name |
+| `companyName` | string | Company name |
+| `jobTitle` | string | Job title |
+| `companyDomain` | string | Company domain |
+| `isPaused` | boolean | Whether the lead is paused |
+| `campaignId` | string | Campaign ID the lead belongs to |
+| `contactId` | string | Contact ID |
+| `emailStatus` | string | Email deliverability status |
+
+### `lemlist_send_email`
+
+Sends an email to a contact through the Lemlist inbox.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `apiKey` | string | Yes | Lemlist API key |
+| `sendUserId` | string | Yes | Identifier for the user sending the message |
+| `sendUserEmail` | string | Yes | Email address of the sender |
+| `sendUserMailboxId` | string | Yes | Mailbox identifier for the sender |
+| `contactId` | string | Yes | Recipient contact identifier |
+| `leadId` | string | Yes | Associated lead identifier |
+| `subject` | string | Yes | Email subject line |
+| `message` | string | Yes | Email message body in HTML format |
+| `cc` | json | No | Array of CC email addresses |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `ok` | boolean | Whether the email was sent successfully |
+
+
diff --git a/apps/docs/content/docs/en/tools/linear.mdx b/apps/docs/content/docs/en/tools/linear.mdx
index c0d6daa5fd..78c95912d9 100644
--- a/apps/docs/content/docs/en/tools/linear.mdx
+++ b/apps/docs/content/docs/en/tools/linear.mdx
@@ -1471,8 +1471,3 @@ List all project statuses in Linear
 | `projectStatuses` | array | List of project statuses |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `linear`
diff --git a/apps/docs/content/docs/en/tools/linkedin.mdx b/apps/docs/content/docs/en/tools/linkedin.mdx
index 78d5374357..7fd37685b5 100644
--- a/apps/docs/content/docs/en/tools/linkedin.mdx
+++ b/apps/docs/content/docs/en/tools/linkedin.mdx
@@ -81,8 +81,3 @@ Retrieve your LinkedIn profile information
 | `error` | string | Error message if operation failed |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `linkedin`
diff --git a/apps/docs/content/docs/en/tools/linkup.mdx b/apps/docs/content/docs/en/tools/linkup.mdx
index ea503c5141..e6b0c3eb3d 100644
--- a/apps/docs/content/docs/en/tools/linkup.mdx
+++ b/apps/docs/content/docs/en/tools/linkup.mdx
@@ -60,8 +60,3 @@ Search the web for information using Linkup
 | `sources` | array | Array of sources used to compile the answer, each containing name, url, and snippet |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `linkup`
diff --git a/apps/docs/content/docs/en/tools/mailchimp.mdx b/apps/docs/content/docs/en/tools/mailchimp.mdx
index 4a5efcb821..7ce7ef5bfb 100644
--- a/apps/docs/content/docs/en/tools/mailchimp.mdx
+++ b/apps/docs/content/docs/en/tools/mailchimp.mdx
@@ -70,8 +70,8 @@ Retrieve a list of audiences (lists) from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Audiences data and metadata |
+| `success` | boolean | Whether the audiences were successfully retrieved |
+| `output` | object | Audiences data |
 
 ### `mailchimp_get_audience`
 
@@ -88,8 +88,8 @@ Retrieve details of a specific audience (list) from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Audience data and metadata |
+| `success` | boolean | Whether the audience was successfully retrieved |
+| `output` | object | Audience data |
 
 ### `mailchimp_create_audience`
 
@@ -150,8 +150,7 @@ Delete an audience (list) from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the audience was successfully deleted |
 
 ### `mailchimp_get_members`
 
@@ -171,8 +170,8 @@ Retrieve a list of members from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Members data and metadata |
+| `success` | boolean | Whether the members were successfully retrieved |
+| `output` | object | Members data |
 
 ### `mailchimp_get_member`
 
@@ -190,8 +189,8 @@ Retrieve details of a specific member from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Member data and metadata |
+| `success` | boolean | Whether the member was successfully retrieved |
+| `output` | object | Member data |
 
 ### `mailchimp_add_member`
 
@@ -277,8 +276,7 @@ Delete a member from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the member was successfully deleted |
 
 ### `mailchimp_archive_member`
 
@@ -338,8 +336,8 @@ Retrieve a list of campaigns from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Campaigns data and metadata |
+| `success` | boolean | Whether the campaigns were successfully retrieved |
+| `output` | object | Campaigns data |
 
 ### `mailchimp_get_campaign`
 
@@ -356,8 +354,8 @@ Retrieve details of a specific campaign from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Campaign data and metadata |
+| `success` | boolean | Whether the campaign was successfully retrieved |
+| `output` | object | Campaign data |
 
 ### `mailchimp_create_campaign`
 
@@ -414,8 +412,7 @@ Delete a campaign from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the campaign was successfully deleted |
 
 ### `mailchimp_send_campaign`
 
@@ -451,8 +448,7 @@ Schedule a Mailchimp campaign to be sent at a specific time
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Schedule confirmation |
+| `success` | boolean | Whether the campaign was successfully scheduled |
 
 ### `mailchimp_unschedule_campaign`
 
@@ -505,7 +501,7 @@ Retrieve the HTML and plain-text content for a Mailchimp campaign
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
+| `success` | boolean | Whether the campaign content was successfully retrieved |
 | `output` | object | Campaign content data |
 
 ### `mailchimp_set_campaign_content`
@@ -545,8 +541,8 @@ Retrieve a list of automations from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Automations data and metadata |
+| `success` | boolean | Whether the automations were successfully retrieved |
+| `output` | object | Automations data |
 
 ### `mailchimp_get_automation`
 
@@ -563,8 +559,8 @@ Retrieve details of a specific automation from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Automation data and metadata |
+| `success` | boolean | Whether the automation was successfully retrieved |
+| `output` | object | Automation data |
 
 ### `mailchimp_start_automation`
 
@@ -638,8 +634,8 @@ Retrieve a list of templates from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Templates data and metadata |
+| `success` | boolean | Whether the templates were successfully retrieved |
+| `output` | object | Templates data |
 
 ### `mailchimp_get_template`
 
@@ -656,8 +652,8 @@ Retrieve details of a specific template from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Template data and metadata |
+| `success` | boolean | Whether the template was successfully retrieved |
+| `output` | object | Template data |
 
 ### `mailchimp_create_template`
 
@@ -713,8 +709,7 @@ Delete a template from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the template was successfully deleted |
 
 ### `mailchimp_get_campaign_reports`
 
@@ -732,8 +727,8 @@ Retrieve a list of campaign reports from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Campaign reports data and metadata |
+| `success` | boolean | Whether the campaign reports were successfully retrieved |
+| `output` | object | Campaign reports data |
 
 ### `mailchimp_get_campaign_report`
 
@@ -750,8 +745,8 @@ Retrieve the report for a specific campaign from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Campaign report data and metadata |
+| `success` | boolean | Whether the campaign report was successfully retrieved |
+| `output` | object | Campaign report data |
 
 ### `mailchimp_get_segments`
 
@@ -770,8 +765,8 @@ Retrieve a list of segments from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Segments data and metadata |
+| `success` | boolean | Whether the segments were successfully retrieved |
+| `output` | object | Segments data |
 
 ### `mailchimp_get_segment`
 
@@ -789,8 +784,8 @@ Retrieve details of a specific segment from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Segment data and metadata |
+| `success` | boolean | Whether the segment was successfully retrieved |
+| `output` | object | Segment data |
 
 ### `mailchimp_create_segment`
 
@@ -849,8 +844,7 @@ Delete a segment from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the segment was successfully deleted |
 
 ### `mailchimp_get_segment_members`
 
@@ -870,8 +864,8 @@ Retrieve members of a specific segment from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Segment members data and metadata |
+| `success` | boolean | Whether the segment members were successfully retrieved |
+| `output` | object | Segment members data |
 
 ### `mailchimp_add_segment_member`
 
@@ -929,8 +923,8 @@ Retrieve tags associated with a member in a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Member tags data and metadata |
+| `success` | boolean | Whether the member tags were successfully retrieved |
+| `output` | object | Member tags data |
 
 ### `mailchimp_add_member_tags`
 
@@ -989,8 +983,8 @@ Retrieve a list of merge fields from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Merge fields data and metadata |
+| `success` | boolean | Whether the merge fields were successfully retrieved |
+| `output` | object | Merge fields data |
 
 ### `mailchimp_get_merge_field`
 
@@ -1008,8 +1002,8 @@ Retrieve details of a specific merge field from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Merge field data and metadata |
+| `success` | boolean | Whether the merge field was successfully retrieved |
+| `output` | object | Merge field data |
 
 ### `mailchimp_create_merge_field`
 
@@ -1067,8 +1061,7 @@ Delete a merge field from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the merge field was successfully deleted |
 
 ### `mailchimp_get_interest_categories`
 
@@ -1087,8 +1080,8 @@ Retrieve a list of interest categories from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Interest categories data and metadata |
+| `success` | boolean | Whether the interest categories were successfully retrieved |
+| `output` | object | Interest categories data |
 
 ### `mailchimp_get_interest_category`
 
@@ -1106,8 +1099,8 @@ Retrieve details of a specific interest category from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Interest category data and metadata |
+| `success` | boolean | Whether the interest category was successfully retrieved |
+| `output` | object | Interest category data |
 
 ### `mailchimp_create_interest_category`
 
@@ -1165,8 +1158,7 @@ Delete an interest category from a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the interest category was successfully deleted |
 
 ### `mailchimp_get_interests`
 
@@ -1186,8 +1178,8 @@ Retrieve a list of interests from an interest category in a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Interests data and metadata |
+| `success` | boolean | Whether the interests were successfully retrieved |
+| `output` | object | Interests data |
 
 ### `mailchimp_get_interest`
 
@@ -1206,8 +1198,8 @@ Retrieve details of a specific interest from an interest category in a Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Interest data and metadata |
+| `success` | boolean | Whether the interest was successfully retrieved |
+| `output` | object | Interest data |
 
 ### `mailchimp_create_interest`
 
@@ -1267,8 +1259,7 @@ Delete an interest from an interest category in a Mailchimp audience
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the interest was successfully deleted |
 
 ### `mailchimp_get_landing_pages`
 
@@ -1286,8 +1277,8 @@ Retrieve a list of landing pages from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Landing pages data and metadata |
+| `success` | boolean | Whether the landing pages were successfully retrieved |
+| `output` | object | Landing pages data |
 
 ### `mailchimp_get_landing_page`
 
@@ -1304,8 +1295,8 @@ Retrieve details of a specific landing page from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Landing page data and metadata |
+| `success` | boolean | Whether the landing page was successfully retrieved |
+| `output` | object | Landing page data |
 
 ### `mailchimp_create_landing_page`
 
@@ -1360,8 +1351,7 @@ Delete a landing page from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
+| `success` | boolean | Whether the landing page was successfully deleted |
 
 ### `mailchimp_publish_landing_page`
 
@@ -1415,8 +1405,8 @@ Retrieve a list of batch operations from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Batch operations data and metadata |
+| `success` | boolean | Whether the batch operations were successfully retrieved |
+| `output` | object | Batch operations data |
 
 ### `mailchimp_get_batch_operation`
 
@@ -1433,8 +1423,8 @@ Retrieve details of a specific batch operation from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Batch operation data and metadata |
+| `success` | boolean | Whether the batch operation was successfully retrieved |
+| `output` | object | Batch operation data |
 
 ### `mailchimp_create_batch_operation`
 
@@ -1469,12 +1459,6 @@ Delete a batch operation from Mailchimp
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Deletion confirmation |
-
-
+| `success` | boolean | Whether the batch operation was successfully deleted |
 
-## Notes
 
-- Category: `tools`
-- Type: `mailchimp`
diff --git a/apps/docs/content/docs/en/tools/mailgun.mdx b/apps/docs/content/docs/en/tools/mailgun.mdx
index 9fb05cfab7..0d29cc9c55 100644
--- a/apps/docs/content/docs/en/tools/mailgun.mdx
+++ b/apps/docs/content/docs/en/tools/mailgun.mdx
@@ -214,8 +214,3 @@ Get details of a specific domain
 | `domain` | json | Domain details |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `mailgun`
diff --git a/apps/docs/content/docs/en/tools/mem0.mdx b/apps/docs/content/docs/en/tools/mem0.mdx
index ff94317490..680c130771 100644
--- a/apps/docs/content/docs/en/tools/mem0.mdx
+++ b/apps/docs/content/docs/en/tools/mem0.mdx
@@ -96,8 +96,3 @@ Retrieve memories from Mem0 by ID or filter criteria
 | `ids` | array | Array of memory IDs that were retrieved |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `mem0`
diff --git a/apps/docs/content/docs/en/tools/memory.mdx b/apps/docs/content/docs/en/tools/memory.mdx
index d2990a74ba..9fb09ade4a 100644
--- a/apps/docs/content/docs/en/tools/memory.mdx
+++ b/apps/docs/content/docs/en/tools/memory.mdx
@@ -97,8 +97,3 @@ Delete memories by conversationId.
 | `error` | string | Error message if operation failed |
 
 
-
-## Notes
-
-- Category: `blocks`
-- Type: `memory`
diff --git a/apps/docs/content/docs/en/tools/meta.json b/apps/docs/content/docs/en/tools/meta.json
index 8a2bca881a..e489efd205 100644
--- a/apps/docs/content/docs/en/tools/meta.json
+++ b/apps/docs/content/docs/en/tools/meta.json
@@ -51,6 +51,7 @@
     "jira_service_management",
     "kalshi",
     "knowledge",
+    "lemlist",
     "linear",
     "linkedin",
     "linkup",
@@ -101,7 +102,6 @@
     "supabase",
     "tavily",
     "telegram",
-    "thinking",
     "translate",
     "trello",
     "tts",
diff --git a/apps/docs/content/docs/en/tools/microsoft_excel.mdx b/apps/docs/content/docs/en/tools/microsoft_excel.mdx
index f260e0653f..b7a2a3fb0d 100644
--- a/apps/docs/content/docs/en/tools/microsoft_excel.mdx
+++ b/apps/docs/content/docs/en/tools/microsoft_excel.mdx
@@ -112,8 +112,3 @@ Create a new worksheet (sheet) in a Microsoft Excel workbook
 | `worksheet` | object | Details of the newly created worksheet |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `microsoft_excel`
diff --git a/apps/docs/content/docs/en/tools/microsoft_planner.mdx b/apps/docs/content/docs/en/tools/microsoft_planner.mdx
index 3d26c3ab52..ef8e7b94dc 100644
--- a/apps/docs/content/docs/en/tools/microsoft_planner.mdx
+++ b/apps/docs/content/docs/en/tools/microsoft_planner.mdx
@@ -294,8 +294,3 @@ Update task details including description, checklist items, and references in Mi
 | `metadata` | object | Metadata including taskId |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `microsoft_planner`
diff --git a/apps/docs/content/docs/en/tools/microsoft_teams.mdx b/apps/docs/content/docs/en/tools/microsoft_teams.mdx
index 0f211e440a..fdeb0de40c 100644
--- a/apps/docs/content/docs/en/tools/microsoft_teams.mdx
+++ b/apps/docs/content/docs/en/tools/microsoft_teams.mdx
@@ -337,8 +337,3 @@ List all members of a Microsoft Teams channel
 | `memberCount` | number | Total number of members |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `microsoft_teams`
diff --git a/apps/docs/content/docs/en/tools/mistral_parse.mdx b/apps/docs/content/docs/en/tools/mistral_parse.mdx
index 56f0597e99..e25f83099f 100644
--- a/apps/docs/content/docs/en/tools/mistral_parse.mdx
+++ b/apps/docs/content/docs/en/tools/mistral_parse.mdx
@@ -59,8 +59,3 @@ Parse PDF documents using Mistral OCR API
 | `metadata` | object | Processing metadata including jobId, fileType, pageCount, and usage info |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `mistral_parse`
diff --git a/apps/docs/content/docs/en/tools/mongodb.mdx b/apps/docs/content/docs/en/tools/mongodb.mdx
index 6b2a3d7bdc..dc69d59d1c 100644
--- a/apps/docs/content/docs/en/tools/mongodb.mdx
+++ b/apps/docs/content/docs/en/tools/mongodb.mdx
@@ -172,9 +172,28 @@ Execute MongoDB aggregation pipeline
 | `documents` | array | Array of documents returned from aggregation |
 | `documentCount` | number | Number of documents returned |
 
+### `mongodb_introspect`
 
+Introspect MongoDB database to list databases, collections, and indexes
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | MongoDB server hostname or IP address |
+| `port` | number | Yes | MongoDB server port \(default: 27017\) |
+| `database` | string | No | Database name to introspect \(optional - if not provided, lists all databases\) |
+| `username` | string | No | MongoDB username |
+| `password` | string | No | MongoDB password |
+| `authSource` | string | No | Authentication database |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `databases` | array | Array of database names |
+| `collections` | array | Array of collection info with name, type, document count, and indexes |
 
-## Notes
 
-- Category: `tools`
-- Type: `mongodb`
diff --git a/apps/docs/content/docs/en/tools/mysql.mdx b/apps/docs/content/docs/en/tools/mysql.mdx
index 391dd5126b..1d9d6c1d88 100644
--- a/apps/docs/content/docs/en/tools/mysql.mdx
+++ b/apps/docs/content/docs/en/tools/mysql.mdx
@@ -157,9 +157,27 @@ Execute raw SQL query on MySQL database
 | `rows` | array | Array of rows returned from the query |
 | `rowCount` | number | Number of rows affected |
 
+### `mysql_introspect`
 
+Introspect MySQL database schema to retrieve table structures, columns, and relationships
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | MySQL server hostname or IP address |
+| `port` | number | Yes | MySQL server port \(default: 3306\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `tables` | array | Array of table schemas with columns, keys, and indexes |
+| `databases` | array | List of available databases on the server |
 
-## Notes
 
-- Category: `tools`
-- Type: `mysql`
diff --git a/apps/docs/content/docs/en/tools/neo4j.mdx b/apps/docs/content/docs/en/tools/neo4j.mdx
index f3f9bce9d0..661ff7c574 100644
--- a/apps/docs/content/docs/en/tools/neo4j.mdx
+++ b/apps/docs/content/docs/en/tools/neo4j.mdx
@@ -168,9 +168,31 @@ Execute arbitrary Cypher queries on Neo4j graph database for complex operations
 | `recordCount` | number | Number of records returned |
 | `summary` | json | Execution summary with timing and counters |
 
+### `neo4j_introspect`
 
+Introspect a Neo4j database to discover its schema including node labels, relationship types, properties, constraints, and indexes.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | Neo4j server hostname or IP address |
+| `port` | number | Yes | Neo4j server port \(default: 7687 for Bolt protocol\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Neo4j username |
+| `password` | string | Yes | Neo4j password |
+| `encryption` | string | No | Connection encryption mode \(enabled, disabled\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `labels` | array | Array of node labels in the database |
+| `relationshipTypes` | array | Array of relationship types in the database |
+| `nodeSchemas` | array | Array of node schemas with their properties |
+| `relationshipSchemas` | array | Array of relationship schemas with their properties |
+| `constraints` | array | Array of database constraints |
+| `indexes` | array | Array of database indexes |
 
-## Notes
 
-- Category: `tools`
-- Type: `neo4j`
diff --git a/apps/docs/content/docs/en/tools/notion.mdx b/apps/docs/content/docs/en/tools/notion.mdx
index dd580a41da..418df58559 100644
--- a/apps/docs/content/docs/en/tools/notion.mdx
+++ b/apps/docs/content/docs/en/tools/notion.mdx
@@ -6,36 +6,10 @@ description: Manage Notion pages
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="notion"
+  type="notion_v2"
   color="#181C1E"
 />
 
-{/* MANUAL-CONTENT-START:intro */}
-[Notion](https://www.notion.so) is an all-in-one workspace that combines notes, documents, wikis, and project management tools into a single platform. It offers a flexible and customizable environment where users can create, organize, and collaborate on content in various formats.
-
-With Notion, you can:
-
-- **Create versatile content**: Build documents, wikis, databases, kanban boards, calendars, and more
-- **Organize information**: Structure content hierarchically with nested pages and powerful databases
-- **Collaborate seamlessly**: Share workspaces and pages with team members for real-time collaboration
-- **Customize your workspace**: Design your ideal workflow with flexible templates and building blocks
-- **Connect information**: Link between pages and databases to create a knowledge network
-- **Access anywhere**: Use Notion across web, desktop, and mobile platforms with automatic syncing
-
-In Sim, the Notion integration enables your agents to interact directly with your Notion workspace programmatically. This allows for powerful automation scenarios such as knowledge management, content creation, and information retrieval. Your agents can:
-
-- **Read Notion pages**: Extract content and metadata from any Notion page.
-- **Read Notion databases**: Retrieve database structure and information.
-- **Write to pages**: Append new content to existing Notion pages.
-- **Create new pages**: Generate new Notion pages under a parent page, with custom titles and content.
-- **Query databases**: Search and filter database entries using advanced filter and sort criteria.
-- **Search workspace**: Search across your entire Notion workspace for pages or databases matching specific queries.
-- **Create new databases**: Programmatically create new databases with custom properties and structure.
-
-This integration bridges the gap between your AI workflows and your knowledge base, enabling seamless documentation and information management. By connecting Sim with Notion, you can automate documentation processes, maintain up-to-date information repositories, generate reports, and organize information intelligently—all through your intelligent agents.
-{/* MANUAL-CONTENT-END */}
-
-
 ## Usage Instructions
 
 Integrate with Notion into the workflow. Can read page, read database, create page, create database, append content, query database, and search workspace.
@@ -58,8 +32,11 @@ Read content from a Notion page
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Page content in markdown format with headers, paragraphs, lists, and todos |
-| `metadata` | object | Page metadata including title, URL, and timestamps |
+| `content` | string | Page content in markdown format |
+| `title` | string | Page title |
+| `url` | string | Page URL |
+| `created_time` | string | Creation timestamp |
+| `last_edited_time` | string | Last edit timestamp |
 
 ### `notion_read_database`
 
@@ -75,8 +52,12 @@ Read database information and structure from Notion
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Database information including title, properties schema, and metadata |
-| `metadata` | object | Database metadata including title, ID, URL, timestamps, and properties schema |
+| `id` | string | Database ID |
+| `title` | string | Database title |
+| `url` | string | Database URL |
+| `created_time` | string | Creation timestamp |
+| `last_edited_time` | string | Last edit timestamp |
+| `properties` | object | Database properties schema |
 
 ### `notion_write`
 
@@ -93,7 +74,7 @@ Append content to a Notion page
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message confirming content was appended to page |
+| `appended` | boolean | Whether content was successfully appended |
 
 ### `notion_create_page`
 
@@ -111,8 +92,11 @@ Create a new page in Notion
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message confirming page creation |
-| `metadata` | object | Page metadata including title, page ID, URL, and timestamps |
+| `id` | string | Page ID |
+| `title` | string | Page title |
+| `url` | string | Page URL |
+| `created_time` | string | Creation timestamp |
+| `last_edited_time` | string | Last edit timestamp |
 
 ### `notion_query_database`
 
@@ -131,8 +115,7 @@ Query and filter Notion database entries with advanced filtering
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Formatted list of database entries with their properties |
-| `metadata` | object | Query metadata including total results count, pagination info, and raw results array |
+| `results` | array | Array of Notion page objects from the database |
 
 ### `notion_search`
 
@@ -150,8 +133,7 @@ Search across all pages and databases in Notion workspace
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Formatted list of search results including pages and databases |
-| `metadata` | object | Search metadata including total results count, pagination info, and raw results array |
+| `results` | array | Array of search results \(pages and databases\) |
 
 ### `notion_create_database`
 
@@ -163,18 +145,37 @@ Create a new database in Notion with custom properties
 | --------- | ---- | -------- | ----------- |
 | `parentId` | string | Yes | ID of the parent page where the database will be created |
 | `title` | string | Yes | Title for the new database |
-| `properties` | string | No | Database properties as JSON object \(optional, will create a default "Name" property if empty\) |
+| `properties` | json | No | Database properties as JSON object \(optional, will create a default "Name" property if empty\) |
 
 #### Output
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `content` | string | Success message with database details and properties list |
-| `metadata` | object | Database metadata including ID, title, URL, creation time, and properties schema |
+| `id` | string | Database ID |
+| `title` | string | Database title |
+| `url` | string | Database URL |
+| `created_time` | string | Creation timestamp |
+| `properties` | object | Database properties schema |
 
+### `notion_add_database_row`
 
+Add a new row to a Notion database with specified properties
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `databaseId` | string | Yes | ID of the database to add the row to |
+| `properties` | json | Yes | Row properties as JSON object matching the database schema \(e.g., \{"Name": \{"title": \[\{"text": \{"content": "Task 1"\}\}\]\}, "Status": \{"select": \{"name": "Done"\}\}\}\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Page/row ID |
+| `url` | string | Page/row URL |
+| `title` | string | Row title |
+| `created_time` | string | Creation timestamp |
+| `last_edited_time` | string | Last edit timestamp |
 
-## Notes
 
-- Category: `tools`
-- Type: `notion`
diff --git a/apps/docs/content/docs/en/tools/onedrive.mdx b/apps/docs/content/docs/en/tools/onedrive.mdx
index d844cf32b5..5e8f4b04be 100644
--- a/apps/docs/content/docs/en/tools/onedrive.mdx
+++ b/apps/docs/content/docs/en/tools/onedrive.mdx
@@ -134,8 +134,3 @@ Delete a file or folder from OneDrive
 | `fileId` | string | The ID of the deleted file |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `onedrive`
diff --git a/apps/docs/content/docs/en/tools/openai.mdx b/apps/docs/content/docs/en/tools/openai.mdx
index e6790dd4cd..b7db750a0f 100644
--- a/apps/docs/content/docs/en/tools/openai.mdx
+++ b/apps/docs/content/docs/en/tools/openai.mdx
@@ -56,8 +56,3 @@ Generate embeddings from text using OpenAI
 | `output` | object | Embeddings generation results |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `openai`
diff --git a/apps/docs/content/docs/en/tools/outlook.mdx b/apps/docs/content/docs/en/tools/outlook.mdx
index c54a0b24c1..82af2bcff1 100644
--- a/apps/docs/content/docs/en/tools/outlook.mdx
+++ b/apps/docs/content/docs/en/tools/outlook.mdx
@@ -235,8 +235,3 @@ Copy an Outlook message to another folder
 | `destinationFolderId` | string | ID of the destination folder |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `outlook`
diff --git a/apps/docs/content/docs/en/tools/parallel_ai.mdx b/apps/docs/content/docs/en/tools/parallel_ai.mdx
index c395c57005..deaf9378e6 100644
--- a/apps/docs/content/docs/en/tools/parallel_ai.mdx
+++ b/apps/docs/content/docs/en/tools/parallel_ai.mdx
@@ -101,8 +101,3 @@ Conduct comprehensive deep research across the web using Parallel AI. Synthesize
 | `basis` | array | Citations and sources with reasoning and confidence levels |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `parallel_ai`
diff --git a/apps/docs/content/docs/en/tools/perplexity.mdx b/apps/docs/content/docs/en/tools/perplexity.mdx
index 53c5238fc3..63a97c40dc 100644
--- a/apps/docs/content/docs/en/tools/perplexity.mdx
+++ b/apps/docs/content/docs/en/tools/perplexity.mdx
@@ -83,8 +83,3 @@ Get ranked search results from Perplexity
 | `results` | array | Array of search results |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `perplexity`
diff --git a/apps/docs/content/docs/en/tools/pinecone.mdx b/apps/docs/content/docs/en/tools/pinecone.mdx
index 340f48da2f..cc052ef5db 100644
--- a/apps/docs/content/docs/en/tools/pinecone.mdx
+++ b/apps/docs/content/docs/en/tools/pinecone.mdx
@@ -142,8 +142,3 @@ Fetch vectors by ID from a Pinecone index
 | `matches` | array | Fetched vectors with ID, values, metadata, and score |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `pinecone`
diff --git a/apps/docs/content/docs/en/tools/pipedrive.mdx b/apps/docs/content/docs/en/tools/pipedrive.mdx
index 3f66973c8b..d561b80752 100644
--- a/apps/docs/content/docs/en/tools/pipedrive.mdx
+++ b/apps/docs/content/docs/en/tools/pipedrive.mdx
@@ -55,7 +55,7 @@ Retrieve all deals from Pipedrive with optional filters
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `deals` | array | Array of deal objects from Pipedrive |
-| `metadata` | object | Operation metadata |
+| `metadata` | object | Pagination metadata for the response |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_deal`
@@ -73,7 +73,6 @@ Retrieve detailed information about a specific deal
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `deal` | object | Deal object with full details |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_create_deal`
@@ -99,7 +98,6 @@ Create a new deal in Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `deal` | object | The created deal object |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_update_deal`
@@ -122,7 +120,6 @@ Update an existing deal in Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `deal` | object | The updated deal object |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_files`
@@ -143,7 +140,7 @@ Retrieve files from Pipedrive with optional filters
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `files` | array | Array of file objects from Pipedrive |
-| `metadata` | object | Operation metadata |
+| `total_items` | number | Total number of files returned |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_mail_messages`
@@ -162,7 +159,7 @@ Retrieve mail threads from Pipedrive mailbox
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `messages` | array | Array of mail thread objects from Pipedrive mailbox |
-| `metadata` | object | Operation metadata |
+| `total_items` | number | Total number of mail threads returned |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_mail_thread`
@@ -180,7 +177,7 @@ Retrieve all messages from a specific mail thread
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `messages` | array | Array of mail message objects from the thread |
-| `metadata` | object | Operation metadata including thread ID |
+| `metadata` | object | Thread and pagination metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_pipelines`
@@ -201,7 +198,7 @@ Retrieve all pipelines from Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `pipelines` | array | Array of pipeline objects from Pipedrive |
-| `metadata` | object | Operation metadata |
+| `total_items` | number | Total number of pipelines returned |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_pipeline_deals`
@@ -222,7 +219,7 @@ Retrieve all deals in a specific pipeline
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `deals` | array | Array of deal objects from the pipeline |
-| `metadata` | object | Operation metadata including pipeline ID |
+| `metadata` | object | Pipeline and pagination metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_projects`
@@ -243,7 +240,7 @@ Retrieve all projects or a specific project from Pipedrive
 | --------- | ---- | ----------- |
 | `projects` | array | Array of project objects \(when listing all\) |
 | `project` | object | Single project object \(when project_id is provided\) |
-| `metadata` | object | Operation metadata |
+| `total_items` | number | Total number of projects returned |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_create_project`
@@ -264,7 +261,6 @@ Create a new project in Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `project` | object | The created project object |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_activities`
@@ -287,7 +283,7 @@ Retrieve activities (tasks) from Pipedrive with optional filters
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `activities` | array | Array of activity objects from Pipedrive |
-| `metadata` | object | Operation metadata |
+| `total_items` | number | Total number of activities returned |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_create_activity`
@@ -313,7 +309,6 @@ Create a new activity (task) in Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `activity` | object | The created activity object |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_update_activity`
@@ -337,7 +332,6 @@ Update an existing activity (task) in Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `activity` | object | The updated activity object |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_get_leads`
@@ -361,7 +355,7 @@ Retrieve all leads or a specific lead from Pipedrive
 | --------- | ---- | ----------- |
 | `leads` | array | Array of lead objects \(when listing all\) |
 | `lead` | object | Single lead object \(when lead_id is provided\) |
-| `metadata` | object | Operation metadata |
+| `total_items` | number | Total number of leads returned |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_create_lead`
@@ -386,7 +380,6 @@ Create a new lead in Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `lead` | object | The created lead object |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_update_lead`
@@ -412,7 +405,6 @@ Update an existing lead in Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `lead` | object | The updated lead object |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 ### `pipedrive_delete_lead`
@@ -430,12 +422,6 @@ Delete a specific lead from Pipedrive
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `data` | object | Deletion confirmation data |
-| `metadata` | object | Operation metadata |
 | `success` | boolean | Operation success status |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `pipedrive`
diff --git a/apps/docs/content/docs/en/tools/polymarket.mdx b/apps/docs/content/docs/en/tools/polymarket.mdx
index feda033a9c..6a6d17852d 100644
--- a/apps/docs/content/docs/en/tools/polymarket.mdx
+++ b/apps/docs/content/docs/en/tools/polymarket.mdx
@@ -333,8 +333,3 @@ Retrieve trade history from Polymarket
 | `trades` | array | Array of trade objects |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `polymarket`
diff --git a/apps/docs/content/docs/en/tools/postgresql.mdx b/apps/docs/content/docs/en/tools/postgresql.mdx
index db75cccf34..143a77a20d 100644
--- a/apps/docs/content/docs/en/tools/postgresql.mdx
+++ b/apps/docs/content/docs/en/tools/postgresql.mdx
@@ -157,9 +157,28 @@ Execute raw SQL query on PostgreSQL database
 | `rows` | array | Array of rows returned from the query |
 | `rowCount` | number | Number of rows affected |
 
+### `postgresql_introspect`
 
+Introspect PostgreSQL database schema to retrieve table structures, columns, and relationships
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | PostgreSQL server hostname or IP address |
+| `port` | number | Yes | PostgreSQL server port \(default: 5432\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `schema` | string | No | Schema to introspect \(default: public\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `tables` | array | Array of table schemas with columns, keys, and indexes |
+| `schemas` | array | List of available schemas in the database |
 
-## Notes
 
-- Category: `tools`
-- Type: `postgresql`
diff --git a/apps/docs/content/docs/en/tools/posthog.mdx b/apps/docs/content/docs/en/tools/posthog.mdx
index c7acf1fdbe..062a9c026e 100644
--- a/apps/docs/content/docs/en/tools/posthog.mdx
+++ b/apps/docs/content/docs/en/tools/posthog.mdx
@@ -77,7 +77,7 @@ Capture multiple events at once in PostHog. Use this for bulk event ingestion to
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `status` | string | Status message indicating whether the batch was captured successfully |
-| `eventsProcessed` | number | Number of events processed in the batch |
+| `events_processed` | number | Number of events processed in the batch |
 
 ### `posthog_list_persons`
 
@@ -600,9 +600,9 @@ Evaluate feature flags for a specific user or group. This is a public endpoint t
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `featureFlags` | object | Feature flag evaluations \(key-value pairs where values are boolean or string variants\) |
-| `featureFlagPayloads` | object | Additional payloads attached to feature flags |
-| `errorsWhileComputingFlags` | boolean | Whether there were errors while computing flags |
+| `feature_flags` | object | Feature flag evaluations \(key-value pairs where values are boolean or string variants\) |
+| `feature_flag_payloads` | object | Additional payloads attached to feature flags |
+| `errors_while_computing_flags` | boolean | Whether there were errors while computing flags |
 
 ### `posthog_list_experiments`
 
@@ -1086,8 +1086,3 @@ Get detailed information about a specific organization by ID. Returns comprehens
 | `organization` | object | Detailed organization information with settings and features |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `posthog`
diff --git a/apps/docs/content/docs/en/tools/qdrant.mdx b/apps/docs/content/docs/en/tools/qdrant.mdx
index a7ac197dd7..4e3271363a 100644
--- a/apps/docs/content/docs/en/tools/qdrant.mdx
+++ b/apps/docs/content/docs/en/tools/qdrant.mdx
@@ -108,8 +108,3 @@ Fetch points by ID from a Qdrant collection
 | `status` | string | Status of the fetch operation |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `qdrant`
diff --git a/apps/docs/content/docs/en/tools/rds.mdx b/apps/docs/content/docs/en/tools/rds.mdx
index 0ecf4d131b..ec1f31869e 100644
--- a/apps/docs/content/docs/en/tools/rds.mdx
+++ b/apps/docs/content/docs/en/tools/rds.mdx
@@ -165,9 +165,30 @@ Execute raw SQL on Amazon RDS using the Data API
 | `rows` | array | Array of rows returned or affected |
 | `rowCount` | number | Number of rows affected |
 
+### `rds_introspect`
 
+Introspect Amazon RDS Aurora database schema to retrieve table structures, columns, and relationships
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `region` | string | Yes | AWS region \(e.g., us-east-1\) |
+| `accessKeyId` | string | Yes | AWS access key ID |
+| `secretAccessKey` | string | Yes | AWS secret access key |
+| `resourceArn` | string | Yes | ARN of the Aurora DB cluster |
+| `secretArn` | string | Yes | ARN of the Secrets Manager secret containing DB credentials |
+| `database` | string | No | Database name \(optional\) |
+| `schema` | string | No | Schema to introspect \(default: public for PostgreSQL, database name for MySQL\) |
+| `engine` | string | No | Database engine \(aurora-postgresql or aurora-mysql\). Auto-detected if not provided. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `engine` | string | Detected database engine type |
+| `tables` | array | Array of table schemas with columns, keys, and indexes |
+| `schemas` | array | List of available schemas in the database |
 
-## Notes
 
-- Category: `tools`
-- Type: `rds`
diff --git a/apps/docs/content/docs/en/tools/reddit.mdx b/apps/docs/content/docs/en/tools/reddit.mdx
index 84435db722..537c2a0bd3 100644
--- a/apps/docs/content/docs/en/tools/reddit.mdx
+++ b/apps/docs/content/docs/en/tools/reddit.mdx
@@ -284,8 +284,3 @@ Subscribe or unsubscribe from a subreddit
 | `message` | string | Success or error message |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `reddit`
diff --git a/apps/docs/content/docs/en/tools/resend.mdx b/apps/docs/content/docs/en/tools/resend.mdx
index e6ff725ed7..eb0bc6a32d 100644
--- a/apps/docs/content/docs/en/tools/resend.mdx
+++ b/apps/docs/content/docs/en/tools/resend.mdx
@@ -58,8 +58,3 @@ Send an email using your own Resend API key and from address
 | `body` | string | Email body content |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `resend`
diff --git a/apps/docs/content/docs/en/tools/s3.mdx b/apps/docs/content/docs/en/tools/s3.mdx
index 3e964c7fd1..302e5dd756 100644
--- a/apps/docs/content/docs/en/tools/s3.mdx
+++ b/apps/docs/content/docs/en/tools/s3.mdx
@@ -147,8 +147,3 @@ Copy an object within or between AWS S3 buckets
 | `metadata` | object | Copy operation metadata |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `s3`
diff --git a/apps/docs/content/docs/en/tools/salesforce.mdx b/apps/docs/content/docs/en/tools/salesforce.mdx
index 870c6161d2..02fe188f7d 100644
--- a/apps/docs/content/docs/en/tools/salesforce.mdx
+++ b/apps/docs/content/docs/en/tools/salesforce.mdx
@@ -259,7 +259,7 @@ Get lead(s) from Salesforce
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Lead data |
 
 ### `salesforce_create_lead`
@@ -286,8 +286,8 @@ Create a new lead
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Created lead |
+| `success` | boolean | Operation success status |
+| `output` | object | Created lead data |
 
 ### `salesforce_update_lead`
 
@@ -314,8 +314,8 @@ Update an existing lead
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Updated lead |
+| `success` | boolean | Operation success status |
+| `output` | object | Updated lead data |
 
 ### `salesforce_delete_lead`
 
@@ -333,8 +333,8 @@ Delete a lead
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Deleted lead |
+| `success` | boolean | Operation success status |
+| `output` | object | Deleted lead data |
 
 ### `salesforce_get_opportunities`
 
@@ -355,7 +355,7 @@ Get opportunity(ies) from Salesforce
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
+| `success` | boolean | Operation success status |
 | `output` | object | Opportunity data |
 
 ### `salesforce_create_opportunity`
@@ -380,8 +380,8 @@ Create a new opportunity
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Created opportunity |
+| `success` | boolean | Operation success status |
+| `output` | object | Created opportunity data |
 
 ### `salesforce_update_opportunity`
 
@@ -406,8 +406,8 @@ Update an existing opportunity
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Updated opportunity |
+| `success` | boolean | Operation success status |
+| `output` | object | Updated opportunity data |
 
 ### `salesforce_delete_opportunity`
 
@@ -425,8 +425,8 @@ Delete an opportunity
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Deleted opportunity |
+| `success` | boolean | Operation success status |
+| `output` | object | Deleted opportunity data |
 
 ### `salesforce_get_cases`
 
@@ -447,7 +447,7 @@ Get case(s) from Salesforce
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
+| `success` | boolean | Operation success status |
 | `output` | object | Case data |
 
 ### `salesforce_create_case`
@@ -472,8 +472,8 @@ Create a new case
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Created case |
+| `success` | boolean | Operation success status |
+| `output` | object | Created case data |
 
 ### `salesforce_update_case`
 
@@ -495,8 +495,8 @@ Update an existing case
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Updated case |
+| `success` | boolean | Operation success status |
+| `output` | object | Updated case data |
 
 ### `salesforce_delete_case`
 
@@ -514,8 +514,8 @@ Delete a case
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Deleted case |
+| `success` | boolean | Operation success status |
+| `output` | object | Deleted case data |
 
 ### `salesforce_get_tasks`
 
@@ -536,7 +536,7 @@ Get task(s) from Salesforce
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
+| `success` | boolean | Operation success status |
 | `output` | object | Task data |
 
 ### `salesforce_create_task`
@@ -561,8 +561,8 @@ Create a new task
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Created task |
+| `success` | boolean | Operation success status |
+| `output` | object | Created task data |
 
 ### `salesforce_update_task`
 
@@ -585,8 +585,8 @@ Update an existing task
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Updated task |
+| `success` | boolean | Operation success status |
+| `output` | object | Updated task data |
 
 ### `salesforce_delete_task`
 
@@ -604,8 +604,8 @@ Delete a task
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success |
-| `output` | object | Deleted task |
+| `success` | boolean | Operation success status |
+| `output` | object | Deleted task data |
 
 ### `salesforce_list_reports`
 
@@ -624,7 +624,7 @@ Get a list of reports accessible by the current user
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Reports data |
 
 ### `salesforce_get_report`
@@ -643,7 +643,7 @@ Get metadata and describe information for a specific report
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Report metadata |
 
 ### `salesforce_run_report`
@@ -664,7 +664,7 @@ Execute a report and retrieve the results
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Report results |
 
 ### `salesforce_list_report_types`
@@ -682,7 +682,7 @@ Get a list of available report types
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Report types data |
 
 ### `salesforce_list_dashboards`
@@ -701,7 +701,7 @@ Get a list of dashboards accessible by the current user
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Dashboards data |
 
 ### `salesforce_get_dashboard`
@@ -720,7 +720,7 @@ Get details and results for a specific dashboard
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Dashboard data |
 
 ### `salesforce_refresh_dashboard`
@@ -739,7 +739,7 @@ Refresh a dashboard to get the latest data
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Refreshed dashboard data |
 
 ### `salesforce_query`
@@ -758,7 +758,7 @@ Execute a custom SOQL query to retrieve data from Salesforce
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Query results |
 
 ### `salesforce_query_more`
@@ -777,7 +777,7 @@ Retrieve additional query results using the nextRecordsUrl from a previous query
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Query results |
 
 ### `salesforce_describe_object`
@@ -796,7 +796,7 @@ Get metadata and field information for a Salesforce object
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Object metadata |
 
 ### `salesforce_list_objects`
@@ -814,12 +814,7 @@ Get a list of all available Salesforce objects
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Success status |
+| `success` | boolean | Operation success status |
 | `output` | object | Objects list |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `salesforce`
diff --git a/apps/docs/content/docs/en/tools/search.mdx b/apps/docs/content/docs/en/tools/search.mdx
index 795956a565..882a18714d 100644
--- a/apps/docs/content/docs/en/tools/search.mdx
+++ b/apps/docs/content/docs/en/tools/search.mdx
@@ -52,8 +52,3 @@ Search the web. Returns the most relevant web results, including title, link, sn
 | `cost` | json | Cost information \($0.01\) |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `search`
diff --git a/apps/docs/content/docs/en/tools/sendgrid.mdx b/apps/docs/content/docs/en/tools/sendgrid.mdx
index a55b71077b..40aec3bb0e 100644
--- a/apps/docs/content/docs/en/tools/sendgrid.mdx
+++ b/apps/docs/content/docs/en/tools/sendgrid.mdx
@@ -400,8 +400,3 @@ Create a new version of an email template in SendGrid
 | `updatedAt` | string | Last update timestamp |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `sendgrid`
diff --git a/apps/docs/content/docs/en/tools/sentry.mdx b/apps/docs/content/docs/en/tools/sentry.mdx
index 905ff45dae..408a61a515 100644
--- a/apps/docs/content/docs/en/tools/sentry.mdx
+++ b/apps/docs/content/docs/en/tools/sentry.mdx
@@ -303,8 +303,3 @@ Create a deploy record for a Sentry release in a specific environment. Deploys t
 | `deploy` | object | The newly created deploy record |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `sentry`
diff --git a/apps/docs/content/docs/en/tools/serper.mdx b/apps/docs/content/docs/en/tools/serper.mdx
index 4671f54083..44496283f5 100644
--- a/apps/docs/content/docs/en/tools/serper.mdx
+++ b/apps/docs/content/docs/en/tools/serper.mdx
@@ -55,8 +55,3 @@ A powerful web search tool that provides access to Google search results through
 | `searchResults` | array | Search results with titles, links, snippets, and type-specific metadata \(date for news, rating for places, imageUrl for images\) |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `serper`
diff --git a/apps/docs/content/docs/en/tools/servicenow.mdx b/apps/docs/content/docs/en/tools/servicenow.mdx
index 8a1a8b71bb..879e808125 100644
--- a/apps/docs/content/docs/en/tools/servicenow.mdx
+++ b/apps/docs/content/docs/en/tools/servicenow.mdx
@@ -122,8 +122,3 @@ Delete a record from a ServiceNow table
 | `metadata` | json | Operation metadata |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `servicenow`
diff --git a/apps/docs/content/docs/en/tools/sftp.mdx b/apps/docs/content/docs/en/tools/sftp.mdx
index 3795d473b0..3cb8d08767 100644
--- a/apps/docs/content/docs/en/tools/sftp.mdx
+++ b/apps/docs/content/docs/en/tools/sftp.mdx
@@ -181,8 +181,3 @@ Create a directory on a remote SFTP server
 | `message` | string | Operation status message |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `sftp`
diff --git a/apps/docs/content/docs/en/tools/sharepoint.mdx b/apps/docs/content/docs/en/tools/sharepoint.mdx
index 70a24feed0..9b2aac048c 100644
--- a/apps/docs/content/docs/en/tools/sharepoint.mdx
+++ b/apps/docs/content/docs/en/tools/sharepoint.mdx
@@ -189,8 +189,3 @@ Upload files to a SharePoint document library
 | `uploadedFiles` | array | Array of uploaded file objects |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `sharepoint`
diff --git a/apps/docs/content/docs/en/tools/shopify.mdx b/apps/docs/content/docs/en/tools/shopify.mdx
index 327e935aee..2247af0e1b 100644
--- a/apps/docs/content/docs/en/tools/shopify.mdx
+++ b/apps/docs/content/docs/en/tools/shopify.mdx
@@ -442,8 +442,3 @@ Get a specific collection by ID, including its products. Use this to retrieve pr
 | `collection` | object | The collection details including its products |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `shopify`
diff --git a/apps/docs/content/docs/en/tools/slack.mdx b/apps/docs/content/docs/en/tools/slack.mdx
index 7eb927c811..8c806d4de8 100644
--- a/apps/docs/content/docs/en/tools/slack.mdx
+++ b/apps/docs/content/docs/en/tools/slack.mdx
@@ -283,8 +283,3 @@ Add an emoji reaction to a Slack message
 | `metadata` | object | Reaction metadata |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `slack`
diff --git a/apps/docs/content/docs/en/tools/smtp.mdx b/apps/docs/content/docs/en/tools/smtp.mdx
index 01075b7494..098deb7b2c 100644
--- a/apps/docs/content/docs/en/tools/smtp.mdx
+++ b/apps/docs/content/docs/en/tools/smtp.mdx
@@ -71,8 +71,3 @@ Send emails via SMTP server
 | `error` | string | Error message if sending failed |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `smtp`
diff --git a/apps/docs/content/docs/en/tools/spotify.mdx b/apps/docs/content/docs/en/tools/spotify.mdx
index 1b8cd3b0c7..04f823d812 100644
--- a/apps/docs/content/docs/en/tools/spotify.mdx
+++ b/apps/docs/content/docs/en/tools/spotify.mdx
@@ -1449,8 +1449,3 @@ Transfer playback to a different device.
 | `success` | boolean | Whether transfer was successful |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `spotify`
diff --git a/apps/docs/content/docs/en/tools/sqs.mdx b/apps/docs/content/docs/en/tools/sqs.mdx
index 0fe60e5425..36820cf018 100644
--- a/apps/docs/content/docs/en/tools/sqs.mdx
+++ b/apps/docs/content/docs/en/tools/sqs.mdx
@@ -61,8 +61,3 @@ Send a message to an Amazon SQS queue
 | `id` | string | Message ID |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `sqs`
diff --git a/apps/docs/content/docs/en/tools/ssh.mdx b/apps/docs/content/docs/en/tools/ssh.mdx
index 663ca7ac31..1f083937d2 100644
--- a/apps/docs/content/docs/en/tools/ssh.mdx
+++ b/apps/docs/content/docs/en/tools/ssh.mdx
@@ -392,8 +392,3 @@ Write or append content to a remote file
 | `message` | string | Operation status message |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `ssh`
diff --git a/apps/docs/content/docs/en/tools/stagehand.mdx b/apps/docs/content/docs/en/tools/stagehand.mdx
index 448a73b6c1..09585de157 100644
--- a/apps/docs/content/docs/en/tools/stagehand.mdx
+++ b/apps/docs/content/docs/en/tools/stagehand.mdx
@@ -81,8 +81,3 @@ Run an autonomous web agent to complete tasks and extract structured data
 | `agentResult` | object | Result from the Stagehand agent execution |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `stagehand`
diff --git a/apps/docs/content/docs/en/tools/stripe.mdx b/apps/docs/content/docs/en/tools/stripe.mdx
index 19c251647c..dad24ade66 100644
--- a/apps/docs/content/docs/en/tools/stripe.mdx
+++ b/apps/docs/content/docs/en/tools/stripe.mdx
@@ -282,7 +282,6 @@ Permanently delete a customer
 | --------- | ---- | ----------- |
 | `deleted` | boolean | Whether the customer was deleted |
 | `id` | string | The ID of the deleted customer |
-| `metadata` | json | Deletion metadata |
 
 ### `stripe_list_customers`
 
@@ -541,7 +540,6 @@ Permanently delete a draft invoice
 | --------- | ---- | ----------- |
 | `deleted` | boolean | Whether the invoice was deleted |
 | `id` | string | The ID of the deleted invoice |
-| `metadata` | json | Deletion metadata |
 
 ### `stripe_finalize_invoice`
 
@@ -856,7 +854,6 @@ Permanently delete a product
 | --------- | ---- | ----------- |
 | `deleted` | boolean | Whether the product was deleted |
 | `id` | string | The ID of the deleted product |
-| `metadata` | json | Deletion metadata |
 
 ### `stripe_list_products`
 
@@ -1035,8 +1032,3 @@ List all Events
 | `metadata` | json | List metadata including count and has_more |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `stripe`
diff --git a/apps/docs/content/docs/en/tools/stt.mdx b/apps/docs/content/docs/en/tools/stt.mdx
index d76afbbd31..db378e0db4 100644
--- a/apps/docs/content/docs/en/tools/stt.mdx
+++ b/apps/docs/content/docs/en/tools/stt.mdx
@@ -195,8 +195,3 @@ Transcribe audio to text using Google Gemini with multimodal capabilities
 | `confidence` | number | Overall confidence score |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `stt`
diff --git a/apps/docs/content/docs/en/tools/supabase.mdx b/apps/docs/content/docs/en/tools/supabase.mdx
index a6e285c9a8..5249cdbdbf 100644
--- a/apps/docs/content/docs/en/tools/supabase.mdx
+++ b/apps/docs/content/docs/en/tools/supabase.mdx
@@ -261,6 +261,25 @@ Call a PostgreSQL function in Supabase
 | `message` | string | Operation status message |
 | `results` | json | Result returned from the function |
 
+### `supabase_introspect`
+
+Introspect Supabase database schema to get table structures, columns, and relationships
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `projectId` | string | Yes | Your Supabase project ID \(e.g., jdrkgepadsdopsntdlom\) |
+| `schema` | string | No | Database schema to introspect \(defaults to all user schemas, commonly "public"\) |
+| `apiKey` | string | Yes | Your Supabase service role secret key |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `tables` | array | Array of table schemas with columns, keys, and indexes |
+
 ### `supabase_storage_upload`
 
 Upload a file to a Supabase storage bucket
@@ -495,8 +514,3 @@ Create a temporary signed URL for a file in a Supabase storage bucket
 | `signedUrl` | string | The temporary signed URL to access the file |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `supabase`
diff --git a/apps/docs/content/docs/en/tools/tavily.mdx b/apps/docs/content/docs/en/tools/tavily.mdx
index 7c4ec1110b..dbf8bb1b77 100644
--- a/apps/docs/content/docs/en/tools/tavily.mdx
+++ b/apps/docs/content/docs/en/tools/tavily.mdx
@@ -147,8 +147,3 @@ Discover and visualize website structure using Tavily
 | `results` | array | Discovered URL |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `tavily`
diff --git a/apps/docs/content/docs/en/tools/telegram.mdx b/apps/docs/content/docs/en/tools/telegram.mdx
index eb8ba336b0..9955078ce6 100644
--- a/apps/docs/content/docs/en/tools/telegram.mdx
+++ b/apps/docs/content/docs/en/tools/telegram.mdx
@@ -197,8 +197,3 @@ Send documents (PDF, ZIP, DOC, etc.) to Telegram channels or users through the T
 | `data` | object | Telegram message data including document |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `telegram`
diff --git a/apps/docs/content/docs/en/tools/thinking.mdx b/apps/docs/content/docs/en/tools/thinking.mdx
deleted file mode 100644
index 917f510327..0000000000
--- a/apps/docs/content/docs/en/tools/thinking.mdx
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: Thinking
-description: Forces model to outline its thought process.
----
-
-import { BlockInfoCard } from "@/components/ui/block-info-card"
-
-<BlockInfoCard 
-  type="thinking"
-  color="#181C1E"
-/>
-
-{/* MANUAL-CONTENT-START:intro */}
-The Thinking tool encourages AI models to engage in explicit reasoning before responding to complex queries. By providing a dedicated space for step-by-step analysis, this tool helps models break down problems, consider multiple perspectives, and arrive at more thoughtful conclusions.
-
-Research has shown that prompting language models to "think step by step" can significantly improve their reasoning capabilities. According to [Anthropic's research on Claude's Think tool](https://www.anthropic.com/engineering/claude-think-tool), when models are given space to work through their reasoning explicitly, they demonstrate:
-
-- **Improved problem-solving**: Breaking complex problems into manageable steps
-- **Enhanced accuracy**: Reducing errors by carefully working through each component of a problem
-- **Greater transparency**: Making the model's reasoning process visible and auditable
-- **More nuanced responses**: Considering multiple angles before arriving at conclusions
-
-In Sim, the Thinking tool creates a structured opportunity for your agents to engage in this kind of deliberate reasoning. By incorporating thinking steps into your workflows, you can help your agents tackle complex tasks more effectively, avoid common reasoning pitfalls, and produce higher-quality outputs. This is particularly valuable for tasks involving multi-step reasoning, complex decision-making, or situations where accuracy is critical.
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Adds a step where the model explicitly outlines its thought process before proceeding. This can improve reasoning quality by encouraging step-by-step analysis.
-
-
-
-## Tools
-
-### `thinking_tool`
-
-Processes a provided thought/instruction, making it available for subsequent steps.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `thought` | string | Yes | Your internal reasoning, analysis, or thought process. Use this to think through the problem step by step before responding. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `acknowledgedThought` | string | The thought that was processed and acknowledged |
-
-
-
-## Notes
-
-- Category: `tools`
-- Type: `thinking`
diff --git a/apps/docs/content/docs/en/tools/translate.mdx b/apps/docs/content/docs/en/tools/translate.mdx
index d28443a91b..3c3f7dc75d 100644
--- a/apps/docs/content/docs/en/tools/translate.mdx
+++ b/apps/docs/content/docs/en/tools/translate.mdx
@@ -66,8 +66,3 @@ Send a chat completion request to any supported LLM provider
 | `tokens` | object | Token usage information |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `translate`
diff --git a/apps/docs/content/docs/en/tools/trello.mdx b/apps/docs/content/docs/en/tools/trello.mdx
index ac924c5f04..91d76f752d 100644
--- a/apps/docs/content/docs/en/tools/trello.mdx
+++ b/apps/docs/content/docs/en/tools/trello.mdx
@@ -151,8 +151,3 @@ Add a comment to a Trello card
 | `comment` | object | The created comment object with id, text, date, and member creator |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `trello`
diff --git a/apps/docs/content/docs/en/tools/tts.mdx b/apps/docs/content/docs/en/tools/tts.mdx
index 99b380939a..f4c1ea4ccb 100644
--- a/apps/docs/content/docs/en/tools/tts.mdx
+++ b/apps/docs/content/docs/en/tools/tts.mdx
@@ -254,8 +254,3 @@ Convert text to speech using PlayHT (voice cloning)
 | `provider` | string | TTS provider used |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `tts`
diff --git a/apps/docs/content/docs/en/tools/twilio_sms.mdx b/apps/docs/content/docs/en/tools/twilio_sms.mdx
index e9170e4694..2b7f6f82ec 100644
--- a/apps/docs/content/docs/en/tools/twilio_sms.mdx
+++ b/apps/docs/content/docs/en/tools/twilio_sms.mdx
@@ -58,8 +58,3 @@ Send text messages to single or multiple recipients using the Twilio API.
 | `toNumber` | string | Phone number message was sent to |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `twilio_sms`
diff --git a/apps/docs/content/docs/en/tools/twilio_voice.mdx b/apps/docs/content/docs/en/tools/twilio_voice.mdx
index 34a44b5a76..892e0e7a2b 100644
--- a/apps/docs/content/docs/en/tools/twilio_voice.mdx
+++ b/apps/docs/content/docs/en/tools/twilio_voice.mdx
@@ -132,8 +132,3 @@ Retrieve call recording information and transcription (if enabled via TwiML).
 | `error` | string | Error message if retrieval failed |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `twilio_voice`
diff --git a/apps/docs/content/docs/en/tools/typeform.mdx b/apps/docs/content/docs/en/tools/typeform.mdx
index bd1d055905..7a2d918e23 100644
--- a/apps/docs/content/docs/en/tools/typeform.mdx
+++ b/apps/docs/content/docs/en/tools/typeform.mdx
@@ -214,8 +214,3 @@ Permanently delete a form and all its responses
 | `message` | string | Deletion confirmation message |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `typeform`
diff --git a/apps/docs/content/docs/en/tools/video_generator.mdx b/apps/docs/content/docs/en/tools/video_generator.mdx
index a56b59108a..7930ad7b2f 100644
--- a/apps/docs/content/docs/en/tools/video_generator.mdx
+++ b/apps/docs/content/docs/en/tools/video_generator.mdx
@@ -190,8 +190,3 @@ Generate videos using Fal.ai platform with access to multiple models including V
 | `jobId` | string | Job ID |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `video_generator`
diff --git a/apps/docs/content/docs/en/tools/vision.mdx b/apps/docs/content/docs/en/tools/vision.mdx
index 06c5f9155f..ade454f419 100644
--- a/apps/docs/content/docs/en/tools/vision.mdx
+++ b/apps/docs/content/docs/en/tools/vision.mdx
@@ -57,8 +57,3 @@ Process and analyze images using advanced vision models. Capable of understandin
 | `usage` | object | Detailed token usage breakdown |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `vision`
diff --git a/apps/docs/content/docs/en/tools/wealthbox.mdx b/apps/docs/content/docs/en/tools/wealthbox.mdx
index 6bfd998cd7..b1e5514985 100644
--- a/apps/docs/content/docs/en/tools/wealthbox.mdx
+++ b/apps/docs/content/docs/en/tools/wealthbox.mdx
@@ -144,8 +144,3 @@ Create or update a Wealthbox task
 | `output` | object | Created or updated task data and metadata |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `wealthbox`
diff --git a/apps/docs/content/docs/en/tools/webflow.mdx b/apps/docs/content/docs/en/tools/webflow.mdx
index 168f3eaf43..6e53139d05 100644
--- a/apps/docs/content/docs/en/tools/webflow.mdx
+++ b/apps/docs/content/docs/en/tools/webflow.mdx
@@ -132,8 +132,3 @@ Delete an item from a Webflow CMS collection
 | `metadata` | json | Metadata about the deletion |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `webflow`
diff --git a/apps/docs/content/docs/en/tools/whatsapp.mdx b/apps/docs/content/docs/en/tools/whatsapp.mdx
index bffed543e8..2c04af3ef7 100644
--- a/apps/docs/content/docs/en/tools/whatsapp.mdx
+++ b/apps/docs/content/docs/en/tools/whatsapp.mdx
@@ -55,8 +55,3 @@ Send WhatsApp messages
 | `timestamp` | string | Message send timestamp |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `whatsapp`
diff --git a/apps/docs/content/docs/en/tools/wikipedia.mdx b/apps/docs/content/docs/en/tools/wikipedia.mdx
index a22a2ca0f7..8a02918d9e 100644
--- a/apps/docs/content/docs/en/tools/wikipedia.mdx
+++ b/apps/docs/content/docs/en/tools/wikipedia.mdx
@@ -97,8 +97,3 @@ Get a random Wikipedia page.
 | `randomPage` | object | Random Wikipedia page data |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `wikipedia`
diff --git a/apps/docs/content/docs/en/tools/wordpress.mdx b/apps/docs/content/docs/en/tools/wordpress.mdx
index 94840bbe58..31592b8100 100644
--- a/apps/docs/content/docs/en/tools/wordpress.mdx
+++ b/apps/docs/content/docs/en/tools/wordpress.mdx
@@ -564,8 +564,3 @@ Search across all content types in WordPress.com (posts, pages, media)
 | `results` | array | Search results |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `wordpress`
diff --git a/apps/docs/content/docs/en/tools/x.mdx b/apps/docs/content/docs/en/tools/x.mdx
index 7b4f5ff0ae..bc5a98affd 100644
--- a/apps/docs/content/docs/en/tools/x.mdx
+++ b/apps/docs/content/docs/en/tools/x.mdx
@@ -108,8 +108,3 @@ Get user profile information
 | `user` | object | X user profile information |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `x`
diff --git a/apps/docs/content/docs/en/tools/youtube.mdx b/apps/docs/content/docs/en/tools/youtube.mdx
index 1c087fb640..dcc057caa7 100644
--- a/apps/docs/content/docs/en/tools/youtube.mdx
+++ b/apps/docs/content/docs/en/tools/youtube.mdx
@@ -194,8 +194,3 @@ Get comments from a YouTube video.
 | `items` | array | Array of comments from the video |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `youtube`
diff --git a/apps/docs/content/docs/en/tools/zendesk.mdx b/apps/docs/content/docs/en/tools/zendesk.mdx
index 3b826c0112..54c794d3f0 100644
--- a/apps/docs/content/docs/en/tools/zendesk.mdx
+++ b/apps/docs/content/docs/en/tools/zendesk.mdx
@@ -78,7 +78,6 @@ Retrieve a list of tickets from Zendesk with optional filtering
 | --------- | ---- | ----------- |
 | `tickets` | array | Array of ticket objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
 
 ### `zendesk_get_ticket`
 
@@ -98,7 +97,7 @@ Get a single ticket by ID from Zendesk
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `ticket` | object | Ticket object |
-| `metadata` | object | Operation metadata |
+| `ticket_id` | number | The ticket ID |
 
 ### `zendesk_create_ticket`
 
@@ -127,7 +126,7 @@ Create a new ticket in Zendesk with support for custom fields
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `ticket` | object | Created ticket object |
-| `metadata` | object | Operation metadata |
+| `ticket_id` | number | The created ticket ID |
 
 ### `zendesk_create_tickets_bulk`
 
@@ -146,8 +145,8 @@ Create multiple tickets in Zendesk at once (max 100)
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `jobStatus` | object | Job status object |
-| `metadata` | object | Operation metadata |
+| `job_status` | object | Job status object |
+| `job_id` | string | The bulk operation job ID |
 
 ### `zendesk_update_ticket`
 
@@ -176,7 +175,7 @@ Update an existing ticket in Zendesk with support for custom fields
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `ticket` | object | Updated ticket object |
-| `metadata` | object | Operation metadata |
+| `ticket_id` | number | The updated ticket ID |
 
 ### `zendesk_update_tickets_bulk`
 
@@ -200,8 +199,8 @@ Update multiple tickets in Zendesk at once (max 100)
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `jobStatus` | object | Job status object |
-| `metadata` | object | Operation metadata |
+| `job_status` | object | Job status object |
+| `job_id` | string | The bulk operation job ID |
 
 ### `zendesk_delete_ticket`
 
@@ -221,7 +220,7 @@ Delete a ticket from Zendesk
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `deleted` | boolean | Deletion success |
-| `metadata` | object | Operation metadata |
+| `ticket_id` | string | The deleted ticket ID |
 
 ### `zendesk_merge_tickets`
 
@@ -242,8 +241,9 @@ Merge multiple tickets into a target ticket
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `jobStatus` | object | Job status object |
-| `metadata` | object | Operation metadata |
+| `job_status` | object | Job status object |
+| `job_id` | string | The merge job ID |
+| `target_ticket_id` | string | The target ticket ID that tickets were merged into |
 
 ### `zendesk_get_users`
 
@@ -267,7 +267,6 @@ Retrieve a list of users from Zendesk with optional filtering
 | --------- | ---- | ----------- |
 | `users` | array | Array of user objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
 
 ### `zendesk_get_user`
 
@@ -287,7 +286,7 @@ Get a single user by ID from Zendesk
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `user` | object | User object |
-| `metadata` | object | Operation metadata |
+| `user_id` | number | The user ID |
 
 ### `zendesk_get_current_user`
 
@@ -306,7 +305,7 @@ Get the currently authenticated user from Zendesk
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `user` | object | Current user object |
-| `metadata` | object | Operation metadata |
+| `user_id` | number | The current user ID |
 
 ### `zendesk_search_users`
 
@@ -330,7 +329,6 @@ Search for users in Zendesk using a query string
 | --------- | ---- | ----------- |
 | `users` | array | Array of user objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
 
 ### `zendesk_create_user`
 
@@ -357,7 +355,7 @@ Create a new user in Zendesk
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `user` | object | Created user object |
-| `metadata` | object | Operation metadata |
+| `user_id` | number | The created user ID |
 
 ### `zendesk_create_users_bulk`
 
@@ -376,8 +374,8 @@ Create multiple users in Zendesk using bulk import
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `jobStatus` | object | Job status object |
-| `metadata` | object | Operation metadata |
+| `job_status` | object | Job status object |
+| `job_id` | string | The bulk operation job ID |
 
 ### `zendesk_update_user`
 
@@ -404,8 +402,8 @@ Update an existing user in Zendesk
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `user` | object | Updated user object |
-| `metadata` | object | Operation metadata |
+| `user` | json | Updated user object |
+| `user_id` | number | The updated user ID |
 
 ### `zendesk_update_users_bulk`
 
@@ -424,8 +422,8 @@ Update multiple users in Zendesk using bulk update
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `jobStatus` | object | Job status object |
-| `metadata` | object | Operation metadata |
+| `job_status` | object | Job status object |
+| `job_id` | string | The bulk operation job ID |
 
 ### `zendesk_delete_user`
 
@@ -445,7 +443,7 @@ Delete a user from Zendesk
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `deleted` | boolean | Deletion success |
-| `metadata` | object | Operation metadata |
+| `user_id` | string | The deleted user ID |
 
 ### `zendesk_get_organizations`
 
@@ -467,7 +465,6 @@ Retrieve a list of organizations from Zendesk
 | --------- | ---- | ----------- |
 | `organizations` | array | Array of organization objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
 
 ### `zendesk_get_organization`
 
@@ -486,8 +483,8 @@ Get a single organization by ID from Zendesk
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `organization` | object | Organization object |
-| `metadata` | object | Operation metadata |
+| `organization` | json | Organization object |
+| `organization_id` | number | The organization ID |
 
 ### `zendesk_autocomplete_organizations`
 
@@ -510,7 +507,6 @@ Autocomplete organizations in Zendesk by name prefix (for name matching/autocomp
 | --------- | ---- | ----------- |
 | `organizations` | array | Array of organization objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
 
 ### `zendesk_create_organization`
 
@@ -534,8 +530,8 @@ Create a new organization in Zendesk
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `organization` | object | Created organization object |
-| `metadata` | object | Operation metadata |
+| `organization` | json | Created organization object |
+| `organization_id` | number | The created organization ID |
 
 ### `zendesk_create_organizations_bulk`
 
@@ -554,8 +550,8 @@ Create multiple organizations in Zendesk using bulk import
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `jobStatus` | object | Job status object |
-| `metadata` | object | Operation metadata |
+| `job_status` | object | Job status object |
+| `job_id` | string | The bulk operation job ID |
 
 ### `zendesk_update_organization`
 
@@ -580,8 +576,8 @@ Update an existing organization in Zendesk
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `organization` | object | Updated organization object |
-| `metadata` | object | Operation metadata |
+| `organization` | json | Updated organization object |
+| `organization_id` | number | The updated organization ID |
 
 ### `zendesk_delete_organization`
 
@@ -600,8 +596,8 @@ Delete an organization from Zendesk
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `deleted` | boolean | Deletion success |
-| `metadata` | object | Operation metadata |
+| `deleted` | boolean | Whether the organization was successfully deleted |
+| `organization_id` | string | The deleted organization ID |
 
 ### `zendesk_search`
 
@@ -626,7 +622,6 @@ Unified search across tickets, users, and organizations in Zendesk
 | --------- | ---- | ----------- |
 | `results` | array | Array of result objects |
 | `paging` | object | Pagination information |
-| `metadata` | object | Operation metadata |
 
 ### `zendesk_search_count`
 
@@ -646,11 +641,5 @@ Count the number of search results matching a query in Zendesk
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `count` | number | Number of matching results |
-| `metadata` | object | Operation metadata |
-
-
 
-## Notes
 
-- Category: `tools`
-- Type: `zendesk`
diff --git a/apps/docs/content/docs/en/tools/zep.mdx b/apps/docs/content/docs/en/tools/zep.mdx
index 4b53ed8f4a..675dc9d6de 100644
--- a/apps/docs/content/docs/en/tools/zep.mdx
+++ b/apps/docs/content/docs/en/tools/zep.mdx
@@ -211,8 +211,3 @@ List all conversation threads for a specific user
 | `totalCount` | number | Total number of threads returned |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `zep`
diff --git a/apps/docs/content/docs/en/tools/zoom.mdx b/apps/docs/content/docs/en/tools/zoom.mdx
index a1bc1b9eab..2185abf39a 100644
--- a/apps/docs/content/docs/en/tools/zoom.mdx
+++ b/apps/docs/content/docs/en/tools/zoom.mdx
@@ -250,8 +250,3 @@ List participants from a past Zoom meeting
 | `pageInfo` | object | Pagination information |
 
 
-
-## Notes
-
-- Category: `tools`
-- Type: `zoom`
diff --git a/apps/docs/content/docs/es/enterprise/index.mdx b/apps/docs/content/docs/es/enterprise/index.mdx
index 48c3f59241..2137bb5366 100644
--- a/apps/docs/content/docs/es/enterprise/index.mdx
+++ b/apps/docs/content/docs/es/enterprise/index.mdx
@@ -70,6 +70,7 @@ Para implementaciones self-hosted, las funciones enterprise se pueden activar me
 |----------|-------------|
 | `SSO_ENABLED`, `NEXT_PUBLIC_SSO_ENABLED` | Inicio de sesión único con SAML/OIDC |
 | `CREDENTIAL_SETS_ENABLED`, `NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED` | Grupos de sondeo para activadores de correo electrónico |
+| `DISABLE_INVITATIONS`, `NEXT_PUBLIC_DISABLE_INVITATIONS` | Desactivar globalmente invitaciones a espacios de trabajo/organizaciones |
 
 <Callout type="warn">
   BYOK solo está disponible en Sim Studio alojado. Las implementaciones autoalojadas configuran las claves de proveedor de IA directamente a través de variables de entorno.
diff --git a/apps/docs/content/docs/fr/enterprise/index.mdx b/apps/docs/content/docs/fr/enterprise/index.mdx
index 46efa6b6ac..c3eb71122e 100644
--- a/apps/docs/content/docs/fr/enterprise/index.mdx
+++ b/apps/docs/content/docs/fr/enterprise/index.mdx
@@ -70,6 +70,7 @@ Pour les déploiements auto-hébergés, les fonctionnalités entreprise peuvent
 |----------|-------------|
 | `SSO_ENABLED`, `NEXT_PUBLIC_SSO_ENABLED` | Authentification unique avec SAML/OIDC |
 | `CREDENTIAL_SETS_ENABLED`, `NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED` | Groupes de sondage pour les déclencheurs d'e-mail |
+| `DISABLE_INVITATIONS`, `NEXT_PUBLIC_DISABLE_INVITATIONS` | Désactiver globalement les invitations aux espaces de travail/organisations |
 
 <Callout type="warn">
   BYOK est uniquement disponible sur Sim Studio hébergé. Les déploiements auto-hébergés configurent les clés de fournisseur d'IA directement via les variables d'environnement.
diff --git a/apps/docs/content/docs/ja/enterprise/index.mdx b/apps/docs/content/docs/ja/enterprise/index.mdx
index a08a5a51d5..1fc8dd6c5a 100644
--- a/apps/docs/content/docs/ja/enterprise/index.mdx
+++ b/apps/docs/content/docs/ja/enterprise/index.mdx
@@ -69,6 +69,7 @@ Sim Studioのホストキーの代わりに、AIモデルプロバイダー用
 |----------|-------------|
 | `SSO_ENABLED`、`NEXT_PUBLIC_SSO_ENABLED` | SAML/OIDCによるシングルサインオン |
 | `CREDENTIAL_SETS_ENABLED`、`NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED` | メールトリガー用のポーリンググループ |
+| `DISABLE_INVITATIONS`、`NEXT_PUBLIC_DISABLE_INVITATIONS` | ワークスペース/組織への招待をグローバルに無効化 |
 
 <Callout type="warn">
   BYOKはホスト型Sim Studioでのみ利用可能です。セルフホスト型デプロイメントでは、環境変数を介してAIプロバイダーキーを直接設定します。
diff --git a/apps/docs/content/docs/zh/enterprise/index.mdx b/apps/docs/content/docs/zh/enterprise/index.mdx
index 045a14ea4d..edef31636b 100644
--- a/apps/docs/content/docs/zh/enterprise/index.mdx
+++ b/apps/docs/content/docs/zh/enterprise/index.mdx
@@ -69,6 +69,7 @@ Sim Studio 企业版为需要更高安全性、合规性和管理能力的组织
 |----------|-------------|
 | `SSO_ENABLED`，`NEXT_PUBLIC_SSO_ENABLED` | 使用 SAML/OIDC 的单点登录 |
 | `CREDENTIAL_SETS_ENABLED`，`NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED` | 用于邮件触发器的轮询组 |
+| `DISABLE_INVITATIONS`，`NEXT_PUBLIC_DISABLE_INVITATIONS` | 全局禁用工作区/组织邀请 |
 
 <Callout type="warn">
   BYOK 仅适用于托管版 Sim Studio。自托管部署需通过环境变量直接配置 AI 提供商密钥。
diff --git a/apps/sim/app/api/copilot/chat/route.ts b/apps/sim/app/api/copilot/chat/route.ts
index 8d92bdbb7b..1c0067e835 100644
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -21,6 +21,7 @@ import { env } from '@/lib/core/config/env'
 import { CopilotFiles } from '@/lib/uploads'
 import { createFileContent } from '@/lib/uploads/utils/file-utils'
 import { tools } from '@/tools/registry'
+import { getLatestVersionTools, stripVersionSuffix } from '@/tools/utils'
 
 const logger = createLogger('CopilotChatAPI')
 
@@ -411,11 +412,14 @@ export async function POST(req: NextRequest) {
       try {
         const { createUserToolSchema } = await import('@/tools/params')
 
-        integrationTools = Object.entries(tools).map(([toolId, toolConfig]) => {
+        const latestTools = getLatestVersionTools(tools)
+
+        integrationTools = Object.entries(latestTools).map(([toolId, toolConfig]) => {
           const userSchema = createUserToolSchema(toolConfig)
+          const strippedName = stripVersionSuffix(toolId)
           return {
-            name: toolId,
-            description: toolConfig.description || toolConfig.name || toolId,
+            name: strippedName,
+            description: toolConfig.description || toolConfig.name || strippedName,
             input_schema: userSchema,
             defer_loading: true, // Anthropic Advanced Tool Use
             ...(toolConfig.oauth?.required && {
diff --git a/apps/sim/app/api/copilot/execute-tool/route.ts b/apps/sim/app/api/copilot/execute-tool/route.ts
index adb88071e3..b737b196de 100644
--- a/apps/sim/app/api/copilot/execute-tool/route.ts
+++ b/apps/sim/app/api/copilot/execute-tool/route.ts
@@ -17,7 +17,7 @@ import { refreshTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 import { REFERENCE } from '@/executor/constants'
 import { createEnvVarPattern } from '@/executor/utils/reference-validation'
 import { executeTool } from '@/tools'
-import { getTool } from '@/tools/utils'
+import { getTool, resolveToolId } from '@/tools/utils'
 
 const logger = createLogger('CopilotExecuteToolAPI')
 
@@ -86,15 +86,17 @@ export async function POST(req: NextRequest) {
 
     const { toolCallId, toolName, arguments: toolArgs, workflowId } = ExecuteToolSchema.parse(body)
 
+    const resolvedToolName = resolveToolId(toolName)
+
     logger.info(`[${tracker.requestId}] Executing tool`, {
       toolCallId,
       toolName,
+      resolvedToolName,
       workflowId,
       hasArgs: Object.keys(toolArgs).length > 0,
     })
 
-    // Get tool config from registry
-    const toolConfig = getTool(toolName)
+    const toolConfig = getTool(resolvedToolName)
     if (!toolConfig) {
       // Find similar tool names to help debug
       const { tools: allTools } = await import('@/tools/registry')
@@ -252,7 +254,7 @@ export async function POST(req: NextRequest) {
       hasApiKey: !!executionParams.apiKey,
     })
 
-    const result = await executeTool(toolName, executionParams, true)
+    const result = await executeTool(resolvedToolName, executionParams, true)
 
     logger.info(`[${tracker.requestId}] Tool execution complete`, {
       toolName,
diff --git a/apps/sim/app/api/organizations/[id]/invitations/route.ts b/apps/sim/app/api/organizations/[id]/invitations/route.ts
index f72705e90e..124d709574 100644
--- a/apps/sim/app/api/organizations/[id]/invitations/route.ts
+++ b/apps/sim/app/api/organizations/[id]/invitations/route.ts
@@ -26,6 +26,10 @@ import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { hasWorkspaceAdminAccess } from '@/lib/workspaces/permissions/utils'
+import {
+  InvitationsNotAllowedError,
+  validateInvitationsAllowed,
+} from '@/executor/utils/permission-check'
 
 const logger = createLogger('OrganizationInvitations')
 
@@ -116,6 +120,8 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
+    await validateInvitationsAllowed(session.user.id)
+
     const { id: organizationId } = await params
     const url = new URL(request.url)
     const validateOnly = url.searchParams.get('validate') === 'true'
@@ -427,6 +433,10 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       },
     })
   } catch (error) {
+    if (error instanceof InvitationsNotAllowedError) {
+      return NextResponse.json({ error: error.message }, { status: 403 })
+    }
+
     logger.error('Failed to create organization invitations', {
       organizationId: (await params).id,
       error,
@@ -486,10 +496,7 @@ export async function DELETE(
         and(
           eq(invitation.id, invitationId),
           eq(invitation.organizationId, organizationId),
-          or(
-            eq(invitation.status, 'pending'),
-            eq(invitation.status, 'rejected') // Allow cancelling rejected invitations too
-          )
+          or(eq(invitation.status, 'pending'), eq(invitation.status, 'rejected'))
         )
       )
       .returning()
diff --git a/apps/sim/app/api/tools/dynamodb/introspect/route.ts b/apps/sim/app/api/tools/dynamodb/introspect/route.ts
new file mode 100644
index 0000000000..55db21aea9
--- /dev/null
+++ b/apps/sim/app/api/tools/dynamodb/introspect/route.ts
@@ -0,0 +1,73 @@
+import { randomUUID } from 'crypto'
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createRawDynamoDBClient, describeTable, listTables } from '@/app/api/tools/dynamodb/utils'
+
+const logger = createLogger('DynamoDBIntrospectAPI')
+
+const IntrospectSchema = z.object({
+  region: z.string().min(1, 'AWS region is required'),
+  accessKeyId: z.string().min(1, 'AWS access key ID is required'),
+  secretAccessKey: z.string().min(1, 'AWS secret access key is required'),
+  tableName: z.string().optional(),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = IntrospectSchema.parse(body)
+
+    logger.info(`[${requestId}] Introspecting DynamoDB in region ${params.region}`)
+
+    const client = createRawDynamoDBClient({
+      region: params.region,
+      accessKeyId: params.accessKeyId,
+      secretAccessKey: params.secretAccessKey,
+    })
+
+    try {
+      const { tables } = await listTables(client)
+
+      if (params.tableName) {
+        logger.info(`[${requestId}] Describing table: ${params.tableName}`)
+        const { tableDetails } = await describeTable(client, params.tableName)
+
+        logger.info(`[${requestId}] Table description completed for '${params.tableName}'`)
+
+        return NextResponse.json({
+          message: `Table '${params.tableName}' described successfully.`,
+          tables,
+          tableDetails,
+        })
+      }
+
+      logger.info(`[${requestId}] Listed ${tables.length} tables`)
+
+      return NextResponse.json({
+        message: `Found ${tables.length} table(s) in region '${params.region}'.`,
+        tables,
+      })
+    } finally {
+      client.destroy()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] DynamoDB introspection failed:`, error)
+
+    return NextResponse.json(
+      { error: `DynamoDB introspection failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}
diff --git a/apps/sim/app/api/tools/dynamodb/utils.ts b/apps/sim/app/api/tools/dynamodb/utils.ts
index 9641fb9b30..c71d8bbe6c 100644
--- a/apps/sim/app/api/tools/dynamodb/utils.ts
+++ b/apps/sim/app/api/tools/dynamodb/utils.ts
@@ -1,4 +1,4 @@
-import { DynamoDBClient } from '@aws-sdk/client-dynamodb'
+import { DescribeTableCommand, DynamoDBClient, ListTablesCommand } from '@aws-sdk/client-dynamodb'
 import {
   DeleteCommand,
   DynamoDBDocumentClient,
@@ -8,7 +8,7 @@ import {
   ScanCommand,
   UpdateCommand,
 } from '@aws-sdk/lib-dynamodb'
-import type { DynamoDBConnectionConfig } from '@/tools/dynamodb/types'
+import type { DynamoDBConnectionConfig, DynamoDBTableSchema } from '@/tools/dynamodb/types'
 
 export function createDynamoDBClient(config: DynamoDBConnectionConfig): DynamoDBDocumentClient {
   const client = new DynamoDBClient({
@@ -172,3 +172,99 @@ export async function deleteItem(
   await client.send(command)
   return { success: true }
 }
+
+/**
+ * Creates a raw DynamoDB client for operations that don't require DocumentClient
+ */
+export function createRawDynamoDBClient(config: DynamoDBConnectionConfig): DynamoDBClient {
+  return new DynamoDBClient({
+    region: config.region,
+    credentials: {
+      accessKeyId: config.accessKeyId,
+      secretAccessKey: config.secretAccessKey,
+    },
+  })
+}
+
+/**
+ * Lists all DynamoDB tables in the configured region
+ */
+export async function listTables(client: DynamoDBClient): Promise<{ tables: string[] }> {
+  const tables: string[] = []
+  let exclusiveStartTableName: string | undefined
+
+  do {
+    const command = new ListTablesCommand({
+      ExclusiveStartTableName: exclusiveStartTableName,
+    })
+
+    const response = await client.send(command)
+    if (response.TableNames) {
+      tables.push(...response.TableNames)
+    }
+    exclusiveStartTableName = response.LastEvaluatedTableName
+  } while (exclusiveStartTableName)
+
+  return { tables }
+}
+
+/**
+ * Describes a specific DynamoDB table and returns its schema information
+ */
+export async function describeTable(
+  client: DynamoDBClient,
+  tableName: string
+): Promise<{ tableDetails: DynamoDBTableSchema }> {
+  const command = new DescribeTableCommand({
+    TableName: tableName,
+  })
+
+  const response = await client.send(command)
+  const table = response.Table
+
+  if (!table) {
+    throw new Error(`Table '${tableName}' not found`)
+  }
+
+  const tableDetails: DynamoDBTableSchema = {
+    tableName: table.TableName || tableName,
+    tableStatus: table.TableStatus || 'UNKNOWN',
+    keySchema:
+      table.KeySchema?.map((key) => ({
+        attributeName: key.AttributeName || '',
+        keyType: (key.KeyType as 'HASH' | 'RANGE') || 'HASH',
+      })) || [],
+    attributeDefinitions:
+      table.AttributeDefinitions?.map((attr) => ({
+        attributeName: attr.AttributeName || '',
+        attributeType: (attr.AttributeType as 'S' | 'N' | 'B') || 'S',
+      })) || [],
+    globalSecondaryIndexes:
+      table.GlobalSecondaryIndexes?.map((gsi) => ({
+        indexName: gsi.IndexName || '',
+        keySchema:
+          gsi.KeySchema?.map((key) => ({
+            attributeName: key.AttributeName || '',
+            keyType: (key.KeyType as 'HASH' | 'RANGE') || 'HASH',
+          })) || [],
+        projectionType: gsi.Projection?.ProjectionType || 'ALL',
+        indexStatus: gsi.IndexStatus || 'UNKNOWN',
+      })) || [],
+    localSecondaryIndexes:
+      table.LocalSecondaryIndexes?.map((lsi) => ({
+        indexName: lsi.IndexName || '',
+        keySchema:
+          lsi.KeySchema?.map((key) => ({
+            attributeName: key.AttributeName || '',
+            keyType: (key.KeyType as 'HASH' | 'RANGE') || 'HASH',
+          })) || [],
+        projectionType: lsi.Projection?.ProjectionType || 'ALL',
+        indexStatus: 'ACTIVE',
+      })) || [],
+    itemCount: Number(table.ItemCount) || 0,
+    tableSizeBytes: Number(table.TableSizeBytes) || 0,
+    billingMode: table.BillingModeSummary?.BillingMode || 'PROVISIONED',
+  }
+
+  return { tableDetails }
+}
diff --git a/apps/sim/app/api/tools/google_calendar/calendars/route.ts b/apps/sim/app/api/tools/google_calendar/calendars/route.ts
index f934d6dd41..0493825399 100644
--- a/apps/sim/app/api/tools/google_calendar/calendars/route.ts
+++ b/apps/sim/app/api/tools/google_calendar/calendars/route.ts
@@ -3,7 +3,6 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
-import { isUuidV4 } from '@/executor/constants'
 export const dynamic = 'force-dynamic'
 
 const logger = createLogger('GoogleCalendarAPI')
@@ -34,16 +33,6 @@ export async function GET(request: NextRequest) {
       logger.warn(`[${requestId}] Missing credentialId parameter`)
       return NextResponse.json({ error: 'Credential ID is required' }, { status: 400 })
     }
-
-    if (!isUuidV4(credentialId)) {
-      logger.warn(`[${requestId}] Invalid credentialId format`, { credentialId })
-      return NextResponse.json({ error: 'Invalid credential ID format' }, { status: 400 })
-    }
-
-    if (workflowId && !isUuidV4(workflowId)) {
-      logger.warn(`[${requestId}] Invalid workflowId format`, { workflowId })
-      return NextResponse.json({ error: 'Invalid workflow ID format' }, { status: 400 })
-    }
     const authz = await authorizeCredentialUse(request, { credentialId, workflowId })
     if (!authz.ok || !authz.credentialOwnerUserId) {
       return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
diff --git a/apps/sim/app/api/tools/mongodb/introspect/route.ts b/apps/sim/app/api/tools/mongodb/introspect/route.ts
new file mode 100644
index 0000000000..a095c13868
--- /dev/null
+++ b/apps/sim/app/api/tools/mongodb/introspect/route.ts
@@ -0,0 +1,73 @@
+import { randomUUID } from 'crypto'
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createMongoDBConnection, executeIntrospect } from '../utils'
+
+const logger = createLogger('MongoDBIntrospectAPI')
+
+const IntrospectSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().optional(),
+  username: z.string().optional(),
+  password: z.string().optional(),
+  authSource: z.string().optional(),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+  let client = null
+
+  try {
+    const body = await request.json()
+    const params = IntrospectSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Introspecting MongoDB at ${params.host}:${params.port}${params.database ? `/${params.database}` : ''}`
+    )
+
+    client = await createMongoDBConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database || 'admin',
+      username: params.username,
+      password: params.password,
+      authSource: params.authSource,
+      ssl: params.ssl,
+    })
+
+    const result = await executeIntrospect(client, params.database)
+
+    logger.info(
+      `[${requestId}] Introspection completed: ${result.databases.length} databases, ${result.collections.length} collections`
+    )
+
+    return NextResponse.json({
+      message: result.message,
+      databases: result.databases,
+      collections: result.collections,
+    })
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] MongoDB introspect failed:`, error)
+
+    return NextResponse.json(
+      { error: `MongoDB introspect failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  } finally {
+    if (client) {
+      await client.close()
+    }
+  }
+}
diff --git a/apps/sim/app/api/tools/mongodb/utils.ts b/apps/sim/app/api/tools/mongodb/utils.ts
index 812cc3cd8e..4697a1cce0 100644
--- a/apps/sim/app/api/tools/mongodb/utils.ts
+++ b/apps/sim/app/api/tools/mongodb/utils.ts
@@ -1,5 +1,5 @@
 import { MongoClient } from 'mongodb'
-import type { MongoDBConnectionConfig } from '@/tools/mongodb/types'
+import type { MongoDBCollectionInfo, MongoDBConnectionConfig } from '@/tools/mongodb/types'
 
 export async function createMongoDBConnection(config: MongoDBConnectionConfig) {
   const credentials =
@@ -129,3 +129,59 @@ export function sanitizeCollectionName(name: string): string {
   }
   return name
 }
+
+/**
+ * Introspect MongoDB to get databases, collections, and indexes
+ */
+export async function executeIntrospect(
+  client: MongoClient,
+  database?: string
+): Promise<{
+  message: string
+  databases: string[]
+  collections: MongoDBCollectionInfo[]
+}> {
+  const databases: string[] = []
+  const collections: MongoDBCollectionInfo[] = []
+
+  if (database) {
+    databases.push(database)
+    const db = client.db(database)
+    const collectionList = await db.listCollections().toArray()
+
+    for (const collInfo of collectionList) {
+      const coll = db.collection(collInfo.name)
+      const indexes = await coll.indexes()
+      const documentCount = await coll.estimatedDocumentCount()
+
+      collections.push({
+        name: collInfo.name,
+        type: collInfo.type || 'collection',
+        documentCount,
+        indexes: indexes.map((idx) => ({
+          name: idx.name || '',
+          key: idx.key as Record<string, number>,
+          unique: idx.unique || false,
+          sparse: idx.sparse,
+        })),
+      })
+    }
+  } else {
+    const admin = client.db().admin()
+    const dbList = await admin.listDatabases()
+
+    for (const dbInfo of dbList.databases) {
+      databases.push(dbInfo.name)
+    }
+  }
+
+  const message = database
+    ? `Found ${collections.length} collections in database '${database}'`
+    : `Found ${databases.length} databases`
+
+  return {
+    message,
+    databases,
+    collections,
+  }
+}
diff --git a/apps/sim/app/api/tools/mysql/introspect/route.ts b/apps/sim/app/api/tools/mysql/introspect/route.ts
new file mode 100644
index 0000000000..5a9cb53c5f
--- /dev/null
+++ b/apps/sim/app/api/tools/mysql/introspect/route.ts
@@ -0,0 +1,70 @@
+import { randomUUID } from 'crypto'
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createMySQLConnection, executeIntrospect } from '@/app/api/tools/mysql/utils'
+
+const logger = createLogger('MySQLIntrospectAPI')
+
+const IntrospectSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = IntrospectSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Introspecting MySQL schema on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const connection = await createMySQLConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeIntrospect(connection, params.database)
+
+      logger.info(
+        `[${requestId}] Introspection completed successfully, found ${result.tables.length} tables`
+      )
+
+      return NextResponse.json({
+        message: `Schema introspection completed. Found ${result.tables.length} table(s) in database '${params.database}'.`,
+        tables: result.tables,
+        databases: result.databases,
+      })
+    } finally {
+      await connection.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] MySQL introspection failed:`, error)
+
+    return NextResponse.json(
+      { error: `MySQL introspection failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}
diff --git a/apps/sim/app/api/tools/mysql/utils.ts b/apps/sim/app/api/tools/mysql/utils.ts
index 7738b3fc0d..44bab141b6 100644
--- a/apps/sim/app/api/tools/mysql/utils.ts
+++ b/apps/sim/app/api/tools/mysql/utils.ts
@@ -166,3 +166,146 @@ function sanitizeSingleIdentifier(identifier: string): string {
 
   return `\`${cleaned}\``
 }
+
+export interface MySQLIntrospectionResult {
+  tables: Array<{
+    name: string
+    database: string
+    columns: Array<{
+      name: string
+      type: string
+      nullable: boolean
+      default: string | null
+      isPrimaryKey: boolean
+      isForeignKey: boolean
+      autoIncrement: boolean
+      references?: {
+        table: string
+        column: string
+      }
+    }>
+    primaryKey: string[]
+    foreignKeys: Array<{
+      column: string
+      referencesTable: string
+      referencesColumn: string
+    }>
+    indexes: Array<{
+      name: string
+      columns: string[]
+      unique: boolean
+    }>
+  }>
+  databases: string[]
+}
+
+export async function executeIntrospect(
+  connection: mysql.Connection,
+  databaseName: string
+): Promise<MySQLIntrospectionResult> {
+  const [databasesRows] = await connection.execute<mysql.RowDataPacket[]>(
+    `SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA
+     WHERE SCHEMA_NAME NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys')
+     ORDER BY SCHEMA_NAME`
+  )
+  const databases = databasesRows.map((row) => row.SCHEMA_NAME)
+
+  const [tablesRows] = await connection.execute<mysql.RowDataPacket[]>(
+    `SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
+     WHERE TABLE_SCHEMA = ? AND TABLE_TYPE = 'BASE TABLE'
+     ORDER BY TABLE_NAME`,
+    [databaseName]
+  )
+
+  const tables = []
+
+  for (const tableRow of tablesRows) {
+    const tableName = tableRow.TABLE_NAME
+
+    const [columnsRows] = await connection.execute<mysql.RowDataPacket[]>(
+      `SELECT COLUMN_NAME, DATA_TYPE, COLUMN_TYPE, IS_NULLABLE, COLUMN_DEFAULT, EXTRA
+       FROM INFORMATION_SCHEMA.COLUMNS
+       WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?
+       ORDER BY ORDINAL_POSITION`,
+      [databaseName, tableName]
+    )
+
+    const [pkRows] = await connection.execute<mysql.RowDataPacket[]>(
+      `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
+       WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND CONSTRAINT_NAME = 'PRIMARY'
+       ORDER BY ORDINAL_POSITION`,
+      [databaseName, tableName]
+    )
+    const primaryKeyColumns = pkRows.map((row) => row.COLUMN_NAME)
+
+    const [fkRows] = await connection.execute<mysql.RowDataPacket[]>(
+      `SELECT kcu.COLUMN_NAME, kcu.REFERENCED_TABLE_NAME, kcu.REFERENCED_COLUMN_NAME
+       FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu
+       WHERE kcu.TABLE_SCHEMA = ? AND kcu.TABLE_NAME = ? AND kcu.REFERENCED_TABLE_NAME IS NOT NULL`,
+      [databaseName, tableName]
+    )
+
+    const foreignKeys = fkRows.map((row) => ({
+      column: row.COLUMN_NAME,
+      referencesTable: row.REFERENCED_TABLE_NAME,
+      referencesColumn: row.REFERENCED_COLUMN_NAME,
+    }))
+
+    const fkColumnSet = new Set(foreignKeys.map((fk) => fk.column))
+
+    const [indexRows] = await connection.execute<mysql.RowDataPacket[]>(
+      `SELECT INDEX_NAME, COLUMN_NAME, SEQ_IN_INDEX, NON_UNIQUE
+       FROM INFORMATION_SCHEMA.STATISTICS
+       WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND INDEX_NAME != 'PRIMARY'
+       ORDER BY INDEX_NAME, SEQ_IN_INDEX`,
+      [databaseName, tableName]
+    )
+
+    const indexMap = new Map<string, { name: string; columns: string[]; unique: boolean }>()
+    for (const row of indexRows) {
+      const indexName = row.INDEX_NAME
+      if (!indexMap.has(indexName)) {
+        indexMap.set(indexName, {
+          name: indexName,
+          columns: [],
+          unique: row.NON_UNIQUE === 0,
+        })
+      }
+      indexMap.get(indexName)!.columns.push(row.COLUMN_NAME)
+    }
+    const indexes = Array.from(indexMap.values())
+
+    const columns = columnsRows.map((col) => {
+      const columnName = col.COLUMN_NAME
+      const fk = foreignKeys.find((f) => f.column === columnName)
+      const isAutoIncrement = col.EXTRA?.toLowerCase().includes('auto_increment') || false
+
+      return {
+        name: columnName,
+        type: col.COLUMN_TYPE || col.DATA_TYPE,
+        nullable: col.IS_NULLABLE === 'YES',
+        default: col.COLUMN_DEFAULT,
+        isPrimaryKey: primaryKeyColumns.includes(columnName),
+        isForeignKey: fkColumnSet.has(columnName),
+        autoIncrement: isAutoIncrement,
+        ...(fk && {
+          references: {
+            table: fk.referencesTable,
+            column: fk.referencesColumn,
+          },
+        }),
+      }
+    })
+
+    tables.push({
+      name: tableName,
+      database: databaseName,
+      columns,
+      primaryKey: primaryKeyColumns,
+      foreignKeys,
+      indexes,
+    })
+  }
+
+  return { tables, databases }
+}
diff --git a/apps/sim/app/api/tools/neo4j/introspect/route.ts b/apps/sim/app/api/tools/neo4j/introspect/route.ts
new file mode 100644
index 0000000000..0543afb026
--- /dev/null
+++ b/apps/sim/app/api/tools/neo4j/introspect/route.ts
@@ -0,0 +1,199 @@
+import { randomUUID } from 'crypto'
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createNeo4jDriver } from '@/app/api/tools/neo4j/utils'
+import type { Neo4jNodeSchema, Neo4jRelationshipSchema } from '@/tools/neo4j/types'
+
+const logger = createLogger('Neo4jIntrospectAPI')
+
+const IntrospectSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  encryption: z.enum(['enabled', 'disabled']).default('disabled'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+  let driver = null
+  let session = null
+
+  try {
+    const body = await request.json()
+    const params = IntrospectSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Introspecting Neo4j database at ${params.host}:${params.port}/${params.database}`
+    )
+
+    driver = await createNeo4jDriver({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      encryption: params.encryption,
+    })
+
+    session = driver.session({ database: params.database })
+
+    const labelsResult = await session.run(
+      'CALL db.labels() YIELD label RETURN label ORDER BY label'
+    )
+    const labels: string[] = labelsResult.records.map((record) => record.get('label') as string)
+
+    const relationshipTypesResult = await session.run(
+      'CALL db.relationshipTypes() YIELD relationshipType RETURN relationshipType ORDER BY relationshipType'
+    )
+    const relationshipTypes: string[] = relationshipTypesResult.records.map(
+      (record) => record.get('relationshipType') as string
+    )
+
+    const nodeSchemas: Neo4jNodeSchema[] = []
+    try {
+      const nodePropertiesResult = await session.run(
+        'CALL db.schema.nodeTypeProperties() YIELD nodeLabels, propertyName, propertyTypes RETURN nodeLabels, propertyName, propertyTypes'
+      )
+
+      const nodePropertiesMap = new Map<string, Array<{ name: string; types: string[] }>>()
+
+      for (const record of nodePropertiesResult.records) {
+        const nodeLabels = record.get('nodeLabels') as string[]
+        const propertyName = record.get('propertyName') as string
+        const propertyTypes = record.get('propertyTypes') as string[]
+
+        const labelKey = nodeLabels.join(':')
+        if (!nodePropertiesMap.has(labelKey)) {
+          nodePropertiesMap.set(labelKey, [])
+        }
+        nodePropertiesMap.get(labelKey)!.push({ name: propertyName, types: propertyTypes })
+      }
+
+      for (const [labelKey, properties] of nodePropertiesMap) {
+        nodeSchemas.push({
+          label: labelKey,
+          properties,
+        })
+      }
+    } catch (nodePropsError) {
+      logger.warn(
+        `[${requestId}] Could not fetch node properties (may not be supported in this Neo4j version): ${nodePropsError}`
+      )
+    }
+
+    const relationshipSchemas: Neo4jRelationshipSchema[] = []
+    try {
+      const relPropertiesResult = await session.run(
+        'CALL db.schema.relTypeProperties() YIELD relationshipType, propertyName, propertyTypes RETURN relationshipType, propertyName, propertyTypes'
+      )
+
+      const relPropertiesMap = new Map<string, Array<{ name: string; types: string[] }>>()
+
+      for (const record of relPropertiesResult.records) {
+        const relType = record.get('relationshipType') as string
+        const propertyName = record.get('propertyName') as string | null
+        const propertyTypes = record.get('propertyTypes') as string[]
+
+        if (!relPropertiesMap.has(relType)) {
+          relPropertiesMap.set(relType, [])
+        }
+        if (propertyName) {
+          relPropertiesMap.get(relType)!.push({ name: propertyName, types: propertyTypes })
+        }
+      }
+
+      for (const [relType, properties] of relPropertiesMap) {
+        relationshipSchemas.push({
+          type: relType,
+          properties,
+        })
+      }
+    } catch (relPropsError) {
+      logger.warn(
+        `[${requestId}] Could not fetch relationship properties (may not be supported in this Neo4j version): ${relPropsError}`
+      )
+    }
+
+    const constraints: Array<{
+      name: string
+      type: string
+      entityType: string
+      properties: string[]
+    }> = []
+    try {
+      const constraintsResult = await session.run('SHOW CONSTRAINTS')
+
+      for (const record of constraintsResult.records) {
+        const name = record.get('name') as string
+        const type = record.get('type') as string
+        const entityType = record.get('entityType') as string
+        const properties = (record.get('properties') as string[]) || []
+
+        constraints.push({ name, type, entityType, properties })
+      }
+    } catch (constraintsError) {
+      logger.warn(
+        `[${requestId}] Could not fetch constraints (may not be supported in this Neo4j version): ${constraintsError}`
+      )
+    }
+
+    const indexes: Array<{ name: string; type: string; entityType: string; properties: string[] }> =
+      []
+    try {
+      const indexesResult = await session.run('SHOW INDEXES')
+
+      for (const record of indexesResult.records) {
+        const name = record.get('name') as string
+        const type = record.get('type') as string
+        const entityType = record.get('entityType') as string
+        const properties = (record.get('properties') as string[]) || []
+
+        indexes.push({ name, type, entityType, properties })
+      }
+    } catch (indexesError) {
+      logger.warn(
+        `[${requestId}] Could not fetch indexes (may not be supported in this Neo4j version): ${indexesError}`
+      )
+    }
+
+    logger.info(
+      `[${requestId}] Introspection completed: ${labels.length} labels, ${relationshipTypes.length} relationship types, ${constraints.length} constraints, ${indexes.length} indexes`
+    )
+
+    return NextResponse.json({
+      message: `Database introspection completed: found ${labels.length} labels, ${relationshipTypes.length} relationship types, ${nodeSchemas.length} node schemas, ${relationshipSchemas.length} relationship schemas, ${constraints.length} constraints, ${indexes.length} indexes`,
+      labels,
+      relationshipTypes,
+      nodeSchemas,
+      relationshipSchemas,
+      constraints,
+      indexes,
+    })
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] Neo4j introspection failed:`, error)
+
+    return NextResponse.json(
+      { error: `Neo4j introspection failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  } finally {
+    if (session) {
+      await session.close()
+    }
+    if (driver) {
+      await driver.close()
+    }
+  }
+}
diff --git a/apps/sim/app/api/tools/postgresql/introspect/route.ts b/apps/sim/app/api/tools/postgresql/introspect/route.ts
new file mode 100644
index 0000000000..3fc5e41fcf
--- /dev/null
+++ b/apps/sim/app/api/tools/postgresql/introspect/route.ts
@@ -0,0 +1,71 @@
+import { randomUUID } from 'crypto'
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createPostgresConnection, executeIntrospect } from '@/app/api/tools/postgresql/utils'
+
+const logger = createLogger('PostgreSQLIntrospectAPI')
+
+const IntrospectSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  schema: z.string().default('public'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = IntrospectSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Introspecting PostgreSQL schema on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const sql = createPostgresConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeIntrospect(sql, params.schema)
+
+      logger.info(
+        `[${requestId}] Introspection completed successfully, found ${result.tables.length} tables`
+      )
+
+      return NextResponse.json({
+        message: `Schema introspection completed. Found ${result.tables.length} table(s) in schema '${params.schema}'.`,
+        tables: result.tables,
+        schemas: result.schemas,
+      })
+    } finally {
+      await sql.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] PostgreSQL introspection failed:`, error)
+
+    return NextResponse.json(
+      { error: `PostgreSQL introspection failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}
diff --git a/apps/sim/app/api/tools/postgresql/utils.ts b/apps/sim/app/api/tools/postgresql/utils.ts
index 27e8b62cd1..eef711144d 100644
--- a/apps/sim/app/api/tools/postgresql/utils.ts
+++ b/apps/sim/app/api/tools/postgresql/utils.ts
@@ -187,3 +187,184 @@ export async function executeDelete(
     rowCount,
   }
 }
+
+export interface IntrospectionResult {
+  tables: Array<{
+    name: string
+    schema: string
+    columns: Array<{
+      name: string
+      type: string
+      nullable: boolean
+      default: string | null
+      isPrimaryKey: boolean
+      isForeignKey: boolean
+      references?: {
+        table: string
+        column: string
+      }
+    }>
+    primaryKey: string[]
+    foreignKeys: Array<{
+      column: string
+      referencesTable: string
+      referencesColumn: string
+    }>
+    indexes: Array<{
+      name: string
+      columns: string[]
+      unique: boolean
+    }>
+  }>
+  schemas: string[]
+}
+
+export async function executeIntrospect(
+  sql: any,
+  schemaName = 'public'
+): Promise<IntrospectionResult> {
+  const schemasResult = await sql`
+    SELECT schema_name
+    FROM information_schema.schemata
+    WHERE schema_name NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+    ORDER BY schema_name
+  `
+  const schemas = schemasResult.map((row: { schema_name: string }) => row.schema_name)
+
+  const tablesResult = await sql`
+    SELECT table_name, table_schema
+    FROM information_schema.tables
+    WHERE table_schema = ${schemaName}
+      AND table_type = 'BASE TABLE'
+    ORDER BY table_name
+  `
+
+  const tables = []
+
+  for (const tableRow of tablesResult) {
+    const tableName = tableRow.table_name
+    const tableSchema = tableRow.table_schema
+
+    const columnsResult = await sql`
+      SELECT
+        c.column_name,
+        c.data_type,
+        c.is_nullable,
+        c.column_default,
+        c.udt_name
+      FROM information_schema.columns c
+      WHERE c.table_schema = ${tableSchema}
+        AND c.table_name = ${tableName}
+      ORDER BY c.ordinal_position
+    `
+
+    const pkResult = await sql`
+      SELECT kcu.column_name
+      FROM information_schema.table_constraints tc
+      JOIN information_schema.key_column_usage kcu
+        ON tc.constraint_name = kcu.constraint_name
+        AND tc.table_schema = kcu.table_schema
+      WHERE tc.constraint_type = 'PRIMARY KEY'
+        AND tc.table_schema = ${tableSchema}
+        AND tc.table_name = ${tableName}
+    `
+    const primaryKeyColumns = pkResult.map((row: { column_name: string }) => row.column_name)
+
+    const fkResult = await sql`
+      SELECT
+        kcu.column_name,
+        ccu.table_name AS foreign_table_name,
+        ccu.column_name AS foreign_column_name
+      FROM information_schema.table_constraints tc
+      JOIN information_schema.key_column_usage kcu
+        ON tc.constraint_name = kcu.constraint_name
+        AND tc.table_schema = kcu.table_schema
+      JOIN information_schema.constraint_column_usage ccu
+        ON ccu.constraint_name = tc.constraint_name
+        AND ccu.table_schema = tc.table_schema
+      WHERE tc.constraint_type = 'FOREIGN KEY'
+        AND tc.table_schema = ${tableSchema}
+        AND tc.table_name = ${tableName}
+    `
+
+    const foreignKeys = fkResult.map(
+      (row: { column_name: string; foreign_table_name: string; foreign_column_name: string }) => ({
+        column: row.column_name,
+        referencesTable: row.foreign_table_name,
+        referencesColumn: row.foreign_column_name,
+      })
+    )
+
+    const fkColumnSet = new Set(foreignKeys.map((fk: { column: string }) => fk.column))
+
+    const indexesResult = await sql`
+      SELECT
+        i.relname AS index_name,
+        a.attname AS column_name,
+        ix.indisunique AS is_unique
+      FROM pg_class t
+      JOIN pg_index ix ON t.oid = ix.indrelid
+      JOIN pg_class i ON i.oid = ix.indexrelid
+      JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(ix.indkey)
+      JOIN pg_namespace n ON n.oid = t.relnamespace
+      WHERE t.relkind = 'r'
+        AND n.nspname = ${tableSchema}
+        AND t.relname = ${tableName}
+        AND NOT ix.indisprimary
+      ORDER BY i.relname, a.attnum
+    `
+
+    const indexMap = new Map<string, { name: string; columns: string[]; unique: boolean }>()
+    for (const row of indexesResult) {
+      const indexName = row.index_name
+      if (!indexMap.has(indexName)) {
+        indexMap.set(indexName, {
+          name: indexName,
+          columns: [],
+          unique: row.is_unique,
+        })
+      }
+      indexMap.get(indexName)!.columns.push(row.column_name)
+    }
+    const indexes = Array.from(indexMap.values())
+
+    const columns = columnsResult.map(
+      (col: {
+        column_name: string
+        data_type: string
+        is_nullable: string
+        column_default: string | null
+        udt_name: string
+      }) => {
+        const columnName = col.column_name
+        const fk = foreignKeys.find((f: { column: string }) => f.column === columnName)
+
+        return {
+          name: columnName,
+          type: col.data_type === 'USER-DEFINED' ? col.udt_name : col.data_type,
+          nullable: col.is_nullable === 'YES',
+          default: col.column_default,
+          isPrimaryKey: primaryKeyColumns.includes(columnName),
+          isForeignKey: fkColumnSet.has(columnName),
+          ...(fk && {
+            references: {
+              table: fk.referencesTable,
+              column: fk.referencesColumn,
+            },
+          }),
+        }
+      }
+    )
+
+    tables.push({
+      name: tableName,
+      schema: tableSchema,
+      columns,
+      primaryKey: primaryKeyColumns,
+      foreignKeys,
+      indexes,
+    })
+  }
+
+  return { tables, schemas }
+}
diff --git a/apps/sim/app/api/tools/rds/introspect/route.ts b/apps/sim/app/api/tools/rds/introspect/route.ts
new file mode 100644
index 0000000000..8eb46ed64b
--- /dev/null
+++ b/apps/sim/app/api/tools/rds/introspect/route.ts
@@ -0,0 +1,80 @@
+import { randomUUID } from 'crypto'
+import { createLogger } from '@sim/logger'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createRdsClient, executeIntrospect, type RdsEngine } from '@/app/api/tools/rds/utils'
+
+const logger = createLogger('RDSIntrospectAPI')
+
+const IntrospectSchema = z.object({
+  region: z.string().min(1, 'AWS region is required'),
+  accessKeyId: z.string().min(1, 'AWS access key ID is required'),
+  secretAccessKey: z.string().min(1, 'AWS secret access key is required'),
+  resourceArn: z.string().min(1, 'Resource ARN is required'),
+  secretArn: z.string().min(1, 'Secret ARN is required'),
+  database: z.string().optional(),
+  schema: z.string().optional(),
+  engine: z.enum(['aurora-postgresql', 'aurora-mysql']).optional(),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = IntrospectSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Introspecting RDS Aurora database${params.database ? ` (${params.database})` : ''}`
+    )
+
+    const client = createRdsClient({
+      region: params.region,
+      accessKeyId: params.accessKeyId,
+      secretAccessKey: params.secretAccessKey,
+      resourceArn: params.resourceArn,
+      secretArn: params.secretArn,
+      database: params.database,
+    })
+
+    try {
+      const result = await executeIntrospect(
+        client,
+        params.resourceArn,
+        params.secretArn,
+        params.database,
+        params.schema,
+        params.engine as RdsEngine | undefined
+      )
+
+      logger.info(
+        `[${requestId}] Introspection completed successfully. Engine: ${result.engine}, found ${result.tables.length} tables`
+      )
+
+      return NextResponse.json({
+        message: `Schema introspection completed. Engine: ${result.engine}. Found ${result.tables.length} table(s).`,
+        engine: result.engine,
+        tables: result.tables,
+        schemas: result.schemas,
+      })
+    } finally {
+      client.destroy()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] RDS introspection failed:`, error)
+
+    return NextResponse.json(
+      { error: `RDS introspection failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}
diff --git a/apps/sim/app/api/tools/rds/utils.ts b/apps/sim/app/api/tools/rds/utils.ts
index d76e248ea3..ac78b83d87 100644
--- a/apps/sim/app/api/tools/rds/utils.ts
+++ b/apps/sim/app/api/tools/rds/utils.ts
@@ -241,3 +241,487 @@ export async function executeDelete(
 
   return executeStatement(client, resourceArn, secretArn, database, sql, parameters)
 }
+
+export type RdsEngine = 'aurora-postgresql' | 'aurora-mysql'
+
+export interface RdsIntrospectionResult {
+  engine: RdsEngine
+  tables: Array<{
+    name: string
+    schema: string
+    columns: Array<{
+      name: string
+      type: string
+      nullable: boolean
+      default: string | null
+      isPrimaryKey: boolean
+      isForeignKey: boolean
+      references?: {
+        table: string
+        column: string
+      }
+    }>
+    primaryKey: string[]
+    foreignKeys: Array<{
+      column: string
+      referencesTable: string
+      referencesColumn: string
+    }>
+    indexes: Array<{
+      name: string
+      columns: string[]
+      unique: boolean
+    }>
+  }>
+  schemas: string[]
+}
+
+/**
+ * Detects the database engine by querying SELECT VERSION()
+ */
+export async function detectEngine(
+  client: RDSDataClient,
+  resourceArn: string,
+  secretArn: string,
+  database: string | undefined
+): Promise<RdsEngine> {
+  const result = await executeStatement(
+    client,
+    resourceArn,
+    secretArn,
+    database,
+    'SELECT VERSION()'
+  )
+
+  if (result.rows.length > 0) {
+    const versionRow = result.rows[0] as Record<string, unknown>
+    const versionValue = Object.values(versionRow)[0]
+    const versionString = String(versionValue).toLowerCase()
+
+    if (versionString.includes('postgresql') || versionString.includes('postgres')) {
+      return 'aurora-postgresql'
+    }
+    if (versionString.includes('mysql') || versionString.includes('mariadb')) {
+      return 'aurora-mysql'
+    }
+  }
+
+  throw new Error('Unable to detect database engine. Please specify the engine parameter.')
+}
+
+/**
+ * Introspects PostgreSQL schema using INFORMATION_SCHEMA
+ */
+async function introspectPostgresql(
+  client: RDSDataClient,
+  resourceArn: string,
+  secretArn: string,
+  database: string | undefined,
+  schemaName: string
+): Promise<RdsIntrospectionResult> {
+  const schemasResult = await executeStatement(
+    client,
+    resourceArn,
+    secretArn,
+    database,
+    `SELECT schema_name FROM information_schema.schemata
+     WHERE schema_name NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+     ORDER BY schema_name`
+  )
+  const schemas = schemasResult.rows.map((row) => (row as { schema_name: string }).schema_name)
+
+  const tablesResult = await executeStatement(
+    client,
+    resourceArn,
+    secretArn,
+    database,
+    `SELECT table_name, table_schema
+     FROM information_schema.tables
+     WHERE table_schema = :schemaName
+       AND table_type = 'BASE TABLE'
+     ORDER BY table_name`,
+    [{ name: 'schemaName', value: { stringValue: schemaName } }]
+  )
+
+  const tables = []
+
+  for (const tableRow of tablesResult.rows) {
+    const row = tableRow as { table_name: string; table_schema: string }
+    const tableName = row.table_name
+    const tableSchema = row.table_schema
+
+    const columnsResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT
+         c.column_name,
+         c.data_type,
+         c.is_nullable,
+         c.column_default,
+         c.udt_name
+       FROM information_schema.columns c
+       WHERE c.table_schema = :tableSchema
+         AND c.table_name = :tableName
+       ORDER BY c.ordinal_position`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+
+    const pkResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT kcu.column_name
+       FROM information_schema.table_constraints tc
+       JOIN information_schema.key_column_usage kcu
+         ON tc.constraint_name = kcu.constraint_name
+         AND tc.table_schema = kcu.table_schema
+       WHERE tc.constraint_type = 'PRIMARY KEY'
+         AND tc.table_schema = :tableSchema
+         AND tc.table_name = :tableName`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+    const primaryKeyColumns = pkResult.rows.map((r) => (r as { column_name: string }).column_name)
+
+    const fkResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT
+         kcu.column_name,
+         ccu.table_name AS foreign_table_name,
+         ccu.column_name AS foreign_column_name
+       FROM information_schema.table_constraints tc
+       JOIN information_schema.key_column_usage kcu
+         ON tc.constraint_name = kcu.constraint_name
+         AND tc.table_schema = kcu.table_schema
+       JOIN information_schema.constraint_column_usage ccu
+         ON ccu.constraint_name = tc.constraint_name
+         AND ccu.table_schema = tc.table_schema
+       WHERE tc.constraint_type = 'FOREIGN KEY'
+         AND tc.table_schema = :tableSchema
+         AND tc.table_name = :tableName`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+
+    const foreignKeys = fkResult.rows.map((r) => {
+      const fkRow = r as {
+        column_name: string
+        foreign_table_name: string
+        foreign_column_name: string
+      }
+      return {
+        column: fkRow.column_name,
+        referencesTable: fkRow.foreign_table_name,
+        referencesColumn: fkRow.foreign_column_name,
+      }
+    })
+
+    const fkColumnSet = new Set(foreignKeys.map((fk) => fk.column))
+
+    const indexesResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT
+         i.relname AS index_name,
+         a.attname AS column_name,
+         ix.indisunique AS is_unique
+       FROM pg_class t
+       JOIN pg_index ix ON t.oid = ix.indrelid
+       JOIN pg_class i ON i.oid = ix.indexrelid
+       JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(ix.indkey)
+       JOIN pg_namespace n ON n.oid = t.relnamespace
+       WHERE t.relkind = 'r'
+         AND n.nspname = :tableSchema
+         AND t.relname = :tableName
+         AND NOT ix.indisprimary
+       ORDER BY i.relname, a.attnum`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+
+    const indexMap = new Map<string, { name: string; columns: string[]; unique: boolean }>()
+    for (const idxRow of indexesResult.rows) {
+      const idx = idxRow as { index_name: string; column_name: string; is_unique: boolean }
+      const indexName = idx.index_name
+      if (!indexMap.has(indexName)) {
+        indexMap.set(indexName, {
+          name: indexName,
+          columns: [],
+          unique: idx.is_unique,
+        })
+      }
+      indexMap.get(indexName)!.columns.push(idx.column_name)
+    }
+    const indexes = Array.from(indexMap.values())
+
+    const columns = columnsResult.rows.map((colRow) => {
+      const col = colRow as {
+        column_name: string
+        data_type: string
+        is_nullable: string
+        column_default: string | null
+        udt_name: string
+      }
+      const columnName = col.column_name
+      const fk = foreignKeys.find((f) => f.column === columnName)
+
+      return {
+        name: columnName,
+        type: col.data_type === 'USER-DEFINED' ? col.udt_name : col.data_type,
+        nullable: col.is_nullable === 'YES',
+        default: col.column_default,
+        isPrimaryKey: primaryKeyColumns.includes(columnName),
+        isForeignKey: fkColumnSet.has(columnName),
+        ...(fk && {
+          references: {
+            table: fk.referencesTable,
+            column: fk.referencesColumn,
+          },
+        }),
+      }
+    })
+
+    tables.push({
+      name: tableName,
+      schema: tableSchema,
+      columns,
+      primaryKey: primaryKeyColumns,
+      foreignKeys,
+      indexes,
+    })
+  }
+
+  return { engine: 'aurora-postgresql', tables, schemas }
+}
+
+/**
+ * Introspects MySQL schema using INFORMATION_SCHEMA
+ */
+async function introspectMysql(
+  client: RDSDataClient,
+  resourceArn: string,
+  secretArn: string,
+  database: string | undefined,
+  schemaName: string
+): Promise<RdsIntrospectionResult> {
+  const schemasResult = await executeStatement(
+    client,
+    resourceArn,
+    secretArn,
+    database,
+    `SELECT SCHEMA_NAME as schema_name FROM information_schema.SCHEMATA
+     WHERE SCHEMA_NAME NOT IN ('mysql', 'information_schema', 'performance_schema', 'sys')
+     ORDER BY SCHEMA_NAME`
+  )
+  const schemas = schemasResult.rows.map((row) => (row as { schema_name: string }).schema_name)
+
+  const tablesResult = await executeStatement(
+    client,
+    resourceArn,
+    secretArn,
+    database,
+    `SELECT TABLE_NAME as table_name, TABLE_SCHEMA as table_schema
+     FROM information_schema.TABLES
+     WHERE TABLE_SCHEMA = :schemaName
+       AND TABLE_TYPE = 'BASE TABLE'
+     ORDER BY TABLE_NAME`,
+    [{ name: 'schemaName', value: { stringValue: schemaName } }]
+  )
+
+  const tables = []
+
+  for (const tableRow of tablesResult.rows) {
+    const row = tableRow as { table_name: string; table_schema: string }
+    const tableName = row.table_name
+    const tableSchema = row.table_schema
+
+    const columnsResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT
+         COLUMN_NAME as column_name,
+         DATA_TYPE as data_type,
+         IS_NULLABLE as is_nullable,
+         COLUMN_DEFAULT as column_default,
+         COLUMN_TYPE as column_type,
+         COLUMN_KEY as column_key
+       FROM information_schema.COLUMNS
+       WHERE TABLE_SCHEMA = :tableSchema
+         AND TABLE_NAME = :tableName
+       ORDER BY ORDINAL_POSITION`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+
+    const pkResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT COLUMN_NAME as column_name
+       FROM information_schema.KEY_COLUMN_USAGE
+       WHERE TABLE_SCHEMA = :tableSchema
+         AND TABLE_NAME = :tableName
+         AND CONSTRAINT_NAME = 'PRIMARY'
+       ORDER BY ORDINAL_POSITION`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+    const primaryKeyColumns = pkResult.rows.map((r) => (r as { column_name: string }).column_name)
+
+    const fkResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT
+         kcu.COLUMN_NAME as column_name,
+         kcu.REFERENCED_TABLE_NAME as foreign_table_name,
+         kcu.REFERENCED_COLUMN_NAME as foreign_column_name
+       FROM information_schema.KEY_COLUMN_USAGE kcu
+       WHERE kcu.TABLE_SCHEMA = :tableSchema
+         AND kcu.TABLE_NAME = :tableName
+         AND kcu.REFERENCED_TABLE_NAME IS NOT NULL`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+
+    const foreignKeys = fkResult.rows.map((r) => {
+      const fkRow = r as {
+        column_name: string
+        foreign_table_name: string
+        foreign_column_name: string
+      }
+      return {
+        column: fkRow.column_name,
+        referencesTable: fkRow.foreign_table_name,
+        referencesColumn: fkRow.foreign_column_name,
+      }
+    })
+
+    const fkColumnSet = new Set(foreignKeys.map((fk) => fk.column))
+
+    const indexesResult = await executeStatement(
+      client,
+      resourceArn,
+      secretArn,
+      database,
+      `SELECT
+         INDEX_NAME as index_name,
+         COLUMN_NAME as column_name,
+         NON_UNIQUE as non_unique
+       FROM information_schema.STATISTICS
+       WHERE TABLE_SCHEMA = :tableSchema
+         AND TABLE_NAME = :tableName
+         AND INDEX_NAME != 'PRIMARY'
+       ORDER BY INDEX_NAME, SEQ_IN_INDEX`,
+      [
+        { name: 'tableSchema', value: { stringValue: tableSchema } },
+        { name: 'tableName', value: { stringValue: tableName } },
+      ]
+    )
+
+    const indexMap = new Map<string, { name: string; columns: string[]; unique: boolean }>()
+    for (const idxRow of indexesResult.rows) {
+      const idx = idxRow as { index_name: string; column_name: string; non_unique: number }
+      const indexName = idx.index_name
+      if (!indexMap.has(indexName)) {
+        indexMap.set(indexName, {
+          name: indexName,
+          columns: [],
+          unique: idx.non_unique === 0,
+        })
+      }
+      indexMap.get(indexName)!.columns.push(idx.column_name)
+    }
+    const indexes = Array.from(indexMap.values())
+
+    const columns = columnsResult.rows.map((colRow) => {
+      const col = colRow as {
+        column_name: string
+        data_type: string
+        is_nullable: string
+        column_default: string | null
+        column_type: string
+        column_key: string
+      }
+      const columnName = col.column_name
+      const fk = foreignKeys.find((f) => f.column === columnName)
+
+      return {
+        name: columnName,
+        type: col.column_type || col.data_type,
+        nullable: col.is_nullable === 'YES',
+        default: col.column_default,
+        isPrimaryKey: col.column_key === 'PRI',
+        isForeignKey: fkColumnSet.has(columnName),
+        ...(fk && {
+          references: {
+            table: fk.referencesTable,
+            column: fk.referencesColumn,
+          },
+        }),
+      }
+    })
+
+    tables.push({
+      name: tableName,
+      schema: tableSchema,
+      columns,
+      primaryKey: primaryKeyColumns,
+      foreignKeys,
+      indexes,
+    })
+  }
+
+  return { engine: 'aurora-mysql', tables, schemas }
+}
+
+/**
+ * Introspects RDS Aurora database schema with auto-detection of engine type
+ */
+export async function executeIntrospect(
+  client: RDSDataClient,
+  resourceArn: string,
+  secretArn: string,
+  database: string | undefined,
+  schemaName?: string,
+  engine?: RdsEngine
+): Promise<RdsIntrospectionResult> {
+  const detectedEngine = engine || (await detectEngine(client, resourceArn, secretArn, database))
+
+  if (detectedEngine === 'aurora-postgresql') {
+    const schema = schemaName || 'public'
+    return introspectPostgresql(client, resourceArn, secretArn, database, schema)
+  }
+  const schema = schemaName || database || ''
+  if (!schema) {
+    throw new Error('Schema or database name is required for MySQL introspection')
+  }
+  return introspectMysql(client, resourceArn, secretArn, database, schema)
+}
diff --git a/apps/sim/app/api/v1/admin/byok/route.ts b/apps/sim/app/api/v1/admin/byok/route.ts
deleted file mode 100644
index 8144993122..0000000000
--- a/apps/sim/app/api/v1/admin/byok/route.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Admin BYOK Keys API
- *
- * GET /api/v1/admin/byok
- *   List all BYOK keys with optional filtering.
- *
- *   Query Parameters:
- *     - organizationId?: string - Filter by organization ID (finds all workspaces billed to this org)
- *     - workspaceId?: string - Filter by specific workspace ID
- *
- *   Response: { data: AdminBYOKKey[], pagination: PaginationMeta }
- *
- * DELETE /api/v1/admin/byok
- *   Delete BYOK keys for an organization or workspace.
- *   Used when an enterprise plan churns to clean up BYOK keys.
- *
- *   Query Parameters:
- *     - organizationId: string - Delete all BYOK keys for workspaces billed to this org
- *     - workspaceId?: string - Delete keys for a specific workspace only (optional)
- *
- *   Response: { success: true, deletedCount: number, workspacesAffected: string[] }
- */
-
-import { db } from '@sim/db'
-import { user, workspace, workspaceBYOKKeys } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { eq, inArray, sql } from 'drizzle-orm'
-import { withAdminAuth } from '@/app/api/v1/admin/middleware'
-import {
-  badRequestResponse,
-  internalErrorResponse,
-  singleResponse,
-} from '@/app/api/v1/admin/responses'
-
-const logger = createLogger('AdminBYOKAPI')
-
-export interface AdminBYOKKey {
-  id: string
-  workspaceId: string
-  workspaceName: string
-  organizationId: string
-  providerId: string
-  createdAt: string
-  createdByUserId: string | null
-  createdByEmail: string | null
-}
-
-export const GET = withAdminAuth(async (request) => {
-  const url = new URL(request.url)
-  const organizationId = url.searchParams.get('organizationId')
-  const workspaceId = url.searchParams.get('workspaceId')
-
-  try {
-    let workspaceIds: string[] = []
-
-    if (workspaceId) {
-      workspaceIds = [workspaceId]
-    } else if (organizationId) {
-      const workspaces = await db
-        .select({ id: workspace.id })
-        .from(workspace)
-        .where(eq(workspace.billedAccountUserId, organizationId))
-
-      workspaceIds = workspaces.map((w) => w.id)
-    }
-
-    const query = db
-      .select({
-        id: workspaceBYOKKeys.id,
-        workspaceId: workspaceBYOKKeys.workspaceId,
-        workspaceName: workspace.name,
-        organizationId: workspace.billedAccountUserId,
-        providerId: workspaceBYOKKeys.providerId,
-        createdAt: workspaceBYOKKeys.createdAt,
-        createdByUserId: workspaceBYOKKeys.createdBy,
-        createdByEmail: user.email,
-      })
-      .from(workspaceBYOKKeys)
-      .innerJoin(workspace, eq(workspaceBYOKKeys.workspaceId, workspace.id))
-      .leftJoin(user, eq(workspaceBYOKKeys.createdBy, user.id))
-
-    let keys
-    if (workspaceIds.length > 0) {
-      keys = await query.where(inArray(workspaceBYOKKeys.workspaceId, workspaceIds))
-    } else {
-      keys = await query
-    }
-
-    const formattedKeys: AdminBYOKKey[] = keys.map((k) => ({
-      id: k.id,
-      workspaceId: k.workspaceId,
-      workspaceName: k.workspaceName,
-      organizationId: k.organizationId,
-      providerId: k.providerId,
-      createdAt: k.createdAt.toISOString(),
-      createdByUserId: k.createdByUserId,
-      createdByEmail: k.createdByEmail,
-    }))
-
-    logger.info('Admin API: Listed BYOK keys', {
-      organizationId,
-      workspaceId,
-      count: formattedKeys.length,
-    })
-
-    return singleResponse({
-      data: formattedKeys,
-      pagination: {
-        total: formattedKeys.length,
-        limit: formattedKeys.length,
-        offset: 0,
-        hasMore: false,
-      },
-    })
-  } catch (error) {
-    logger.error('Admin API: Failed to list BYOK keys', { error, organizationId, workspaceId })
-    return internalErrorResponse('Failed to list BYOK keys')
-  }
-})
-
-export const DELETE = withAdminAuth(async (request) => {
-  const url = new URL(request.url)
-  const organizationId = url.searchParams.get('organizationId')
-  const workspaceId = url.searchParams.get('workspaceId')
-  const reason = url.searchParams.get('reason') || 'Enterprise plan churn cleanup'
-
-  if (!organizationId && !workspaceId) {
-    return badRequestResponse('Either organizationId or workspaceId is required')
-  }
-
-  try {
-    let workspaceIds: string[] = []
-
-    if (workspaceId) {
-      workspaceIds = [workspaceId]
-    } else if (organizationId) {
-      const workspaces = await db
-        .select({ id: workspace.id })
-        .from(workspace)
-        .where(eq(workspace.billedAccountUserId, organizationId))
-
-      workspaceIds = workspaces.map((w) => w.id)
-    }
-
-    if (workspaceIds.length === 0) {
-      logger.info('Admin API: No workspaces found for BYOK cleanup', {
-        organizationId,
-        workspaceId,
-      })
-      return singleResponse({
-        success: true,
-        deletedCount: 0,
-        workspacesAffected: [],
-        message: 'No workspaces found for the given organization/workspace ID',
-      })
-    }
-
-    const countResult = await db
-      .select({ count: sql<number>`count(*)` })
-      .from(workspaceBYOKKeys)
-      .where(inArray(workspaceBYOKKeys.workspaceId, workspaceIds))
-
-    const totalToDelete = Number(countResult[0]?.count ?? 0)
-
-    if (totalToDelete === 0) {
-      logger.info('Admin API: No BYOK keys to delete', {
-        organizationId,
-        workspaceId,
-        workspaceIds,
-      })
-      return singleResponse({
-        success: true,
-        deletedCount: 0,
-        workspacesAffected: [],
-        message: 'No BYOK keys found for the specified workspaces',
-      })
-    }
-
-    await db.delete(workspaceBYOKKeys).where(inArray(workspaceBYOKKeys.workspaceId, workspaceIds))
-
-    logger.info('Admin API: Deleted BYOK keys', {
-      organizationId,
-      workspaceId,
-      workspaceIds,
-      deletedCount: totalToDelete,
-      reason,
-    })
-
-    return singleResponse({
-      success: true,
-      deletedCount: totalToDelete,
-      workspacesAffected: workspaceIds,
-      reason,
-    })
-  } catch (error) {
-    logger.error('Admin API: Failed to delete BYOK keys', { error, organizationId, workspaceId })
-    return internalErrorResponse('Failed to delete BYOK keys')
-  }
-})
diff --git a/apps/sim/app/api/v1/admin/index.ts b/apps/sim/app/api/v1/admin/index.ts
index ad91e0c447..e76bece6eb 100644
--- a/apps/sim/app/api/v1/admin/index.ts
+++ b/apps/sim/app/api/v1/admin/index.ts
@@ -17,6 +17,12 @@
  *   Workspaces:
  *   GET    /api/v1/admin/workspaces                         - List all workspaces
  *   GET    /api/v1/admin/workspaces/:id                     - Get workspace details
+ *   GET    /api/v1/admin/workspaces/:id/members             - List workspace members
+ *   POST   /api/v1/admin/workspaces/:id/members             - Add/update workspace member
+ *   DELETE /api/v1/admin/workspaces/:id/members?userId=X    - Remove workspace member
+ *   GET    /api/v1/admin/workspaces/:id/members/:mid        - Get workspace member details
+ *   PATCH  /api/v1/admin/workspaces/:id/members/:mid        - Update workspace member permissions
+ *   DELETE /api/v1/admin/workspaces/:id/members/:mid        - Remove workspace member by ID
  *   GET    /api/v1/admin/workspaces/:id/workflows           - List workspace workflows
  *   DELETE /api/v1/admin/workspaces/:id/workflows           - Delete all workspace workflows
  *   GET    /api/v1/admin/workspaces/:id/folders             - List workspace folders
@@ -53,10 +59,6 @@
  *   GET    /api/v1/admin/subscriptions/:id                  - Get subscription details
  *   DELETE /api/v1/admin/subscriptions/:id                  - Cancel subscription (?atPeriodEnd=true for scheduled)
  *
- *   BYOK Keys:
- *   GET    /api/v1/admin/byok                               - List BYOK keys (?organizationId=X or ?workspaceId=X)
- *   DELETE /api/v1/admin/byok                               - Delete BYOK keys for org/workspace
- *
  *   Access Control (Permission Groups):
  *   GET    /api/v1/admin/access-control                     - List permission groups (?organizationId=X)
  *   DELETE /api/v1/admin/access-control                     - Delete permission groups for org (?organizationId=X)
@@ -99,6 +101,7 @@ export type {
   AdminWorkflowDetail,
   AdminWorkspace,
   AdminWorkspaceDetail,
+  AdminWorkspaceMember,
   DbMember,
   DbOrganization,
   DbSubscription,
diff --git a/apps/sim/app/api/v1/admin/types.ts b/apps/sim/app/api/v1/admin/types.ts
index fbc12ae7ec..114563a372 100644
--- a/apps/sim/app/api/v1/admin/types.ts
+++ b/apps/sim/app/api/v1/admin/types.ts
@@ -518,6 +518,22 @@ export interface AdminMemberDetail extends AdminMember {
   billingBlocked: boolean
 }
 
+// =============================================================================
+// Workspace Member Types
+// =============================================================================
+
+export interface AdminWorkspaceMember {
+  id: string
+  workspaceId: string
+  userId: string
+  permissions: 'admin' | 'write' | 'read'
+  createdAt: string
+  updatedAt: string
+  userName: string
+  userEmail: string
+  userImage: string | null
+}
+
 // =============================================================================
 // User Billing Types
 // =============================================================================
diff --git a/apps/sim/app/api/v1/admin/workspaces/[id]/members/[memberId]/route.ts b/apps/sim/app/api/v1/admin/workspaces/[id]/members/[memberId]/route.ts
new file mode 100644
index 0000000000..49092d86df
--- /dev/null
+++ b/apps/sim/app/api/v1/admin/workspaces/[id]/members/[memberId]/route.ts
@@ -0,0 +1,232 @@
+/**
+ * GET /api/v1/admin/workspaces/[id]/members/[memberId]
+ *
+ * Get workspace member details.
+ *
+ * Response: AdminSingleResponse<AdminWorkspaceMember>
+ *
+ * PATCH /api/v1/admin/workspaces/[id]/members/[memberId]
+ *
+ * Update member permissions.
+ *
+ * Body:
+ *   - permissions: 'admin' | 'write' | 'read' - New permission level
+ *
+ * Response: AdminSingleResponse<AdminWorkspaceMember>
+ *
+ * DELETE /api/v1/admin/workspaces/[id]/members/[memberId]
+ *
+ * Remove member from workspace.
+ *
+ * Response: AdminSingleResponse<{ removed: true, memberId: string, userId: string }>
+ */
+
+import { db } from '@sim/db'
+import { permissions, user, workspace } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { and, eq } from 'drizzle-orm'
+import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
+import {
+  badRequestResponse,
+  internalErrorResponse,
+  notFoundResponse,
+  singleResponse,
+} from '@/app/api/v1/admin/responses'
+import type { AdminWorkspaceMember } from '@/app/api/v1/admin/types'
+
+const logger = createLogger('AdminWorkspaceMemberDetailAPI')
+
+interface RouteParams {
+  id: string
+  memberId: string
+}
+
+export const GET = withAdminAuthParams<RouteParams>(async (_, context) => {
+  const { id: workspaceId, memberId } = await context.params
+
+  try {
+    const [workspaceData] = await db
+      .select({ id: workspace.id })
+      .from(workspace)
+      .where(eq(workspace.id, workspaceId))
+      .limit(1)
+
+    if (!workspaceData) {
+      return notFoundResponse('Workspace')
+    }
+
+    const [memberData] = await db
+      .select({
+        id: permissions.id,
+        userId: permissions.userId,
+        permissionType: permissions.permissionType,
+        createdAt: permissions.createdAt,
+        updatedAt: permissions.updatedAt,
+        userName: user.name,
+        userEmail: user.email,
+        userImage: user.image,
+      })
+      .from(permissions)
+      .innerJoin(user, eq(permissions.userId, user.id))
+      .where(
+        and(
+          eq(permissions.id, memberId),
+          eq(permissions.entityType, 'workspace'),
+          eq(permissions.entityId, workspaceId)
+        )
+      )
+      .limit(1)
+
+    if (!memberData) {
+      return notFoundResponse('Workspace member')
+    }
+
+    const data: AdminWorkspaceMember = {
+      id: memberData.id,
+      workspaceId,
+      userId: memberData.userId,
+      permissions: memberData.permissionType,
+      createdAt: memberData.createdAt.toISOString(),
+      updatedAt: memberData.updatedAt.toISOString(),
+      userName: memberData.userName,
+      userEmail: memberData.userEmail,
+      userImage: memberData.userImage,
+    }
+
+    logger.info(`Admin API: Retrieved member ${memberId} from workspace ${workspaceId}`)
+
+    return singleResponse(data)
+  } catch (error) {
+    logger.error('Admin API: Failed to get workspace member', { error, workspaceId, memberId })
+    return internalErrorResponse('Failed to get workspace member')
+  }
+})
+
+export const PATCH = withAdminAuthParams<RouteParams>(async (request, context) => {
+  const { id: workspaceId, memberId } = await context.params
+
+  try {
+    const body = await request.json()
+
+    if (!body.permissions || !['admin', 'write', 'read'].includes(body.permissions)) {
+      return badRequestResponse('permissions must be "admin", "write", or "read"')
+    }
+
+    const [workspaceData] = await db
+      .select({ id: workspace.id })
+      .from(workspace)
+      .where(eq(workspace.id, workspaceId))
+      .limit(1)
+
+    if (!workspaceData) {
+      return notFoundResponse('Workspace')
+    }
+
+    const [existingMember] = await db
+      .select({
+        id: permissions.id,
+        userId: permissions.userId,
+        permissionType: permissions.permissionType,
+        createdAt: permissions.createdAt,
+      })
+      .from(permissions)
+      .where(
+        and(
+          eq(permissions.id, memberId),
+          eq(permissions.entityType, 'workspace'),
+          eq(permissions.entityId, workspaceId)
+        )
+      )
+      .limit(1)
+
+    if (!existingMember) {
+      return notFoundResponse('Workspace member')
+    }
+
+    const now = new Date()
+
+    await db
+      .update(permissions)
+      .set({ permissionType: body.permissions, updatedAt: now })
+      .where(eq(permissions.id, memberId))
+
+    const [userData] = await db
+      .select({ name: user.name, email: user.email, image: user.image })
+      .from(user)
+      .where(eq(user.id, existingMember.userId))
+      .limit(1)
+
+    const data: AdminWorkspaceMember = {
+      id: existingMember.id,
+      workspaceId,
+      userId: existingMember.userId,
+      permissions: body.permissions,
+      createdAt: existingMember.createdAt.toISOString(),
+      updatedAt: now.toISOString(),
+      userName: userData?.name ?? '',
+      userEmail: userData?.email ?? '',
+      userImage: userData?.image ?? null,
+    }
+
+    logger.info(`Admin API: Updated member ${memberId} permissions to ${body.permissions}`, {
+      workspaceId,
+      previousPermissions: existingMember.permissionType,
+    })
+
+    return singleResponse(data)
+  } catch (error) {
+    logger.error('Admin API: Failed to update workspace member', { error, workspaceId, memberId })
+    return internalErrorResponse('Failed to update workspace member')
+  }
+})
+
+export const DELETE = withAdminAuthParams<RouteParams>(async (_, context) => {
+  const { id: workspaceId, memberId } = await context.params
+
+  try {
+    const [workspaceData] = await db
+      .select({ id: workspace.id })
+      .from(workspace)
+      .where(eq(workspace.id, workspaceId))
+      .limit(1)
+
+    if (!workspaceData) {
+      return notFoundResponse('Workspace')
+    }
+
+    const [existingMember] = await db
+      .select({
+        id: permissions.id,
+        userId: permissions.userId,
+      })
+      .from(permissions)
+      .where(
+        and(
+          eq(permissions.id, memberId),
+          eq(permissions.entityType, 'workspace'),
+          eq(permissions.entityId, workspaceId)
+        )
+      )
+      .limit(1)
+
+    if (!existingMember) {
+      return notFoundResponse('Workspace member')
+    }
+
+    await db.delete(permissions).where(eq(permissions.id, memberId))
+
+    logger.info(`Admin API: Removed member ${memberId} from workspace ${workspaceId}`, {
+      userId: existingMember.userId,
+    })
+
+    return singleResponse({
+      removed: true,
+      memberId,
+      userId: existingMember.userId,
+      workspaceId,
+    })
+  } catch (error) {
+    logger.error('Admin API: Failed to remove workspace member', { error, workspaceId, memberId })
+    return internalErrorResponse('Failed to remove workspace member')
+  }
+})
diff --git a/apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts b/apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts
new file mode 100644
index 0000000000..687198506c
--- /dev/null
+++ b/apps/sim/app/api/v1/admin/workspaces/[id]/members/route.ts
@@ -0,0 +1,298 @@
+/**
+ * GET /api/v1/admin/workspaces/[id]/members
+ *
+ * List all members of a workspace with their permission details.
+ *
+ * Query Parameters:
+ *   - limit: number (default: 50, max: 250)
+ *   - offset: number (default: 0)
+ *
+ * Response: AdminListResponse<AdminWorkspaceMember>
+ *
+ * POST /api/v1/admin/workspaces/[id]/members
+ *
+ * Add a user to a workspace with a specific permission level.
+ * If the user already has permissions, updates their permission level.
+ *
+ * Body:
+ *   - userId: string - User ID to add
+ *   - permissions: 'admin' | 'write' | 'read' - Permission level
+ *
+ * Response: AdminSingleResponse<AdminWorkspaceMember & { action: 'created' | 'updated' }>
+ *
+ * DELETE /api/v1/admin/workspaces/[id]/members
+ *
+ * Remove a user from a workspace.
+ *
+ * Query Parameters:
+ *   - userId: string - User ID to remove
+ *
+ * Response: AdminSingleResponse<{ removed: true }>
+ */
+
+import crypto from 'crypto'
+import { db } from '@sim/db'
+import { permissions, user, workspace } from '@sim/db/schema'
+import { createLogger } from '@sim/logger'
+import { and, count, eq } from 'drizzle-orm'
+import { withAdminAuthParams } from '@/app/api/v1/admin/middleware'
+import {
+  badRequestResponse,
+  internalErrorResponse,
+  listResponse,
+  notFoundResponse,
+  singleResponse,
+} from '@/app/api/v1/admin/responses'
+import {
+  type AdminWorkspaceMember,
+  createPaginationMeta,
+  parsePaginationParams,
+} from '@/app/api/v1/admin/types'
+
+const logger = createLogger('AdminWorkspaceMembersAPI')
+
+interface RouteParams {
+  id: string
+}
+
+export const GET = withAdminAuthParams<RouteParams>(async (request, context) => {
+  const { id: workspaceId } = await context.params
+  const url = new URL(request.url)
+  const { limit, offset } = parsePaginationParams(url)
+
+  try {
+    const [workspaceData] = await db
+      .select({ id: workspace.id })
+      .from(workspace)
+      .where(eq(workspace.id, workspaceId))
+      .limit(1)
+
+    if (!workspaceData) {
+      return notFoundResponse('Workspace')
+    }
+
+    const [countResult, membersData] = await Promise.all([
+      db
+        .select({ count: count() })
+        .from(permissions)
+        .where(and(eq(permissions.entityType, 'workspace'), eq(permissions.entityId, workspaceId))),
+      db
+        .select({
+          id: permissions.id,
+          userId: permissions.userId,
+          permissionType: permissions.permissionType,
+          createdAt: permissions.createdAt,
+          updatedAt: permissions.updatedAt,
+          userName: user.name,
+          userEmail: user.email,
+          userImage: user.image,
+        })
+        .from(permissions)
+        .innerJoin(user, eq(permissions.userId, user.id))
+        .where(and(eq(permissions.entityType, 'workspace'), eq(permissions.entityId, workspaceId)))
+        .orderBy(permissions.createdAt)
+        .limit(limit)
+        .offset(offset),
+    ])
+
+    const total = countResult[0].count
+    const data: AdminWorkspaceMember[] = membersData.map((m) => ({
+      id: m.id,
+      workspaceId,
+      userId: m.userId,
+      permissions: m.permissionType,
+      createdAt: m.createdAt.toISOString(),
+      updatedAt: m.updatedAt.toISOString(),
+      userName: m.userName,
+      userEmail: m.userEmail,
+      userImage: m.userImage,
+    }))
+
+    const pagination = createPaginationMeta(total, limit, offset)
+
+    logger.info(`Admin API: Listed ${data.length} members for workspace ${workspaceId}`)
+
+    return listResponse(data, pagination)
+  } catch (error) {
+    logger.error('Admin API: Failed to list workspace members', { error, workspaceId })
+    return internalErrorResponse('Failed to list workspace members')
+  }
+})
+
+export const POST = withAdminAuthParams<RouteParams>(async (request, context) => {
+  const { id: workspaceId } = await context.params
+
+  try {
+    const body = await request.json()
+
+    if (!body.userId || typeof body.userId !== 'string') {
+      return badRequestResponse('userId is required')
+    }
+
+    if (!body.permissions || !['admin', 'write', 'read'].includes(body.permissions)) {
+      return badRequestResponse('permissions must be "admin", "write", or "read"')
+    }
+
+    const [workspaceData] = await db
+      .select({ id: workspace.id, name: workspace.name })
+      .from(workspace)
+      .where(eq(workspace.id, workspaceId))
+      .limit(1)
+
+    if (!workspaceData) {
+      return notFoundResponse('Workspace')
+    }
+
+    const [userData] = await db
+      .select({ id: user.id, name: user.name, email: user.email, image: user.image })
+      .from(user)
+      .where(eq(user.id, body.userId))
+      .limit(1)
+
+    if (!userData) {
+      return notFoundResponse('User')
+    }
+
+    const [existingPermission] = await db
+      .select({
+        id: permissions.id,
+        permissionType: permissions.permissionType,
+        createdAt: permissions.createdAt,
+        updatedAt: permissions.updatedAt,
+      })
+      .from(permissions)
+      .where(
+        and(
+          eq(permissions.userId, body.userId),
+          eq(permissions.entityType, 'workspace'),
+          eq(permissions.entityId, workspaceId)
+        )
+      )
+      .limit(1)
+
+    if (existingPermission) {
+      if (existingPermission.permissionType !== body.permissions) {
+        const now = new Date()
+        await db
+          .update(permissions)
+          .set({ permissionType: body.permissions, updatedAt: now })
+          .where(eq(permissions.id, existingPermission.id))
+
+        logger.info(
+          `Admin API: Updated user ${body.userId} permissions in workspace ${workspaceId}`,
+          {
+            previousPermissions: existingPermission.permissionType,
+            newPermissions: body.permissions,
+          }
+        )
+
+        return singleResponse({
+          id: existingPermission.id,
+          workspaceId,
+          userId: body.userId,
+          permissions: body.permissions as 'admin' | 'write' | 'read',
+          createdAt: existingPermission.createdAt.toISOString(),
+          updatedAt: now.toISOString(),
+          userName: userData.name,
+          userEmail: userData.email,
+          userImage: userData.image,
+          action: 'updated' as const,
+        })
+      }
+
+      return singleResponse({
+        id: existingPermission.id,
+        workspaceId,
+        userId: body.userId,
+        permissions: existingPermission.permissionType,
+        createdAt: existingPermission.createdAt.toISOString(),
+        updatedAt: existingPermission.updatedAt.toISOString(),
+        userName: userData.name,
+        userEmail: userData.email,
+        userImage: userData.image,
+        action: 'already_member' as const,
+      })
+    }
+
+    const now = new Date()
+    const permissionId = crypto.randomUUID()
+
+    await db.insert(permissions).values({
+      id: permissionId,
+      userId: body.userId,
+      entityType: 'workspace',
+      entityId: workspaceId,
+      permissionType: body.permissions,
+      createdAt: now,
+      updatedAt: now,
+    })
+
+    logger.info(`Admin API: Added user ${body.userId} to workspace ${workspaceId}`, {
+      permissions: body.permissions,
+      permissionId,
+    })
+
+    return singleResponse({
+      id: permissionId,
+      workspaceId,
+      userId: body.userId,
+      permissions: body.permissions as 'admin' | 'write' | 'read',
+      createdAt: now.toISOString(),
+      updatedAt: now.toISOString(),
+      userName: userData.name,
+      userEmail: userData.email,
+      userImage: userData.image,
+      action: 'created' as const,
+    })
+  } catch (error) {
+    logger.error('Admin API: Failed to add workspace member', { error, workspaceId })
+    return internalErrorResponse('Failed to add workspace member')
+  }
+})
+
+export const DELETE = withAdminAuthParams<RouteParams>(async (request, context) => {
+  const { id: workspaceId } = await context.params
+  const url = new URL(request.url)
+  const userId = url.searchParams.get('userId')
+
+  try {
+    if (!userId) {
+      return badRequestResponse('userId query parameter is required')
+    }
+
+    const [workspaceData] = await db
+      .select({ id: workspace.id })
+      .from(workspace)
+      .where(eq(workspace.id, workspaceId))
+      .limit(1)
+
+    if (!workspaceData) {
+      return notFoundResponse('Workspace')
+    }
+
+    const [existingPermission] = await db
+      .select({ id: permissions.id })
+      .from(permissions)
+      .where(
+        and(
+          eq(permissions.userId, userId),
+          eq(permissions.entityType, 'workspace'),
+          eq(permissions.entityId, workspaceId)
+        )
+      )
+      .limit(1)
+
+    if (!existingPermission) {
+      return notFoundResponse('Workspace member')
+    }
+
+    await db.delete(permissions).where(eq(permissions.id, existingPermission.id))
+
+    logger.info(`Admin API: Removed user ${userId} from workspace ${workspaceId}`)
+
+    return singleResponse({ removed: true, userId, workspaceId })
+  } catch (error) {
+    logger.error('Admin API: Failed to remove workspace member', { error, workspaceId, userId })
+    return internalErrorResponse('Failed to remove workspace member')
+  }
+})
diff --git a/apps/sim/app/api/wand/route.ts b/apps/sim/app/api/wand/route.ts
index 69f79f4a9d..54f914a2b7 100644
--- a/apps/sim/app/api/wand/route.ts
+++ b/apps/sim/app/api/wand/route.ts
@@ -243,6 +243,11 @@ Use this context to calculate relative dates like "yesterday", "last week", "beg
       finalSystemPrompt += currentTimeContext
     }
 
+    if (generationType === 'json-object') {
+      finalSystemPrompt +=
+        '\n\nIMPORTANT: Return ONLY the raw JSON object. Do NOT wrap it in markdown code blocks (no ```json or ```). Do NOT include any explanation or text before or after the JSON. The response must start with { and end with }.'
+    }
+
     const messages: ChatMessage[] = [{ role: 'system', content: finalSystemPrompt }]
 
     messages.push(...history.filter((msg) => msg.role !== 'system'))
diff --git a/apps/sim/app/api/webhooks/[id]/test-url/route.ts b/apps/sim/app/api/webhooks/[id]/test-url/route.ts
deleted file mode 100644
index 7b27b2280c..0000000000
--- a/apps/sim/app/api/webhooks/[id]/test-url/route.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { db, webhook, workflow } from '@sim/db'
-import { createLogger } from '@sim/logger'
-import { eq } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { getSession } from '@/lib/auth'
-import { generateRequestId } from '@/lib/core/utils/request'
-import { getBaseUrl } from '@/lib/core/utils/urls'
-import { signTestWebhookToken } from '@/lib/webhooks/test-tokens'
-import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
-
-const logger = createLogger('MintWebhookTestUrlAPI')
-
-export const dynamic = 'force-dynamic'
-
-export async function POST(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = generateRequestId()
-  try {
-    const session = await getSession()
-    if (!session?.user?.id) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const { id } = await params
-    const body = await request.json().catch(() => ({}))
-    const ttlSeconds = Math.max(
-      60,
-      Math.min(60 * 60 * 24 * 30, Number(body?.ttlSeconds) || 60 * 60 * 24 * 7)
-    )
-
-    // Load webhook + workflow for permission check
-    const rows = await db
-      .select({
-        webhook: webhook,
-        workflow: {
-          id: workflow.id,
-          userId: workflow.userId,
-          workspaceId: workflow.workspaceId,
-        },
-      })
-      .from(webhook)
-      .innerJoin(workflow, eq(webhook.workflowId, workflow.id))
-      .where(eq(webhook.id, id))
-      .limit(1)
-
-    if (rows.length === 0) {
-      return NextResponse.json({ error: 'Webhook not found' }, { status: 404 })
-    }
-
-    const wf = rows[0].workflow
-
-    // Permissions: owner OR workspace write/admin
-    let canMint = false
-    if (wf.userId === session.user.id) {
-      canMint = true
-    } else if (wf.workspaceId) {
-      const perm = await getUserEntityPermissions(session.user.id, 'workspace', wf.workspaceId)
-      if (perm === 'write' || perm === 'admin') {
-        canMint = true
-      }
-    }
-
-    if (!canMint) {
-      logger.warn(`[${requestId}] User ${session.user.id} denied mint for webhook ${id}`)
-      return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
-    }
-
-    const token = await signTestWebhookToken(id, ttlSeconds)
-    const url = `${getBaseUrl()}/api/webhooks/test/${id}?token=${encodeURIComponent(token)}`
-
-    logger.info(`[${requestId}] Minted test URL for webhook ${id}`)
-    return NextResponse.json({
-      url,
-      expiresAt: new Date(Date.now() + ttlSeconds * 1000).toISOString(),
-    })
-  } catch (error: any) {
-    logger.error('Error minting test webhook URL', error)
-    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
-  }
-}
diff --git a/apps/sim/app/api/webhooks/route.ts b/apps/sim/app/api/webhooks/route.ts
index a26fe9933b..4e980646b9 100644
--- a/apps/sim/app/api/webhooks/route.ts
+++ b/apps/sim/app/api/webhooks/route.ts
@@ -793,6 +793,58 @@ export async function POST(request: NextRequest) {
     }
     // --- End Grain specific logic ---
 
+    // --- Lemlist specific logic ---
+    if (savedWebhook && provider === 'lemlist') {
+      logger.info(
+        `[${requestId}] Lemlist provider detected. Creating Lemlist webhook subscription.`
+      )
+      try {
+        const lemlistResult = await createLemlistWebhookSubscription(
+          {
+            id: savedWebhook.id,
+            path: savedWebhook.path,
+            providerConfig: savedWebhook.providerConfig,
+          },
+          requestId
+        )
+
+        if (lemlistResult) {
+          // Update the webhook record with the external Lemlist hook ID
+          const updatedConfig = {
+            ...(savedWebhook.providerConfig as Record<string, any>),
+            externalId: lemlistResult.id,
+          }
+          await db
+            .update(webhook)
+            .set({
+              providerConfig: updatedConfig,
+              updatedAt: new Date(),
+            })
+            .where(eq(webhook.id, savedWebhook.id))
+
+          savedWebhook.providerConfig = updatedConfig
+          logger.info(`[${requestId}] Successfully created Lemlist webhook`, {
+            lemlistHookId: lemlistResult.id,
+            webhookId: savedWebhook.id,
+          })
+        }
+      } catch (err) {
+        logger.error(
+          `[${requestId}] Error creating Lemlist webhook subscription, rolling back webhook`,
+          err
+        )
+        await db.delete(webhook).where(eq(webhook.id, savedWebhook.id))
+        return NextResponse.json(
+          {
+            error: 'Failed to create webhook in Lemlist',
+            details: err instanceof Error ? err.message : 'Unknown error',
+          },
+          { status: 500 }
+        )
+      }
+    }
+    // --- End Lemlist specific logic ---
+
     if (!targetWebhookId && savedWebhook) {
       try {
         PlatformEvents.webhookCreated({
@@ -1316,3 +1368,116 @@ async function createGrainWebhookSubscription(
     throw error
   }
 }
+
+// Helper function to create the webhook subscription in Lemlist
+async function createLemlistWebhookSubscription(
+  webhookData: any,
+  requestId: string
+): Promise<{ id: string } | undefined> {
+  try {
+    const { path, providerConfig } = webhookData
+    const { apiKey, triggerId, campaignId } = providerConfig || {}
+
+    if (!apiKey) {
+      logger.warn(`[${requestId}] Missing apiKey for Lemlist webhook creation.`, {
+        webhookId: webhookData.id,
+      })
+      throw new Error(
+        'Lemlist API Key is required. Please provide your Lemlist API Key in the trigger configuration.'
+      )
+    }
+
+    // Map trigger IDs to Lemlist event types
+    const eventTypeMap: Record<string, string | undefined> = {
+      lemlist_email_replied: 'emailsReplied',
+      lemlist_linkedin_replied: 'linkedinReplied',
+      lemlist_interested: 'interested',
+      lemlist_not_interested: 'notInterested',
+      lemlist_email_opened: 'emailsOpened',
+      lemlist_email_clicked: 'emailsClicked',
+      lemlist_email_bounced: 'emailsBounced',
+      lemlist_email_sent: 'emailsSent',
+      lemlist_webhook: undefined, // Generic webhook - no type filter
+    }
+
+    const eventType = eventTypeMap[triggerId]
+
+    logger.info(`[${requestId}] Creating Lemlist webhook`, {
+      triggerId,
+      eventType,
+      hasCampaignId: !!campaignId,
+      webhookId: webhookData.id,
+    })
+
+    const notificationUrl = `${getBaseUrl()}/api/webhooks/trigger/${path}`
+
+    const lemlistApiUrl = 'https://api.lemlist.com/api/hooks'
+
+    // Build request body
+    const requestBody: Record<string, any> = {
+      targetUrl: notificationUrl,
+    }
+
+    // Add event type if specified (omit for generic webhook to receive all events)
+    if (eventType) {
+      requestBody.type = eventType
+    }
+
+    // Add campaign filter if specified
+    if (campaignId) {
+      requestBody.campaignId = campaignId
+    }
+
+    // Lemlist uses Basic Auth with empty username and API key as password
+    const authString = Buffer.from(`:${apiKey}`).toString('base64')
+
+    const lemlistResponse = await fetch(lemlistApiUrl, {
+      method: 'POST',
+      headers: {
+        Authorization: `Basic ${authString}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(requestBody),
+    })
+
+    const responseBody = await lemlistResponse.json()
+
+    if (!lemlistResponse.ok || responseBody.error) {
+      const errorMessage = responseBody.message || responseBody.error || 'Unknown Lemlist API error'
+      logger.error(
+        `[${requestId}] Failed to create webhook in Lemlist for webhook ${webhookData.id}. Status: ${lemlistResponse.status}`,
+        { message: errorMessage, response: responseBody }
+      )
+
+      let userFriendlyMessage = 'Failed to create webhook subscription in Lemlist'
+      if (lemlistResponse.status === 401) {
+        userFriendlyMessage = 'Invalid Lemlist API Key. Please verify your API Key is correct.'
+      } else if (lemlistResponse.status === 403) {
+        userFriendlyMessage =
+          'Access denied. Please ensure your Lemlist API Key has appropriate permissions.'
+      } else if (errorMessage && errorMessage !== 'Unknown Lemlist API error') {
+        userFriendlyMessage = `Lemlist error: ${errorMessage}`
+      }
+
+      throw new Error(userFriendlyMessage)
+    }
+
+    logger.info(
+      `[${requestId}] Successfully created webhook in Lemlist for webhook ${webhookData.id}.`,
+      {
+        lemlistWebhookId: responseBody._id,
+      }
+    )
+
+    return { id: responseBody._id }
+  } catch (error: any) {
+    logger.error(
+      `[${requestId}] Exception during Lemlist webhook creation for webhook ${webhookData.id}.`,
+      {
+        message: error.message,
+        stack: error.stack,
+      }
+    )
+    throw error
+  }
+}
diff --git a/apps/sim/app/api/webhooks/test/[id]/route.ts b/apps/sim/app/api/webhooks/test/[id]/route.ts
deleted file mode 100644
index 46653c3bf7..0000000000
--- a/apps/sim/app/api/webhooks/test/[id]/route.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { type NextRequest, NextResponse } from 'next/server'
-import { generateRequestId } from '@/lib/core/utils/request'
-import {
-  checkWebhookPreprocessing,
-  findWebhookAndWorkflow,
-  handleProviderChallenges,
-  parseWebhookBody,
-  queueWebhookExecution,
-  verifyProviderAuth,
-} from '@/lib/webhooks/processor'
-import { verifyTestWebhookToken } from '@/lib/webhooks/test-tokens'
-
-const logger = createLogger('WebhookTestReceiverAPI')
-
-export const dynamic = 'force-dynamic'
-export const runtime = 'nodejs'
-
-export async function POST(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
-  const requestId = generateRequestId()
-  const webhookId = (await params).id
-
-  logger.info(`[${requestId}] Test webhook request received for webhook ${webhookId}`)
-
-  const parseResult = await parseWebhookBody(request, requestId)
-  if (parseResult instanceof NextResponse) {
-    return parseResult
-  }
-
-  const { body, rawBody } = parseResult
-
-  const challengeResponse = await handleProviderChallenges(body, request, requestId, '')
-  if (challengeResponse) {
-    return challengeResponse
-  }
-
-  const url = new URL(request.url)
-  const token = url.searchParams.get('token')
-
-  if (!token) {
-    logger.warn(`[${requestId}] Test webhook request missing token`)
-    return new NextResponse('Unauthorized', { status: 401 })
-  }
-
-  const isValid = await verifyTestWebhookToken(token, webhookId)
-  if (!isValid) {
-    logger.warn(`[${requestId}] Invalid test webhook token`)
-    return new NextResponse('Unauthorized', { status: 401 })
-  }
-
-  const result = await findWebhookAndWorkflow({ requestId, webhookId })
-  if (!result) {
-    logger.warn(`[${requestId}] No active webhook found for id: ${webhookId}`)
-    return new NextResponse('Webhook not found', { status: 404 })
-  }
-
-  const { webhook: foundWebhook, workflow: foundWorkflow } = result
-
-  const authError = await verifyProviderAuth(
-    foundWebhook,
-    foundWorkflow,
-    request,
-    rawBody,
-    requestId
-  )
-  if (authError) {
-    return authError
-  }
-
-  let preprocessError: NextResponse | null = null
-  try {
-    // Test webhooks skip deployment check but still enforce rate limits and usage limits
-    // They run on live/draft state to allow testing before deployment
-    preprocessError = await checkWebhookPreprocessing(foundWorkflow, foundWebhook, requestId, {
-      isTestMode: true,
-    })
-    if (preprocessError) {
-      return preprocessError
-    }
-  } catch (error) {
-    logger.error(`[${requestId}] Unexpected error during webhook preprocessing`, {
-      error: error instanceof Error ? error.message : String(error),
-      stack: error instanceof Error ? error.stack : undefined,
-      webhookId: foundWebhook.id,
-      workflowId: foundWorkflow.id,
-    })
-
-    if (foundWebhook.provider === 'microsoft-teams') {
-      return NextResponse.json(
-        {
-          type: 'message',
-          text: 'An unexpected error occurred during preprocessing',
-        },
-        { status: 500 }
-      )
-    }
-
-    return NextResponse.json(
-      { error: 'An unexpected error occurred during preprocessing' },
-      { status: 500 }
-    )
-  }
-
-  logger.info(
-    `[${requestId}] Executing TEST webhook for ${foundWebhook.provider} (workflow: ${foundWorkflow.id})`
-  )
-
-  return queueWebhookExecution(foundWebhook, foundWorkflow, body, request, {
-    requestId,
-    path: foundWebhook.path,
-    testMode: true,
-    executionTarget: 'live',
-  })
-}
diff --git a/apps/sim/app/api/webhooks/test/route.ts b/apps/sim/app/api/webhooks/test/route.ts
deleted file mode 100644
index bf3aece243..0000000000
--- a/apps/sim/app/api/webhooks/test/route.ts
+++ /dev/null
@@ -1,522 +0,0 @@
-import { db } from '@sim/db'
-import { webhook } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { eq } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { generateRequestId } from '@/lib/core/utils/request'
-import { getBaseUrl } from '@/lib/core/utils/urls'
-
-const logger = createLogger('WebhookTestAPI')
-
-export const dynamic = 'force-dynamic'
-
-export async function GET(request: NextRequest) {
-  const requestId = generateRequestId()
-
-  try {
-    const { searchParams } = new URL(request.url)
-    const webhookId = searchParams.get('id')
-
-    if (!webhookId) {
-      logger.warn(`[${requestId}] Missing webhook ID in test request`)
-      return NextResponse.json({ success: false, error: 'Webhook ID is required' }, { status: 400 })
-    }
-
-    logger.debug(`[${requestId}] Testing webhook with ID: ${webhookId}`)
-
-    const webhooks = await db.select().from(webhook).where(eq(webhook.id, webhookId)).limit(1)
-
-    if (webhooks.length === 0) {
-      logger.warn(`[${requestId}] Webhook not found: ${webhookId}`)
-      return NextResponse.json({ success: false, error: 'Webhook not found' }, { status: 404 })
-    }
-
-    const foundWebhook = webhooks[0]
-    const provider = foundWebhook.provider || 'generic'
-    const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
-
-    const webhookUrl = `${getBaseUrl()}/api/webhooks/trigger/${foundWebhook.path}`
-
-    logger.info(`[${requestId}] Testing webhook for provider: ${provider}`, {
-      webhookId,
-      path: foundWebhook.path,
-      isActive: foundWebhook.isActive,
-    })
-
-    switch (provider) {
-      case 'whatsapp': {
-        const verificationToken = providerConfig.verificationToken
-
-        if (!verificationToken) {
-          logger.warn(`[${requestId}] WhatsApp webhook missing verification token: ${webhookId}`)
-          return NextResponse.json(
-            { success: false, error: 'Webhook has no verification token' },
-            { status: 400 }
-          )
-        }
-
-        const challenge = `test_${Date.now()}`
-
-        const whatsappUrl = `${webhookUrl}?hub.mode=subscribe&hub.verify_token=${verificationToken}&hub.challenge=${challenge}`
-
-        logger.debug(`[${requestId}] Testing WhatsApp webhook verification`, {
-          webhookId,
-          challenge,
-        })
-
-        const response = await fetch(whatsappUrl, {
-          headers: {
-            'User-Agent': 'facebookplatform/1.0',
-          },
-        })
-
-        const status = response.status
-        const contentType = response.headers.get('content-type')
-        const responseText = await response.text()
-
-        const success = status === 200 && responseText === challenge
-
-        if (success) {
-          logger.info(`[${requestId}] WhatsApp webhook verification successful: ${webhookId}`)
-        } else {
-          logger.warn(`[${requestId}] WhatsApp webhook verification failed: ${webhookId}`, {
-            status,
-            contentType,
-            responseTextLength: responseText.length,
-          })
-        }
-
-        return NextResponse.json({
-          success,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            verificationToken,
-            isActive: foundWebhook.isActive,
-          },
-          test: {
-            status,
-            contentType,
-            responseText,
-            expectedStatus: 200,
-            expectedContentType: 'text/plain',
-            expectedResponse: challenge,
-          },
-          message: success
-            ? 'Webhook configuration is valid. You can now use this URL in WhatsApp.'
-            : 'Webhook verification failed. Please check your configuration.',
-          diagnostics: {
-            statusMatch: status === 200 ? '✅ Status code is 200' : '❌ Status code should be 200',
-            contentTypeMatch:
-              contentType === 'text/plain'
-                ? '✅ Content-Type is text/plain'
-                : '❌ Content-Type should be text/plain',
-            bodyMatch:
-              responseText === challenge
-                ? '✅ Response body matches challenge'
-                : '❌ Response body should exactly match the challenge string',
-          },
-        })
-      }
-
-      case 'telegram': {
-        const botToken = providerConfig.botToken
-
-        if (!botToken) {
-          logger.warn(`[${requestId}] Telegram webhook missing configuration: ${webhookId}`)
-          return NextResponse.json(
-            { success: false, error: 'Webhook has incomplete configuration' },
-            { status: 400 }
-          )
-        }
-
-        const testMessage = {
-          update_id: 12345,
-          message: {
-            message_id: 67890,
-            from: {
-              id: 123456789,
-              first_name: 'Test',
-              username: 'testbot',
-            },
-            chat: {
-              id: 123456789,
-              first_name: 'Test',
-              username: 'testbot',
-              type: 'private',
-            },
-            date: Math.floor(Date.now() / 1000),
-            text: 'This is a test message',
-          },
-        }
-
-        logger.debug(`[${requestId}] Testing Telegram webhook connection`, {
-          webhookId,
-          url: webhookUrl,
-        })
-
-        const response = await fetch(webhookUrl, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'User-Agent': 'TelegramBot/1.0',
-          },
-          body: JSON.stringify(testMessage),
-        })
-
-        const status = response.status
-        let responseText = ''
-        try {
-          responseText = await response.text()
-        } catch (_e) {}
-
-        const success = status >= 200 && status < 300
-
-        if (success) {
-          logger.info(`[${requestId}] Telegram webhook test successful: ${webhookId}`)
-        } else {
-          logger.warn(`[${requestId}] Telegram webhook test failed: ${webhookId}`, {
-            status,
-            responseText,
-          })
-        }
-
-        let webhookInfo = null
-        try {
-          const webhookInfoUrl = `https://api.telegram.org/bot${botToken}/getWebhookInfo`
-          const infoResponse = await fetch(webhookInfoUrl, {
-            headers: {
-              'User-Agent': 'TelegramBot/1.0',
-            },
-          })
-          if (infoResponse.ok) {
-            const infoJson = await infoResponse.json()
-            if (infoJson.ok) {
-              webhookInfo = infoJson.result
-            }
-          }
-        } catch (e) {
-          logger.warn(`[${requestId}] Failed to get Telegram webhook info`, e)
-        }
-
-        const curlCommand = [
-          `curl -X POST "${webhookUrl}"`,
-          `-H "Content-Type: application/json"`,
-          `-H "User-Agent: TelegramBot/1.0"`,
-          `-d '${JSON.stringify(testMessage, null, 2)}'`,
-        ].join(' \\\n')
-
-        return NextResponse.json({
-          success,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            botToken: `${botToken.substring(0, 5)}...${botToken.substring(botToken.length - 5)}`, // Show partial token for security
-            isActive: foundWebhook.isActive,
-          },
-          test: {
-            status,
-            responseText,
-            webhookInfo,
-          },
-          message: success
-            ? 'Telegram webhook appears to be working. Any message sent to your bot will trigger the workflow.'
-            : 'Telegram webhook test failed. Please check server logs for more details.',
-          curlCommand,
-          info: 'To fix issues with Telegram webhooks getting 403 Forbidden responses, ensure the webhook request includes a User-Agent header.',
-        })
-      }
-
-      case 'github': {
-        const contentType = providerConfig.contentType || 'application/json'
-
-        logger.info(`[${requestId}] GitHub webhook test successful: ${webhookId}`)
-        return NextResponse.json({
-          success: true,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            contentType,
-            isActive: foundWebhook.isActive,
-          },
-          message:
-            'GitHub webhook configuration is valid. Use this URL in your GitHub repository settings.',
-          setup: {
-            url: webhookUrl,
-            contentType,
-            events: ['push', 'pull_request', 'issues', 'issue_comment'],
-          },
-        })
-      }
-
-      case 'stripe': {
-        logger.info(`[${requestId}] Stripe webhook test successful: ${webhookId}`)
-        return NextResponse.json({
-          success: true,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            isActive: foundWebhook.isActive,
-          },
-          message: 'Stripe webhook configuration is valid. Use this URL in your Stripe dashboard.',
-          setup: {
-            url: webhookUrl,
-            events: [
-              'charge.succeeded',
-              'invoice.payment_succeeded',
-              'customer.subscription.created',
-            ],
-          },
-        })
-      }
-
-      case 'generic': {
-        const token = providerConfig.token
-        const secretHeaderName = providerConfig.secretHeaderName
-        const requireAuth = providerConfig.requireAuth
-        const allowedIps = providerConfig.allowedIps
-
-        let curlCommand = `curl -X POST "${webhookUrl}" -H "Content-Type: application/json"`
-
-        if (requireAuth && token) {
-          if (secretHeaderName) {
-            curlCommand += ` -H "${secretHeaderName}: ${token}"`
-          } else {
-            curlCommand += ` -H "Authorization: Bearer ${token}"`
-          }
-        }
-
-        curlCommand += ` -d '{"event":"test_event","timestamp":"${new Date().toISOString()}"}'`
-
-        logger.info(`[${requestId}] General webhook test successful: ${webhookId}`)
-        return NextResponse.json({
-          success: true,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            isActive: foundWebhook.isActive,
-          },
-          message:
-            'General webhook configuration is valid. Use the URL and authentication details as needed.',
-          details: {
-            requireAuth: requireAuth || false,
-            hasToken: !!token,
-            hasCustomHeader: !!secretHeaderName,
-            customHeaderName: secretHeaderName,
-            hasIpRestrictions: Array.isArray(allowedIps) && allowedIps.length > 0,
-          },
-          test: {
-            curlCommand,
-            headers: requireAuth
-              ? secretHeaderName
-                ? { [secretHeaderName]: token }
-                : { Authorization: `Bearer ${token}` }
-              : {},
-            samplePayload: {
-              event: 'test_event',
-              timestamp: new Date().toISOString(),
-            },
-          },
-        })
-      }
-
-      case 'slack': {
-        const signingSecret = providerConfig.signingSecret
-
-        if (!signingSecret) {
-          logger.warn(`[${requestId}] Slack webhook missing signing secret: ${webhookId}`)
-          return NextResponse.json(
-            { success: false, error: 'Webhook has no signing secret configured' },
-            { status: 400 }
-          )
-        }
-
-        logger.info(`[${requestId}] Slack webhook test successful: ${webhookId}`)
-        return NextResponse.json({
-          success: true,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            isActive: foundWebhook.isActive,
-          },
-          message:
-            'Slack webhook configuration is valid. Use this URL in your Slack Event Subscriptions settings.',
-          setup: {
-            url: webhookUrl,
-            events: ['message.channels', 'reaction_added', 'app_mention'],
-            signingSecretConfigured: true,
-          },
-          test: {
-            curlCommand: [
-              `curl -X POST "${webhookUrl}"`,
-              `-H "Content-Type: application/json"`,
-              `-H "X-Slack-Request-Timestamp: $(date +%s)"`,
-              `-H "X-Slack-Signature: v0=$(date +%s)"`,
-              `-d '{"type":"event_callback","event":{"type":"message","channel":"C0123456789","user":"U0123456789","text":"Hello from Slack!","ts":"1234567890.123456"},"team_id":"T0123456789"}'`,
-            ].join(' \\\n'),
-            samplePayload: {
-              type: 'event_callback',
-              token: 'XXYYZZ',
-              team_id: 'T123ABC',
-              event: {
-                type: 'message',
-                user: 'U123ABC',
-                text: 'Hello from Slack!',
-                ts: '1234567890.1234',
-              },
-              event_id: 'Ev123ABC',
-            },
-          },
-        })
-      }
-
-      case 'airtable': {
-        const baseId = providerConfig.baseId
-        const tableId = providerConfig.tableId
-        const webhookSecret = providerConfig.webhookSecret
-
-        if (!baseId || !tableId) {
-          logger.warn(`[${requestId}] Airtable webhook missing Base ID or Table ID: ${webhookId}`)
-          return NextResponse.json(
-            {
-              success: false,
-              error: 'Webhook configuration is incomplete (missing Base ID or Table ID)',
-            },
-            { status: 400 }
-          )
-        }
-
-        const samplePayload = {
-          webhook: {
-            id: 'whiYOUR_WEBHOOK_ID',
-          },
-          base: {
-            id: baseId,
-          },
-          payloadFormat: 'v0',
-          actionMetadata: {
-            source: 'tableOrViewChange',
-            sourceMetadata: {},
-          },
-          payloads: [
-            {
-              timestamp: new Date().toISOString(),
-              baseTransactionNumber: Date.now(),
-              changedTablesById: {
-                [tableId]: {
-                  changedRecordsById: {
-                    recSAMPLEID1: {
-                      current: { cellValuesByFieldId: { fldSAMPLEID: 'New Value' } },
-                      previous: { cellValuesByFieldId: { fldSAMPLEID: 'Old Value' } },
-                    },
-                  },
-                  changedFieldsById: {},
-                  changedViewsById: {},
-                },
-              },
-            },
-          ],
-        }
-
-        let curlCommand = `curl -X POST "${webhookUrl}" -H "Content-Type: application/json"`
-        curlCommand += ` -d '${JSON.stringify(samplePayload, null, 2)}'`
-
-        logger.info(`[${requestId}] Airtable webhook test successful: ${webhookId}`)
-        return NextResponse.json({
-          success: true,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            baseId: baseId,
-            tableId: tableId,
-            secretConfigured: !!webhookSecret,
-            isActive: foundWebhook.isActive,
-          },
-          message:
-            'Airtable webhook configuration appears valid. Use the sample curl command to manually send a test payload to your webhook URL.',
-          test: {
-            curlCommand: curlCommand,
-            samplePayload: samplePayload,
-          },
-        })
-      }
-
-      case 'microsoft-teams': {
-        const hmacSecret = providerConfig.hmacSecret
-
-        if (!hmacSecret) {
-          logger.warn(`[${requestId}] Microsoft Teams webhook missing HMAC secret: ${webhookId}`)
-          return NextResponse.json(
-            { success: false, error: 'Microsoft Teams webhook requires HMAC secret' },
-            { status: 400 }
-          )
-        }
-
-        logger.info(`[${requestId}] Microsoft Teams webhook test successful: ${webhookId}`)
-        return NextResponse.json({
-          success: true,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            isActive: foundWebhook.isActive,
-          },
-          message: 'Microsoft Teams outgoing webhook configuration is valid.',
-          setup: {
-            url: webhookUrl,
-            hmacSecretConfigured: !!hmacSecret,
-            instructions: [
-              'Create an outgoing webhook in Microsoft Teams',
-              'Set the callback URL to the webhook URL above',
-              'Copy the HMAC security token to the configuration',
-              'Users can trigger the webhook by @mentioning it in Teams',
-            ],
-          },
-          test: {
-            curlCommand: `curl -X POST "${webhookUrl}" \\
-  -H "Content-Type: application/json" \\
-  -H "Authorization: HMAC <signature>" \\
-  -d '{"type":"message","text":"Hello from Microsoft Teams!","from":{"id":"test","name":"Test User"}}'`,
-            samplePayload: {
-              type: 'message',
-              id: '1234567890',
-              timestamp: new Date().toISOString(),
-              text: 'Hello Sim Bot!',
-              from: {
-                id: '29:1234567890abcdef',
-                name: 'Test User',
-              },
-              conversation: {
-                id: '19:meeting_abcdef@thread.v2',
-              },
-            },
-          },
-        })
-      }
-
-      default: {
-        logger.info(`[${requestId}] Generic webhook test successful: ${webhookId}`)
-        return NextResponse.json({
-          success: true,
-          webhook: {
-            id: foundWebhook.id,
-            url: webhookUrl,
-            provider: foundWebhook.provider,
-            isActive: foundWebhook.isActive,
-          },
-          message:
-            'Webhook configuration is valid. You can use this URL to receive webhook events.',
-        })
-      }
-    }
-  } catch (error: any) {
-    logger.error(`[${requestId}] Error testing webhook`, error)
-    return NextResponse.json(
-      {
-        success: false,
-        error: 'Test failed',
-        message: error.message,
-      },
-      { status: 500 }
-    )
-  }
-}
diff --git a/apps/sim/app/api/webhooks/trigger/[path]/route.ts b/apps/sim/app/api/webhooks/trigger/[path]/route.ts
index f3aba1e7b4..ae11e476cf 100644
--- a/apps/sim/app/api/webhooks/trigger/[path]/route.ts
+++ b/apps/sim/app/api/webhooks/trigger/[path]/route.ts
@@ -152,7 +152,6 @@ export async function POST(
     const response = await queueWebhookExecution(foundWebhook, foundWorkflow, body, request, {
       requestId,
       path,
-      testMode: false,
       executionTarget: 'deployed',
     })
     responses.push(response)
diff --git a/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts b/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
index 84be273d12..246cc6b245 100644
--- a/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
+++ b/apps/sim/app/api/workspaces/[id]/byok-keys/route.ts
@@ -6,8 +6,6 @@ import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { isEnterpriseOrgAdminOrOwner } from '@/lib/billing/core/subscription'
-import { isHosted } from '@/lib/core/config/feature-flags'
 import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
@@ -58,15 +56,6 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
-    let byokEnabled = true
-    if (isHosted) {
-      byokEnabled = await isEnterpriseOrgAdminOrOwner(userId)
-    }
-
-    if (!byokEnabled) {
-      return NextResponse.json({ keys: [], byokEnabled: false })
-    }
-
     const byokKeys = await db
       .select({
         id: workspaceBYOKKeys.id,
@@ -108,7 +97,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
       })
     )
 
-    return NextResponse.json({ keys: formattedKeys, byokEnabled: true })
+    return NextResponse.json({ keys: formattedKeys })
   } catch (error: unknown) {
     logger.error(`[${requestId}] BYOK keys GET error`, error)
     return NextResponse.json(
@@ -131,20 +120,6 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
 
     const userId = session.user.id
 
-    if (isHosted) {
-      const canManageBYOK = await isEnterpriseOrgAdminOrOwner(userId)
-      if (!canManageBYOK) {
-        logger.warn(`[${requestId}] User not authorized to manage BYOK keys`, { userId })
-        return NextResponse.json(
-          {
-            error:
-              'BYOK is an Enterprise-only feature. Only organization admins and owners can manage API keys.',
-          },
-          { status: 403 }
-        )
-      }
-    }
-
     const permission = await getUserEntityPermissions(userId, 'workspace', workspaceId)
     if (permission !== 'admin') {
       return NextResponse.json(
@@ -245,20 +220,6 @@ export async function DELETE(
 
     const userId = session.user.id
 
-    if (isHosted) {
-      const canManageBYOK = await isEnterpriseOrgAdminOrOwner(userId)
-      if (!canManageBYOK) {
-        logger.warn(`[${requestId}] User not authorized to manage BYOK keys`, { userId })
-        return NextResponse.json(
-          {
-            error:
-              'BYOK is an Enterprise-only feature. Only organization admins and owners can manage API keys.',
-          },
-          { status: 403 }
-        )
-      }
-    }
-
     const permission = await getUserEntityPermissions(userId, 'workspace', workspaceId)
     if (permission !== 'admin') {
       return NextResponse.json(
diff --git a/apps/sim/app/api/workspaces/invitations/route.test.ts b/apps/sim/app/api/workspaces/invitations/route.test.ts
index b47e7bf362..f56e9d0120 100644
--- a/apps/sim/app/api/workspaces/invitations/route.test.ts
+++ b/apps/sim/app/api/workspaces/invitations/route.test.ts
@@ -101,6 +101,16 @@ describe('Workspace Invitations API Route', () => {
       eq: vi.fn().mockImplementation((field, value) => ({ type: 'eq', field, value })),
       inArray: vi.fn().mockImplementation((field, values) => ({ type: 'inArray', field, values })),
     }))
+
+    vi.doMock('@/executor/utils/permission-check', () => ({
+      validateInvitationsAllowed: vi.fn().mockResolvedValue(undefined),
+      InvitationsNotAllowedError: class InvitationsNotAllowedError extends Error {
+        constructor() {
+          super('Invitations are not allowed based on your permission group settings')
+          this.name = 'InvitationsNotAllowedError'
+        }
+      },
+    }))
   })
 
   describe('GET /api/workspaces/invitations', () => {
diff --git a/apps/sim/app/api/workspaces/invitations/route.ts b/apps/sim/app/api/workspaces/invitations/route.ts
index 06ad14d34d..bd70b9dc9c 100644
--- a/apps/sim/app/api/workspaces/invitations/route.ts
+++ b/apps/sim/app/api/workspaces/invitations/route.ts
@@ -18,6 +18,10 @@ import { PlatformEvents } from '@/lib/core/telemetry'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { sendEmail } from '@/lib/messaging/email/mailer'
 import { getFromEmailAddress } from '@/lib/messaging/email/utils'
+import {
+  InvitationsNotAllowedError,
+  validateInvitationsAllowed,
+} from '@/executor/utils/permission-check'
 
 export const dynamic = 'force-dynamic'
 
@@ -76,6 +80,8 @@ export async function POST(req: NextRequest) {
   }
 
   try {
+    await validateInvitationsAllowed(session.user.id)
+
     const { workspaceId, email, role = 'member', permission = 'read' } = await req.json()
 
     if (!workspaceId || !email) {
@@ -213,6 +219,9 @@ export async function POST(req: NextRequest) {
 
     return NextResponse.json({ success: true, invitation: invitationData })
   } catch (error) {
+    if (error instanceof InvitationsNotAllowedError) {
+      return NextResponse.json({ error: error.message }, { status: 403 })
+    }
     logger.error('Error creating workspace invitation:', error)
     return NextResponse.json({ error: 'Failed to create invitation' }, { status: 500 })
   }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/pane-context-menu.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/pane-context-menu.tsx
index e7a98f1e8a..a5bba68b46 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/pane-context-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/pane-context-menu.tsx
@@ -34,6 +34,7 @@ export function PaneContextMenu({
   disableAdmin = false,
   canUndo = false,
   canRedo = false,
+  isInvitationsDisabled = false,
 }: PaneContextMenuProps) {
   return (
     <Popover
@@ -142,17 +143,21 @@ export function PaneContextMenu({
           {isChatOpen ? 'Close Chat' : 'Open Chat'}
         </PopoverItem>
 
-        {/* Admin action */}
-        <PopoverDivider />
-        <PopoverItem
-          disabled={disableAdmin}
-          onClick={() => {
-            onInvite()
-            onClose()
-          }}
-        >
-          Invite to Workspace
-        </PopoverItem>
+        {/* Admin action - hidden when invitations are disabled */}
+        {!isInvitationsDisabled && (
+          <>
+            <PopoverDivider />
+            <PopoverItem
+              disabled={disableAdmin}
+              onClick={() => {
+                onInvite()
+                onClose()
+              }}
+            >
+              Invite to Workspace
+            </PopoverItem>
+          </>
+        )}
       </PopoverContent>
     </Popover>
   )
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/types.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/types.ts
index 53b5246cc4..ed0ecd26ee 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/types.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/context-menu/types.ts
@@ -94,4 +94,6 @@ export interface PaneContextMenuProps {
   canUndo?: boolean
   /** Whether redo is available */
   canRedo?: boolean
+  /** Whether invitations are disabled (feature flag or permission group) */
+  isInvitationsDisabled?: boolean
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
index dd9e45cfcc..dcc2dffd06 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
@@ -326,8 +326,8 @@ export default function CopilotMarkdownRenderer({ content }: CopilotMarkdownRend
       ),
 
       table: ({ children }: React.TableHTMLAttributes<HTMLTableElement>) => (
-        <div className='my-4 max-w-full overflow-x-auto'>
-          <table className='min-w-full table-auto border border-[var(--border-1)] font-season text-sm'>
+        <div className='my-3 max-w-full overflow-x-auto'>
+          <table className='min-w-full table-auto border border-[var(--border-1)] font-season text-xs'>
             {children}
           </table>
         </div>
@@ -346,12 +346,12 @@ export default function CopilotMarkdownRenderer({ content }: CopilotMarkdownRend
         </tr>
       ),
       th: ({ children }: React.ThHTMLAttributes<HTMLTableCellElement>) => (
-        <th className='border-[var(--border-1)] border-r px-4 py-2 align-top font-base text-[var(--text-secondary)] last:border-r-0 dark:font-[470]'>
+        <th className='border-[var(--border-1)] border-r px-2.5 py-1.5 align-top font-base text-[var(--text-secondary)] last:border-r-0 dark:font-[470]'>
           {children}
         </th>
       ),
       td: ({ children }: React.TdHTMLAttributes<HTMLTableCellElement>) => (
-        <td className='break-words border-[var(--border-1)] border-r px-4 py-2 align-top font-base text-[var(--text-primary)] last:border-r-0 dark:font-[470]'>
+        <td className='break-words border-[var(--border-1)] border-r px-2.5 py-1.5 align-top font-base text-[var(--text-primary)] last:border-r-0 dark:font-[470]'>
           {children}
         </td>
       ),
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block.tsx
index e1bfda0baa..54c7042e75 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block.tsx
@@ -246,7 +246,7 @@ export function ThinkingBlock({
           )}
         >
           {/* Render markdown during streaming with thinking text styling */}
-          <div className='[&_*]:!text-[var(--text-muted)] [&_*]:!text-[12px] [&_*]:!leading-none [&_*]:!m-0 [&_*]:!p-0 [&_*]:!mb-0 [&_*]:!mt-0 [&_p]:!m-0 [&_h1]:!text-[12px] [&_h1]:!font-semibold [&_h2]:!text-[12px] [&_h2]:!font-semibold [&_h3]:!text-[12px] [&_h3]:!font-semibold [&_code]:!text-[11px] [&_ul]:!pl-4 [&_ul]:!my-0 [&_ol]:!pl-4 [&_ol]:!my-0 [&_li]:!my-0 [&_li]:!py-0 [&_br]:!leading-[0.5] whitespace-pre-wrap font-[470] font-season text-[12px] text-[var(--text-muted)] leading-none'>
+          <div className='[&_*]:!text-[var(--text-muted)] [&_*]:!text-[12px] [&_*]:!leading-[1.3] [&_p]:!m-0 [&_p]:!mb-1 [&_h1]:!text-[12px] [&_h1]:!font-semibold [&_h1]:!m-0 [&_h1]:!mb-1 [&_h2]:!text-[12px] [&_h2]:!font-semibold [&_h2]:!m-0 [&_h2]:!mb-1 [&_h3]:!text-[12px] [&_h3]:!font-semibold [&_h3]:!m-0 [&_h3]:!mb-1 [&_code]:!text-[11px] [&_ul]:!pl-5 [&_ul]:!my-1 [&_ol]:!pl-6 [&_ol]:!my-1 [&_li]:!my-0.5 [&_li]:!py-0 [&_br]:!leading-[0.5] [&_table]:!my-2 [&_th]:!px-2 [&_th]:!py-1 [&_th]:!text-[11px] [&_td]:!px-2 [&_td]:!py-1 [&_td]:!text-[11px] whitespace-pre-wrap font-[470] font-season text-[12px] text-[var(--text-muted)]'>
             <CopilotMarkdownRenderer content={content} />
             <span className='ml-1 inline-block h-2 w-1 animate-pulse bg-[var(--text-muted)]' />
           </div>
@@ -286,7 +286,7 @@ export function ThinkingBlock({
         )}
       >
         {/* Use markdown renderer for completed content */}
-        <div className='[&_*]:!text-[var(--text-muted)] [&_*]:!text-[12px] [&_*]:!leading-none [&_*]:!m-0 [&_*]:!p-0 [&_*]:!mb-0 [&_*]:!mt-0 [&_p]:!m-0 [&_h1]:!text-[12px] [&_h1]:!font-semibold [&_h2]:!text-[12px] [&_h2]:!font-semibold [&_h3]:!text-[12px] [&_h3]:!font-semibold [&_code]:!text-[11px] [&_ul]:!pl-4 [&_ul]:!my-0 [&_ol]:!pl-4 [&_ol]:!my-0 [&_li]:!my-0 [&_li]:!py-0 [&_br]:!leading-[0.5] whitespace-pre-wrap font-[470] font-season text-[12px] text-[var(--text-muted)] leading-none'>
+        <div className='[&_*]:!text-[var(--text-muted)] [&_*]:!text-[12px] [&_*]:!leading-[1.3] [&_p]:!m-0 [&_p]:!mb-1 [&_h1]:!text-[12px] [&_h1]:!font-semibold [&_h1]:!m-0 [&_h1]:!mb-1 [&_h2]:!text-[12px] [&_h2]:!font-semibold [&_h2]:!m-0 [&_h2]:!mb-1 [&_h3]:!text-[12px] [&_h3]:!font-semibold [&_h3]:!m-0 [&_h3]:!mb-1 [&_code]:!text-[11px] [&_ul]:!pl-5 [&_ul]:!my-1 [&_ol]:!pl-6 [&_ol]:!my-1 [&_li]:!my-0.5 [&_li]:!py-0 [&_br]:!leading-[0.5] [&_table]:!my-2 [&_th]:!px-2 [&_th]:!py-1 [&_th]:!text-[11px] [&_td]:!px-2 [&_td]:!py-1 [&_td]:!text-[11px] whitespace-pre-wrap font-[470] font-season text-[12px] text-[var(--text-muted)]'>
           <CopilotMarkdownRenderer content={content} />
         </div>
       </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
index 4f921c898e..c2fdf92647 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
@@ -1827,7 +1827,8 @@ function getStateVerb(state: string): string {
  * e.g., "google_calendar_list_events" -> "Google Calendar List Events"
  */
 function formatToolName(name: string): string {
-  return name
+  const baseName = name.replace(/_v\d+$/, '')
+  return baseName
     .split('_')
     .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
     .join(' ')
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
index fd0c69277e..b33427bab9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
@@ -240,7 +240,7 @@ const generateOutputPaths = (outputs: Record<string, any>, prefix = ''): string[
     } else if (typeof value === 'object' && value !== null) {
       if ('type' in value && typeof value.type === 'string') {
         const hasNestedProperties =
-          (value.type === 'object' && value.properties) ||
+          ((value.type === 'object' || value.type === 'json') && value.properties) ||
           (value.type === 'array' && value.items?.properties) ||
           (value.type === 'array' &&
             value.items &&
@@ -251,7 +251,7 @@ const generateOutputPaths = (outputs: Record<string, any>, prefix = ''): string[
           paths.push(currentPath)
         }
 
-        if (value.type === 'object' && value.properties) {
+        if ((value.type === 'object' || value.type === 'json') && value.properties) {
           paths.push(...generateOutputPaths(value.properties, currentPath))
         } else if (value.type === 'array' && value.items?.properties) {
           paths.push(...generateOutputPaths(value.items.properties, currentPath))
@@ -303,8 +303,8 @@ const generateOutputPathsWithTypes = (
           paths.push({ path: currentPath, type: 'array' })
           const subPaths = generateOutputPathsWithTypes(value.items.properties, currentPath)
           paths.push(...subPaths)
-        } else if (value.type === 'object' && value.properties) {
-          paths.push({ path: currentPath, type: 'object' })
+        } else if ((value.type === 'object' || value.type === 'json') && value.properties) {
+          paths.push({ path: currentPath, type: value.type })
           const subPaths = generateOutputPathsWithTypes(value.properties, currentPath)
           paths.push(...subPaths)
         } else {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
index 46228def69..26b125591e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -16,7 +16,7 @@ import {
   Switch,
   Tooltip,
 } from '@/components/emcn'
-import { McpIcon } from '@/components/icons'
+import { McpIcon, WorkflowIcon } from '@/components/icons'
 import { cn } from '@/lib/core/utils/cn'
 import {
   getIssueBadgeLabel,
@@ -30,6 +30,7 @@ import {
   type OAuthProvider,
   type OAuthService,
 } from '@/lib/oauth'
+import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import {
   CheckboxList,
   Code,
@@ -769,9 +770,10 @@ function WorkflowToolDeployBadge({
 }) {
   const { isDeployed, needsRedeploy, isLoading, refetch } = useChildDeployment(workflowId)
   const [isDeploying, setIsDeploying] = useState(false)
+  const userPermissions = useUserPermissionsContext()
 
   const deployWorkflow = useCallback(async () => {
-    if (isDeploying || !workflowId) return
+    if (isDeploying || !workflowId || !userPermissions.canAdmin) return
 
     try {
       setIsDeploying(true)
@@ -796,7 +798,7 @@ function WorkflowToolDeployBadge({
     } finally {
       setIsDeploying(false)
     }
-  }, [isDeploying, workflowId, refetch, onDeploySuccess])
+  }, [isDeploying, workflowId, refetch, onDeploySuccess, userPermissions.canAdmin])
 
   if (isLoading || (isDeployed && !needsRedeploy)) {
     return null
@@ -811,13 +813,13 @@ function WorkflowToolDeployBadge({
       <Tooltip.Trigger asChild>
         <Badge
           variant={!isDeployed ? 'red' : 'amber'}
-          className='cursor-pointer'
+          className={userPermissions.canAdmin ? 'cursor-pointer' : 'cursor-not-allowed'}
           size='sm'
           dot
           onClick={(e: React.MouseEvent) => {
             e.stopPropagation()
             e.preventDefault()
-            if (!isDeploying) {
+            if (!isDeploying && userPermissions.canAdmin) {
               deployWorkflow()
             }
           }}
@@ -826,7 +828,13 @@ function WorkflowToolDeployBadge({
         </Badge>
       </Tooltip.Trigger>
       <Tooltip.Content>
-        <span className='text-sm'>{!isDeployed ? 'Click to deploy' : 'Click to redeploy'}</span>
+        <span className='text-sm'>
+          {!userPermissions.canAdmin
+            ? 'Admin permission required to deploy'
+            : !isDeployed
+              ? 'Click to deploy'
+              : 'Click to redeploy'}
+        </span>
       </Tooltip.Content>
     </Tooltip.Root>
   )
@@ -933,6 +941,13 @@ export function ToolInput({
   const forceRefreshMcpTools = useForceRefreshMcpTools()
   const openSettingsModal = useSettingsModalStore((state) => state.openModal)
   const mcpDataLoading = mcpLoading || mcpServersLoading
+
+  // Fetch workflows for the Workflows section in the dropdown
+  const { data: workflowsList = [] } = useWorkflows(workspaceId, { syncRegistry: false })
+  const availableWorkflows = useMemo(
+    () => workflowsList.filter((w) => w.id !== workflowId),
+    [workflowsList, workflowId]
+  )
   const hasRefreshedRef = useRef(false)
 
   const hasMcpTools = selectedTools.some((tool) => tool.type === 'mcp')
@@ -1016,6 +1031,7 @@ export function ToolInput({
   const toolBlocks = useMemo(() => {
     const allToolBlocks = getAllBlocks().filter(
       (block) =>
+        !block.hideFromToolbar &&
         (block.category === 'tools' ||
           block.type === 'api' ||
           block.type === 'webhook_request' ||
@@ -1735,6 +1751,36 @@ export function ToolInput({
       })
     }
 
+    // Workflows section - shows available workflows that can be executed as tools
+    if (availableWorkflows.length > 0) {
+      groups.push({
+        section: 'Workflows',
+        items: availableWorkflows.map((workflow) => ({
+          label: workflow.name,
+          value: `workflow-${workflow.id}`,
+          iconElement: createToolIcon('#6366F1', WorkflowIcon),
+          onSelect: () => {
+            const newTool: StoredTool = {
+              type: 'workflow',
+              title: 'Workflow',
+              toolId: 'workflow_executor',
+              params: {
+                workflowId: workflow.id,
+              },
+              isExpanded: true,
+              usageControl: 'auto',
+            }
+            setStoreValue([
+              ...selectedTools.map((tool) => ({ ...tool, isExpanded: false })),
+              newTool,
+            ])
+            setOpen(false)
+          },
+          disabled: isPreview || disabled,
+        })),
+      })
+    }
+
     return groups
   }, [
     customTools,
@@ -1749,6 +1795,7 @@ export function ToolInput({
     handleSelectTool,
     permissionConfig.disableCustomTools,
     permissionConfig.disableMcpTools,
+    availableWorkflows,
   ])
 
   const toolRequiresOAuth = (toolId: string): boolean => {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx
index b66463ca95..4fb9e306aa 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx
@@ -16,7 +16,6 @@ import { useWebhookManagement } from '@/hooks/use-webhook-management'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { getTrigger, isTriggerValid } from '@/triggers'
 import { SYSTEM_SUBBLOCK_IDS } from '@/triggers/constants'
-import { ShortInput } from '../short-input/short-input'
 
 const logger = createLogger('TriggerSave')
 
@@ -41,22 +40,6 @@ export function TriggerSave({
   const [errorMessage, setErrorMessage] = useState<string | null>(null)
   const [deleteStatus, setDeleteStatus] = useState<'idle' | 'deleting'>('idle')
   const [showDeleteDialog, setShowDeleteDialog] = useState(false)
-  const [isGeneratingTestUrl, setIsGeneratingTestUrl] = useState(false)
-
-  const storedTestUrl = useSubBlockStore((state) => state.getValue(blockId, 'testUrl')) as
-    | string
-    | null
-  const storedTestUrlExpiresAt = useSubBlockStore((state) =>
-    state.getValue(blockId, 'testUrlExpiresAt')
-  ) as string | null
-
-  const isTestUrlExpired = useMemo(() => {
-    if (!storedTestUrlExpiresAt) return true
-    return new Date(storedTestUrlExpiresAt) < new Date()
-  }, [storedTestUrlExpiresAt])
-
-  const testUrl = isTestUrlExpired ? null : (storedTestUrl as string | null)
-  const testUrlExpiresAt = isTestUrlExpired ? null : (storedTestUrlExpiresAt as string | null)
 
   const effectiveTriggerId = useMemo(() => {
     if (triggerId && isTriggerValid(triggerId)) {
@@ -86,9 +69,6 @@ export function TriggerSave({
   const triggerDef =
     effectiveTriggerId && isTriggerValid(effectiveTriggerId) ? getTrigger(effectiveTriggerId) : null
 
-  const hasWebhookUrlDisplay =
-    triggerDef?.subBlocks.some((sb) => sb.id === 'webhookUrlDisplay') ?? false
-
   const validateRequiredFields = useCallback(
     (
       configToCheck: Record<string, any> | null | undefined
@@ -212,13 +192,6 @@ export function TriggerSave({
     validateRequiredFields,
   ])
 
-  useEffect(() => {
-    if (isTestUrlExpired && storedTestUrl) {
-      useSubBlockStore.getState().setValue(blockId, 'testUrl', null)
-      useSubBlockStore.getState().setValue(blockId, 'testUrlExpiresAt', null)
-    }
-  }, [blockId, isTestUrlExpired, storedTestUrl])
-
   const handleSave = async () => {
     if (isPreview || disabled) return
 
@@ -278,34 +251,6 @@ export function TriggerSave({
     }
   }
 
-  const generateTestUrl = async () => {
-    if (!webhookId) return
-    try {
-      setIsGeneratingTestUrl(true)
-      const res = await fetch(`/api/webhooks/${webhookId}/test-url`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({}),
-      })
-      if (!res.ok) {
-        const err = await res.json().catch(() => ({}))
-        throw new Error(err?.error || 'Failed to generate test URL')
-      }
-      const json = await res.json()
-      useSubBlockStore.getState().setValue(blockId, 'testUrl', json.url)
-      useSubBlockStore.getState().setValue(blockId, 'testUrlExpiresAt', json.expiresAt)
-      collaborativeSetSubblockValue(blockId, 'testUrl', json.url)
-      collaborativeSetSubblockValue(blockId, 'testUrlExpiresAt', json.expiresAt)
-    } catch (e) {
-      logger.error('Failed to generate test webhook URL', { error: e })
-      setErrorMessage(
-        e instanceof Error ? e.message : 'Failed to generate test URL. Please try again.'
-      )
-    } finally {
-      setIsGeneratingTestUrl(false)
-    }
-  }
-
   const handleDeleteClick = () => {
     if (isPreview || disabled || !webhookId) return
     setShowDeleteDialog(true)
@@ -324,14 +269,9 @@ export function TriggerSave({
         setSaveStatus('idle')
         setErrorMessage(null)
 
-        useSubBlockStore.getState().setValue(blockId, 'testUrl', null)
-        useSubBlockStore.getState().setValue(blockId, 'testUrlExpiresAt', null)
-
         collaborativeSetSubblockValue(blockId, 'triggerPath', '')
         collaborativeSetSubblockValue(blockId, 'webhookId', null)
         collaborativeSetSubblockValue(blockId, 'triggerConfig', null)
-        collaborativeSetSubblockValue(blockId, 'testUrl', null)
-        collaborativeSetSubblockValue(blockId, 'testUrlExpiresAt', null)
 
         logger.info('Trigger configuration deleted successfully', {
           blockId,
@@ -383,51 +323,6 @@ export function TriggerSave({
 
       {errorMessage && <p className='mt-2 text-[12px] text-[var(--text-error)]'>{errorMessage}</p>}
 
-      {webhookId && hasWebhookUrlDisplay && (
-        <div className='mt-4 space-y-2'>
-          <div className='flex items-center justify-between'>
-            <span className='font-medium text-[13px] text-[var(--text-primary)]'>
-              Test Webhook URL
-            </span>
-            <Button
-              variant='ghost'
-              onClick={generateTestUrl}
-              disabled={isGeneratingTestUrl || isProcessing}
-            >
-              {isGeneratingTestUrl ? 'Generating…' : testUrl ? 'Regenerate' : 'Generate'}
-            </Button>
-          </div>
-          {testUrl ? (
-            <>
-              <ShortInput
-                blockId={blockId}
-                subBlockId={`${subBlockId}-test-url`}
-                config={{
-                  id: `${subBlockId}-test-url`,
-                  type: 'short-input',
-                  readOnly: true,
-                  showCopyButton: true,
-                }}
-                value={testUrl}
-                readOnly={true}
-                showCopyButton={true}
-                disabled={isPreview || disabled}
-                isPreview={isPreview}
-              />
-              {testUrlExpiresAt && (
-                <p className='text-[12px] text-[var(--text-tertiary)]'>
-                  Expires {new Date(testUrlExpiresAt).toLocaleString()}
-                </p>
-              )}
-            </>
-          ) : (
-            <p className='text-[12px] text-[var(--text-tertiary)]'>
-              Generate a temporary URL to test against the live (undeployed) workflow state.
-            </p>
-          )}
-        </div>
-      )}
-
       <Modal open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
         <ModalContent size='sm'>
           <ModalHeader>Delete Trigger</ModalHeader>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
index 46b0451483..9e915ce18c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
@@ -108,7 +108,7 @@ export function Panel() {
   // Delete workflow hook
   const { isDeleting, handleDeleteWorkflow } = useDeleteWorkflow({
     workspaceId,
-    getWorkflowIds: () => activeWorkflowId || '',
+    workflowIds: activeWorkflowId || '',
     isActive: true,
     onSuccess: () => setIsDeleteModalOpen(false),
   })
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
index fbd93d2491..b98eb7d390 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
@@ -35,7 +35,6 @@ import { getDependsOnFields } from '@/blocks/utils'
 import { useKnowledgeBase } from '@/hooks/kb/use-knowledge'
 import { useMcpServers, useMcpToolsQuery } from '@/hooks/queries/mcp'
 import { useCredentialName } from '@/hooks/queries/oauth-credentials'
-import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useSelectorDisplayName } from '@/hooks/use-selector-display-name'
 import { useVariablesStore } from '@/stores/panel'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -613,34 +612,6 @@ export const WorkflowBlock = memo(function WorkflowBlock({
     [isDeploying, setDeploymentStatus, refetchDeployment]
   )
 
-  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
-
-  /**
-   * Clear credential-dependent fields when credential changes to prevent
-   * stale data from persisting with new credentials.
-   */
-  const prevCredRef = useRef<string | undefined>(undefined)
-  useEffect(() => {
-    const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-    if (!activeWorkflowId) return
-    const current = useSubBlockStore.getState().workflowValues[activeWorkflowId]?.[id]
-    if (!current) return
-    const credValue = current.credential
-    const cred =
-      typeof credValue === 'object' && credValue !== null && 'value' in credValue
-        ? ((credValue as { value?: unknown }).value as string | undefined)
-        : (credValue as string | undefined)
-    if (prevCredRef.current !== cred) {
-      const hadPreviousCredential = prevCredRef.current !== undefined
-      prevCredRef.current = cred
-      if (hadPreviousCredential) {
-        const keys = Object.keys(current)
-        const dependentKeys = keys.filter((k) => k !== 'credential')
-        dependentKeys.forEach((k) => collaborativeSetSubblockValue(id, k, ''))
-      }
-    }
-  }, [id, collaborativeSetSubblockValue])
-
   const currentStoreBlock = currentWorkflow.getBlockById(id)
 
   const isStarterBlock = type === 'starter'
@@ -1021,11 +992,11 @@ export const WorkflowBlock = memo(function WorkflowBlock({
                   <Tooltip.Trigger asChild>
                     <Badge
                       variant={!childIsDeployed ? 'red' : 'amber'}
-                      className='cursor-pointer'
+                      className={userPermissions.canAdmin ? 'cursor-pointer' : 'cursor-not-allowed'}
                       dot
                       onClick={(e) => {
                         e.stopPropagation()
-                        if (childWorkflowId && !isDeploying) {
+                        if (childWorkflowId && !isDeploying && userPermissions.canAdmin) {
                           deployWorkflow(childWorkflowId)
                         }
                       }}
@@ -1035,7 +1006,11 @@ export const WorkflowBlock = memo(function WorkflowBlock({
                   </Tooltip.Trigger>
                   <Tooltip.Content>
                     <span className='text-sm'>
-                      {!childIsDeployed ? 'Click to deploy' : 'Click to redeploy'}
+                      {!userPermissions.canAdmin
+                        ? 'Admin permission required to deploy'
+                        : !childIsDeployed
+                          ? 'Click to deploy'
+                          : 'Click to redeploy'}
                     </span>
                   </Tooltip.Content>
                 </Tooltip.Root>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts
index 1490d6040b..634d28a86e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils.ts
@@ -50,7 +50,7 @@ export function getBlockRingStyles(options: BlockRingOptions): {
       !isPending &&
       !isDeletedBlock &&
       diffStatus === 'new' &&
-      'ring-[var(--brand-tertiary)]',
+      'ring-[var(--brand-tertiary-2)]',
     !isActive &&
       !isPending &&
       !isDeletedBlock &&
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
index bbaad51aa8..2ac4f3cb72 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -64,6 +64,7 @@ import { getBlock } from '@/blocks'
 import { isAnnotationOnlyBlock } from '@/executor/constants'
 import { useWorkspaceEnvironment } from '@/hooks/queries/environment'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
+import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { useStreamCleanup } from '@/hooks/use-stream-cleanup'
 import { useChatStore } from '@/stores/chat/store'
 import { useCopilotTrainingStore } from '@/stores/copilot-training/store'
@@ -281,6 +282,9 @@ const WorkflowContent = React.memo(() => {
   // Panel open states for context menu
   const isVariablesOpen = useVariablesStore((state) => state.isOpen)
   const isChatOpen = useChatStore((state) => state.isChatOpen)
+
+  // Permission config for invitation control
+  const { isInvitationsDisabled } = usePermissionConfig()
   const snapGrid: [number, number] = useMemo(
     () => [snapToGridSize, snapToGridSize],
     [snapToGridSize]
@@ -3426,6 +3430,7 @@ const WorkflowContent = React.memo(() => {
               disableAdmin={!effectivePermissions.canAdmin}
               canUndo={canUndo}
               canRedo={canRedo}
+              isInvitationsDisabled={isInvitationsDisabled}
             />
           </>
         )}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
index ee43fefbf9..0d8fd312cc 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
@@ -182,7 +182,7 @@ export function SearchModal({
     const allBlocks = getAllBlocks()
     const filteredAllBlocks = filterBlocks(allBlocks)
     return filteredAllBlocks
-      .filter((block) => block.category === 'tools')
+      .filter((block) => !block.hideFromToolbar && block.category === 'tools')
       .map(
         (block): ToolItem => ({
           id: block.type,
@@ -225,7 +225,7 @@ export function SearchModal({
     const docsItems: DocItem[] = []
 
     allBlocks.forEach((block) => {
-      if (block.docsLink) {
+      if (block.docsLink && !block.hideFromToolbar) {
         docsItems.push({
           id: `docs-${block.type}`,
           name: block.name,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx
index 034f028290..fc7bf1dcda 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx
@@ -342,6 +342,12 @@ export function AccessControl() {
         category: 'Logs',
         configKey: 'hideTraceSpans' as const,
       },
+      {
+        id: 'disable-invitations',
+        label: 'Invitations',
+        category: 'Collaboration',
+        configKey: 'disableInvitations' as const,
+      },
     ],
     []
   )
@@ -869,7 +875,8 @@ export function AccessControl() {
                             !editingConfig?.hideFilesTab &&
                             !editingConfig?.disableMcpTools &&
                             !editingConfig?.disableCustomTools &&
-                            !editingConfig?.hideTraceSpans
+                            !editingConfig?.hideTraceSpans &&
+                            !editingConfig?.disableInvitations
                           setEditingConfig((prev) =>
                             prev
                               ? {
@@ -883,6 +890,7 @@ export function AccessControl() {
                                   disableMcpTools: allVisible,
                                   disableCustomTools: allVisible,
                                   hideTraceSpans: allVisible,
+                                  disableInvitations: allVisible,
                                 }
                               : prev
                           )
@@ -896,7 +904,8 @@ export function AccessControl() {
                         !editingConfig?.hideFilesTab &&
                         !editingConfig?.disableMcpTools &&
                         !editingConfig?.disableCustomTools &&
-                        !editingConfig?.hideTraceSpans
+                        !editingConfig?.hideTraceSpans &&
+                        !editingConfig?.disableInvitations
                           ? 'Deselect All'
                           : 'Select All'}
                       </Button>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx
index e06ab18c3b..867c128f60 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx
@@ -2,7 +2,7 @@
 
 import { useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { Crown, Eye, EyeOff } from 'lucide-react'
+import { Eye, EyeOff } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import {
   Button,
@@ -83,7 +83,6 @@ export function BYOK() {
 
   const { data, isLoading } = useBYOKKeys(workspaceId)
   const keys = data?.keys ?? []
-  const byokEnabled = data?.byokEnabled ?? true
   const upsertKey = useUpsertBYOKKey()
   const deleteKey = useDeleteBYOKKey()
 
@@ -98,31 +97,6 @@ export function BYOK() {
     return keys.find((k) => k.providerId === providerId)
   }
 
-  // Show enterprise-only gate if BYOK is not enabled
-  if (!isLoading && !byokEnabled) {
-    return (
-      <div className='flex h-full flex-col items-center justify-center gap-[16px] py-[32px]'>
-        <div className='flex h-[48px] w-[48px] items-center justify-center rounded-full bg-[var(--surface-6)]'>
-          <Crown className='h-[24px] w-[24px] text-[var(--amber-9)]' />
-        </div>
-        <div className='flex flex-col items-center gap-[8px] text-center'>
-          <h3 className='font-medium text-[15px] text-[var(--text-primary)]'>Enterprise Feature</h3>
-          <p className='max-w-[320px] text-[13px] text-[var(--text-secondary)]'>
-            Bring Your Own Key (BYOK) is available exclusively on the Enterprise plan. Upgrade to
-            use your own API keys and eliminate the 2x cost multiplier.
-          </p>
-        </div>
-        <Button
-          variant='primary'
-          className='!bg-[var(--brand-tertiary-2)] !text-[var(--text-inverse)] hover:!bg-[var(--brand-tertiary-2)]/90'
-          onClick={() => window.open('https://sim.ai/enterprise', '_blank')}
-        >
-          Contact Sales
-        </Button>
-      </div>
-    )
-  }
-
   const handleSave = async () => {
     if (!editingProvider || !apiKeyInput.trim()) return
 
@@ -340,7 +314,7 @@ export function BYOK() {
               <span className='font-medium text-[var(--text-primary)]'>
                 {PROVIDERS.find((p) => p.id === deleteConfirmProvider)?.name}
               </span>{' '}
-              API key? This workspace will revert to using platform keys with the 2x multiplier.
+              API key? This workspace will revert to using platform hosted keys.
             </p>
           </ModalBody>
           <ModalFooter>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx
index 6f3f7e0b57..b78de6ed98 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/team-management.tsx
@@ -33,11 +33,13 @@ import {
 } from '@/hooks/queries/organization'
 import { useSubscriptionData } from '@/hooks/queries/subscription'
 import { useAdminWorkspaces } from '@/hooks/queries/workspace'
+import { usePermissionConfig } from '@/hooks/use-permission-config'
 
 const logger = createLogger('TeamManagement')
 
 export function TeamManagement() {
   const { data: session } = useSession()
+  const { isInvitationsDisabled } = usePermissionConfig()
 
   const { data: organizationsData } = useOrganizations()
   const activeOrganization = organizationsData?.activeOrganization
@@ -385,8 +387,8 @@ export function TeamManagement() {
         </div>
       )}
 
-      {/* Action: Invite New Members */}
-      {adminOrOwner && (
+      {/* Action: Invite New Members - hidden when invitations are disabled */}
+      {adminOrOwner && !isInvitationsDisabled && (
         <div>
           <MemberInvitationCard
             inviteEmail={inviteEmail}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
index a22df0a777..bc610fe74e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
@@ -152,9 +152,8 @@ const allNavigationItems: NavigationItem[] = [
     id: 'byok',
     label: 'BYOK',
     icon: KeySquare,
-    section: 'enterprise',
+    section: 'system',
     requiresHosted: true,
-    requiresEnterprise: true,
   },
   {
     id: 'copilot',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx
index a64f79ca99..6be102415c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx
@@ -347,11 +347,11 @@ export function ContextMenu({
                     title={name}
                     onClick={(e) => {
                       e.stopPropagation()
-                      onColorChange(color)
+                      setHexInput(color)
                     }}
                     className={cn(
                       'h-[20px] w-[20px] rounded-[4px]',
-                      currentColor?.toLowerCase() === color.toLowerCase() && 'ring-1 ring-white'
+                      hexInput.toLowerCase() === color.toLowerCase() && 'ring-1 ring-white'
                     )}
                     style={{ backgroundColor: color }}
                   />
@@ -373,7 +373,7 @@ export function ContextMenu({
                   onKeyDown={handleHexKeyDown}
                   onFocus={handleHexFocus}
                   onClick={(e) => e.stopPropagation()}
-                  className='h-[20px] min-w-0 flex-1 rounded-[4px] bg-[#363636] px-[6px] text-[11px] text-white uppercase focus:outline-none'
+                  className='h-[20px] min-w-0 flex-1 rounded-[4px] bg-[#363636] px-[6px] text-[11px] text-white uppercase caret-white focus:outline-none'
                 />
                 <button
                   type='button'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
index 1dc249088d..b105472bee 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/folder-item/folder-item.tsx
@@ -20,6 +20,7 @@ import {
   useCanDelete,
   useDeleteFolder,
   useDuplicateFolder,
+  useExportFolder,
 } from '@/app/workspace/[workspaceId]/w/hooks'
 import { useCreateFolder, useUpdateFolder } from '@/hooks/queries/folders'
 import { useCreateWorkflow } from '@/hooks/queries/workflows'
@@ -57,23 +58,24 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
   const { canDeleteFolder } = useCanDelete({ workspaceId })
   const canDelete = useMemo(() => canDeleteFolder(folder.id), [canDeleteFolder, folder.id])
 
-  // Delete modal state
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false)
 
-  // Delete folder hook
   const { isDeleting, handleDeleteFolder } = useDeleteFolder({
     workspaceId,
-    getFolderIds: () => folder.id,
+    folderIds: folder.id,
     onSuccess: () => setIsDeleteModalOpen(false),
   })
 
-  // Duplicate folder hook
   const { handleDuplicateFolder } = useDuplicateFolder({
     workspaceId,
-    getFolderIds: () => folder.id,
+    folderIds: folder.id,
+  })
+
+  const { isExporting, hasWorkflows, handleExportFolder } = useExportFolder({
+    workspaceId,
+    folderId: folder.id,
   })
 
-  // Folder expand hook - must be declared before callbacks that use expandFolder
   const {
     isExpanded,
     handleToggleExpanded,
@@ -90,7 +92,6 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
    */
   const handleCreateWorkflowInFolder = useCallback(async () => {
     try {
-      // Generate name and color upfront for optimistic updates
       const name = generateCreativeWorkflowName()
       const color = getNextWorkflowColor()
 
@@ -103,15 +104,12 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
 
       if (result.id) {
         router.push(`/workspace/${workspaceId}/w/${result.id}`)
-        // Expand the parent folder so the new workflow is visible
         expandFolder()
-        // Scroll to the newly created workflow
         window.dispatchEvent(
           new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: result.id } })
         )
       }
     } catch (error) {
-      // Error already handled by mutation's onError callback
       logger.error('Failed to create workflow in folder:', error)
     }
   }, [createWorkflowMutation, workspaceId, folder.id, router, expandFolder])
@@ -128,9 +126,7 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
         parentId: folder.id,
       })
       if (result.id) {
-        // Expand the parent folder so the new folder is visible
         expandFolder()
-        // Scroll to the newly created folder
         window.dispatchEvent(
           new CustomEvent(SIDEBAR_SCROLL_EVENT, { detail: { itemId: result.id } })
         )
@@ -147,7 +143,6 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
    */
   const onDragStart = useCallback(
     (e: React.DragEvent) => {
-      // Don't start drag if editing
       if (isEditing) {
         e.preventDefault()
         return
@@ -159,12 +154,10 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
     [folder.id]
   )
 
-  // Item drag hook
   const { isDragging, shouldPreventClickRef, handleDragStart, handleDragEnd } = useItemDrag({
     onDragStart,
   })
 
-  // Context menu hook
   const {
     isOpen: isContextMenuOpen,
     position,
@@ -174,7 +167,6 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
     preventDismiss,
   } = useContextMenu()
 
-  // Rename hook
   const {
     isEditing,
     editValue,
@@ -258,7 +250,6 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
       e.preventDefault()
       e.stopPropagation()
 
-      // Toggle: close if open, open if closed
       if (isContextMenuOpen) {
         closeMenu()
         return
@@ -365,13 +356,16 @@ export function FolderItem({ folder, level, hoverHandlers }: FolderItemProps) {
         onCreate={handleCreateWorkflowInFolder}
         onCreateFolder={handleCreateFolderInFolder}
         onDuplicate={handleDuplicateFolder}
+        onExport={handleExportFolder}
         onDelete={() => setIsDeleteModalOpen(true)}
         showCreate={true}
         showCreateFolder={true}
+        showExport={true}
         disableRename={!userPermissions.canEdit}
         disableCreate={!userPermissions.canEdit || createWorkflowMutation.isPending}
         disableCreateFolder={!userPermissions.canEdit || createFolderMutation.isPending}
-        disableDuplicate={!userPermissions.canEdit}
+        disableDuplicate={!userPermissions.canEdit || !hasWorkflows}
+        disableExport={!userPermissions.canEdit || isExporting || !hasWorkflows}
         disableDelete={!userPermissions.canEdit || !canDelete}
       />
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
index 2665ed3b24..eaad0371a4 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
@@ -46,19 +46,15 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
   const userPermissions = useUserPermissionsContext()
   const isSelected = selectedWorkflows.has(workflow.id)
 
-  // Can delete check hook
   const { canDeleteWorkflows } = useCanDelete({ workspaceId })
 
-  // Delete modal state
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false)
   const [workflowIdsToDelete, setWorkflowIdsToDelete] = useState<string[]>([])
   const [deleteModalNames, setDeleteModalNames] = useState<string | string[]>('')
   const [canDeleteCaptured, setCanDeleteCaptured] = useState(true)
 
-  // Presence avatars state
   const [hasAvatars, setHasAvatars] = useState(false)
 
-  // Capture selection at right-click time (using ref to persist across renders)
   const capturedSelectionRef = useRef<{
     workflowIds: string[]
     workflowNames: string | string[]
@@ -68,7 +64,6 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
    * Handle opening the delete modal - uses pre-captured selection state
    */
   const handleOpenDeleteModal = useCallback(() => {
-    // Use the selection captured at right-click time
     if (capturedSelectionRef.current) {
       setWorkflowIdsToDelete(capturedSelectionRef.current.workflowIds)
       setDeleteModalNames(capturedSelectionRef.current.workflowNames)
@@ -76,42 +71,32 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
     }
   }, [])
 
-  // Delete workflow hook
   const { isDeleting, handleDeleteWorkflow } = useDeleteWorkflow({
     workspaceId,
-    getWorkflowIds: () => workflowIdsToDelete,
+    workflowIds: workflowIdsToDelete,
     isActive: (workflowIds) => workflowIds.includes(params.workflowId as string),
     onSuccess: () => setIsDeleteModalOpen(false),
   })
 
-  // Duplicate workflow hook
-  const { handleDuplicateWorkflow } = useDuplicateWorkflow({
-    workspaceId,
-    getWorkflowIds: () => {
-      // Use the selection captured at right-click time
-      return capturedSelectionRef.current?.workflowIds || []
-    },
-  })
+  const { handleDuplicateWorkflow: duplicateWorkflow } = useDuplicateWorkflow({ workspaceId })
 
-  // Export workflow hook
-  const { handleExportWorkflow } = useExportWorkflow({
-    workspaceId,
-    getWorkflowIds: () => {
-      // Use the selection captured at right-click time
-      return capturedSelectionRef.current?.workflowIds || []
-    },
-  })
+  const { handleExportWorkflow: exportWorkflow } = useExportWorkflow({ workspaceId })
+  const handleDuplicateWorkflow = useCallback(() => {
+    const workflowIds = capturedSelectionRef.current?.workflowIds || []
+    if (workflowIds.length === 0) return
+    duplicateWorkflow(workflowIds)
+  }, [duplicateWorkflow])
+
+  const handleExportWorkflow = useCallback(() => {
+    const workflowIds = capturedSelectionRef.current?.workflowIds || []
+    if (workflowIds.length === 0) return
+    exportWorkflow(workflowIds)
+  }, [exportWorkflow])
 
-  /**
-   * Opens the workflow in a new browser tab
-   */
   const handleOpenInNewTab = useCallback(() => {
     window.open(`/workspace/${workspaceId}/w/${workflow.id}`, '_blank')
   }, [workspaceId, workflow.id])
 
-  /**
-   * Changes the workflow color
-   */
   const handleColorChange = useCallback(
     (color: string) => {
       updateWorkflow(workflow.id, { color })
@@ -126,7 +111,6 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
    */
   const onDragStart = useCallback(
     (e: React.DragEvent) => {
-      // Don't start drag if editing
       if (isEditing) {
         e.preventDefault()
         return
@@ -141,12 +125,10 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
     [isSelected, selectedWorkflows, workflow.id]
   )
 
-  // Item drag hook
   const { isDragging, shouldPreventClickRef, handleDragStart, handleDragEnd } = useItemDrag({
     onDragStart,
   })
 
-  // Context menu hook
   const {
     isOpen: isContextMenuOpen,
     position,
@@ -215,14 +197,12 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
       e.preventDefault()
       e.stopPropagation()
 
-      // Toggle: close if open, open if closed
       if (isContextMenuOpen) {
         closeMenu()
         return
       }
 
       captureSelectionState()
-      // Open context menu aligned with the button
       const rect = e.currentTarget.getBoundingClientRect()
       handleContextMenuBase({
         preventDefault: () => {},
@@ -234,7 +214,6 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
     [isContextMenuOpen, closeMenu, captureSelectionState, handleContextMenuBase]
   )
 
-  // Rename hook
   const {
     isEditing,
     editValue,
@@ -281,12 +260,10 @@ export function WorkflowItem({ workflow, active, level, onWorkflowClick }: Workf
 
       const isModifierClick = e.shiftKey || e.metaKey || e.ctrlKey
 
-      // Prevent default link behavior when using modifier keys
       if (isModifierClick) {
         e.preventDefault()
       }
 
-      // Use metaKey (Cmd on Mac) or ctrlKey (Ctrl on Windows/Linux)
       onWorkflowClick(workflow.id, e.shiftKey, e.metaKey || e.ctrlKey)
     },
     [shouldPreventClickRef, workflow.id, onWorkflowClick, isEditing]
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/workflow-list.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/workflow-list.tsx
index 78385ad873..468960c20a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/workflow-list.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/workflow-list.tsx
@@ -9,7 +9,6 @@ import {
   useDragDrop,
   useWorkflowSelection,
 } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
-import { useImportWorkflow } from '@/app/workspace/[workspaceId]/w/hooks/use-import-workflow'
 import { useFolders } from '@/hooks/queries/folders'
 import { useFolderStore } from '@/stores/folders/store'
 import type { FolderTreeNode } from '@/stores/folders/types'
@@ -25,15 +24,13 @@ const TREE_SPACING = {
 interface WorkflowListProps {
   regularWorkflows: WorkflowMetadata[]
   isLoading?: boolean
-  isImporting: boolean
-  setIsImporting: (value: boolean) => void
+  handleFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void
   fileInputRef: React.RefObject<HTMLInputElement | null>
   scrollContainerRef: React.RefObject<HTMLDivElement | null>
 }
 
 /**
  * WorkflowList component displays workflows organized by folders with drag-and-drop support.
- * Uses the workflow import hook for handling JSON imports.
  *
  * @param props - Component props
  * @returns Workflow list with folders and drag-drop support
@@ -41,8 +38,7 @@ interface WorkflowListProps {
 export function WorkflowList({
   regularWorkflows,
   isLoading = false,
-  isImporting,
-  setIsImporting,
+  handleFileChange,
   fileInputRef,
   scrollContainerRef,
 }: WorkflowListProps) {
@@ -65,9 +61,6 @@ export function WorkflowList({
     createFolderHeaderHoverHandlers,
   } = useDragDrop()
 
-  // Workflow import hook
-  const { handleFileChange } = useImportWorkflow({ workspaceId })
-
   // Set scroll container when ref changes
   useEffect(() => {
     if (scrollContainerRef.current) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 37c3a9b0e5..fc9f2563fd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -18,6 +18,7 @@ import {
 import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu'
 import { DeleteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal'
 import { InviteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal'
+import { usePermissionConfig } from '@/hooks/use-permission-config'
 
 const logger = createLogger('WorkspaceHeader')
 
@@ -151,12 +152,18 @@ export function WorkspaceHeader({
     setIsMounted(true)
   }, [])
 
+  const { isInvitationsDisabled } = usePermissionConfig()
+
   // Listen for open-invite-modal event from context menu
   useEffect(() => {
-    const handleOpenInvite = () => setIsInviteModalOpen(true)
+    const handleOpenInvite = () => {
+      if (!isInvitationsDisabled) {
+        setIsInviteModalOpen(true)
+      }
+    }
     window.addEventListener('open-invite-modal', handleOpenInvite)
     return () => window.removeEventListener('open-invite-modal', handleOpenInvite)
-  }, [])
+  }, [isInvitationsDisabled])
 
   /**
    * Focus the inline list rename input when it becomes active
@@ -458,8 +465,8 @@ export function WorkspaceHeader({
       </div>
       {/* Workspace Actions */}
       <div className='flex flex-shrink-0 items-center gap-[10px]'>
-        {/* Invite - hidden in collapsed mode */}
-        {!isCollapsed && (
+        {/* Invite - hidden in collapsed mode or when invitations are disabled */}
+        {!isCollapsed && !isInvitationsDisabled && (
           <Badge className='cursor-pointer' onClick={() => setIsInviteModalOpen(true)}>
             Invite
           </Badge>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
index 6acab60c56..cb4b7a5bf8 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
@@ -2,10 +2,10 @@
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
-import { ArrowDown, Database, HelpCircle, Layout, Plus, Search, Settings } from 'lucide-react'
+import { Database, HelpCircle, Layout, Plus, Search, Settings } from 'lucide-react'
 import Link from 'next/link'
 import { useParams, usePathname, useRouter } from 'next/navigation'
-import { Button, FolderPlus, Library, Tooltip } from '@/components/emcn'
+import { Button, Download, FolderPlus, Library, Loader, Tooltip } from '@/components/emcn'
 import { useSession } from '@/lib/auth/auth-client'
 import { getEnv, isTruthy } from '@/lib/core/config/env'
 import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
@@ -30,6 +30,7 @@ import {
 import {
   useDuplicateWorkspace,
   useExportWorkspace,
+  useImportWorkflow,
   useImportWorkspace,
 } from '@/app/workspace/[workspaceId]/w/hooks'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
@@ -85,9 +86,11 @@ export function Sidebar() {
   const isCollapsed = hasHydrated ? isCollapsedStore : false
   const isOnWorkflowPage = !!workflowId
 
-  const [isImporting, setIsImporting] = useState(false)
   const workspaceFileInputRef = useRef<HTMLInputElement>(null)
 
+  const { isImporting, handleFileChange: handleImportFileChange } = useImportWorkflow({
+    workspaceId,
+  })
   const { isImporting: isImportingWorkspace, handleImportWorkspace: importWorkspace } =
     useImportWorkspace()
   const { handleExportWorkspace: exportWorkspace } = useExportWorkspace()
@@ -213,7 +216,7 @@ export function Sidebar() {
   }, [activeNavItemHref])
 
   const { handleDuplicateWorkspace: duplicateWorkspace } = useDuplicateWorkspace({
-    getWorkspaceId: () => workspaceId,
+    workspaceId,
   })
 
   const searchModalWorkflows = useMemo(
@@ -565,21 +568,31 @@ export function Sidebar() {
                       Workflows
                     </div>
                     <div className='flex items-center justify-center gap-[10px]'>
-                      <Tooltip.Root>
-                        <Tooltip.Trigger asChild>
-                          <Button
-                            variant='ghost'
-                            className='translate-y-[-0.25px] p-[1px]'
-                            onClick={handleImportWorkflow}
-                            disabled={isImporting || !canEdit}
-                          >
-                            <ArrowDown className='h-[14px] w-[14px]' />
-                          </Button>
-                        </Tooltip.Trigger>
-                        <Tooltip.Content>
-                          <p>{isImporting ? 'Importing workflow...' : 'Import workflow'}</p>
-                        </Tooltip.Content>
-                      </Tooltip.Root>
+                      {isImporting ? (
+                        <Button
+                          variant='ghost'
+                          className='translate-y-[-0.25px] p-[1px]'
+                          disabled={!canEdit || isImporting}
+                        >
+                          <Loader className='h-[14px] w-[14px]' animate />
+                        </Button>
+                      ) : (
+                        <Tooltip.Root>
+                          <Tooltip.Trigger asChild>
+                            <Button
+                              variant='ghost'
+                              className='translate-y-[-0.25px] p-[1px]'
+                              onClick={handleImportWorkflow}
+                              disabled={!canEdit}
+                            >
+                              <Download className='h-[14px] w-[14px]' />
+                            </Button>
+                          </Tooltip.Trigger>
+                          <Tooltip.Content>
+                            <p>Import workflows</p>
+                          </Tooltip.Content>
+                        </Tooltip.Root>
+                      )}
                       <Tooltip.Root>
                         <Tooltip.Trigger asChild>
                           <Button
@@ -622,8 +635,7 @@ export function Sidebar() {
                   <WorkflowList
                     regularWorkflows={regularWorkflows}
                     isLoading={isLoading}
-                    isImporting={isImporting}
-                    setIsImporting={setIsImporting}
+                    handleFileChange={handleImportFileChange}
                     fileInputRef={fileInputRef}
                     scrollContainerRef={scrollContainerRef}
                   />
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/index.ts
index 1ebc8bfbfd..b479aab46a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/index.ts
@@ -4,6 +4,7 @@ export { useDeleteWorkflow } from './use-delete-workflow'
 export { useDuplicateFolder } from './use-duplicate-folder'
 export { useDuplicateWorkflow } from './use-duplicate-workflow'
 export { useDuplicateWorkspace } from './use-duplicate-workspace'
+export { useExportFolder } from './use-export-folder'
 export { useExportWorkflow } from './use-export-workflow'
 export { useExportWorkspace } from './use-export-workspace'
 export { useImportWorkflow } from './use-import-workflow'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-folder.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-folder.ts
index b8b2e1ba41..c276a136db 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-folder.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-folder.ts
@@ -11,10 +11,9 @@ interface UseDeleteFolderProps {
    */
   workspaceId: string
   /**
-   * Function that returns the folder ID(s) to delete
-   * This function is called when deletion occurs to get fresh selection state
+   * The folder ID(s) to delete
    */
-  getFolderIds: () => string | string[]
+  folderIds: string | string[]
   /**
    * Optional callback after successful deletion
    */
@@ -24,17 +23,10 @@ interface UseDeleteFolderProps {
 /**
  * Hook for managing folder deletion.
  *
- * Handles:
- * - Single or bulk folder deletion
- * - Calling delete API for each folder
- * - Loading state management
- * - Error handling and logging
- * - Clearing selection after deletion
- *
  * @param props - Hook configuration
  * @returns Delete folder handlers and state
  */
-export function useDeleteFolder({ workspaceId, getFolderIds, onSuccess }: UseDeleteFolderProps) {
+export function useDeleteFolder({ workspaceId, folderIds, onSuccess }: UseDeleteFolderProps) {
   const deleteFolderMutation = useDeleteFolderMutation()
   const [isDeleting, setIsDeleting] = useState(false)
 
@@ -46,23 +38,18 @@ export function useDeleteFolder({ workspaceId, getFolderIds, onSuccess }: UseDel
       return
     }
 
+    if (!folderIds) {
+      return
+    }
+
     setIsDeleting(true)
     try {
-      // Get fresh folder IDs at deletion time
-      const folderIdsOrId = getFolderIds()
-      if (!folderIdsOrId) {
-        return
-      }
-
-      // Normalize to array for consistent handling
-      const folderIdsToDelete = Array.isArray(folderIdsOrId) ? folderIdsOrId : [folderIdsOrId]
+      const folderIdsToDelete = Array.isArray(folderIds) ? folderIds : [folderIds]
 
-      // Delete each folder sequentially
       for (const folderId of folderIdsToDelete) {
         await deleteFolderMutation.mutateAsync({ id: folderId, workspaceId })
       }
 
-      // Clear selection after successful deletion
       const { clearSelection } = useFolderStore.getState()
       clearSelection()
 
@@ -74,7 +61,7 @@ export function useDeleteFolder({ workspaceId, getFolderIds, onSuccess }: UseDel
     } finally {
       setIsDeleting(false)
     }
-  }, [getFolderIds, isDeleting, deleteFolderMutation, workspaceId, onSuccess])
+  }, [folderIds, isDeleting, deleteFolderMutation, workspaceId, onSuccess])
 
   return {
     isDeleting,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-workflow.ts
index a807b71e53..86d5c4ac9a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-delete-workflow.ts
@@ -12,10 +12,9 @@ interface UseDeleteWorkflowProps {
    */
   workspaceId: string
   /**
-   * Function that returns the workflow ID(s) to delete
-   * This function is called when deletion occurs to get fresh selection state
+   * Workflow ID(s) to delete
    */
-  getWorkflowIds: () => string | string[]
+  workflowIds: string | string[]
   /**
    * Whether the active workflow is being deleted
    * Can be a boolean or a function that receives the workflow IDs
@@ -30,20 +29,12 @@ interface UseDeleteWorkflowProps {
 /**
  * Hook for managing workflow deletion with navigation logic.
  *
- * Handles:
- * - Single or bulk workflow deletion
- * - Finding next workflow to navigate to
- * - Navigating before deletion (if active workflow)
- * - Removing workflow(s) from registry
- * - Loading state management
- * - Error handling and logging
- *
  * @param props - Hook configuration
  * @returns Delete workflow handlers and state
  */
 export function useDeleteWorkflow({
   workspaceId,
-  getWorkflowIds,
+  workflowIds,
   isActive = false,
   onSuccess,
 }: UseDeleteWorkflowProps) {
@@ -59,30 +50,21 @@ export function useDeleteWorkflow({
       return
     }
 
+    if (!workflowIds) {
+      return
+    }
+
     setIsDeleting(true)
     try {
-      // Get fresh workflow IDs at deletion time
-      const workflowIdsOrId = getWorkflowIds()
-      if (!workflowIdsOrId) {
-        return
-      }
-
-      // Normalize to array for consistent handling
-      const workflowIdsToDelete = Array.isArray(workflowIdsOrId)
-        ? workflowIdsOrId
-        : [workflowIdsOrId]
+      const workflowIdsToDelete = Array.isArray(workflowIds) ? workflowIds : [workflowIds]
 
-      // Determine if active workflow is being deleted
       const isActiveWorkflowBeingDeleted =
         typeof isActive === 'function' ? isActive(workflowIdsToDelete) : isActive
 
-      // Find next workflow to navigate to (if active workflow is being deleted)
       const sidebarWorkflows = Object.values(workflows).filter((w) => w.workspaceId === workspaceId)
 
-      // Find which specific workflow is the active one (if any in the deletion list)
       let activeWorkflowId: string | null = null
       if (isActiveWorkflowBeingDeleted && typeof isActive === 'function') {
-        // Check each workflow being deleted to find which one is active
         activeWorkflowId =
           workflowIdsToDelete.find((id) => isActive([id])) || workflowIdsToDelete[0]
       } else {
@@ -93,13 +75,11 @@ export function useDeleteWorkflow({
 
       let nextWorkflowId: string | null = null
       if (isActiveWorkflowBeingDeleted && sidebarWorkflows.length > workflowIdsToDelete.length) {
-        // Find the first workflow that's not being deleted
         const remainingWorkflows = sidebarWorkflows.filter(
           (w) => !workflowIdsToDelete.includes(w.id)
         )
 
         if (remainingWorkflows.length > 0) {
-          // Try to find the next workflow after the current one
           const workflowsAfterCurrent = remainingWorkflows.filter((w) => {
             const idx = sidebarWorkflows.findIndex((sw) => sw.id === w.id)
             return idx > currentIndex
@@ -108,13 +88,11 @@ export function useDeleteWorkflow({
           if (workflowsAfterCurrent.length > 0) {
             nextWorkflowId = workflowsAfterCurrent[0].id
           } else {
-            // Otherwise, use the first remaining workflow
             nextWorkflowId = remainingWorkflows[0].id
           }
         }
       }
 
-      // Navigate first if this is the active workflow
       if (isActiveWorkflowBeingDeleted) {
         if (nextWorkflowId) {
           router.push(`/workspace/${workspaceId}/w/${nextWorkflowId}`)
@@ -123,10 +101,8 @@ export function useDeleteWorkflow({
         }
       }
 
-      // Delete all workflows
       await Promise.all(workflowIdsToDelete.map((id) => removeWorkflow(id)))
 
-      // Clear selection after successful deletion
       const { clearSelection } = useFolderStore.getState()
       clearSelection()
 
@@ -138,16 +114,7 @@ export function useDeleteWorkflow({
     } finally {
       setIsDeleting(false)
     }
-  }, [
-    getWorkflowIds,
-    isDeleting,
-    workflows,
-    workspaceId,
-    isActive,
-    router,
-    removeWorkflow,
-    onSuccess,
-  ])
+  }, [workflowIds, isDeleting, workflows, workspaceId, isActive, router, removeWorkflow, onSuccess])
 
   return {
     isDeleting,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts
index aa701f7c5e..a7d93045b8 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-folder.ts
@@ -7,7 +7,10 @@ const logger = createLogger('useDuplicateFolder')
 
 interface UseDuplicateFolderProps {
   workspaceId: string
-  getFolderIds: () => string | string[]
+  /**
+   * The folder ID(s) to duplicate
+   */
+  folderIds: string | string[]
   onSuccess?: () => void
 }
 
@@ -17,11 +20,7 @@ interface UseDuplicateFolderProps {
  * @param props - Hook configuration
  * @returns Duplicate folder handlers and state
  */
-export function useDuplicateFolder({
-  workspaceId,
-  getFolderIds,
-  onSuccess,
-}: UseDuplicateFolderProps) {
+export function useDuplicateFolder({ workspaceId, folderIds, onSuccess }: UseDuplicateFolderProps) {
   const duplicateFolderMutation = useDuplicateFolderMutation()
   const [isDuplicating, setIsDuplicating] = useState(false)
 
@@ -46,21 +45,17 @@ export function useDuplicateFolder({
       return
     }
 
+    if (!folderIds) {
+      return
+    }
+
     setIsDuplicating(true)
     try {
-      // Get fresh folder IDs at duplication time
-      const folderIdsOrId = getFolderIds()
-      if (!folderIdsOrId) {
-        return
-      }
-
-      // Normalize to array for consistent handling
-      const folderIdsToDuplicate = Array.isArray(folderIdsOrId) ? folderIdsOrId : [folderIdsOrId]
+      const folderIdsToDuplicate = Array.isArray(folderIds) ? folderIds : [folderIds]
 
       const duplicatedIds: string[] = []
       const folderStore = useFolderStore.getState()
 
-      // Duplicate each folder sequentially
       for (const folderId of folderIdsToDuplicate) {
         const folder = folderStore.getFolderById(folderId)
 
@@ -72,7 +67,6 @@ export function useDuplicateFolder({
         const siblingNames = new Set(
           folderStore.getChildFolders(folder.parentId).map((sibling) => sibling.name)
         )
-        // Avoid colliding with the original folder name
         siblingNames.add(folder.name)
 
         const duplicateName = generateDuplicateName(folder.name, siblingNames)
@@ -90,7 +84,6 @@ export function useDuplicateFolder({
         }
       }
 
-      // Clear selection after successful duplication
       const { clearSelection } = useFolderStore.getState()
       clearSelection()
 
@@ -107,7 +100,7 @@ export function useDuplicateFolder({
       setIsDuplicating(false)
     }
   }, [
-    getFolderIds,
+    folderIds,
     generateDuplicateName,
     isDuplicating,
     duplicateFolderMutation,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
index 5d39e8739e..734fed6cdf 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
@@ -13,11 +13,6 @@ interface UseDuplicateWorkflowProps {
    * Current workspace ID
    */
   workspaceId: string
-  /**
-   * Function that returns the workflow ID(s) to duplicate
-   * This function is called when duplication occurs to get fresh selection state
-   */
-  getWorkflowIds: () => string | string[]
   /**
    * Optional callback after successful duplication
    */
@@ -27,89 +22,72 @@ interface UseDuplicateWorkflowProps {
 /**
  * Hook for managing workflow duplication with optimistic updates.
  *
- * Handles:
- * - Single or bulk workflow duplication
- * - Optimistic UI updates (shows new workflow immediately)
- * - Automatic rollback on failure
- * - Loading state management
- * - Error handling and logging
- * - Clearing selection after duplication
- * - Navigation to duplicated workflow (single only)
- *
  * @param props - Hook configuration
  * @returns Duplicate workflow handlers and state
  */
-export function useDuplicateWorkflow({
-  workspaceId,
-  getWorkflowIds,
-  onSuccess,
-}: UseDuplicateWorkflowProps) {
+export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWorkflowProps) {
   const router = useRouter()
   const { workflows } = useWorkflowRegistry()
   const duplicateMutation = useDuplicateWorkflowMutation()
 
   /**
    * Duplicate the workflow(s)
+   * @param workflowIds - The workflow ID(s) to duplicate
    */
-  const handleDuplicateWorkflow = useCallback(async () => {
-    if (duplicateMutation.isPending) {
-      return
-    }
+  const handleDuplicateWorkflow = useCallback(
+    async (workflowIds: string | string[]) => {
+      if (!workflowIds || (Array.isArray(workflowIds) && workflowIds.length === 0)) {
+        return
+      }
 
-    // Get fresh workflow IDs at duplication time
-    const workflowIdsOrId = getWorkflowIds()
-    if (!workflowIdsOrId) {
-      return
-    }
+      if (duplicateMutation.isPending) {
+        return
+      }
 
-    // Normalize to array for consistent handling
-    const workflowIdsToDuplicate = Array.isArray(workflowIdsOrId)
-      ? workflowIdsOrId
-      : [workflowIdsOrId]
+      const workflowIdsToDuplicate = Array.isArray(workflowIds) ? workflowIds : [workflowIds]
 
-    const duplicatedIds: string[] = []
+      const duplicatedIds: string[] = []
 
-    try {
-      // Duplicate each workflow sequentially
-      for (const sourceId of workflowIdsToDuplicate) {
-        const sourceWorkflow = workflows[sourceId]
-        if (!sourceWorkflow) {
-          logger.warn(`Workflow ${sourceId} not found, skipping`)
-          continue
-        }
+      try {
+        for (const sourceId of workflowIdsToDuplicate) {
+          const sourceWorkflow = workflows[sourceId]
+          if (!sourceWorkflow) {
+            logger.warn(`Workflow ${sourceId} not found, skipping`)
+            continue
+          }
 
-        const result = await duplicateMutation.mutateAsync({
-          workspaceId,
-          sourceId,
-          name: `${sourceWorkflow.name} (Copy)`,
-          description: sourceWorkflow.description,
-          color: getNextWorkflowColor(),
-          folderId: sourceWorkflow.folderId,
-        })
+          const result = await duplicateMutation.mutateAsync({
+            workspaceId,
+            sourceId,
+            name: `${sourceWorkflow.name} (Copy)`,
+            description: sourceWorkflow.description,
+            color: getNextWorkflowColor(),
+            folderId: sourceWorkflow.folderId,
+          })
 
-        duplicatedIds.push(result.id)
-      }
+          duplicatedIds.push(result.id)
+        }
+
+        const { clearSelection } = useFolderStore.getState()
+        clearSelection()
 
-      // Clear selection after successful duplication
-      const { clearSelection } = useFolderStore.getState()
-      clearSelection()
+        logger.info('Workflow(s) duplicated successfully', {
+          workflowIds: workflowIdsToDuplicate,
+          duplicatedIds,
+        })
 
-      logger.info('Workflow(s) duplicated successfully', {
-        workflowIds: workflowIdsToDuplicate,
-        duplicatedIds,
-      })
+        if (duplicatedIds.length === 1) {
+          router.push(`/workspace/${workspaceId}/w/${duplicatedIds[0]}`)
+        }
 
-      // Navigate to duplicated workflow if single duplication
-      if (duplicatedIds.length === 1) {
-        router.push(`/workspace/${workspaceId}/w/${duplicatedIds[0]}`)
+        onSuccess?.()
+      } catch (error) {
+        logger.error('Error duplicating workflow(s):', { error })
+        throw error
       }
-
-      onSuccess?.()
-    } catch (error) {
-      logger.error('Error duplicating workflow(s):', { error })
-      throw error
-    }
-  }, [getWorkflowIds, duplicateMutation, workflows, workspaceId, router, onSuccess])
+    },
+    [duplicateMutation, workflows, workspaceId, router, onSuccess]
+  )
 
   return {
     isDuplicating: duplicateMutation.isPending,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workspace.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workspace.ts
index 5e66fbc532..8206395d34 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workspace.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workspace.ts
@@ -6,10 +6,9 @@ const logger = createLogger('useDuplicateWorkspace')
 
 interface UseDuplicateWorkspaceProps {
   /**
-   * Function that returns the workspace ID to duplicate
-   * This function is called when duplication occurs to get fresh state
+   * The workspace ID to duplicate
    */
-  getWorkspaceId: () => string | null
+  workspaceId: string | null
   /**
    * Optional callback after successful duplication
    */
@@ -19,17 +18,10 @@ interface UseDuplicateWorkspaceProps {
 /**
  * Hook for managing workspace duplication.
  *
- * Handles:
- * - Workspace duplication
- * - Calling duplicate API
- * - Loading state management
- * - Error handling and logging
- * - Navigation to duplicated workspace
- *
  * @param props - Hook configuration
  * @returns Duplicate workspace handlers and state
  */
-export function useDuplicateWorkspace({ getWorkspaceId, onSuccess }: UseDuplicateWorkspaceProps) {
+export function useDuplicateWorkspace({ workspaceId, onSuccess }: UseDuplicateWorkspaceProps) {
   const router = useRouter()
   const [isDuplicating, setIsDuplicating] = useState(false)
 
@@ -38,18 +30,12 @@ export function useDuplicateWorkspace({ getWorkspaceId, onSuccess }: UseDuplicat
    */
   const handleDuplicateWorkspace = useCallback(
     async (workspaceName: string) => {
-      if (isDuplicating) {
+      if (isDuplicating || !workspaceId) {
         return
       }
 
       setIsDuplicating(true)
       try {
-        // Get fresh workspace ID at duplication time
-        const workspaceId = getWorkspaceId()
-        if (!workspaceId) {
-          return
-        }
-
         const response = await fetch(`/api/workspaces/${workspaceId}/duplicate`, {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
@@ -70,7 +56,6 @@ export function useDuplicateWorkspace({ getWorkspaceId, onSuccess }: UseDuplicat
           workflowsCount: duplicatedWorkspace.workflowsCount,
         })
 
-        // Navigate to duplicated workspace
         router.push(`/workspace/${duplicatedWorkspace.id}/w`)
 
         onSuccess?.()
@@ -83,7 +68,7 @@ export function useDuplicateWorkspace({ getWorkspaceId, onSuccess }: UseDuplicat
         setIsDuplicating(false)
       }
     },
-    [getWorkspaceId, isDuplicating, router, onSuccess]
+    [workspaceId, isDuplicating, router, onSuccess]
   )
 
   return {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-folder.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-folder.ts
new file mode 100644
index 0000000000..a35da0616f
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-folder.ts
@@ -0,0 +1,237 @@
+import { useCallback, useMemo, useState } from 'react'
+import { createLogger } from '@sim/logger'
+import JSZip from 'jszip'
+import { sanitizeForExport } from '@/lib/workflows/sanitization/json-sanitizer'
+import { useFolderStore } from '@/stores/folders/store'
+import type { WorkflowFolder } from '@/stores/folders/types'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+import type { WorkflowMetadata } from '@/stores/workflows/registry/types'
+import type { Variable } from '@/stores/workflows/workflow/types'
+
+const logger = createLogger('useExportFolder')
+
+interface UseExportFolderProps {
+  /**
+   * Current workspace ID
+   */
+  workspaceId: string
+  /**
+   * The folder ID to export
+   */
+  folderId: string
+  /**
+   * Optional callback after successful export
+   */
+  onSuccess?: () => void
+}
+
+/**
+ * Recursively collects all workflow IDs within a folder and its subfolders.
+ *
+ * @param folderId - The folder ID to collect workflows from
+ * @param workflows - All workflows in the workspace
+ * @param folders - All folders in the workspace
+ * @returns Array of workflow IDs
+ */
+function collectWorkflowsInFolder(
+  folderId: string,
+  workflows: Record<string, WorkflowMetadata>,
+  folders: Record<string, WorkflowFolder>
+): string[] {
+  const workflowIds: string[] = []
+
+  for (const workflow of Object.values(workflows)) {
+    if (workflow.folderId === folderId) {
+      workflowIds.push(workflow.id)
+    }
+  }
+
+  for (const folder of Object.values(folders)) {
+    if (folder.parentId === folderId) {
+      const childWorkflowIds = collectWorkflowsInFolder(folder.id, workflows, folders)
+      workflowIds.push(...childWorkflowIds)
+    }
+  }
+
+  return workflowIds
+}
+
+/**
+ * Hook for managing folder export to ZIP.
+ *
+ * @param props - Hook configuration
+ * @returns Export folder handlers and state
+ */
+export function useExportFolder({ workspaceId, folderId, onSuccess }: UseExportFolderProps) {
+  const { workflows } = useWorkflowRegistry()
+  const { folders } = useFolderStore()
+  const [isExporting, setIsExporting] = useState(false)
+
+  /**
+   * Check if the folder has any workflows (recursively)
+   */
+  const hasWorkflows = useMemo(() => {
+    if (!folderId) return false
+    return collectWorkflowsInFolder(folderId, workflows, folders).length > 0
+  }, [folderId, workflows, folders])
+
+  /**
+   * Download file helper
+   */
+  const downloadFile = (content: Blob, filename: string, mimeType = 'application/zip') => {
+    try {
+      const blob = content instanceof Blob ? content : new Blob([content], { type: mimeType })
+      const url = URL.createObjectURL(blob)
+      const a = document.createElement('a')
+      a.href = url
+      a.download = filename
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+      URL.revokeObjectURL(url)
+    } catch (error) {
+      logger.error('Failed to download file:', error)
+    }
+  }
+
+  /**
+   * Export all workflows in the folder (including nested subfolders) to ZIP
+   */
+  const handleExportFolder = useCallback(async () => {
+    if (isExporting) {
+      return
+    }
+
+    if (!folderId) {
+      logger.warn('No folder ID provided for export')
+      return
+    }
+
+    setIsExporting(true)
+    try {
+      const folderStore = useFolderStore.getState()
+      const folder = folderStore.getFolderById(folderId)
+
+      if (!folder) {
+        logger.warn('Folder not found for export', { folderId })
+        return
+      }
+
+      const workflowIdsToExport = collectWorkflowsInFolder(folderId, workflows, folderStore.folders)
+
+      if (workflowIdsToExport.length === 0) {
+        logger.warn('No workflows found in folder to export', { folderId, folderName: folder.name })
+        return
+      }
+
+      logger.info('Starting folder export', {
+        folderId,
+        folderName: folder.name,
+        workflowCount: workflowIdsToExport.length,
+      })
+
+      const exportedWorkflows: Array<{ name: string; content: string }> = []
+
+      for (const workflowId of workflowIdsToExport) {
+        try {
+          const workflow = workflows[workflowId]
+          if (!workflow) {
+            logger.warn(`Workflow ${workflowId} not found in registry`)
+            continue
+          }
+
+          const workflowResponse = await fetch(`/api/workflows/${workflowId}`)
+          if (!workflowResponse.ok) {
+            logger.error(`Failed to fetch workflow ${workflowId}`)
+            continue
+          }
+
+          const { data: workflowData } = await workflowResponse.json()
+          if (!workflowData?.state) {
+            logger.warn(`Workflow ${workflowId} has no state`)
+            continue
+          }
+
+          const variablesResponse = await fetch(`/api/workflows/${workflowId}/variables`)
+          let workflowVariables: Record<string, Variable> | undefined
+          if (variablesResponse.ok) {
+            const variablesData = await variablesResponse.json()
+            workflowVariables = variablesData?.data
+          }
+
+          const workflowState = {
+            ...workflowData.state,
+            metadata: {
+              name: workflow.name,
+              description: workflow.description,
+              color: workflow.color,
+              exportedAt: new Date().toISOString(),
+            },
+            variables: workflowVariables,
+          }
+
+          const exportState = sanitizeForExport(workflowState)
+          const jsonString = JSON.stringify(exportState, null, 2)
+
+          exportedWorkflows.push({
+            name: workflow.name,
+            content: jsonString,
+          })
+
+          logger.info(`Workflow ${workflowId} exported successfully`)
+        } catch (error) {
+          logger.error(`Failed to export workflow ${workflowId}:`, error)
+        }
+      }
+
+      if (exportedWorkflows.length === 0) {
+        logger.warn('No workflows were successfully exported from folder', {
+          folderId,
+          folderName: folder.name,
+        })
+        return
+      }
+
+      const zip = new JSZip()
+      const seenFilenames = new Set<string>()
+
+      for (const exportedWorkflow of exportedWorkflows) {
+        const baseName = exportedWorkflow.name.replace(/[^a-z0-9]/gi, '-')
+        let filename = `${baseName}.json`
+        let counter = 1
+        while (seenFilenames.has(filename.toLowerCase())) {
+          filename = `${baseName}-${counter}.json`
+          counter++
+        }
+        seenFilenames.add(filename.toLowerCase())
+        zip.file(filename, exportedWorkflow.content)
+      }
+
+      const zipBlob = await zip.generateAsync({ type: 'blob' })
+      const zipFilename = `${folder.name.replace(/[^a-z0-9]/gi, '-')}-export.zip`
+      downloadFile(zipBlob, zipFilename, 'application/zip')
+
+      const { clearSelection } = useFolderStore.getState()
+      clearSelection()
+
+      logger.info('Folder exported successfully', {
+        folderId,
+        folderName: folder.name,
+        workflowCount: exportedWorkflows.length,
+      })
+
+      onSuccess?.()
+    } catch (error) {
+      logger.error('Error exporting folder:', { error })
+      throw error
+    } finally {
+      setIsExporting(false)
+    }
+  }, [folderId, isExporting, workflows, folders, onSuccess])
+
+  return {
+    isExporting,
+    hasWorkflows,
+    handleExportFolder,
+  }
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts
index f2a0d13f12..dbfa1b8524 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts
@@ -13,11 +13,6 @@ interface UseExportWorkflowProps {
    * Current workspace ID
    */
   workspaceId: string
-  /**
-   * Function that returns the workflow ID(s) to export
-   * This function is called when export occurs to get fresh selection state
-   */
-  getWorkflowIds: () => string | string[]
   /**
    * Optional callback after successful export
    */
@@ -27,23 +22,10 @@ interface UseExportWorkflowProps {
 /**
  * Hook for managing workflow export to JSON.
  *
- * Handles:
- * - Single or bulk workflow export
- * - Fetching workflow data and variables from API
- * - Sanitizing workflow state for export
- * - Downloading as JSON file(s)
- * - Loading state management
- * - Error handling and logging
- * - Clearing selection after export
- *
  * @param props - Hook configuration
  * @returns Export workflow handlers and state
  */
-export function useExportWorkflow({
-  workspaceId,
-  getWorkflowIds,
-  onSuccess,
-}: UseExportWorkflowProps) {
+export function useExportWorkflow({ workspaceId, onSuccess }: UseExportWorkflowProps) {
   const { workflows } = useWorkflowRegistry()
   const [isExporting, setIsExporting] = useState(false)
 
@@ -75,130 +57,129 @@ export function useExportWorkflow({
    * - Single workflow: exports as JSON file
    * - Multiple workflows: exports as ZIP file containing all JSON files
    * Fetches workflow data from API to support bulk export of non-active workflows
+   * @param workflowIds - The workflow ID(s) to export
    */
-  const handleExportWorkflow = useCallback(async () => {
-    if (isExporting) {
-      return
-    }
-
-    setIsExporting(true)
-    try {
-      // Get fresh workflow IDs at export time
-      const workflowIdsOrId = getWorkflowIds()
-      if (!workflowIdsOrId) {
+  const handleExportWorkflow = useCallback(
+    async (workflowIds: string | string[]) => {
+      if (isExporting) {
         return
       }
 
-      // Normalize to array for consistent handling
-      const workflowIdsToExport = Array.isArray(workflowIdsOrId)
-        ? workflowIdsOrId
-        : [workflowIdsOrId]
-
-      logger.info('Starting workflow export', {
-        workflowIdsToExport,
-        count: workflowIdsToExport.length,
-      })
-
-      const exportedWorkflows: Array<{ name: string; content: string }> = []
-
-      // Export each workflow
-      for (const workflowId of workflowIdsToExport) {
-        try {
-          const workflow = workflows[workflowId]
-          if (!workflow) {
-            logger.warn(`Workflow ${workflowId} not found in registry`)
-            continue
-          }
-
-          // Fetch workflow state from API
-          const workflowResponse = await fetch(`/api/workflows/${workflowId}`)
-          if (!workflowResponse.ok) {
-            logger.error(`Failed to fetch workflow ${workflowId}`)
-            continue
-          }
-
-          const { data: workflowData } = await workflowResponse.json()
-          if (!workflowData?.state) {
-            logger.warn(`Workflow ${workflowId} has no state`)
-            continue
-          }
-
-          // Fetch workflow variables (API returns Record format directly)
-          const variablesResponse = await fetch(`/api/workflows/${workflowId}/variables`)
-          let workflowVariables: Record<string, Variable> | undefined
-          if (variablesResponse.ok) {
-            const variablesData = await variablesResponse.json()
-            workflowVariables = variablesData?.data
-          }
+      if (!workflowIds || (Array.isArray(workflowIds) && workflowIds.length === 0)) {
+        return
+      }
 
-          // Prepare export state
-          const workflowState = {
-            ...workflowData.state,
-            metadata: {
+      setIsExporting(true)
+      try {
+        const workflowIdsToExport = Array.isArray(workflowIds) ? workflowIds : [workflowIds]
+
+        logger.info('Starting workflow export', {
+          workflowIdsToExport,
+          count: workflowIdsToExport.length,
+        })
+
+        const exportedWorkflows: Array<{ name: string; content: string }> = []
+
+        for (const workflowId of workflowIdsToExport) {
+          try {
+            const workflow = workflows[workflowId]
+            if (!workflow) {
+              logger.warn(`Workflow ${workflowId} not found in registry`)
+              continue
+            }
+
+            const workflowResponse = await fetch(`/api/workflows/${workflowId}`)
+            if (!workflowResponse.ok) {
+              logger.error(`Failed to fetch workflow ${workflowId}`)
+              continue
+            }
+
+            const { data: workflowData } = await workflowResponse.json()
+            if (!workflowData?.state) {
+              logger.warn(`Workflow ${workflowId} has no state`)
+              continue
+            }
+
+            const variablesResponse = await fetch(`/api/workflows/${workflowId}/variables`)
+            let workflowVariables: Record<string, Variable> | undefined
+            if (variablesResponse.ok) {
+              const variablesData = await variablesResponse.json()
+              workflowVariables = variablesData?.data
+            }
+
+            const workflowState = {
+              ...workflowData.state,
+              metadata: {
+                name: workflow.name,
+                description: workflow.description,
+                color: workflow.color,
+                exportedAt: new Date().toISOString(),
+              },
+              variables: workflowVariables,
+            }
+
+            const exportState = sanitizeForExport(workflowState)
+            const jsonString = JSON.stringify(exportState, null, 2)
+
+            exportedWorkflows.push({
               name: workflow.name,
-              description: workflow.description,
-              color: workflow.color,
-              exportedAt: new Date().toISOString(),
-            },
-            variables: workflowVariables,
-          }
+              content: jsonString,
+            })
 
-          const exportState = sanitizeForExport(workflowState)
-          const jsonString = JSON.stringify(exportState, null, 2)
-
-          exportedWorkflows.push({
-            name: workflow.name,
-            content: jsonString,
-          })
+            logger.info(`Workflow ${workflowId} exported successfully`)
+          } catch (error) {
+            logger.error(`Failed to export workflow ${workflowId}:`, error)
+          }
+        }
 
-          logger.info(`Workflow ${workflowId} exported successfully`)
-        } catch (error) {
-          logger.error(`Failed to export workflow ${workflowId}:`, error)
+        if (exportedWorkflows.length === 0) {
+          logger.warn('No workflows were successfully exported')
+          return
         }
-      }
 
-      if (exportedWorkflows.length === 0) {
-        logger.warn('No workflows were successfully exported')
-        return
-      }
+        if (exportedWorkflows.length === 1) {
+          const filename = `${exportedWorkflows[0].name.replace(/[^a-z0-9]/gi, '-')}.json`
+          downloadFile(exportedWorkflows[0].content, filename, 'application/json')
+        } else {
+          const zip = new JSZip()
+          const seenFilenames = new Set<string>()
+
+          for (const exportedWorkflow of exportedWorkflows) {
+            const baseName = exportedWorkflow.name.replace(/[^a-z0-9]/gi, '-')
+            let filename = `${baseName}.json`
+            let counter = 1
+            while (seenFilenames.has(filename.toLowerCase())) {
+              filename = `${baseName}-${counter}.json`
+              counter++
+            }
+            seenFilenames.add(filename.toLowerCase())
+            zip.file(filename, exportedWorkflow.content)
+          }
 
-      // Download as single JSON or ZIP depending on count
-      if (exportedWorkflows.length === 1) {
-        // Single workflow - download as JSON
-        const filename = `${exportedWorkflows[0].name.replace(/[^a-z0-9]/gi, '-')}.json`
-        downloadFile(exportedWorkflows[0].content, filename, 'application/json')
-      } else {
-        // Multiple workflows - download as ZIP
-        const zip = new JSZip()
-
-        for (const exportedWorkflow of exportedWorkflows) {
-          const filename = `${exportedWorkflow.name.replace(/[^a-z0-9]/gi, '-')}.json`
-          zip.file(filename, exportedWorkflow.content)
+          const zipBlob = await zip.generateAsync({ type: 'blob' })
+          const zipFilename = `workflows-export-${Date.now()}.zip`
+          downloadFile(zipBlob, zipFilename, 'application/zip')
         }
 
-        const zipBlob = await zip.generateAsync({ type: 'blob' })
-        const zipFilename = `workflows-export-${Date.now()}.zip`
-        downloadFile(zipBlob, zipFilename, 'application/zip')
+        const { clearSelection } = useFolderStore.getState()
+        clearSelection()
+
+        logger.info('Workflow(s) exported successfully', {
+          workflowIds: workflowIdsToExport,
+          count: exportedWorkflows.length,
+          format: exportedWorkflows.length === 1 ? 'JSON' : 'ZIP',
+        })
+
+        onSuccess?.()
+      } catch (error) {
+        logger.error('Error exporting workflow(s):', { error })
+        throw error
+      } finally {
+        setIsExporting(false)
       }
-
-      // Clear selection after successful export
-      const { clearSelection } = useFolderStore.getState()
-      clearSelection()
-
-      logger.info('Workflow(s) exported successfully', {
-        workflowIds: workflowIdsToExport,
-        count: exportedWorkflows.length,
-        format: exportedWorkflows.length === 1 ? 'JSON' : 'ZIP',
-      })
-
-      onSuccess?.()
-    } catch (error) {
-      logger.error('Error exporting workflow(s):', { error })
-      throw error
-    } finally {
-      setIsExporting(false)
-    }
-  }, [getWorkflowIds, isExporting, workflows, onSuccess])
+    },
+    [isExporting, workflows, onSuccess]
+  )
 
   return {
     isExporting,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workspace.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workspace.ts
index 1d25315a3e..af663c92d0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workspace.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workspace.ts
@@ -44,21 +44,18 @@ export function useExportWorkspace({ onSuccess }: UseExportWorkspaceProps = {})
       try {
         logger.info('Exporting workspace', { workspaceId })
 
-        // Fetch all workflows in workspace
         const workflowsResponse = await fetch(`/api/workflows?workspaceId=${workspaceId}`)
         if (!workflowsResponse.ok) {
           throw new Error('Failed to fetch workflows')
         }
         const { data: workflows } = await workflowsResponse.json()
 
-        // Fetch all folders in workspace
         const foldersResponse = await fetch(`/api/folders?workspaceId=${workspaceId}`)
         if (!foldersResponse.ok) {
           throw new Error('Failed to fetch folders')
         }
         const foldersData = await foldersResponse.json()
 
-        // Export each workflow
         const workflowsToExport: WorkflowExportData[] = []
 
         for (const workflow of workflows) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workflow.ts
index 5fdc654d82..a5e190f05e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workflow.ts
@@ -33,6 +33,7 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
   const createWorkflowMutation = useCreateWorkflow()
   const queryClient = useQueryClient()
   const createFolderMutation = useCreateFolder()
+  const clearDiff = useWorkflowDiffStore((state) => state.clearDiff)
   const [isImporting, setIsImporting] = useState(false)
 
   /**
@@ -48,9 +49,8 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
       }
 
       const workflowName = extractWorkflowName(content, filename)
-      useWorkflowDiffStore.getState().clearDiff()
+      clearDiff()
 
-      // Extract color from metadata
       const parsedContent = JSON.parse(content)
       const workflowColor =
         parsedContent.state?.metadata?.color || parsedContent.metadata?.color || '#3972F6'
@@ -63,7 +63,6 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
       })
       const newWorkflowId = result.id
 
-      // Update workflow color if we extracted one
       if (workflowColor !== '#3972F6') {
         await fetch(`/api/workflows/${newWorkflowId}`, {
           method: 'PATCH',
@@ -72,16 +71,13 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
         })
       }
 
-      // Save workflow state
       await fetch(`/api/workflows/${newWorkflowId}/state`, {
         method: 'PUT',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(workflowData),
       })
 
-      // Save variables if any (handle both legacy Array and current Record formats)
       if (workflowData.variables) {
-        // Convert to Record format for API (handles backwards compatibility with old Array exports)
         const variablesArray = Array.isArray(workflowData.variables)
           ? workflowData.variables
           : Object.values(workflowData.variables)
@@ -114,7 +110,7 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
       logger.info(`Imported workflow: ${workflowName}`)
       return newWorkflowId
     },
-    [createWorkflowMutation, workspaceId]
+    [clearDiff, createWorkflowMutation, workspaceId]
   )
 
   /**
@@ -134,7 +130,6 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
         const importedWorkflowIds: string[] = []
 
         if (hasZip && fileArray.length === 1) {
-          // Import from ZIP - preserves folder structure
           const zipFile = fileArray[0]
           const { workflows: extractedWorkflows, metadata } = await extractWorkflowsFromZip(zipFile)
 
@@ -149,7 +144,6 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
             try {
               let targetFolderId = importFolder.id
 
-              // Recreate nested folder structure
               if (workflow.folderPath.length > 0) {
                 const folderPathKey = workflow.folderPath.join('/')
 
@@ -187,7 +181,6 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
             }
           }
         } else if (jsonFiles.length > 0) {
-          // Import multiple JSON files or single JSON
           const extractedWorkflows = await extractWorkflowsFromFiles(jsonFiles)
 
           for (const workflow of extractedWorkflows) {
@@ -200,22 +193,21 @@ export function useImportWorkflow({ workspaceId }: UseImportWorkflowProps) {
           }
         }
 
-        // Reload workflows and folders to show newly imported ones
         await queryClient.invalidateQueries({ queryKey: workflowKeys.list(workspaceId) })
         await queryClient.invalidateQueries({ queryKey: folderKeys.list(workspaceId) })
 
         logger.info(`Import complete. Imported ${importedWorkflowIds.length} workflow(s)`)
 
-        // Navigate to first imported workflow if any
         if (importedWorkflowIds.length > 0) {
-          router.push(`/workspace/${workspaceId}/w/${importedWorkflowIds[0]}`)
+          router.push(
+            `/workspace/${workspaceId}/w/${importedWorkflowIds[importedWorkflowIds.length - 1]}`
+          )
         }
       } catch (error) {
         logger.error('Failed to import workflows:', error)
       } finally {
         setIsImporting(false)
 
-        // Reset file input
         if (event.target) {
           event.target.value = ''
         }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts
index d62165f8f2..d79add0c23 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-import-workspace.ts
@@ -21,15 +21,6 @@ interface UseImportWorkspaceProps {
 /**
  * Hook for managing workspace import from ZIP files.
  *
- * Handles:
- * - Extracting workflows from ZIP file
- * - Creating new workspace
- * - Recreating folder structure
- * - Importing all workflows with states and variables
- * - Navigation to imported workspace
- * - Loading state management
- * - Error handling and logging
- *
  * @param props - Hook configuration
  * @returns Import workspace handlers and state
  */
@@ -37,6 +28,7 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
   const router = useRouter()
   const [isImporting, setIsImporting] = useState(false)
   const createFolderMutation = useCreateFolder()
+  const clearDiff = useWorkflowDiffStore((state) => state.clearDiff)
 
   /**
    * Handle workspace import from ZIP file
@@ -56,7 +48,6 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
       try {
         logger.info('Importing workspace from ZIP')
 
-        // Extract workflows from ZIP
         const { workflows: extractedWorkflows, metadata } = await extractWorkflowsFromZip(zipFile)
 
         if (extractedWorkflows.length === 0) {
@@ -64,7 +55,6 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
           return
         }
 
-        // Create new workspace
         const workspaceName = metadata?.workspaceName || zipFile.name.replace(/\.zip$/i, '')
         const createResponse = await fetch('/api/workspaces', {
           method: 'POST',
@@ -81,7 +71,6 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
 
         const folderMap = new Map<string, string>()
 
-        // Import workflows
         for (const workflow of extractedWorkflows) {
           try {
             const { data: workflowData, errors: parseErrors } = parseWorkflowJson(workflow.content)
@@ -91,7 +80,6 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
               continue
             }
 
-            // Recreate folder structure
             let targetFolderId: string | null = null
             if (workflow.folderPath.length > 0) {
               const folderPathKey = workflow.folderPath.join('/')
@@ -120,14 +108,12 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
             }
 
             const workflowName = extractWorkflowName(workflow.content, workflow.name)
-            useWorkflowDiffStore.getState().clearDiff()
+            clearDiff()
 
-            // Extract color from workflow metadata
             const parsedContent = JSON.parse(workflow.content)
             const workflowColor =
               parsedContent.state?.metadata?.color || parsedContent.metadata?.color || '#3972F6'
 
-            // Create workflow
             const createWorkflowResponse = await fetch('/api/workflows', {
               method: 'POST',
               headers: { 'Content-Type': 'application/json' },
@@ -147,7 +133,6 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
 
             const newWorkflow = await createWorkflowResponse.json()
 
-            // Save workflow state
             const stateResponse = await fetch(`/api/workflows/${newWorkflow.id}/state`, {
               method: 'PUT',
               headers: { 'Content-Type': 'application/json' },
@@ -159,9 +144,7 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
               continue
             }
 
-            // Save variables if any (handle both legacy Array and current Record formats)
             if (workflowData.variables) {
-              // Convert to Record format for API (handles backwards compatibility with old Array exports)
               const variablesArray = Array.isArray(workflowData.variables)
                 ? workflowData.variables
                 : Object.values(workflowData.variables)
@@ -199,7 +182,6 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
 
         logger.info(`Workspace import complete. Imported ${extractedWorkflows.length} workflows`)
 
-        // Navigate to new workspace
         router.push(`/workspace/${newWorkspace.id}/w`)
 
         onSuccess?.()
@@ -210,7 +192,7 @@ export function useImportWorkspace({ onSuccess }: UseImportWorkspaceProps = {})
         setIsImporting(false)
       }
     },
-    [isImporting, router, onSuccess, createFolderMutation]
+    [isImporting, router, onSuccess, createFolderMutation, clearDiff]
   )
 
   return {
diff --git a/apps/sim/background/webhook-execution.ts b/apps/sim/background/webhook-execution.ts
index b0447e8a00..55cb3e0300 100644
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -92,7 +92,6 @@ export type WebhookExecutionPayload = {
   headers: Record<string, string>
   path: string
   blockId?: string
-  testMode?: boolean
   executionTarget?: 'deployed' | 'live'
   credentialId?: string
   credentialAccountUserId?: string
@@ -318,7 +317,7 @@ async function executeWebhookJobInternal(
         workspaceId,
         variables: {},
         triggerData: {
-          isTest: payload.testMode === true,
+          isTest: false,
           executionTarget: payload.executionTarget || 'deployed',
         },
         deploymentVersionId,
@@ -376,7 +375,7 @@ async function executeWebhookJobInternal(
         workspaceId,
         variables: {},
         triggerData: {
-          isTest: payload.testMode === true,
+          isTest: false,
           executionTarget: payload.executionTarget || 'deployed',
         },
         deploymentVersionId,
@@ -595,7 +594,7 @@ async function executeWebhookJobInternal(
         workspaceId: errorWorkspaceId,
         variables: {},
         triggerData: {
-          isTest: payload.testMode === true,
+          isTest: false,
           executionTarget: payload.executionTarget || 'deployed',
         },
         deploymentVersionId,
diff --git a/apps/sim/blocks/blocks/cursor.ts b/apps/sim/blocks/blocks/cursor.ts
index a57856b1a9..3953549cd0 100644
--- a/apps/sim/blocks/blocks/cursor.ts
+++ b/apps/sim/blocks/blocks/cursor.ts
@@ -1,11 +1,12 @@
 import { CursorIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { CursorResponse } from '@/tools/cursor/types'
 
 export const CursorBlock: BlockConfig<CursorResponse> = {
   type: 'cursor',
-  name: 'Cursor',
+  name: 'Cursor (Legacy)',
   description: 'Launch and manage Cursor cloud agents to work on GitHub repositories',
   longDescription:
     'Interact with Cursor Cloud Agents API to launch AI agents that can work on your GitHub repositories. Supports launching agents, adding follow-up instructions, checking status, viewing conversations, and managing agent lifecycle.',
@@ -14,6 +15,7 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
   bgColor: '#1E1E1E',
   icon: CursorIcon,
   authMode: AuthMode.ApiKey,
+  hideFromToolbar: true,
   subBlocks: [
     {
       id: 'operation',
@@ -169,3 +171,42 @@ export const CursorBlock: BlockConfig<CursorResponse> = {
     metadata: { type: 'json', description: 'Response metadata' },
   },
 }
+
+export const CursorV2Block: BlockConfig<CursorResponse> = {
+  ...CursorBlock,
+  type: 'cursor_v2',
+  name: 'Cursor',
+  hideFromToolbar: false,
+  tools: {
+    ...CursorBlock.tools,
+    access: [
+      'cursor_list_agents_v2',
+      'cursor_get_agent_v2',
+      'cursor_get_conversation_v2',
+      'cursor_launch_agent_v2',
+      'cursor_add_followup_v2',
+      'cursor_stop_agent_v2',
+      'cursor_delete_agent_v2',
+    ],
+    config: {
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => params.operation || 'cursor_launch_agent',
+        suffix: '_v2',
+        fallbackToolId: 'cursor_launch_agent_v2',
+      }),
+    },
+  },
+  outputs: {
+    id: { type: 'string', description: 'Agent identifier' },
+    url: { type: 'string', description: 'Agent URL (launch operation)' },
+    name: { type: 'string', description: 'Agent name' },
+    status: { type: 'string', description: 'Agent status' },
+    source: { type: 'json', description: 'Agent source repository info' },
+    target: { type: 'json', description: 'Agent target branch/PR info' },
+    summary: { type: 'string', description: 'Agent summary' },
+    createdAt: { type: 'string', description: 'Agent creation timestamp' },
+    agents: { type: 'json', description: 'Array of agent objects (list operation)' },
+    nextCursor: { type: 'string', description: 'Pagination cursor (list operation)' },
+    messages: { type: 'json', description: 'Conversation messages (get conversation operation)' },
+  },
+}
diff --git a/apps/sim/blocks/blocks/dynamodb.ts b/apps/sim/blocks/blocks/dynamodb.ts
index 2579c55196..11e51c7b45 100644
--- a/apps/sim/blocks/blocks/dynamodb.ts
+++ b/apps/sim/blocks/blocks/dynamodb.ts
@@ -1,13 +1,13 @@
 import { DynamoDBIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
-import type { DynamoDBResponse } from '@/tools/dynamodb/types'
+import type { DynamoDBIntrospectResponse, DynamoDBResponse } from '@/tools/dynamodb/types'
 
-export const DynamoDBBlock: BlockConfig<DynamoDBResponse> = {
+export const DynamoDBBlock: BlockConfig<DynamoDBResponse | DynamoDBIntrospectResponse> = {
   type: 'dynamodb',
   name: 'Amazon DynamoDB',
   description: 'Connect to Amazon DynamoDB',
   longDescription:
-    'Integrate Amazon DynamoDB into workflows. Supports Get, Put, Query, Scan, Update, and Delete operations on DynamoDB tables.',
+    'Integrate Amazon DynamoDB into workflows. Supports Get, Put, Query, Scan, Update, Delete, and Introspect operations on DynamoDB tables.',
   docsLink: 'https://docs.sim.ai/tools/dynamodb',
   category: 'tools',
   bgColor: 'linear-gradient(45deg, #2E27AD 0%, #527FFF 100%)',
@@ -24,6 +24,7 @@ export const DynamoDBBlock: BlockConfig<DynamoDBResponse> = {
         { label: 'Scan', id: 'scan' },
         { label: 'Update Item', id: 'update' },
         { label: 'Delete Item', id: 'delete' },
+        { label: 'Introspect', id: 'introspect' },
       ],
       value: () => 'get',
     },
@@ -56,6 +57,19 @@ export const DynamoDBBlock: BlockConfig<DynamoDBResponse> = {
       type: 'short-input',
       placeholder: 'my-table',
       required: true,
+      condition: {
+        field: 'operation',
+        value: 'introspect',
+        not: true,
+      },
+    },
+    {
+      id: 'tableName',
+      title: 'Table Name (Optional)',
+      type: 'short-input',
+      placeholder: 'Leave empty to list all tables',
+      required: false,
+      condition: { field: 'operation', value: 'introspect' },
     },
     // Key field for get, update, delete operations
     {
@@ -420,6 +434,7 @@ Return ONLY the expression - no explanations.`,
       'dynamodb_scan',
       'dynamodb_update',
       'dynamodb_delete',
+      'dynamodb_introspect',
     ],
     config: {
       tool: (params) => {
@@ -436,6 +451,8 @@ Return ONLY the expression - no explanations.`,
             return 'dynamodb_update'
           case 'delete':
             return 'dynamodb_delete'
+          case 'introspect':
+            return 'dynamodb_introspect'
           default:
             throw new Error(`Invalid DynamoDB operation: ${params.operation}`)
         }
@@ -552,5 +569,13 @@ Return ONLY the expression - no explanations.`,
       type: 'number',
       description: 'Number of items returned',
     },
+    tables: {
+      type: 'array',
+      description: 'List of table names from introspect operation',
+    },
+    tableDetails: {
+      type: 'json',
+      description: 'Detailed schema information for a specific table from introspect operation',
+    },
   },
 }
diff --git a/apps/sim/blocks/blocks/elasticsearch.ts b/apps/sim/blocks/blocks/elasticsearch.ts
index 4a04f7ade7..25796eb742 100644
--- a/apps/sim/blocks/blocks/elasticsearch.ts
+++ b/apps/sim/blocks/blocks/elasticsearch.ts
@@ -33,6 +33,7 @@ export const ElasticsearchBlock: BlockConfig<ElasticsearchResponse> = {
         { label: 'Create Index', id: 'elasticsearch_create_index' },
         { label: 'Delete Index', id: 'elasticsearch_delete_index' },
         { label: 'Get Index Info', id: 'elasticsearch_get_index' },
+        { label: 'List Indices', id: 'elasticsearch_list_indices' },
         // Cluster Operations
         { label: 'Cluster Health', id: 'elasticsearch_cluster_health' },
         { label: 'Cluster Stats', id: 'elasticsearch_cluster_stats' },
@@ -452,6 +453,7 @@ Return ONLY valid JSON - no explanations, no markdown code blocks.`,
       'elasticsearch_get_index',
       'elasticsearch_cluster_health',
       'elasticsearch_cluster_stats',
+      'elasticsearch_list_indices',
     ],
     config: {
       tool: (params) => {
diff --git a/apps/sim/blocks/blocks/github.ts b/apps/sim/blocks/blocks/github.ts
index c0c44b4f38..9b44dcdf01 100644
--- a/apps/sim/blocks/blocks/github.ts
+++ b/apps/sim/blocks/blocks/github.ts
@@ -1,12 +1,13 @@
 import { GithubIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { GitHubResponse } from '@/tools/github/types'
 import { getTrigger } from '@/triggers'
 
 export const GitHubBlock: BlockConfig<GitHubResponse> = {
   type: 'github',
-  name: 'GitHub',
+  name: 'GitHub (Legacy)',
   description: 'Interact with GitHub or trigger workflows from GitHub events',
   authMode: AuthMode.ApiKey,
   longDescription:
@@ -16,6 +17,7 @@ export const GitHubBlock: BlockConfig<GitHubResponse> = {
   bgColor: '#181C1E',
   icon: GithubIcon,
   triggerAllowed: true,
+  hideFromToolbar: true,
   subBlocks: [
     {
       id: 'operation',
@@ -1335,3 +1337,45 @@ export const GitHubBlock: BlockConfig<GitHubResponse> = {
     ],
   },
 }
+
+export const GitHubV2Block: BlockConfig<GitHubResponse> = {
+  ...GitHubBlock,
+  type: 'github_v2',
+  name: 'GitHub',
+  hideFromToolbar: false,
+  tools: {
+    ...GitHubBlock.tools,
+    access: (GitHubBlock.tools?.access || []).map((toolId) => `${toolId}_v2`),
+    config: {
+      ...GitHubBlock.tools?.config,
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => (GitHubBlock.tools?.config as any)?.tool(params),
+        suffix: '_v2',
+        fallbackToolId: 'github_create_issue_v2',
+      }),
+      params: (GitHubBlock.tools?.config as any)?.params,
+    },
+  },
+  outputs: {
+    data: { type: 'json', description: 'Operation result data (API-aligned)' },
+
+    // Trigger outputs (unchanged)
+    action: { type: 'string', description: 'The action that was performed' },
+    event_type: { type: 'string', description: 'Type of GitHub event' },
+    repository: { type: 'string', description: 'Repository full name' },
+    repository_name: { type: 'string', description: 'Repository name only' },
+    repository_owner: { type: 'string', description: 'Repository owner username' },
+    sender: { type: 'string', description: 'Username of the user who triggered the event' },
+    sender_id: { type: 'string', description: 'User ID of the sender' },
+    ref: { type: 'string', description: 'Git reference (for push events)' },
+    before: { type: 'string', description: 'SHA of the commit before the push' },
+    after: { type: 'string', description: 'SHA of the commit after the push' },
+    commits: { type: 'string', description: 'Array of commit objects (for push events)' },
+    pull_request: { type: 'string', description: 'Pull request object (for pull_request events)' },
+    issue: { type: 'string', description: 'Issue object (for issues events)' },
+    comment: { type: 'string', description: 'Comment object (for comment events)' },
+    branch: { type: 'string', description: 'Branch name extracted from ref' },
+    commit_message: { type: 'string', description: 'Latest commit message' },
+    commit_author: { type: 'string', description: 'Author of the latest commit' },
+  },
+}
diff --git a/apps/sim/blocks/blocks/gmail.ts b/apps/sim/blocks/blocks/gmail.ts
index a8b3453647..f5543b8351 100644
--- a/apps/sim/blocks/blocks/gmail.ts
+++ b/apps/sim/blocks/blocks/gmail.ts
@@ -1,12 +1,44 @@
 import { GmailIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { GmailToolResponse } from '@/tools/gmail/types'
 import { getTrigger } from '@/triggers'
 
+function selectGmailToolId(params: Record<string, any>): string {
+  switch (params.operation) {
+    case 'send_gmail':
+      return 'gmail_send'
+    case 'draft_gmail':
+      return 'gmail_draft'
+    case 'search_gmail':
+      return 'gmail_search'
+    case 'read_gmail':
+      return 'gmail_read'
+    case 'move_gmail':
+      return 'gmail_move'
+    case 'mark_read_gmail':
+      return 'gmail_mark_read'
+    case 'mark_unread_gmail':
+      return 'gmail_mark_unread'
+    case 'archive_gmail':
+      return 'gmail_archive'
+    case 'unarchive_gmail':
+      return 'gmail_unarchive'
+    case 'delete_gmail':
+      return 'gmail_delete'
+    case 'add_label_gmail':
+      return 'gmail_add_label'
+    case 'remove_label_gmail':
+      return 'gmail_remove_label'
+    default:
+      throw new Error(`Invalid Gmail operation: ${params.operation}`)
+  }
+}
+
 export const GmailBlock: BlockConfig<GmailToolResponse> = {
   type: 'gmail',
-  name: 'Gmail',
+  name: 'Gmail (Legacy)',
   description: 'Send, read, search, and move Gmail messages or trigger workflows from Gmail events',
   authMode: AuthMode.OAuth,
   longDescription:
@@ -15,6 +47,7 @@ export const GmailBlock: BlockConfig<GmailToolResponse> = {
   category: 'tools',
   bgColor: '#E0E0E0',
   icon: GmailIcon,
+  hideFromToolbar: true,
   triggerAllowed: true,
   subBlocks: [
     // Operation selector
@@ -376,36 +409,7 @@ Return ONLY the search query - no explanations, no extra text.`,
       'gmail_remove_label',
     ],
     config: {
-      tool: (params) => {
-        switch (params.operation) {
-          case 'send_gmail':
-            return 'gmail_send'
-          case 'draft_gmail':
-            return 'gmail_draft'
-          case 'search_gmail':
-            return 'gmail_search'
-          case 'read_gmail':
-            return 'gmail_read'
-          case 'move_gmail':
-            return 'gmail_move'
-          case 'mark_read_gmail':
-            return 'gmail_mark_read'
-          case 'mark_unread_gmail':
-            return 'gmail_mark_unread'
-          case 'archive_gmail':
-            return 'gmail_archive'
-          case 'unarchive_gmail':
-            return 'gmail_unarchive'
-          case 'delete_gmail':
-            return 'gmail_delete'
-          case 'add_label_gmail':
-            return 'gmail_add_label'
-          case 'remove_label_gmail':
-            return 'gmail_remove_label'
-          default:
-            throw new Error(`Invalid Gmail operation: ${params.operation}`)
-        }
-      },
+      tool: selectGmailToolId,
       params: (params) => {
         const {
           credential,
@@ -539,3 +543,59 @@ Return ONLY the search query - no explanations, no extra text.`,
     available: ['gmail_poller'],
   },
 }
+
+export const GmailV2Block: BlockConfig<GmailToolResponse> = {
+  ...GmailBlock,
+  type: 'gmail_v2',
+  name: 'Gmail',
+  hideFromToolbar: false,
+  tools: {
+    ...GmailBlock.tools,
+    access: [
+      'gmail_send_v2',
+      'gmail_draft_v2',
+      'gmail_read_v2',
+      'gmail_search_v2',
+      'gmail_move_v2',
+      'gmail_mark_read_v2',
+      'gmail_mark_unread_v2',
+      'gmail_archive_v2',
+      'gmail_unarchive_v2',
+      'gmail_delete_v2',
+      'gmail_add_label_v2',
+      'gmail_remove_label_v2',
+    ],
+    config: {
+      ...GmailBlock.tools?.config,
+      tool: createVersionedToolSelector({
+        baseToolSelector: selectGmailToolId,
+        suffix: '_v2',
+        fallbackToolId: 'gmail_send_v2',
+      }),
+    },
+  },
+  outputs: {
+    // V2 tool outputs (API-aligned)
+    id: { type: 'string', description: 'Gmail message ID' },
+    threadId: { type: 'string', description: 'Gmail thread ID' },
+    labelIds: { type: 'array', description: 'Email label IDs' },
+    from: { type: 'string', description: 'Sender' },
+    to: { type: 'string', description: 'To' },
+    subject: { type: 'string', description: 'Subject' },
+    date: { type: 'string', description: 'Date' },
+    body: { type: 'string', description: 'Email body text (best-effort)' },
+    results: { type: 'json', description: 'Search/read summary results' },
+    attachments: { type: 'json', description: 'Downloaded attachments (if enabled)' },
+
+    // Trigger outputs (unchanged)
+    email_id: { type: 'string', description: 'Gmail message ID' },
+    thread_id: { type: 'string', description: 'Gmail thread ID' },
+    cc: { type: 'string', description: 'CC recipients (comma-separated)' },
+    body_text: { type: 'string', description: 'Plain text email body' },
+    body_html: { type: 'string', description: 'HTML email body' },
+    labels: { type: 'string', description: 'Email labels (comma-separated)' },
+    has_attachments: { type: 'boolean', description: 'Whether email has attachments' },
+    raw_email: { type: 'json', description: 'Complete raw email data from Gmail API (if enabled)' },
+    timestamp: { type: 'string', description: 'Event timestamp' },
+  },
+}
diff --git a/apps/sim/blocks/blocks/google_calendar.ts b/apps/sim/blocks/blocks/google_calendar.ts
index 9d919f6b91..4f09c65d26 100644
--- a/apps/sim/blocks/blocks/google_calendar.ts
+++ b/apps/sim/blocks/blocks/google_calendar.ts
@@ -1,11 +1,12 @@
 import { GoogleCalendarIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { GoogleCalendarResponse } from '@/tools/google_calendar/types'
 
 export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
   type: 'google_calendar',
-  name: 'Google Calendar',
+  name: 'Google Calendar (Legacy)',
   description: 'Manage Google Calendar events',
   authMode: AuthMode.OAuth,
   longDescription:
@@ -14,6 +15,7 @@ export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
   category: 'tools',
   bgColor: '#E0E0E0',
   icon: GoogleCalendarIcon,
+  hideFromToolbar: true,
   subBlocks: [
     {
       id: 'operation',
@@ -385,3 +387,46 @@ Return ONLY the natural language event text - no explanations.`,
     metadata: { type: 'json', description: 'Event metadata' },
   },
 }
+
+export const GoogleCalendarV2Block: BlockConfig<GoogleCalendarResponse> = {
+  ...GoogleCalendarBlock,
+  type: 'google_calendar_v2',
+  name: 'Google Calendar',
+  hideFromToolbar: false,
+  tools: {
+    ...GoogleCalendarBlock.tools,
+    access: [
+      'google_calendar_create_v2',
+      'google_calendar_list_v2',
+      'google_calendar_get_v2',
+      'google_calendar_quick_add_v2',
+      'google_calendar_invite_v2',
+    ],
+    config: {
+      ...GoogleCalendarBlock.tools?.config,
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => `google_calendar_${params.operation || 'create'}`,
+        suffix: '_v2',
+        fallbackToolId: 'google_calendar_create_v2',
+      }),
+      params: GoogleCalendarBlock.tools?.config?.params,
+    },
+  },
+  outputs: {
+    id: { type: 'string', description: 'Event ID' },
+    htmlLink: { type: 'string', description: 'Event link' },
+    status: { type: 'string', description: 'Event status' },
+    summary: { type: 'string', description: 'Event title' },
+    description: { type: 'string', description: 'Event description' },
+    location: { type: 'string', description: 'Event location' },
+    start: { type: 'json', description: 'Event start' },
+    end: { type: 'json', description: 'Event end' },
+    attendees: { type: 'json', description: 'Event attendees' },
+    creator: { type: 'json', description: 'Event creator' },
+    organizer: { type: 'json', description: 'Event organizer' },
+    events: { type: 'json', description: 'List of events (list operation)' },
+    nextPageToken: { type: 'string', description: 'Next page token' },
+    nextSyncToken: { type: 'string', description: 'Next sync token' },
+    timeZone: { type: 'string', description: 'Calendar time zone' },
+  },
+}
diff --git a/apps/sim/blocks/blocks/intercom.ts b/apps/sim/blocks/blocks/intercom.ts
index 1f9ad316d7..efbc8e876a 100644
--- a/apps/sim/blocks/blocks/intercom.ts
+++ b/apps/sim/blocks/blocks/intercom.ts
@@ -1,10 +1,12 @@
 import { IntercomIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 
 export const IntercomBlock: BlockConfig = {
   type: 'intercom',
-  name: 'Intercom',
+  name: 'Intercom (Legacy)',
+  hideFromToolbar: true,
   description: 'Manage contacts, companies, conversations, tickets, and messages in Intercom',
   longDescription:
     'Integrate Intercom into the workflow. Can create, get, update, list, search, and delete contacts; create, get, and list companies; get, list, reply, and search conversations; create and get tickets; and create messages.',
@@ -937,3 +939,108 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
     output: { type: 'json', description: 'Operation result data' },
   },
 }
+
+export const IntercomV2Block: BlockConfig = {
+  ...IntercomBlock,
+  type: 'intercom_v2',
+  name: 'Intercom',
+  hideFromToolbar: false,
+  tools: {
+    ...IntercomBlock.tools,
+    access: [
+      'intercom_create_contact_v2',
+      'intercom_get_contact_v2',
+      'intercom_update_contact_v2',
+      'intercom_list_contacts_v2',
+      'intercom_search_contacts_v2',
+      'intercom_delete_contact_v2',
+      'intercom_create_company_v2',
+      'intercom_get_company_v2',
+      'intercom_list_companies_v2',
+      'intercom_get_conversation_v2',
+      'intercom_list_conversations_v2',
+      'intercom_reply_conversation_v2',
+      'intercom_search_conversations_v2',
+      'intercom_create_ticket_v2',
+      'intercom_get_ticket_v2',
+      'intercom_create_message_v2',
+    ],
+    config: {
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => {
+          switch (params.operation) {
+            case 'create_contact':
+              return 'intercom_create_contact'
+            case 'get_contact':
+              return 'intercom_get_contact'
+            case 'update_contact':
+              return 'intercom_update_contact'
+            case 'list_contacts':
+              return 'intercom_list_contacts'
+            case 'search_contacts':
+              return 'intercom_search_contacts'
+            case 'delete_contact':
+              return 'intercom_delete_contact'
+            case 'create_company':
+              return 'intercom_create_company'
+            case 'get_company':
+              return 'intercom_get_company'
+            case 'list_companies':
+              return 'intercom_list_companies'
+            case 'get_conversation':
+              return 'intercom_get_conversation'
+            case 'list_conversations':
+              return 'intercom_list_conversations'
+            case 'reply_conversation':
+              return 'intercom_reply_conversation'
+            case 'search_conversations':
+              return 'intercom_search_conversations'
+            case 'create_ticket':
+              return 'intercom_create_ticket'
+            case 'get_ticket':
+              return 'intercom_get_ticket'
+            case 'create_message':
+              return 'intercom_create_message'
+            default:
+              return 'intercom_create_contact'
+          }
+        },
+        suffix: '_v2',
+        fallbackToolId: 'intercom_create_contact_v2',
+      }),
+      params: IntercomBlock.tools!.config!.params,
+    },
+  },
+  outputs: {
+    contact: {
+      type: 'json',
+      description:
+        'Contact object with id, type, role, email, phone, name, external_id, created_at, updated_at',
+    },
+    contactId: { type: 'string', description: 'ID of the contact (for create/update operations)' },
+    contacts: { type: 'array', description: 'Array of contacts (for list/search operations)' },
+    company: { type: 'json', description: 'Company object with id, company_id, name, website' },
+    companyId: { type: 'string', description: 'ID of the company (for create operations)' },
+    companies: { type: 'array', description: 'Array of companies (for list operations)' },
+    conversation: { type: 'json', description: 'Conversation object with id, title, state, open' },
+    conversationId: {
+      type: 'string',
+      description: 'ID of the conversation (for reply operations)',
+    },
+    conversations: {
+      type: 'array',
+      description: 'Array of conversations (for list/search operations)',
+    },
+    ticket: { type: 'json', description: 'Ticket object with id, ticket_id, ticket_state' },
+    ticketId: { type: 'string', description: 'ID of the ticket (for create operations)' },
+    message: { type: 'json', description: 'Message object with id, type' },
+    messageId: { type: 'string', description: 'ID of the message (for create operations)' },
+    total_count: { type: 'number', description: 'Total count (for list/search operations)' },
+    pages: { type: 'json', description: 'Pagination info with page, per_page, total_pages' },
+    id: { type: 'string', description: 'ID of the deleted item (for delete operations)' },
+    deleted: {
+      type: 'boolean',
+      description: 'Whether the item was deleted (for delete operations)',
+    },
+  },
+}
diff --git a/apps/sim/blocks/blocks/lemlist.ts b/apps/sim/blocks/blocks/lemlist.ts
new file mode 100644
index 0000000000..21dd7b212e
--- /dev/null
+++ b/apps/sim/blocks/blocks/lemlist.ts
@@ -0,0 +1,240 @@
+import { LemlistIcon } from '@/components/icons'
+import { AuthMode, type BlockConfig } from '@/blocks/types'
+import type { LemlistResponse } from '@/tools/lemlist/types'
+import { getTrigger } from '@/triggers'
+
+export const LemlistBlock: BlockConfig<LemlistResponse> = {
+  type: 'lemlist',
+  name: 'Lemlist',
+  description: 'Manage outreach activities, leads, and send emails via Lemlist',
+  authMode: AuthMode.ApiKey,
+  longDescription:
+    'Integrate Lemlist into your workflow. Retrieve campaign activities and replies, get lead information, and send emails through the Lemlist inbox.',
+  docsLink: 'https://docs.sim.ai/tools/lemlist',
+  category: 'tools',
+  bgColor: '#316BFF',
+  icon: LemlistIcon,
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Get Activities', id: 'get_activities' },
+        { label: 'Get Lead', id: 'get_lead' },
+        { label: 'Send Email', id: 'send_email' },
+      ],
+      value: () => 'get_activities',
+    },
+    {
+      id: 'type',
+      title: 'Activity Type',
+      type: 'dropdown',
+      options: [
+        { label: 'All', id: '' },
+        { label: 'Email Opened', id: 'emailOpened' },
+        { label: 'Email Clicked', id: 'emailClicked' },
+        { label: 'Email Replied', id: 'emailReplied' },
+        { label: 'Email Sent', id: 'emailsSent' },
+        { label: 'Email Bounced', id: 'emailsBounced' },
+        { label: 'Paused', id: 'paused' },
+        { label: 'Interested', id: 'interested' },
+        { label: 'Not Interested', id: 'notInterested' },
+      ],
+      value: () => '',
+      condition: { field: 'operation', value: 'get_activities' },
+    },
+    {
+      id: 'campaignId',
+      title: 'Campaign ID',
+      type: 'short-input',
+      placeholder: 'Filter by campaign ID (optional)',
+      condition: { field: 'operation', value: 'get_activities' },
+    },
+    {
+      id: 'filterLeadId',
+      title: 'Lead ID',
+      type: 'short-input',
+      placeholder: 'Filter by lead ID (optional)',
+      condition: { field: 'operation', value: 'get_activities' },
+    },
+    {
+      id: 'limit',
+      title: 'Limit',
+      type: 'short-input',
+      placeholder: '100 (max)',
+      condition: { field: 'operation', value: 'get_activities' },
+    },
+    {
+      id: 'offset',
+      title: 'Offset',
+      type: 'short-input',
+      placeholder: '0',
+      condition: { field: 'operation', value: 'get_activities' },
+    },
+    {
+      id: 'email',
+      title: 'Email Address',
+      type: 'short-input',
+      placeholder: 'Enter lead email address',
+      condition: { field: 'operation', value: 'get_lead' },
+      mode: 'basic',
+      canonicalParamId: 'leadIdentifier',
+    },
+    {
+      id: 'leadIdLookup',
+      title: 'Lead ID',
+      type: 'short-input',
+      placeholder: 'Enter lead ID',
+      condition: { field: 'operation', value: 'get_lead' },
+      mode: 'advanced',
+      canonicalParamId: 'leadIdentifier',
+    },
+    {
+      id: 'sendUserId',
+      title: 'Sender User ID',
+      type: 'short-input',
+      placeholder: 'Your Lemlist user ID',
+      required: { field: 'operation', value: 'send_email' },
+      condition: { field: 'operation', value: 'send_email' },
+    },
+    {
+      id: 'sendUserEmail',
+      title: 'Sender Email',
+      type: 'short-input',
+      placeholder: 'Your email address',
+      required: { field: 'operation', value: 'send_email' },
+      condition: { field: 'operation', value: 'send_email' },
+    },
+    {
+      id: 'sendUserMailboxId',
+      title: 'Mailbox ID',
+      type: 'short-input',
+      placeholder: 'Your mailbox ID',
+      required: { field: 'operation', value: 'send_email' },
+      condition: { field: 'operation', value: 'send_email' },
+    },
+    {
+      id: 'contactId',
+      title: 'Contact ID',
+      type: 'short-input',
+      placeholder: 'Recipient contact ID',
+      required: { field: 'operation', value: 'send_email' },
+      condition: { field: 'operation', value: 'send_email' },
+    },
+    {
+      id: 'leadId',
+      title: 'Lead ID',
+      type: 'short-input',
+      placeholder: 'Associated lead ID',
+      required: { field: 'operation', value: 'send_email' },
+      condition: { field: 'operation', value: 'send_email' },
+    },
+    {
+      id: 'subject',
+      title: 'Subject',
+      type: 'short-input',
+      placeholder: 'Email subject',
+      required: { field: 'operation', value: 'send_email' },
+      condition: { field: 'operation', value: 'send_email' },
+    },
+    {
+      id: 'message',
+      title: 'Message',
+      type: 'long-input',
+      placeholder: 'Email message body (HTML supported)',
+      required: { field: 'operation', value: 'send_email' },
+      condition: { field: 'operation', value: 'send_email' },
+    },
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input',
+      required: true,
+      placeholder: 'Enter your Lemlist API key',
+      password: true,
+    },
+    // Trigger subBlocks - first trigger has dropdown, others don't
+    ...getTrigger('lemlist_email_replied').subBlocks,
+    ...getTrigger('lemlist_linkedin_replied').subBlocks,
+    ...getTrigger('lemlist_interested').subBlocks,
+    ...getTrigger('lemlist_not_interested').subBlocks,
+    ...getTrigger('lemlist_email_opened').subBlocks,
+    ...getTrigger('lemlist_email_clicked').subBlocks,
+    ...getTrigger('lemlist_email_bounced').subBlocks,
+    ...getTrigger('lemlist_email_sent').subBlocks,
+    ...getTrigger('lemlist_webhook').subBlocks,
+  ],
+  tools: {
+    access: ['lemlist_get_activities', 'lemlist_get_lead', 'lemlist_send_email'],
+    config: {
+      tool: (params) => {
+        if (params.limit) {
+          params.limit = Number(params.limit)
+        }
+        if (params.offset) {
+          params.offset = Number(params.offset)
+        }
+        // Map filterLeadId to leadId for get_activities tool
+        if (params.filterLeadId) {
+          params.leadId = params.filterLeadId
+        }
+
+        switch (params.operation) {
+          case 'get_activities':
+            return 'lemlist_get_activities'
+          case 'get_lead':
+            return 'lemlist_get_lead'
+          case 'send_email':
+            return 'lemlist_send_email'
+          default:
+            return 'lemlist_get_activities'
+        }
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Operation to perform' },
+    apiKey: { type: 'string', description: 'Lemlist API key' },
+    type: { type: 'string', description: 'Activity type filter' },
+    campaignId: { type: 'string', description: 'Campaign ID filter' },
+    filterLeadId: { type: 'string', description: 'Lead ID filter for activities' },
+    leadId: { type: 'string', description: 'Lead ID for send email' },
+    limit: { type: 'number', description: 'Result limit' },
+    offset: { type: 'number', description: 'Result offset' },
+    leadIdentifier: { type: 'string', description: 'Lead email address or ID' },
+    sendUserId: { type: 'string', description: 'Sender user ID' },
+    sendUserEmail: { type: 'string', description: 'Sender email address' },
+    sendUserMailboxId: { type: 'string', description: 'Sender mailbox ID' },
+    contactId: { type: 'string', description: 'Recipient contact ID' },
+    subject: { type: 'string', description: 'Email subject' },
+    message: { type: 'string', description: 'Email message body' },
+  },
+  outputs: {
+    activities: { type: 'json', description: 'List of campaign activities' },
+    count: { type: 'number', description: 'Number of activities returned' },
+    _id: { type: 'string', description: 'Lead ID' },
+    email: { type: 'string', description: 'Lead email' },
+    firstName: { type: 'string', description: 'Lead first name' },
+    lastName: { type: 'string', description: 'Lead last name' },
+    companyName: { type: 'string', description: 'Company name' },
+    jobTitle: { type: 'string', description: 'Job title' },
+    isPaused: { type: 'boolean', description: 'Whether lead is paused' },
+    emailStatus: { type: 'string', description: 'Email deliverability status' },
+    ok: { type: 'boolean', description: 'Whether email was sent successfully' },
+  },
+  triggers: {
+    enabled: true,
+    available: [
+      'lemlist_email_replied',
+      'lemlist_linkedin_replied',
+      'lemlist_interested',
+      'lemlist_not_interested',
+      'lemlist_email_opened',
+      'lemlist_email_clicked',
+      'lemlist_email_bounced',
+      'lemlist_email_sent',
+      'lemlist_webhook',
+    ],
+  },
+}
diff --git a/apps/sim/blocks/blocks/mongodb.ts b/apps/sim/blocks/blocks/mongodb.ts
index 142b733eee..0685fee4f7 100644
--- a/apps/sim/blocks/blocks/mongodb.ts
+++ b/apps/sim/blocks/blocks/mongodb.ts
@@ -1,8 +1,8 @@
 import { MongoDBIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
-import type { MongoDBResponse } from '@/tools/mongodb/types'
+import type { MongoDBIntrospectResponse, MongoDBResponse } from '@/tools/mongodb/types'
 
-export const MongoDBBlock: BlockConfig<MongoDBResponse> = {
+export const MongoDBBlock: BlockConfig<MongoDBResponse | MongoDBIntrospectResponse> = {
   type: 'mongodb',
   name: 'MongoDB',
   description: 'Connect to MongoDB database',
@@ -23,6 +23,7 @@ export const MongoDBBlock: BlockConfig<MongoDBResponse> = {
         { label: 'Update Documents', id: 'update' },
         { label: 'Delete Documents', id: 'delete' },
         { label: 'Aggregate Pipeline', id: 'execute' },
+        { label: 'Introspect Database', id: 'introspect' },
       ],
       value: () => 'query',
     },
@@ -86,6 +87,7 @@ export const MongoDBBlock: BlockConfig<MongoDBResponse> = {
       type: 'short-input',
       placeholder: 'users',
       required: true,
+      condition: { field: 'operation', value: 'introspect', not: true },
     },
     {
       id: 'query',
@@ -803,6 +805,7 @@ Return ONLY the MongoDB query filter as valid JSON - no explanations, no markdow
       'mongodb_update',
       'mongodb_delete',
       'mongodb_execute',
+      'mongodb_introspect',
     ],
     config: {
       tool: (params) => {
@@ -817,6 +820,8 @@ Return ONLY the MongoDB query filter as valid JSON - no explanations, no markdow
             return 'mongodb_delete'
           case 'execute':
             return 'mongodb_execute'
+          case 'introspect':
+            return 'mongodb_introspect'
           default:
             throw new Error(`Invalid MongoDB operation: ${params.operation}`)
         }
@@ -936,5 +941,14 @@ Return ONLY the MongoDB query filter as valid JSON - no explanations, no markdow
       type: 'number',
       description: 'Number of documents matched (update operations)',
     },
+    databases: {
+      type: 'array',
+      description: 'Array of database names (introspect operation)',
+    },
+    collections: {
+      type: 'array',
+      description:
+        'Array of collection info with name, type, document count, and indexes (introspect operation)',
+    },
   },
 }
diff --git a/apps/sim/blocks/blocks/mysql.ts b/apps/sim/blocks/blocks/mysql.ts
index 21c84436a4..07bacb14fe 100644
--- a/apps/sim/blocks/blocks/mysql.ts
+++ b/apps/sim/blocks/blocks/mysql.ts
@@ -23,6 +23,7 @@ export const MySQLBlock: BlockConfig<MySQLResponse> = {
         { label: 'Update Data', id: 'update' },
         { label: 'Delete Data', id: 'delete' },
         { label: 'Execute Raw SQL', id: 'execute' },
+        { label: 'Introspect Schema', id: 'introspect' },
       ],
       value: () => 'query',
     },
@@ -285,7 +286,14 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
     },
   ],
   tools: {
-    access: ['mysql_query', 'mysql_insert', 'mysql_update', 'mysql_delete', 'mysql_execute'],
+    access: [
+      'mysql_query',
+      'mysql_insert',
+      'mysql_update',
+      'mysql_delete',
+      'mysql_execute',
+      'mysql_introspect',
+    ],
     config: {
       tool: (params) => {
         switch (params.operation) {
@@ -299,6 +307,8 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
             return 'mysql_delete'
           case 'execute':
             return 'mysql_execute'
+          case 'introspect':
+            return 'mysql_introspect'
           default:
             throw new Error(`Invalid MySQL operation: ${params.operation}`)
         }
diff --git a/apps/sim/blocks/blocks/neo4j.ts b/apps/sim/blocks/blocks/neo4j.ts
index deda340a3c..2624e5e0bb 100644
--- a/apps/sim/blocks/blocks/neo4j.ts
+++ b/apps/sim/blocks/blocks/neo4j.ts
@@ -1,8 +1,8 @@
 import { Neo4jIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
-import type { Neo4jResponse } from '@/tools/neo4j/types'
+import type { Neo4jIntrospectResponse, Neo4jResponse } from '@/tools/neo4j/types'
 
-export const Neo4jBlock: BlockConfig<Neo4jResponse> = {
+export const Neo4jBlock: BlockConfig<Neo4jResponse | Neo4jIntrospectResponse> = {
   type: 'neo4j',
   name: 'Neo4j',
   description: 'Connect to Neo4j graph database',
@@ -24,6 +24,7 @@ export const Neo4jBlock: BlockConfig<Neo4jResponse> = {
         { label: 'Update Properties (SET)', id: 'update' },
         { label: 'Delete Nodes/Relationships', id: 'delete' },
         { label: 'Execute Cypher', id: 'execute' },
+        { label: 'Introspect Schema', id: 'introspect' },
       ],
       value: () => 'query',
     },
@@ -589,6 +590,7 @@ Return ONLY valid JSON.`,
       'neo4j_update',
       'neo4j_delete',
       'neo4j_execute',
+      'neo4j_introspect',
     ],
     config: {
       tool: (params) => {
@@ -605,6 +607,8 @@ Return ONLY valid JSON.`,
             return 'neo4j_delete'
           case 'execute':
             return 'neo4j_execute'
+          case 'introspect':
+            return 'neo4j_introspect'
           default:
             throw new Error(`Invalid Neo4j operation: ${params.operation}`)
         }
diff --git a/apps/sim/blocks/blocks/notion.ts b/apps/sim/blocks/blocks/notion.ts
index 29e493b037..9bc6e6bf38 100644
--- a/apps/sim/blocks/blocks/notion.ts
+++ b/apps/sim/blocks/blocks/notion.ts
@@ -1,11 +1,14 @@
 import { NotionIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { NotionResponse } from '@/tools/notion/types'
 
+// Legacy block - hidden from toolbar
 export const NotionBlock: BlockConfig<NotionResponse> = {
   type: 'notion',
-  name: 'Notion',
+  name: 'Notion (Legacy)',
+  hideFromToolbar: true,
   description: 'Manage Notion pages',
   authMode: AuthMode.OAuth,
   longDescription:
@@ -24,6 +27,7 @@ export const NotionBlock: BlockConfig<NotionResponse> = {
         { label: 'Read Database', id: 'notion_read_database' },
         { label: 'Create Page', id: 'notion_create_page' },
         { label: 'Create Database', id: 'notion_create_database' },
+        { label: 'Add Database Row', id: 'notion_add_database_row' },
         { label: 'Append Content', id: 'notion_write' },
         { label: 'Query Database', id: 'notion_query_database' },
         { label: 'Search Workspace', id: 'notion_search' },
@@ -143,11 +147,10 @@ export const NotionBlock: BlockConfig<NotionResponse> = {
     },
     {
       id: 'filter',
-      title: 'Filter (JSON)',
-      type: 'long-input',
+      title: 'Filter',
+      type: 'code',
       placeholder: 'Enter filter conditions as JSON (optional)',
       condition: { field: 'operation', value: 'notion_query_database' },
-      required: true,
       wandConfig: {
         enabled: true,
         prompt:
@@ -159,8 +162,8 @@ export const NotionBlock: BlockConfig<NotionResponse> = {
     },
     {
       id: 'sorts',
-      title: 'Sort Criteria (JSON)',
-      type: 'long-input',
+      title: 'Sort Criteria',
+      type: 'code',
       placeholder: 'Enter sort criteria as JSON array (optional)',
       condition: { field: 'operation', value: 'notion_query_database' },
       wandConfig: {
@@ -228,19 +231,44 @@ export const NotionBlock: BlockConfig<NotionResponse> = {
     },
     {
       id: 'properties',
-      title: 'Database Properties (JSON)',
-      type: 'long-input',
+      title: 'Database Properties',
+      type: 'code',
       placeholder: 'Enter database properties as JSON object',
       condition: { field: 'operation', value: 'notion_create_database' },
       wandConfig: {
         enabled: true,
         prompt:
-          'Generate Notion database properties in JSON format based on the user\'s description. Properties define the schema of the database. Common types: "title" (required), "rich_text", "number", "select" (with options), "multi_select", "date", "checkbox", "url", "email", "phone_number". Example: {"Name": {"title": {}}, "Status": {"select": {"options": [{"name": "To Do"}, {"name": "Done"}]}}, "Priority": {"number": {}}}. Return ONLY valid JSON - no explanations.',
+          'Generate Notion database properties in JSON format based on the user\'s description. Only provide the json, no escaping required. Properties define the schema of the database. Common types: "title" (required), "rich_text", "number", "select" (with options), "multi_select", "date", "checkbox", "url", "email", "phone_number". Example: {"Name": {"title": {}}, "Status": {"select": {"options": [{"name": "To Do"}, {"name": "Done"}]}}, "Priority": {"number": {}}}. Return ONLY valid JSON - no explanations.',
         placeholder:
           'Describe the columns/properties you want (e.g., "name, status dropdown, due date, priority number")...',
         generationType: 'json-object',
       },
     },
+    // Add Database Row Fields
+    {
+      id: 'databaseId',
+      title: 'Database ID',
+      type: 'short-input',
+      placeholder: 'Enter Notion database ID',
+      condition: { field: 'operation', value: 'notion_add_database_row' },
+      required: true,
+    },
+    {
+      id: 'properties',
+      title: 'Row Properties',
+      type: 'code',
+      placeholder: 'Enter row properties as JSON object',
+      condition: { field: 'operation', value: 'notion_add_database_row' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt:
+          'Generate Notion page/row properties in JSON format based on the user\'s description. Properties must match the database schema. Common formats: Title: {"Name": {"title": [{"text": {"content": "Value"}}]}}, Text: {"Description": {"rich_text": [{"text": {"content": "Value"}}]}}, Number: {"Price": {"number": 10}}, Select: {"Status": {"select": {"name": "Done"}}}, Multi-select: {"Tags": {"multi_select": [{"name": "Tag1"}, {"name": "Tag2"}]}}, Date: {"Due": {"date": {"start": "2024-01-01"}}}, Checkbox: {"Done": {"checkbox": true}}, URL: {"Link": {"url": "https://..."}}, Email: {"Contact": {"email": "test@example.com"}}. Return ONLY valid JSON - no explanations.',
+        placeholder:
+          'Describe the row data (e.g., "name is Task 1, status is Done, priority is High")...',
+        generationType: 'json-object',
+      },
+    },
   ],
   tools: {
     access: [
@@ -276,18 +304,24 @@ export const NotionBlock: BlockConfig<NotionResponse> = {
       params: (params) => {
         const { credential, operation, properties, filter, sorts, ...rest } = params
 
-        // Parse properties from JSON string for create operations
+        // Parse properties from JSON string for create/add operations
         let parsedProperties
         if (
-          (operation === 'notion_create_page' || operation === 'notion_create_database') &&
+          (operation === 'notion_create_page' ||
+            operation === 'notion_create_database' ||
+            operation === 'notion_add_database_row') &&
           properties
         ) {
-          try {
-            parsedProperties = JSON.parse(properties)
-          } catch (error) {
-            throw new Error(
-              `Invalid JSON for properties: ${error instanceof Error ? error.message : String(error)}`
-            )
+          if (typeof properties === 'string') {
+            try {
+              parsedProperties = JSON.parse(properties)
+            } catch (error) {
+              throw new Error(
+                `Invalid JSON for properties: ${error instanceof Error ? error.message : String(error)}`
+              )
+            }
+          } else {
+            parsedProperties = properties
           }
         }
 
@@ -357,3 +391,111 @@ export const NotionBlock: BlockConfig<NotionResponse> = {
     },
   },
 }
+
+// V2 Block with API-aligned outputs
+export const NotionV2Block: BlockConfig<any> = {
+  type: 'notion_v2',
+  name: 'Notion',
+  description: 'Manage Notion pages',
+  authMode: AuthMode.OAuth,
+  longDescription:
+    'Integrate with Notion into the workflow. Can read page, read database, create page, create database, append content, query database, and search workspace.',
+  docsLink: 'https://docs.sim.ai/tools/notion',
+  category: 'tools',
+  bgColor: '#181C1E',
+  icon: NotionIcon,
+  hideFromToolbar: false,
+  subBlocks: NotionBlock.subBlocks,
+  tools: {
+    access: [
+      'notion_read_v2',
+      'notion_read_database_v2',
+      'notion_write_v2',
+      'notion_create_page_v2',
+      'notion_query_database_v2',
+      'notion_search_v2',
+      'notion_create_database_v2',
+      'notion_add_database_row_v2',
+    ],
+    config: {
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => params.operation || 'notion_read',
+        suffix: '_v2',
+        fallbackToolId: 'notion_read_v2',
+      }),
+      params: NotionBlock.tools?.config?.params,
+    },
+  },
+  inputs: NotionBlock.inputs,
+  outputs: {
+    // Read page outputs
+    content: {
+      type: 'string',
+      description: 'Page content in markdown format',
+      condition: { field: 'operation', value: 'notion_read' },
+    },
+    title: {
+      type: 'string',
+      description: 'Page or database title',
+    },
+    url: {
+      type: 'string',
+      description: 'Notion URL',
+    },
+    id: {
+      type: 'string',
+      description: 'Page or database ID',
+      condition: {
+        field: 'operation',
+        value: [
+          'notion_create_page',
+          'notion_create_database',
+          'notion_add_database_row',
+          'notion_read_database',
+          'notion_update_page',
+        ],
+      },
+    },
+    created_time: {
+      type: 'string',
+      description: 'Creation timestamp',
+    },
+    last_edited_time: {
+      type: 'string',
+      description: 'Last edit timestamp',
+    },
+    // Database query/search outputs
+    results: {
+      type: 'array',
+      description: 'Array of results from query or search',
+      condition: { field: 'operation', value: ['notion_query_database', 'notion_search'] },
+    },
+    has_more: {
+      type: 'boolean',
+      description: 'Whether more results are available',
+      condition: { field: 'operation', value: ['notion_query_database', 'notion_search'] },
+    },
+    next_cursor: {
+      type: 'string',
+      description: 'Cursor for pagination',
+      condition: { field: 'operation', value: ['notion_query_database', 'notion_search'] },
+    },
+    total_results: {
+      type: 'number',
+      description: 'Number of results returned',
+      condition: { field: 'operation', value: ['notion_query_database', 'notion_search'] },
+    },
+    // Database schema
+    properties: {
+      type: 'json',
+      description: 'Database properties schema',
+      condition: { field: 'operation', value: ['notion_read_database', 'notion_create_database'] },
+    },
+    // Write output
+    appended: {
+      type: 'boolean',
+      description: 'Whether content was successfully appended',
+      condition: { field: 'operation', value: 'notion_write' },
+    },
+  },
+}
diff --git a/apps/sim/blocks/blocks/postgresql.ts b/apps/sim/blocks/blocks/postgresql.ts
index bde8f56427..2f37573334 100644
--- a/apps/sim/blocks/blocks/postgresql.ts
+++ b/apps/sim/blocks/blocks/postgresql.ts
@@ -23,6 +23,7 @@ export const PostgreSQLBlock: BlockConfig<PostgresResponse> = {
         { label: 'Update Data', id: 'update' },
         { label: 'Delete Data', id: 'delete' },
         { label: 'Execute Raw SQL', id: 'execute' },
+        { label: 'Introspect Schema', id: 'introspect' },
       ],
       value: () => 'query',
     },
@@ -285,6 +286,14 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
       condition: { field: 'operation', value: 'delete' },
       required: true,
     },
+    {
+      id: 'schema',
+      title: 'Schema Name',
+      type: 'short-input',
+      placeholder: 'public',
+      value: () => 'public',
+      condition: { field: 'operation', value: 'introspect' },
+    },
   ],
   tools: {
     access: [
@@ -293,6 +302,7 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
       'postgresql_update',
       'postgresql_delete',
       'postgresql_execute',
+      'postgresql_introspect',
     ],
     config: {
       tool: (params) => {
@@ -307,6 +317,8 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
             return 'postgresql_delete'
           case 'execute':
             return 'postgresql_execute'
+          case 'introspect':
+            return 'postgresql_introspect'
           default:
             throw new Error(`Invalid PostgreSQL operation: ${params.operation}`)
         }
@@ -343,6 +355,7 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
         if (rest.table) result.table = rest.table
         if (rest.query) result.query = rest.query
         if (rest.where) result.where = rest.where
+        if (rest.schema) result.schema = rest.schema
         if (parsedData !== undefined) result.data = parsedData
 
         return result
@@ -361,6 +374,7 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
     query: { type: 'string', description: 'SQL query to execute' },
     data: { type: 'json', description: 'Data for insert/update operations' },
     where: { type: 'string', description: 'WHERE clause for update/delete' },
+    schema: { type: 'string', description: 'Schema name for introspection' },
   },
   outputs: {
     message: {
@@ -375,5 +389,13 @@ Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
       type: 'number',
       description: 'Number of rows affected by the operation',
     },
+    tables: {
+      type: 'array',
+      description: 'Array of table schemas with columns, keys, and indexes (introspect operation)',
+    },
+    schemas: {
+      type: 'array',
+      description: 'List of available schemas in the database (introspect operation)',
+    },
   },
 }
diff --git a/apps/sim/blocks/blocks/rds.ts b/apps/sim/blocks/blocks/rds.ts
index 0563daeecf..1bf54787c2 100644
--- a/apps/sim/blocks/blocks/rds.ts
+++ b/apps/sim/blocks/blocks/rds.ts
@@ -1,8 +1,8 @@
 import { RDSIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
-import type { RdsResponse } from '@/tools/rds/types'
+import type { RdsIntrospectResponse, RdsResponse } from '@/tools/rds/types'
 
-export const RDSBlock: BlockConfig<RdsResponse> = {
+export const RDSBlock: BlockConfig<RdsResponse | RdsIntrospectResponse> = {
   type: 'rds',
   name: 'Amazon RDS',
   description: 'Connect to Amazon RDS via Data API',
@@ -23,6 +23,7 @@ export const RDSBlock: BlockConfig<RdsResponse> = {
         { label: 'Update Data', id: 'update' },
         { label: 'Delete Data', id: 'delete' },
         { label: 'Execute Raw SQL', id: 'execute' },
+        { label: 'Introspect Schema', id: 'introspect' },
       ],
       value: () => 'query',
     },
@@ -340,9 +341,36 @@ Return ONLY the JSON object.`,
         generationType: 'json-object',
       },
     },
+    {
+      id: 'schema',
+      title: 'Schema Name',
+      type: 'short-input',
+      placeholder: 'public (PostgreSQL) or database name (MySQL)',
+      condition: { field: 'operation', value: 'introspect' },
+      required: false,
+    },
+    {
+      id: 'engine',
+      title: 'Database Engine',
+      type: 'dropdown',
+      options: [
+        { label: 'Auto-detect', id: '' },
+        { label: 'Aurora PostgreSQL', id: 'aurora-postgresql' },
+        { label: 'Aurora MySQL', id: 'aurora-mysql' },
+      ],
+      condition: { field: 'operation', value: 'introspect' },
+      value: () => '',
+    },
   ],
   tools: {
-    access: ['rds_query', 'rds_insert', 'rds_update', 'rds_delete', 'rds_execute'],
+    access: [
+      'rds_query',
+      'rds_insert',
+      'rds_update',
+      'rds_delete',
+      'rds_execute',
+      'rds_introspect',
+    ],
     config: {
       tool: (params) => {
         switch (params.operation) {
@@ -356,12 +384,14 @@ Return ONLY the JSON object.`,
             return 'rds_delete'
           case 'execute':
             return 'rds_execute'
+          case 'introspect':
+            return 'rds_introspect'
           default:
             throw new Error(`Invalid RDS operation: ${params.operation}`)
         }
       },
       params: (params) => {
-        const { operation, data, conditions, ...rest } = params
+        const { operation, data, conditions, schema, engine, ...rest } = params
 
         // Parse JSON fields
         const parseJson = (value: unknown, fieldName: string) => {
@@ -399,6 +429,8 @@ Return ONLY the JSON object.`,
         if (rest.query) result.query = rest.query
         if (parsedConditions !== undefined) result.conditions = parsedConditions
         if (parsedData !== undefined) result.data = parsedData
+        if (schema) result.schema = schema
+        if (engine) result.engine = engine
 
         return result
       },
@@ -416,6 +448,11 @@ Return ONLY the JSON object.`,
     query: { type: 'string', description: 'SQL query to execute' },
     data: { type: 'json', description: 'Data for insert/update operations' },
     conditions: { type: 'json', description: 'Conditions for update/delete (e.g., {"id": 1})' },
+    schema: { type: 'string', description: 'Schema to introspect (for introspect operation)' },
+    engine: {
+      type: 'string',
+      description: 'Database engine (aurora-postgresql or aurora-mysql, auto-detected if not set)',
+    },
   },
   outputs: {
     message: {
@@ -430,5 +467,18 @@ Return ONLY the JSON object.`,
       type: 'number',
       description: 'Number of rows affected by the operation',
     },
+    engine: {
+      type: 'string',
+      description: 'Detected database engine type (for introspect operation)',
+    },
+    tables: {
+      type: 'array',
+      description:
+        'Array of table schemas with columns, keys, and indexes (for introspect operation)',
+    },
+    schemas: {
+      type: 'array',
+      description: 'List of available schemas in the database (for introspect operation)',
+    },
   },
 }
diff --git a/apps/sim/blocks/blocks/supabase.ts b/apps/sim/blocks/blocks/supabase.ts
index 4a60037fcc..e8254a66a1 100644
--- a/apps/sim/blocks/blocks/supabase.ts
+++ b/apps/sim/blocks/blocks/supabase.ts
@@ -34,6 +34,7 @@ export const SupabaseBlock: BlockConfig<SupabaseResponse> = {
         { label: 'Full-Text Search', id: 'text_search' },
         { label: 'Vector Search', id: 'vector_search' },
         { label: 'Call RPC Function', id: 'rpc' },
+        { label: 'Introspect Schema', id: 'introspect' },
         // Storage - File Operations
         { label: 'Storage: Upload File', id: 'storage_upload' },
         { label: 'Storage: Download File', id: 'storage_download' },
@@ -490,6 +491,14 @@ Return ONLY the order by expression - no explanations, no extra text.`,
       placeholder: '{\n  "param1": "value1",\n  "param2": "value2"\n}',
       condition: { field: 'operation', value: 'rpc' },
     },
+    // Introspect operation fields
+    {
+      id: 'schema',
+      title: 'Schema',
+      type: 'short-input',
+      placeholder: 'public (leave empty for all user schemas)',
+      condition: { field: 'operation', value: 'introspect' },
+    },
     // Text Search operation fields
     {
       id: 'column',
@@ -876,6 +885,7 @@ Return ONLY the PostgREST filter expression - no explanations, no markdown, no e
       'supabase_text_search',
       'supabase_vector_search',
       'supabase_rpc',
+      'supabase_introspect',
       'supabase_storage_upload',
       'supabase_storage_download',
       'supabase_storage_list',
@@ -911,6 +921,8 @@ Return ONLY the PostgREST filter expression - no explanations, no markdown, no e
             return 'supabase_vector_search'
           case 'rpc':
             return 'supabase_rpc'
+          case 'introspect':
+            return 'supabase_introspect'
           case 'storage_upload':
             return 'supabase_storage_upload'
           case 'storage_download':
@@ -1085,7 +1097,6 @@ Return ONLY the PostgREST filter expression - no explanations, no markdown, no e
     operation: { type: 'string', description: 'Operation to perform' },
     projectId: { type: 'string', description: 'Supabase project identifier' },
     table: { type: 'string', description: 'Database table name' },
-    schema: { type: 'string', description: 'Database schema (default: public)' },
     select: { type: 'string', description: 'Columns to return (comma-separated, defaults to *)' },
     apiKey: { type: 'string', description: 'Service role secret key' },
     // Data for insert/update operations
@@ -1113,6 +1124,8 @@ Return ONLY the PostgREST filter expression - no explanations, no markdown, no e
     language: { type: 'string', description: 'Language for text search' },
     // Count operation inputs
     countType: { type: 'string', description: 'Count type: exact, planned, or estimated' },
+    // Introspect operation inputs
+    schema: { type: 'string', description: 'Database schema to introspect (e.g., public)' },
     // Storage operation inputs
     bucket: { type: 'string', description: 'Storage bucket name' },
     path: { type: 'string', description: 'File or folder path in storage' },
@@ -1158,5 +1171,13 @@ Return ONLY the PostgREST filter expression - no explanations, no markdown, no e
       type: 'string',
       description: 'Temporary signed URL for storage file',
     },
+    tables: {
+      type: 'json',
+      description: 'Array of table schemas for introspect operation',
+    },
+    schemas: {
+      type: 'json',
+      description: 'Array of schema names found in the database',
+    },
   },
 }
diff --git a/apps/sim/blocks/blocks/wealthbox.ts b/apps/sim/blocks/blocks/wealthbox.ts
index 3346c6ede2..7a1eacd3df 100644
--- a/apps/sim/blocks/blocks/wealthbox.ts
+++ b/apps/sim/blocks/blocks/wealthbox.ts
@@ -250,7 +250,7 @@ Return ONLY the date/time string - no explanations, no quotes, no extra text.`,
     tasks: { type: 'json', description: 'Array of task objects from bulk read operations' },
     metadata: {
       type: 'json',
-      description: 'Operation metadata including item IDs, types, and operation details',
+      description: 'Operation metadata with itemId, noteId, contactId, taskId, itemType',
     },
     success: {
       type: 'boolean',
diff --git a/apps/sim/blocks/registry.ts b/apps/sim/blocks/registry.ts
index 8a4d75121f..85a5b7ac2f 100644
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -15,7 +15,7 @@ import { CirclebackBlock } from '@/blocks/blocks/circleback'
 import { ClayBlock } from '@/blocks/blocks/clay'
 import { ConditionBlock } from '@/blocks/blocks/condition'
 import { ConfluenceBlock } from '@/blocks/blocks/confluence'
-import { CursorBlock } from '@/blocks/blocks/cursor'
+import { CursorBlock, CursorV2Block } from '@/blocks/blocks/cursor'
 import { DatadogBlock } from '@/blocks/blocks/datadog'
 import { DiscordBlock } from '@/blocks/blocks/discord'
 import { DropboxBlock } from '@/blocks/blocks/dropbox'
@@ -30,11 +30,11 @@ import { FirecrawlBlock } from '@/blocks/blocks/firecrawl'
 import { FirefliesBlock } from '@/blocks/blocks/fireflies'
 import { FunctionBlock } from '@/blocks/blocks/function'
 import { GenericWebhookBlock } from '@/blocks/blocks/generic_webhook'
-import { GitHubBlock } from '@/blocks/blocks/github'
+import { GitHubBlock, GitHubV2Block } from '@/blocks/blocks/github'
 import { GitLabBlock } from '@/blocks/blocks/gitlab'
-import { GmailBlock } from '@/blocks/blocks/gmail'
+import { GmailBlock, GmailV2Block } from '@/blocks/blocks/gmail'
 import { GoogleSearchBlock } from '@/blocks/blocks/google'
-import { GoogleCalendarBlock } from '@/blocks/blocks/google_calendar'
+import { GoogleCalendarBlock, GoogleCalendarV2Block } from '@/blocks/blocks/google_calendar'
 import { GoogleDocsBlock } from '@/blocks/blocks/google_docs'
 import { GoogleDriveBlock } from '@/blocks/blocks/google_drive'
 import { GoogleFormsBlock } from '@/blocks/blocks/google_form'
@@ -54,12 +54,13 @@ import { ImageGeneratorBlock } from '@/blocks/blocks/image_generator'
 import { ImapBlock } from '@/blocks/blocks/imap'
 import { IncidentioBlock } from '@/blocks/blocks/incidentio'
 import { InputTriggerBlock } from '@/blocks/blocks/input_trigger'
-import { IntercomBlock } from '@/blocks/blocks/intercom'
+import { IntercomBlock, IntercomV2Block } from '@/blocks/blocks/intercom'
 import { JinaBlock } from '@/blocks/blocks/jina'
 import { JiraBlock } from '@/blocks/blocks/jira'
 import { JiraServiceManagementBlock } from '@/blocks/blocks/jira_service_management'
 import { KalshiBlock } from '@/blocks/blocks/kalshi'
 import { KnowledgeBlock } from '@/blocks/blocks/knowledge'
+import { LemlistBlock } from '@/blocks/blocks/lemlist'
 import { LinearBlock } from '@/blocks/blocks/linear'
 import { LinkedInBlock } from '@/blocks/blocks/linkedin'
 import { LinkupBlock } from '@/blocks/blocks/linkup'
@@ -77,7 +78,7 @@ import { MongoDBBlock } from '@/blocks/blocks/mongodb'
 import { MySQLBlock } from '@/blocks/blocks/mysql'
 import { Neo4jBlock } from '@/blocks/blocks/neo4j'
 import { NoteBlock } from '@/blocks/blocks/note'
-import { NotionBlock } from '@/blocks/blocks/notion'
+import { NotionBlock, NotionV2Block } from '@/blocks/blocks/notion'
 import { OneDriveBlock } from '@/blocks/blocks/onedrive'
 import { OpenAIBlock } from '@/blocks/blocks/openai'
 import { OutlookBlock } from '@/blocks/blocks/outlook'
@@ -165,6 +166,7 @@ export const registry: Record<string, BlockConfig> = {
   condition: ConditionBlock,
   confluence: ConfluenceBlock,
   cursor: CursorBlock,
+  cursor_v2: CursorV2Block,
   datadog: DatadogBlock,
   discord: DiscordBlock,
   dropbox: DropboxBlock,
@@ -179,13 +181,16 @@ export const registry: Record<string, BlockConfig> = {
   function: FunctionBlock,
   generic_webhook: GenericWebhookBlock,
   github: GitHubBlock,
+  github_v2: GitHubV2Block,
   gitlab: GitLabBlock,
   gmail: GmailBlock,
+  gmail_v2: GmailV2Block,
   grain: GrainBlock,
   grafana: GrafanaBlock,
   greptile: GreptileBlock,
   guardrails: GuardrailsBlock,
   google_calendar: GoogleCalendarBlock,
+  google_calendar_v2: GoogleCalendarV2Block,
   google_docs: GoogleDocsBlock,
   google_drive: GoogleDriveBlock,
   google_forms: GoogleFormsBlock,
@@ -203,11 +208,13 @@ export const registry: Record<string, BlockConfig> = {
   incidentio: IncidentioBlock,
   input_trigger: InputTriggerBlock,
   intercom: IntercomBlock,
+  intercom_v2: IntercomV2Block,
   jina: JinaBlock,
   jira: JiraBlock,
   jira_service_management: JiraServiceManagementBlock,
   kalshi: KalshiBlock,
   knowledge: KnowledgeBlock,
+  lemlist: LemlistBlock,
   linear: LinearBlock,
   linkedin: LinkedInBlock,
   linkup: LinkupBlock,
@@ -226,6 +233,7 @@ export const registry: Record<string, BlockConfig> = {
   neo4j: Neo4jBlock,
   note: NoteBlock,
   notion: NotionBlock,
+  notion_v2: NotionV2Block,
   onedrive: OneDriveBlock,
   openai: OpenAIBlock,
   outlook: OutlookBlock,
diff --git a/apps/sim/blocks/utils.ts b/apps/sim/blocks/utils.ts
index 6d75c58619..52ddbf3b93 100644
--- a/apps/sim/blocks/utils.ts
+++ b/apps/sim/blocks/utils.ts
@@ -214,3 +214,38 @@ export const PROVIDER_CREDENTIAL_INPUTS = {
   bedrockSecretKey: { type: 'string', description: 'AWS Secret Access Key for Bedrock' },
   bedrockRegion: { type: 'string', description: 'AWS region for Bedrock' },
 } as const
+
+/**
+ * Create a versioned tool selector from an existing tool selector.
+ *
+ * This is useful for `*_v2` blocks where the operation UI remains the same, but
+ * the underlying tool IDs are suffixed (e.g. `cursor_launch_agent` -> `cursor_launch_agent_v2`).
+ *
+ * @example
+ * tools: {
+ *   config: {
+ *     tool: createVersionedToolSelector({
+ *       baseToolSelector: (params) => params.operation,
+ *       suffix: '_v2',
+ *       fallbackToolId: 'cursor_launch_agent_v2',
+ *     }),
+ *   },
+ * }
+ */
+export function createVersionedToolSelector<TParams extends Record<string, any>>(args: {
+  baseToolSelector: (params: TParams) => string
+  suffix: `_${string}`
+  fallbackToolId: string
+}): (params: TParams) => string {
+  const { baseToolSelector, suffix, fallbackToolId } = args
+
+  return (params: TParams) => {
+    try {
+      const baseToolId = baseToolSelector(params)
+      if (!baseToolId || typeof baseToolId !== 'string') return fallbackToolId
+      return baseToolId.endsWith(suffix) ? baseToolId : `${baseToolId}${suffix}`
+    } catch {
+      return fallbackToolId
+    }
+  }
+}
diff --git a/apps/sim/components/emcn/icons/animate/download.module.css b/apps/sim/components/emcn/icons/animate/download.module.css
new file mode 100644
index 0000000000..0f279d3ff0
--- /dev/null
+++ b/apps/sim/components/emcn/icons/animate/download.module.css
@@ -0,0 +1,22 @@
+/**
+ * Download icon animation
+ * Subtle continuous animation for import/download states
+ * Arrow gently pulses down to suggest downloading motion
+ */
+
+@keyframes arrow-pulse {
+  0%,
+  100% {
+    transform: translateY(0);
+    opacity: 1;
+  }
+  50% {
+    transform: translateY(1.5px);
+    opacity: 0.7;
+  }
+}
+
+.animated-download-svg {
+  animation: arrow-pulse 1.5s ease-in-out infinite;
+  transform-origin: center center;
+}
diff --git a/apps/sim/components/emcn/icons/download.tsx b/apps/sim/components/emcn/icons/download.tsx
new file mode 100644
index 0000000000..74737dbd70
--- /dev/null
+++ b/apps/sim/components/emcn/icons/download.tsx
@@ -0,0 +1,42 @@
+import type { SVGProps } from 'react'
+import styles from '@/components/emcn/icons/animate/download.module.css'
+
+export interface DownloadProps extends SVGProps<SVGSVGElement> {
+  /**
+   * Enable animation on the download icon
+   * @default false
+   */
+  animate?: boolean
+}
+
+/**
+ * Download icon component with optional CSS-based animation
+ * Based on lucide arrow-down icon structure.
+ * When animate is false, this is a lightweight static icon with no animation overhead.
+ * When animate is true, CSS module animations are applied for a subtle pulsing effect.
+ * @param props - SVG properties including className, animate, etc.
+ */
+export function Download({ animate = false, className, ...props }: DownloadProps) {
+  const svgClassName = animate
+    ? `${styles['animated-download-svg']} ${className || ''}`.trim()
+    : className
+
+  return (
+    <svg
+      xmlns='http://www.w3.org/2000/svg'
+      width='24'
+      height='24'
+      viewBox='0 0 24 24'
+      fill='none'
+      stroke='currentColor'
+      strokeWidth='2'
+      strokeLinecap='round'
+      strokeLinejoin='round'
+      className={svgClassName}
+      {...props}
+    >
+      <path d='M12 5v14' />
+      <path d='m19 12-7 7-7-7' />
+    </svg>
+  )
+}
diff --git a/apps/sim/components/emcn/icons/index.ts b/apps/sim/components/emcn/icons/index.ts
index 9dc0cfb306..5288b6f3d2 100644
--- a/apps/sim/components/emcn/icons/index.ts
+++ b/apps/sim/components/emcn/icons/index.ts
@@ -5,6 +5,7 @@ export { ChevronDown } from './chevron-down'
 export { Connections } from './connections'
 export { Copy } from './copy'
 export { DocumentAttachment } from './document-attachment'
+export { Download } from './download'
 export { Duplicate } from './duplicate'
 export { Eye } from './eye'
 export { FolderCode } from './folder-code'
diff --git a/apps/sim/components/icons.tsx b/apps/sim/components/icons.tsx
index de0ab92021..91803c3316 100644
--- a/apps/sim/components/icons.tsx
+++ b/apps/sim/components/icons.tsx
@@ -1853,6 +1853,31 @@ export function LinearIcon(props: React.SVGProps<SVGSVGElement>) {
   )
 }
 
+export function LemlistIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg {...props} xmlns='http://www.w3.org/2000/svg' viewBox='0 0 180 181' fill='none'>
+      <path
+        fillRule='evenodd'
+        clipRule='evenodd'
+        d='M32.0524 0.919922H147.948C165.65 0.919922 180 15.2703 180 32.9723V148.867C180 166.57 165.65 180.92 147.948 180.92H32.0524C14.3504 180.92 0 166.57 0 148.867V32.9723C0 15.2703 14.3504 0.919922 32.0524 0.919922ZM119.562 82.8879H85.0826C82.4732 82.8879 80.3579 85.0032 80.3579 87.6126V94.2348C80.3579 96.8442 82.4732 98.9595 85.0826 98.9595H119.562C122.171 98.9595 124.286 96.8442 124.286 94.2348V87.6126C124.286 85.0032 122.171 82.8879 119.562 82.8879ZM85.0826 49.1346H127.061C129.67 49.1346 131.785 51.2499 131.785 53.8593V60.4815C131.785 63.0909 129.67 65.2062 127.061 65.2062H85.0826C82.4732 65.2062 80.3579 63.0909 80.3579 60.4815V53.8593C80.3579 51.2499 82.4732 49.1346 85.0826 49.1346ZM131.785 127.981V121.358C131.785 118.75 129.669 116.634 127.061 116.634H76.5706C69.7821 116.634 64.2863 111.138 64.2863 104.349V53.8593C64.2863 51.2513 62.1697 49.1346 59.5616 49.1346H52.9395C50.3314 49.1346 48.2147 51.2513 48.2147 53.8593V114.199C48.8497 124.133 56.7873 132.07 66.7205 132.705H127.061C129.669 132.705 131.785 130.589 131.785 127.981Z'
+        fill='#316BFF'
+      />
+      <path
+        d='M85.0826 49.1346H127.061C129.67 49.1346 131.785 51.2499 131.785 53.8593V60.4815C131.785 63.0909 129.67 65.2062 127.061 65.2062H85.0826C82.4732 65.2062 80.3579 63.0909 80.3579 60.4815V53.8593C80.3579 51.2499 82.4732 49.1346 85.0826 49.1346Z'
+        fill='white'
+      />
+      <path
+        d='M85.0826 82.8879H119.562C122.171 82.8879 124.286 85.0032 124.286 87.6126V94.2348C124.286 96.8442 122.171 98.9595 119.562 98.9595H85.0826C82.4732 98.9595 80.3579 96.8442 80.3579 94.2348V87.6126C80.3579 85.0032 82.4732 82.8879 85.0826 82.8879Z'
+        fill='white'
+      />
+      <path
+        d='M131.785 121.358V127.981C131.785 130.589 129.669 132.705 127.061 132.705H66.7205C56.7873 132.07 48.8497 124.133 48.2147 114.199V53.8593C48.2147 51.2513 50.3314 49.1346 52.9395 49.1346H59.5616C62.1697 49.1346 64.2863 51.2513 64.2863 53.8593V104.349C64.2863 111.138 69.7821 116.634 76.5706 116.634H127.061C129.669 116.634 131.785 118.75 131.785 121.358Z'
+        fill='white'
+      />
+    </svg>
+  )
+}
+
 export function TelegramIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
diff --git a/apps/sim/executor/utils/permission-check.ts b/apps/sim/executor/utils/permission-check.ts
index 5e24df54ce..aabcea6e99 100644
--- a/apps/sim/executor/utils/permission-check.ts
+++ b/apps/sim/executor/utils/permission-check.ts
@@ -42,6 +42,13 @@ export class CustomToolsNotAllowedError extends Error {
   }
 }
 
+export class InvitationsNotAllowedError extends Error {
+  constructor() {
+    super('Invitations are not allowed based on your permission group settings')
+    this.name = 'InvitationsNotAllowedError'
+  }
+}
+
 export async function getUserPermissionConfig(
   userId: string
 ): Promise<PermissionGroupConfig | null> {
@@ -184,3 +191,30 @@ export async function validateCustomToolsAllowed(
     throw new CustomToolsNotAllowedError()
   }
 }
+
+/**
+ * Validates if the user is allowed to send invitations.
+ * Also checks the global feature flag.
+ */
+export async function validateInvitationsAllowed(userId: string | undefined): Promise<void> {
+  const { isInvitationsDisabled } = await import('@/lib/core/config/feature-flags')
+  if (isInvitationsDisabled) {
+    logger.warn('Invitations blocked by feature flag')
+    throw new InvitationsNotAllowedError()
+  }
+
+  if (!userId) {
+    return
+  }
+
+  const config = await getUserPermissionConfig(userId)
+
+  if (!config) {
+    return
+  }
+
+  if (config.disableInvitations) {
+    logger.warn('Invitations blocked by permission group', { userId })
+    throw new InvitationsNotAllowedError()
+  }
+}
diff --git a/apps/sim/hooks/queries/byok-keys.ts b/apps/sim/hooks/queries/byok-keys.ts
index 36ec66827c..26d348d5a7 100644
--- a/apps/sim/hooks/queries/byok-keys.ts
+++ b/apps/sim/hooks/queries/byok-keys.ts
@@ -17,7 +17,6 @@ export interface BYOKKey {
 
 export interface BYOKKeysResponse {
   keys: BYOKKey[]
-  byokEnabled: boolean
 }
 
 export const byokKeysKeys = {
@@ -33,7 +32,6 @@ async function fetchBYOKKeys(workspaceId: string): Promise<BYOKKeysResponse> {
   const data = await response.json()
   return {
     keys: data.keys ?? [],
-    byokEnabled: data.byokEnabled ?? true,
   }
 }
 
diff --git a/apps/sim/hooks/use-permission-config.ts b/apps/sim/hooks/use-permission-config.ts
index 584930f060..55e14c4b9f 100644
--- a/apps/sim/hooks/use-permission-config.ts
+++ b/apps/sim/hooks/use-permission-config.ts
@@ -1,4 +1,5 @@
 import { useMemo } from 'react'
+import { getEnv, isTruthy } from '@/lib/core/config/env'
 import {
   DEFAULT_PERMISSION_GROUP_CONFIG,
   type PermissionGroupConfig,
@@ -14,6 +15,7 @@ export interface PermissionConfigResult {
   filterProviders: (providerIds: string[]) => string[]
   isBlockAllowed: (blockType: string) => boolean
   isProviderAllowed: (providerId: string) => boolean
+  isInvitationsDisabled: boolean
 }
 
 export function usePermissionConfig(): PermissionConfigResult {
@@ -59,6 +61,11 @@ export function usePermissionConfig(): PermissionConfigResult {
     }
   }, [config.allowedModelProviders])
 
+  const isInvitationsDisabled = useMemo(() => {
+    const featureFlagDisabled = isTruthy(getEnv('NEXT_PUBLIC_DISABLE_INVITATIONS'))
+    return featureFlagDisabled || config.disableInvitations
+  }, [config.disableInvitations])
+
   return {
     config,
     isLoading,
@@ -67,5 +74,6 @@ export function usePermissionConfig(): PermissionConfigResult {
     filterProviders,
     isBlockAllowed,
     isProviderAllowed,
+    isInvitationsDisabled,
   }
 }
diff --git a/apps/sim/lib/api-key/byok.ts b/apps/sim/lib/api-key/byok.ts
index 34c589c21a..04a35adb42 100644
--- a/apps/sim/lib/api-key/byok.ts
+++ b/apps/sim/lib/api-key/byok.ts
@@ -2,7 +2,6 @@ import { db } from '@sim/db'
 import { workspaceBYOKKeys } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
-import { isWorkspaceOnEnterprisePlan } from '@/lib/billing'
 import { getRotatingApiKey } from '@/lib/core/config/api-keys'
 import { isHosted } from '@/lib/core/config/feature-flags'
 import { decryptSecret } from '@/lib/core/security/encryption'
@@ -91,18 +90,12 @@ export async function getApiKeyWithBYOK(
     logger.debug('BYOK check', { provider, model, workspaceId, isHosted, isModelHosted })
 
     if (isModelHosted || isMistralModel) {
-      const hasEnterprise = await isWorkspaceOnEnterprisePlan(workspaceId)
-
-      if (hasEnterprise) {
-        const byokResult = await getBYOKKey(workspaceId, byokProviderId)
-        if (byokResult) {
-          logger.info('Using BYOK key', { provider, model, workspaceId })
-          return byokResult
-        }
-        logger.debug('No BYOK key found, falling back', { provider, model, workspaceId })
-      } else {
-        logger.debug('Workspace not on enterprise plan, skipping BYOK', { workspaceId })
+      const byokResult = await getBYOKKey(workspaceId, byokProviderId)
+      if (byokResult) {
+        logger.info('Using BYOK key', { provider, model, workspaceId })
+        return byokResult
       }
+      logger.debug('No BYOK key found, falling back', { provider, model, workspaceId })
 
       if (isModelHosted) {
         try {
diff --git a/apps/sim/lib/billing/core/subscription.ts b/apps/sim/lib/billing/core/subscription.ts
index d5721b7ebd..2b287da4a8 100644
--- a/apps/sim/lib/billing/core/subscription.ts
+++ b/apps/sim/lib/billing/core/subscription.ts
@@ -1,5 +1,5 @@
 import { db } from '@sim/db'
-import { member, subscription, user, userStats, workspace } from '@sim/db/schema'
+import { member, subscription, user, userStats } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/plan'
@@ -218,34 +218,6 @@ export async function isTeamOrgAdminOrOwner(userId: string): Promise<boolean> {
   }
 }
 
-/**
- * Check if a workspace has access to enterprise features (BYOK)
- * Used at execution time to determine if BYOK keys should be used
- * Returns true if workspace's billed account is on enterprise plan
- */
-export async function isWorkspaceOnEnterprisePlan(workspaceId: string): Promise<boolean> {
-  try {
-    if (!isProd) {
-      return true
-    }
-
-    const [ws] = await db
-      .select({ billedAccountUserId: workspace.billedAccountUserId })
-      .from(workspace)
-      .where(eq(workspace.id, workspaceId))
-      .limit(1)
-
-    if (!ws) {
-      return false
-    }
-
-    return isEnterprisePlan(ws.billedAccountUserId)
-  } catch (error) {
-    logger.error('Error checking workspace enterprise status', { error, workspaceId })
-    return false
-  }
-}
-
 /**
  * Check if an organization has team or enterprise plan
  * Used at execution time (e.g., polling services) to check org billing directly
diff --git a/apps/sim/lib/billing/index.ts b/apps/sim/lib/billing/index.ts
index ddd4b8d1c5..9ec6f9cd6b 100644
--- a/apps/sim/lib/billing/index.ts
+++ b/apps/sim/lib/billing/index.ts
@@ -20,7 +20,6 @@ export {
   isProPlan as hasProPlan,
   isTeamOrgAdminOrOwner,
   isTeamPlan as hasTeamPlan,
-  isWorkspaceOnEnterprisePlan,
   sendPlanWelcomeEmail,
 } from '@/lib/billing/core/subscription'
 export * from '@/lib/billing/core/usage'
diff --git a/apps/sim/lib/copilot/tools/client/other/search-library-docs.ts b/apps/sim/lib/copilot/tools/client/other/search-library-docs.ts
new file mode 100644
index 0000000000..7dcff295b2
--- /dev/null
+++ b/apps/sim/lib/copilot/tools/client/other/search-library-docs.ts
@@ -0,0 +1,50 @@
+import { BookOpen, Loader2, MinusCircle, XCircle } from 'lucide-react'
+import {
+  BaseClientTool,
+  type BaseClientToolMetadata,
+  ClientToolCallState,
+} from '@/lib/copilot/tools/client/base-tool'
+
+export class SearchLibraryDocsClientTool extends BaseClientTool {
+  static readonly id = 'search_library_docs'
+
+  constructor(toolCallId: string) {
+    super(toolCallId, SearchLibraryDocsClientTool.id, SearchLibraryDocsClientTool.metadata)
+  }
+
+  static readonly metadata: BaseClientToolMetadata = {
+    displayNames: {
+      [ClientToolCallState.generating]: { text: 'Reading docs', icon: Loader2 },
+      [ClientToolCallState.pending]: { text: 'Reading docs', icon: Loader2 },
+      [ClientToolCallState.executing]: { text: 'Reading docs', icon: Loader2 },
+      [ClientToolCallState.success]: { text: 'Read docs', icon: BookOpen },
+      [ClientToolCallState.error]: { text: 'Failed to read docs', icon: XCircle },
+      [ClientToolCallState.aborted]: { text: 'Aborted reading docs', icon: XCircle },
+      [ClientToolCallState.rejected]: { text: 'Skipped reading docs', icon: MinusCircle },
+    },
+    getDynamicText: (params, state) => {
+      const libraryName = params?.library_name
+      if (libraryName && typeof libraryName === 'string') {
+        switch (state) {
+          case ClientToolCallState.success:
+            return `Read ${libraryName} docs`
+          case ClientToolCallState.executing:
+          case ClientToolCallState.generating:
+          case ClientToolCallState.pending:
+            return `Reading ${libraryName} docs`
+          case ClientToolCallState.error:
+            return `Failed to read ${libraryName} docs`
+          case ClientToolCallState.aborted:
+            return `Aborted reading ${libraryName} docs`
+          case ClientToolCallState.rejected:
+            return `Skipped reading ${libraryName} docs`
+        }
+      }
+      return undefined
+    },
+  }
+
+  async execute(): Promise<void> {
+    return
+  }
+}
diff --git a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
index 07bac4194a..096e8b3381 100644
--- a/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/edit-workflow.ts
@@ -2004,7 +2004,7 @@ function applyOperationsToWorkflowState(
             validationErrors.push(...validationResult.errors)
 
             Object.entries(validationResult.validInputs).forEach(([key, value]) => {
-              // Skip runtime subblock IDs (webhookId, triggerPath, testUrl, testUrlExpiresAt)
+              // Skip runtime subblock IDs (webhookId, triggerPath)
               if (TRIGGER_RUNTIME_SUBBLOCK_IDS.includes(key)) {
                 return
               }
diff --git a/apps/sim/lib/core/config/env.ts b/apps/sim/lib/core/config/env.ts
index c2be459174..de11e88746 100644
--- a/apps/sim/lib/core/config/env.ts
+++ b/apps/sim/lib/core/config/env.ts
@@ -257,6 +257,9 @@ export const env = createEnv({
     // Organizations - for self-hosted deployments
     ORGANIZATIONS_ENABLED:                 z.boolean().optional(),                 // Enable organizations on self-hosted (bypasses plan requirements)
 
+    // Invitations - for self-hosted deployments
+    DISABLE_INVITATIONS:                   z.boolean().optional(),                 // Disable workspace invitations globally (for self-hosted deployments)
+
     // SSO Configuration (for script-based registration)
     SSO_ENABLED:                           z.boolean().optional(),                 // Enable SSO functionality
     SSO_PROVIDER_TYPE:                     z.enum(['oidc', 'saml']).optional(),    // [REQUIRED] SSO provider type
@@ -337,6 +340,7 @@ export const env = createEnv({
     NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED:   z.boolean().optional(),                 // Enable credential sets (email polling) on self-hosted
     NEXT_PUBLIC_ACCESS_CONTROL_ENABLED:    z.boolean().optional(),                 // Enable access control (permission groups) on self-hosted
     NEXT_PUBLIC_ORGANIZATIONS_ENABLED:     z.boolean().optional(),                 // Enable organizations on self-hosted (bypasses plan requirements)
+    NEXT_PUBLIC_DISABLE_INVITATIONS:       z.boolean().optional(),                 // Disable workspace invitations globally (for self-hosted deployments)
     NEXT_PUBLIC_EMAIL_PASSWORD_SIGNUP_ENABLED: z.boolean().optional().default(true), // Control visibility of email/password login forms
   },
 
@@ -368,6 +372,7 @@ export const env = createEnv({
     NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED: process.env.NEXT_PUBLIC_CREDENTIAL_SETS_ENABLED,
     NEXT_PUBLIC_ACCESS_CONTROL_ENABLED: process.env.NEXT_PUBLIC_ACCESS_CONTROL_ENABLED,
     NEXT_PUBLIC_ORGANIZATIONS_ENABLED: process.env.NEXT_PUBLIC_ORGANIZATIONS_ENABLED,
+    NEXT_PUBLIC_DISABLE_INVITATIONS: process.env.NEXT_PUBLIC_DISABLE_INVITATIONS,
     NEXT_PUBLIC_EMAIL_PASSWORD_SIGNUP_ENABLED: process.env.NEXT_PUBLIC_EMAIL_PASSWORD_SIGNUP_ENABLED,
     NEXT_PUBLIC_E2B_ENABLED: process.env.NEXT_PUBLIC_E2B_ENABLED,
     NEXT_PUBLIC_COPILOT_TRAINING_ENABLED: process.env.NEXT_PUBLIC_COPILOT_TRAINING_ENABLED,
diff --git a/apps/sim/lib/core/config/feature-flags.ts b/apps/sim/lib/core/config/feature-flags.ts
index 33317ba1cf..2a57e569da 100644
--- a/apps/sim/lib/core/config/feature-flags.ts
+++ b/apps/sim/lib/core/config/feature-flags.ts
@@ -103,6 +103,12 @@ export const isOrganizationsEnabled =
  */
 export const isE2bEnabled = isTruthy(env.E2B_ENABLED)
 
+/**
+ * Are invitations disabled globally
+ * When true, workspace invitations are disabled for all users
+ */
+export const isInvitationsDisabled = isTruthy(env.DISABLE_INVITATIONS)
+
 /**
  * Get cost multiplier based on environment
  */
diff --git a/apps/sim/lib/core/security/redaction.ts b/apps/sim/lib/core/security/redaction.ts
index cf1909cce6..92241cc4d1 100644
--- a/apps/sim/lib/core/security/redaction.ts
+++ b/apps/sim/lib/core/security/redaction.ts
@@ -2,13 +2,10 @@
  * Centralized redaction utilities for sensitive data
  */
 
-/** Standard marker used for all redacted values */
 export const REDACTED_MARKER = '[REDACTED]'
 
-/**
- * Patterns for sensitive key names (case-insensitive matching)
- * These patterns match common naming conventions for sensitive data
- */
+const BYPASS_REDACTION_KEYS = new Set(['nextPageToken'])
+
 const SENSITIVE_KEY_PATTERNS: RegExp[] = [
   /^api[_-]?key$/i,
   /^access[_-]?token$/i,
@@ -66,12 +63,10 @@ const SENSITIVE_VALUE_PATTERNS: Array<{
   },
 ]
 
-/**
- * Checks if a key name matches any sensitive pattern
- * @param key - The key name to check
- * @returns True if the key is considered sensitive
- */
 export function isSensitiveKey(key: string): boolean {
+  if (BYPASS_REDACTION_KEYS.has(key)) {
+    return false
+  }
   const lowerKey = key.toLowerCase()
   return SENSITIVE_KEY_PATTERNS.some((pattern) => pattern.test(lowerKey))
 }
@@ -93,12 +88,6 @@ export function redactSensitiveValues(value: string): string {
   return result
 }
 
-/**
- * Recursively redacts sensitive data (API keys, passwords, tokens, etc.) from an object
- *
- * @param obj - The object to redact sensitive data from
- * @returns A new object with sensitive data redacted
- */
 export function redactApiKeys(obj: any): any {
   if (obj === null || obj === undefined) {
     return obj
diff --git a/apps/sim/lib/permission-groups/types.ts b/apps/sim/lib/permission-groups/types.ts
index 810f06a305..3c82dcc457 100644
--- a/apps/sim/lib/permission-groups/types.ts
+++ b/apps/sim/lib/permission-groups/types.ts
@@ -11,6 +11,7 @@ export interface PermissionGroupConfig {
   disableMcpTools: boolean
   disableCustomTools: boolean
   hideTemplates: boolean
+  disableInvitations: boolean
 }
 
 export const DEFAULT_PERMISSION_GROUP_CONFIG: PermissionGroupConfig = {
@@ -25,6 +26,7 @@ export const DEFAULT_PERMISSION_GROUP_CONFIG: PermissionGroupConfig = {
   disableMcpTools: false,
   disableCustomTools: false,
   hideTemplates: false,
+  disableInvitations: false,
 }
 
 export function parsePermissionGroupConfig(config: unknown): PermissionGroupConfig {
@@ -47,5 +49,6 @@ export function parsePermissionGroupConfig(config: unknown): PermissionGroupConf
     disableMcpTools: typeof c.disableMcpTools === 'boolean' ? c.disableMcpTools : false,
     disableCustomTools: typeof c.disableCustomTools === 'boolean' ? c.disableCustomTools : false,
     hideTemplates: typeof c.hideTemplates === 'boolean' ? c.hideTemplates : false,
+    disableInvitations: typeof c.disableInvitations === 'boolean' ? c.disableInvitations : false,
   }
 }
diff --git a/apps/sim/lib/webhooks/processor.ts b/apps/sim/lib/webhooks/processor.ts
index 5d7d847658..7a70705d41 100644
--- a/apps/sim/lib/webhooks/processor.ts
+++ b/apps/sim/lib/webhooks/processor.ts
@@ -25,7 +25,6 @@ export interface WebhookProcessorOptions {
   requestId: string
   path?: string
   webhookId?: string
-  testMode?: boolean
   executionTarget?: 'deployed' | 'live'
 }
 
@@ -733,17 +732,12 @@ export async function verifyProviderAuth(
 /**
  * Run preprocessing checks for webhook execution
  * This replaces the old checkRateLimits and checkUsageLimits functions
- *
- * @param isTestMode - If true, skips deployment check (for test webhooks that run on live/draft state)
  */
 export async function checkWebhookPreprocessing(
   foundWorkflow: any,
   foundWebhook: any,
-  requestId: string,
-  options?: { isTestMode?: boolean }
+  requestId: string
 ): Promise<NextResponse | null> {
-  const { isTestMode = false } = options || {}
-
   try {
     const executionId = uuidv4()
 
@@ -753,8 +747,8 @@ export async function checkWebhookPreprocessing(
       triggerType: 'webhook',
       executionId,
       requestId,
-      checkRateLimit: true, // Webhooks need rate limiting
-      checkDeployment: !isTestMode, // Test webhooks skip deployment check (run on live state)
+      checkRateLimit: true,
+      checkDeployment: true,
       workspaceId: foundWorkflow.workspaceId,
     })
 
@@ -954,7 +948,6 @@ export async function queueWebhookExecution(
       headers,
       path: options.path || foundWebhook.path,
       blockId: foundWebhook.blockId,
-      testMode: options.testMode,
       executionTarget: options.executionTarget,
       ...(credentialId ? { credentialId } : {}),
     }
@@ -962,18 +955,14 @@ export async function queueWebhookExecution(
     if (isTriggerDevEnabled) {
       const handle = await tasks.trigger('webhook-execution', payload)
       logger.info(
-        `[${options.requestId}] Queued ${options.testMode ? 'TEST ' : ''}webhook execution task ${
-          handle.id
-        } for ${foundWebhook.provider} webhook`
+        `[${options.requestId}] Queued webhook execution task ${handle.id} for ${foundWebhook.provider} webhook`
       )
     } else {
       void executeWebhookJob(payload).catch((error) => {
         logger.error(`[${options.requestId}] Direct webhook execution failed`, error)
       })
       logger.info(
-        `[${options.requestId}] Queued direct ${
-          options.testMode ? 'TEST ' : ''
-        }webhook execution for ${foundWebhook.provider} webhook (Trigger.dev disabled)`
+        `[${options.requestId}] Queued direct webhook execution for ${foundWebhook.provider} webhook (Trigger.dev disabled)`
       )
     }
 
diff --git a/apps/sim/lib/webhooks/provider-subscriptions.ts b/apps/sim/lib/webhooks/provider-subscriptions.ts
index 7b45669353..d7782a7ce3 100644
--- a/apps/sim/lib/webhooks/provider-subscriptions.ts
+++ b/apps/sim/lib/webhooks/provider-subscriptions.ts
@@ -9,6 +9,7 @@ const airtableLogger = createLogger('AirtableWebhook')
 const typeformLogger = createLogger('TypeformWebhook')
 const calendlyLogger = createLogger('CalendlyWebhook')
 const grainLogger = createLogger('GrainWebhook')
+const lemlistLogger = createLogger('LemlistWebhook')
 
 function getProviderConfig(webhook: any): Record<string, any> {
   return (webhook.providerConfig as Record<string, any>) || {}
@@ -711,9 +712,58 @@ export async function deleteGrainWebhook(webhook: any, requestId: string): Promi
   }
 }
 
+/**
+ * Delete a Lemlist webhook
+ * Don't fail webhook deletion if cleanup fails
+ */
+export async function deleteLemlistWebhook(webhook: any, requestId: string): Promise<void> {
+  try {
+    const config = getProviderConfig(webhook)
+    const apiKey = config.apiKey as string | undefined
+    const externalId = config.externalId as string | undefined
+
+    if (!apiKey) {
+      lemlistLogger.warn(
+        `[${requestId}] Missing apiKey for Lemlist webhook deletion ${webhook.id}, skipping cleanup`
+      )
+      return
+    }
+
+    if (!externalId) {
+      lemlistLogger.warn(
+        `[${requestId}] Missing externalId for Lemlist webhook deletion ${webhook.id}, skipping cleanup`
+      )
+      return
+    }
+
+    // Lemlist uses Basic Auth with empty username and API key as password
+    const authString = Buffer.from(`:${apiKey}`).toString('base64')
+    const lemlistApiUrl = `https://api.lemlist.com/api/hooks/${externalId}`
+
+    const lemlistResponse = await fetch(lemlistApiUrl, {
+      method: 'DELETE',
+      headers: {
+        Authorization: `Basic ${authString}`,
+      },
+    })
+
+    if (!lemlistResponse.ok && lemlistResponse.status !== 404) {
+      const responseBody = await lemlistResponse.json().catch(() => ({}))
+      lemlistLogger.warn(
+        `[${requestId}] Failed to delete Lemlist webhook (non-fatal): ${lemlistResponse.status}`,
+        { response: responseBody }
+      )
+    } else {
+      lemlistLogger.info(`[${requestId}] Successfully deleted Lemlist webhook ${externalId}`)
+    }
+  } catch (error) {
+    lemlistLogger.warn(`[${requestId}] Error deleting Lemlist webhook (non-fatal)`, error)
+  }
+}
+
 /**
  * Clean up external webhook subscriptions for a webhook
- * Handles Airtable, Teams, Telegram, Typeform, Calendly, and Grain cleanup
+ * Handles Airtable, Teams, Telegram, Typeform, Calendly, Grain, and Lemlist cleanup
  * Don't fail deletion if cleanup fails
  */
 export async function cleanupExternalWebhook(
@@ -733,5 +783,7 @@ export async function cleanupExternalWebhook(
     await deleteCalendlyWebhook(webhook, requestId)
   } else if (webhook.provider === 'grain') {
     await deleteGrainWebhook(webhook, requestId)
+  } else if (webhook.provider === 'lemlist') {
+    await deleteLemlistWebhook(webhook, requestId)
   }
 }
diff --git a/apps/sim/lib/webhooks/test-tokens.ts b/apps/sim/lib/webhooks/test-tokens.ts
deleted file mode 100644
index 26495bde1e..0000000000
--- a/apps/sim/lib/webhooks/test-tokens.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { jwtVerify, SignJWT } from 'jose'
-import { env } from '@/lib/core/config/env'
-
-type TestTokenPayload = {
-  typ: 'webhook_test'
-  wid: string
-}
-
-const getSecretKey = () => new TextEncoder().encode(env.INTERNAL_API_SECRET)
-
-export async function signTestWebhookToken(webhookId: string, ttlSeconds: number): Promise<string> {
-  const secret = getSecretKey()
-  const payload: TestTokenPayload = { typ: 'webhook_test', wid: webhookId }
-
-  const token = await new SignJWT(payload)
-    .setProtectedHeader({ alg: 'HS256' })
-    .setIssuedAt()
-    .setExpirationTime(`${ttlSeconds}s`)
-    .setIssuer('sim-webhooks')
-    .setAudience('sim-test')
-    .sign(secret)
-
-  return token
-}
-
-export async function verifyTestWebhookToken(
-  token: string,
-  expectedWebhookId: string
-): Promise<boolean> {
-  try {
-    const secret = getSecretKey()
-    const { payload } = await jwtVerify(token, secret, {
-      issuer: 'sim-webhooks',
-      audience: 'sim-test',
-    })
-
-    if (
-      payload &&
-      (payload as any).typ === 'webhook_test' &&
-      (payload as any).wid === expectedWebhookId
-    ) {
-      return true
-    }
-    return false
-  } catch (_e) {
-    return false
-  }
-}
diff --git a/apps/sim/lib/workflows/comparison/compare.test.ts b/apps/sim/lib/workflows/comparison/compare.test.ts
index 9b72d30c52..d0abb00409 100644
--- a/apps/sim/lib/workflows/comparison/compare.test.ts
+++ b/apps/sim/lib/workflows/comparison/compare.test.ts
@@ -2340,62 +2340,6 @@ describe('hasWorkflowChanged', () => {
       expect(hasWorkflowChanged(currentState, deployedState)).toBe(false)
     })
 
-    it.concurrent('should not detect change when testUrl differs', () => {
-      const deployedState = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            type: 'starter',
-            subBlocks: {
-              triggerConfig: { value: { event: 'push' } },
-              testUrl: { value: null },
-            },
-          }),
-        },
-      })
-
-      const currentState = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            type: 'starter',
-            subBlocks: {
-              triggerConfig: { value: { event: 'push' } },
-              testUrl: { value: 'https://test.example.com/webhook' },
-            },
-          }),
-        },
-      })
-
-      expect(hasWorkflowChanged(currentState, deployedState)).toBe(false)
-    })
-
-    it.concurrent('should not detect change when testUrlExpiresAt differs', () => {
-      const deployedState = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            type: 'starter',
-            subBlocks: {
-              triggerConfig: { value: { event: 'push' } },
-              testUrlExpiresAt: { value: null },
-            },
-          }),
-        },
-      })
-
-      const currentState = createWorkflowState({
-        blocks: {
-          block1: createBlock('block1', {
-            type: 'starter',
-            subBlocks: {
-              triggerConfig: { value: { event: 'push' } },
-              testUrlExpiresAt: { value: '2025-12-31T23:59:59Z' },
-            },
-          }),
-        },
-      })
-
-      expect(hasWorkflowChanged(currentState, deployedState)).toBe(false)
-    })
-
     it.concurrent('should not detect change when all runtime metadata differs', () => {
       const deployedState = createWorkflowState({
         blocks: {
@@ -2405,8 +2349,6 @@ describe('hasWorkflowChanged', () => {
               triggerConfig: { value: { event: 'push' } },
               webhookId: { value: null },
               triggerPath: { value: '' },
-              testUrl: { value: null },
-              testUrlExpiresAt: { value: null },
             },
           }),
         },
@@ -2420,8 +2362,6 @@ describe('hasWorkflowChanged', () => {
               triggerConfig: { value: { event: 'push' } },
               webhookId: { value: 'wh_123456' },
               triggerPath: { value: '/api/webhooks/abc123' },
-              testUrl: { value: 'https://test.example.com/webhook' },
-              testUrlExpiresAt: { value: '2025-12-31T23:59:59Z' },
             },
           }),
         },
diff --git a/apps/sim/stores/panel/copilot/store.ts b/apps/sim/stores/panel/copilot/store.ts
index d4e926c91e..97b785177a 100644
--- a/apps/sim/stores/panel/copilot/store.ts
+++ b/apps/sim/stores/panel/copilot/store.ts
@@ -42,6 +42,7 @@ import { RememberDebugClientTool } from '@/lib/copilot/tools/client/other/rememb
 import { ResearchClientTool } from '@/lib/copilot/tools/client/other/research'
 import { SearchDocumentationClientTool } from '@/lib/copilot/tools/client/other/search-documentation'
 import { SearchErrorsClientTool } from '@/lib/copilot/tools/client/other/search-errors'
+import { SearchLibraryDocsClientTool } from '@/lib/copilot/tools/client/other/search-library-docs'
 import { SearchOnlineClientTool } from '@/lib/copilot/tools/client/other/search-online'
 import { SearchPatternsClientTool } from '@/lib/copilot/tools/client/other/search-patterns'
 import { SleepClientTool } from '@/lib/copilot/tools/client/other/sleep'
@@ -116,6 +117,7 @@ const CLIENT_TOOL_INSTANTIATORS: Record<string, (id: string) => any> = {
   get_trigger_blocks: (id) => new GetTriggerBlocksClientTool(id),
   search_online: (id) => new SearchOnlineClientTool(id),
   search_documentation: (id) => new SearchDocumentationClientTool(id),
+  search_library_docs: (id) => new SearchLibraryDocsClientTool(id),
   search_patterns: (id) => new SearchPatternsClientTool(id),
   search_errors: (id) => new SearchErrorsClientTool(id),
   remember_debug: (id) => new RememberDebugClientTool(id),
@@ -174,6 +176,7 @@ export const CLASS_TOOL_METADATA: Record<string, BaseClientToolMetadata | undefi
   get_trigger_blocks: (GetTriggerBlocksClientTool as any)?.metadata,
   search_online: (SearchOnlineClientTool as any)?.metadata,
   search_documentation: (SearchDocumentationClientTool as any)?.metadata,
+  search_library_docs: (SearchLibraryDocsClientTool as any)?.metadata,
   search_patterns: (SearchPatternsClientTool as any)?.metadata,
   search_errors: (SearchErrorsClientTool as any)?.metadata,
   remember_debug: (RememberDebugClientTool as any)?.metadata,
@@ -2433,9 +2436,10 @@ export const useCopilotStore = create<CopilotStore>()(
 
       // If already sending a message, queue this one instead
       if (isSendingMessage) {
-        get().addToQueue(message, { fileAttachments, contexts })
+        get().addToQueue(message, { fileAttachments, contexts, messageId })
         logger.info('[Copilot] Message queued (already sending)', {
           queueLength: get().messageQueue.length + 1,
+          originalMessageId: messageId,
         })
         return
       }
@@ -3161,8 +3165,12 @@ export const useCopilotStore = create<CopilotStore>()(
         // Process next message in queue if any
         const nextInQueue = get().messageQueue[0]
         if (nextInQueue) {
+          // Use originalMessageId if available (from edit/resend), otherwise use queue entry id
+          const messageIdToUse = nextInQueue.originalMessageId || nextInQueue.id
           logger.info('[Queue] Processing next queued message', {
             id: nextInQueue.id,
+            originalMessageId: nextInQueue.originalMessageId,
+            messageIdToUse,
             queueLength: get().messageQueue.length,
           })
           // Remove from queue and send
@@ -3173,7 +3181,7 @@ export const useCopilotStore = create<CopilotStore>()(
               stream: true,
               fileAttachments: nextInQueue.fileAttachments,
               contexts: nextInQueue.contexts,
-              messageId: nextInQueue.id,
+              messageId: messageIdToUse,
             })
           }, 100)
         }
@@ -3615,10 +3623,12 @@ export const useCopilotStore = create<CopilotStore>()(
         fileAttachments: options?.fileAttachments,
         contexts: options?.contexts,
         queuedAt: Date.now(),
+        originalMessageId: options?.messageId,
       }
       set({ messageQueue: [...get().messageQueue, queuedMessage] })
       logger.info('[Queue] Message added to queue', {
         id: queuedMessage.id,
+        originalMessageId: options?.messageId,
         queueLength: get().messageQueue.length,
       })
     },
@@ -3659,12 +3669,15 @@ export const useCopilotStore = create<CopilotStore>()(
         await new Promise((resolve) => setTimeout(resolve, 50))
       }
 
+      // Use originalMessageId if available (from edit/resend), otherwise use queue entry id
+      const messageIdToUse = message.originalMessageId || message.id
+
       // Send the message
       await get().sendMessage(message.content, {
         stream: true,
         fileAttachments: message.fileAttachments,
         contexts: message.contexts,
-        messageId: message.id,
+        messageId: messageIdToUse,
       })
     },
 
diff --git a/apps/sim/stores/panel/copilot/types.ts b/apps/sim/stores/panel/copilot/types.ts
index bf9b210d88..fbb6404aac 100644
--- a/apps/sim/stores/panel/copilot/types.ts
+++ b/apps/sim/stores/panel/copilot/types.ts
@@ -70,6 +70,8 @@ export interface QueuedMessage {
   fileAttachments?: MessageFileAttachment[]
   contexts?: ChatContext[]
   queuedAt: number
+  /** Original messageId to use when processing (for edit/resend flows) */
+  originalMessageId?: string
 }
 
 // Contexts attached to a user message
@@ -249,6 +251,8 @@ export interface CopilotActions {
     options?: {
       fileAttachments?: MessageFileAttachment[]
       contexts?: ChatContext[]
+      /** Original messageId to preserve (for edit/resend flows) */
+      messageId?: string
     }
   ) => void
   removeFromQueue: (id: string) => void
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 33d2c0d9ef..152f6ef257 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -97,11 +97,18 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           return acc
         }, {})
 
-        set((state) => ({
-          workflows: mapped,
-          error: null,
-          hydration:
-            state.hydration.phase === 'state-loading'
+        set((state) => {
+          // Preserve hydration if workflow is loading or already ready and still exists
+          const shouldPreserveHydration =
+            state.hydration.phase === 'state-loading' ||
+            (state.hydration.phase === 'ready' &&
+              state.hydration.workflowId &&
+              mapped[state.hydration.workflowId])
+
+          return {
+            workflows: mapped,
+            error: null,
+            hydration: shouldPreserveHydration
               ? state.hydration
               : {
                   phase: 'metadata-ready',
@@ -110,7 +117,8 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
                   requestId: null,
                   error: null,
                 },
-        }))
+          }
+        })
       },
 
       failMetadataLoad: (workspaceId: string | null, errorMessage: string) => {
diff --git a/apps/sim/tools/apollo/account_bulk_create.ts b/apps/sim/tools/apollo/account_bulk_create.ts
index 6bcaefecc5..6b8cc45f4d 100644
--- a/apps/sim/tools/apollo/account_bulk_create.ts
+++ b/apps/sim/tools/apollo/account_bulk_create.ts
@@ -56,11 +56,9 @@ export const apolloAccountBulkCreateTool: ToolConfig<
       output: {
         created_accounts: data.accounts || data.created_accounts || [],
         failed_accounts: data.failed_accounts || [],
-        metadata: {
-          total_submitted: data.accounts?.length || 0,
-          created: data.created_accounts?.length || data.accounts?.length || 0,
-          failed: data.failed_accounts?.length || 0,
-        },
+        total_submitted: data.accounts?.length || 0,
+        created: data.created_accounts?.length || data.accounts?.length || 0,
+        failed: data.failed_accounts?.length || 0,
       },
     }
   },
@@ -74,9 +72,17 @@ export const apolloAccountBulkCreateTool: ToolConfig<
       type: 'json',
       description: 'Array of accounts that failed to create',
     },
-    metadata: {
-      type: 'json',
-      description: 'Bulk creation metadata including counts of created and failed accounts',
+    total_submitted: {
+      type: 'number',
+      description: 'Total number of accounts submitted',
+    },
+    created: {
+      type: 'number',
+      description: 'Number of accounts successfully created',
+    },
+    failed: {
+      type: 'number',
+      description: 'Number of accounts that failed to create',
     },
   },
 }
diff --git a/apps/sim/tools/apollo/account_bulk_update.ts b/apps/sim/tools/apollo/account_bulk_update.ts
index 7d20d20956..a78d4f8c45 100644
--- a/apps/sim/tools/apollo/account_bulk_update.ts
+++ b/apps/sim/tools/apollo/account_bulk_update.ts
@@ -56,11 +56,9 @@ export const apolloAccountBulkUpdateTool: ToolConfig<
       output: {
         updated_accounts: data.accounts || data.updated_accounts || [],
         failed_accounts: data.failed_accounts || [],
-        metadata: {
-          total_submitted: data.accounts?.length || 0,
-          updated: data.updated_accounts?.length || data.accounts?.length || 0,
-          failed: data.failed_accounts?.length || 0,
-        },
+        total_submitted: data.accounts?.length || 0,
+        updated: data.updated_accounts?.length || data.accounts?.length || 0,
+        failed: data.failed_accounts?.length || 0,
       },
     }
   },
@@ -74,9 +72,17 @@ export const apolloAccountBulkUpdateTool: ToolConfig<
       type: 'json',
       description: 'Array of accounts that failed to update',
     },
-    metadata: {
-      type: 'json',
-      description: 'Bulk update metadata including counts of updated and failed accounts',
+    total_submitted: {
+      type: 'number',
+      description: 'Total number of accounts submitted',
+    },
+    updated: {
+      type: 'number',
+      description: 'Number of accounts successfully updated',
+    },
+    failed: {
+      type: 'number',
+      description: 'Number of accounts that failed to update',
     },
   },
 }
diff --git a/apps/sim/tools/apollo/account_create.ts b/apps/sim/tools/apollo/account_create.ts
index dac3203d66..7ec84d8766 100644
--- a/apps/sim/tools/apollo/account_create.ts
+++ b/apps/sim/tools/apollo/account_create.ts
@@ -71,16 +71,14 @@ export const apolloAccountCreateTool: ToolConfig<
     return {
       success: true,
       output: {
-        account: data.account || {},
-        metadata: {
-          created: !!data.account,
-        },
+        account: data.account ?? null,
+        created: !!data.account,
       },
     }
   },
 
   outputs: {
-    account: { type: 'json', description: 'Created account data from Apollo' },
-    metadata: { type: 'json', description: 'Creation metadata including created status' },
+    account: { type: 'json', description: 'Created account data from Apollo', optional: true },
+    created: { type: 'boolean', description: 'Whether the account was successfully created' },
   },
 }
diff --git a/apps/sim/tools/apollo/account_search.ts b/apps/sim/tools/apollo/account_search.ts
index 9b2a870606..2be36218c0 100644
--- a/apps/sim/tools/apollo/account_search.ts
+++ b/apps/sim/tools/apollo/account_search.ts
@@ -83,21 +83,18 @@ export const apolloAccountSearchTool: ToolConfig<
     return {
       success: true,
       output: {
-        accounts: data.accounts || [],
-        metadata: {
-          page: data.pagination?.page || 1,
-          per_page: data.pagination?.per_page || 25,
-          total_entries: data.pagination?.total_entries || 0,
-        },
+        accounts: data.accounts ?? null,
+        pagination: data.pagination ?? null,
       },
     }
   },
 
   outputs: {
-    accounts: { type: 'json', description: 'Array of accounts matching the search criteria' },
-    metadata: {
+    accounts: {
       type: 'json',
-      description: 'Pagination information including page, per_page, and total_entries',
+      description: 'Array of accounts matching the search criteria',
+      optional: true,
     },
+    pagination: { type: 'json', description: 'Pagination information', optional: true },
   },
 }
diff --git a/apps/sim/tools/apollo/account_update.ts b/apps/sim/tools/apollo/account_update.ts
index f49555318f..bebe5b55db 100644
--- a/apps/sim/tools/apollo/account_update.ts
+++ b/apps/sim/tools/apollo/account_update.ts
@@ -79,16 +79,14 @@ export const apolloAccountUpdateTool: ToolConfig<
     return {
       success: true,
       output: {
-        account: data.account || {},
-        metadata: {
-          updated: !!data.account,
-        },
+        account: data.account ?? null,
+        updated: !!data.account,
       },
     }
   },
 
   outputs: {
-    account: { type: 'json', description: 'Updated account data from Apollo' },
-    metadata: { type: 'json', description: 'Update metadata including updated status' },
+    account: { type: 'json', description: 'Updated account data from Apollo', optional: true },
+    updated: { type: 'boolean', description: 'Whether the account was successfully updated' },
   },
 }
diff --git a/apps/sim/tools/apollo/contact_bulk_create.ts b/apps/sim/tools/apollo/contact_bulk_create.ts
index 3b6a74089d..b16a4e94c1 100644
--- a/apps/sim/tools/apollo/contact_bulk_create.ts
+++ b/apps/sim/tools/apollo/contact_bulk_create.ts
@@ -69,11 +69,9 @@ export const apolloContactBulkCreateTool: ToolConfig<
       output: {
         created_contacts: data.contacts || data.created_contacts || [],
         existing_contacts: data.existing_contacts || [],
-        metadata: {
-          total_submitted: data.contacts?.length || 0,
-          created: data.created_contacts?.length || data.contacts?.length || 0,
-          existing: data.existing_contacts?.length || 0,
-        },
+        total_submitted: data.contacts?.length || 0,
+        created: data.created_contacts?.length || data.contacts?.length || 0,
+        existing: data.existing_contacts?.length || 0,
       },
     }
   },
@@ -87,9 +85,17 @@ export const apolloContactBulkCreateTool: ToolConfig<
       type: 'json',
       description: 'Array of existing contacts (when deduplication is enabled)',
     },
-    metadata: {
-      type: 'json',
-      description: 'Bulk creation metadata including counts of created and existing contacts',
+    total_submitted: {
+      type: 'number',
+      description: 'Total number of contacts submitted',
+    },
+    created: {
+      type: 'number',
+      description: 'Number of contacts successfully created',
+    },
+    existing: {
+      type: 'number',
+      description: 'Number of existing contacts found',
     },
   },
 }
diff --git a/apps/sim/tools/apollo/contact_bulk_update.ts b/apps/sim/tools/apollo/contact_bulk_update.ts
index 8aec17f56e..4f254cfc1f 100644
--- a/apps/sim/tools/apollo/contact_bulk_update.ts
+++ b/apps/sim/tools/apollo/contact_bulk_update.ts
@@ -56,11 +56,9 @@ export const apolloContactBulkUpdateTool: ToolConfig<
       output: {
         updated_contacts: data.contacts || data.updated_contacts || [],
         failed_contacts: data.failed_contacts || [],
-        metadata: {
-          total_submitted: data.contacts?.length || 0,
-          updated: data.updated_contacts?.length || data.contacts?.length || 0,
-          failed: data.failed_contacts?.length || 0,
-        },
+        total_submitted: data.contacts?.length || 0,
+        updated: data.updated_contacts?.length || data.contacts?.length || 0,
+        failed: data.failed_contacts?.length || 0,
       },
     }
   },
@@ -74,9 +72,17 @@ export const apolloContactBulkUpdateTool: ToolConfig<
       type: 'json',
       description: 'Array of contacts that failed to update',
     },
-    metadata: {
-      type: 'json',
-      description: 'Bulk update metadata including counts of updated and failed contacts',
+    total_submitted: {
+      type: 'number',
+      description: 'Total number of contacts submitted',
+    },
+    updated: {
+      type: 'number',
+      description: 'Number of contacts successfully updated',
+    },
+    failed: {
+      type: 'number',
+      description: 'Number of contacts that failed to update',
     },
   },
 }
diff --git a/apps/sim/tools/apollo/contact_create.ts b/apps/sim/tools/apollo/contact_create.ts
index efc806f0ad..ae5a6ea133 100644
--- a/apps/sim/tools/apollo/contact_create.ts
+++ b/apps/sim/tools/apollo/contact_create.ts
@@ -87,16 +87,14 @@ export const apolloContactCreateTool: ToolConfig<
     return {
       success: true,
       output: {
-        contact: data.contact || {},
-        metadata: {
-          created: !!data.contact,
-        },
+        contact: data.contact ?? null,
+        created: !!data.contact,
       },
     }
   },
 
   outputs: {
-    contact: { type: 'json', description: 'Created contact data from Apollo' },
-    metadata: { type: 'json', description: 'Creation metadata including created status' },
+    contact: { type: 'json', description: 'Created contact data from Apollo', optional: true },
+    created: { type: 'boolean', description: 'Whether the contact was successfully created' },
   },
 }
diff --git a/apps/sim/tools/apollo/contact_search.ts b/apps/sim/tools/apollo/contact_search.ts
index 6a6ee9a151..b50b8e21fa 100644
--- a/apps/sim/tools/apollo/contact_search.ts
+++ b/apps/sim/tools/apollo/contact_search.ts
@@ -75,21 +75,18 @@ export const apolloContactSearchTool: ToolConfig<
     return {
       success: true,
       output: {
-        contacts: data.contacts || [],
-        metadata: {
-          page: data.pagination?.page || 1,
-          per_page: data.pagination?.per_page || 25,
-          total_entries: data.pagination?.total_entries || 0,
-        },
+        contacts: data.contacts ?? null,
+        pagination: data.pagination ?? null,
       },
     }
   },
 
   outputs: {
-    contacts: { type: 'json', description: 'Array of contacts matching the search criteria' },
-    metadata: {
+    contacts: {
       type: 'json',
-      description: 'Pagination information including page, per_page, and total_entries',
+      description: 'Array of contacts matching the search criteria',
+      optional: true,
     },
+    pagination: { type: 'json', description: 'Pagination information', optional: true },
   },
 }
diff --git a/apps/sim/tools/apollo/contact_update.ts b/apps/sim/tools/apollo/contact_update.ts
index c7c6041cf4..7a94ac1c12 100644
--- a/apps/sim/tools/apollo/contact_update.ts
+++ b/apps/sim/tools/apollo/contact_update.ts
@@ -93,16 +93,14 @@ export const apolloContactUpdateTool: ToolConfig<
     return {
       success: true,
       output: {
-        contact: data.contact || {},
-        metadata: {
-          updated: !!data.contact,
-        },
+        contact: data.contact ?? null,
+        updated: !!data.contact,
       },
     }
   },
 
   outputs: {
-    contact: { type: 'json', description: 'Updated contact data from Apollo' },
-    metadata: { type: 'json', description: 'Update metadata including updated status' },
+    contact: { type: 'json', description: 'Updated contact data from Apollo', optional: true },
+    updated: { type: 'boolean', description: 'Whether the contact was successfully updated' },
   },
 }
diff --git a/apps/sim/tools/apollo/email_accounts.ts b/apps/sim/tools/apollo/email_accounts.ts
index bf865f0578..ceb854a602 100644
--- a/apps/sim/tools/apollo/email_accounts.ts
+++ b/apps/sim/tools/apollo/email_accounts.ts
@@ -41,15 +41,13 @@ export const apolloEmailAccountsTool: ToolConfig<
       success: true,
       output: {
         email_accounts: data.email_accounts || [],
-        metadata: {
-          total: data.email_accounts?.length || 0,
-        },
+        total: data.email_accounts?.length || 0,
       },
     }
   },
 
   outputs: {
     email_accounts: { type: 'json', description: 'Array of team email accounts linked in Apollo' },
-    metadata: { type: 'json', description: 'Metadata including total count of email accounts' },
+    total: { type: 'number', description: 'Total count of email accounts' },
   },
 }
diff --git a/apps/sim/tools/apollo/opportunity_create.ts b/apps/sim/tools/apollo/opportunity_create.ts
index 5c329fd7b8..45d5d80264 100644
--- a/apps/sim/tools/apollo/opportunity_create.ts
+++ b/apps/sim/tools/apollo/opportunity_create.ts
@@ -97,16 +97,18 @@ export const apolloOpportunityCreateTool: ToolConfig<
     return {
       success: true,
       output: {
-        opportunity: data.opportunity || {},
-        metadata: {
-          created: !!data.opportunity,
-        },
+        opportunity: data.opportunity ?? null,
+        created: !!data.opportunity,
       },
     }
   },
 
   outputs: {
-    opportunity: { type: 'json', description: 'Created opportunity data from Apollo' },
-    metadata: { type: 'json', description: 'Creation metadata including created status' },
+    opportunity: {
+      type: 'json',
+      description: 'Created opportunity data from Apollo',
+      optional: true,
+    },
+    created: { type: 'boolean', description: 'Whether the opportunity was successfully created' },
   },
 }
diff --git a/apps/sim/tools/apollo/opportunity_get.ts b/apps/sim/tools/apollo/opportunity_get.ts
index e6a3912b32..4fb9c2cc7c 100644
--- a/apps/sim/tools/apollo/opportunity_get.ts
+++ b/apps/sim/tools/apollo/opportunity_get.ts
@@ -48,15 +48,13 @@ export const apolloOpportunityGetTool: ToolConfig<
       success: true,
       output: {
         opportunity: data.opportunity || {},
-        metadata: {
-          found: !!data.opportunity,
-        },
+        found: !!data.opportunity,
       },
     }
   },
 
   outputs: {
     opportunity: { type: 'json', description: 'Complete opportunity data from Apollo' },
-    metadata: { type: 'json', description: 'Retrieval metadata including found status' },
+    found: { type: 'boolean', description: 'Whether the opportunity was found' },
   },
 }
diff --git a/apps/sim/tools/apollo/opportunity_search.ts b/apps/sim/tools/apollo/opportunity_search.ts
index 2ad8782419..3a317feda0 100644
--- a/apps/sim/tools/apollo/opportunity_search.ts
+++ b/apps/sim/tools/apollo/opportunity_search.ts
@@ -91,11 +91,9 @@ export const apolloOpportunitySearchTool: ToolConfig<
       success: true,
       output: {
         opportunities: data.opportunities || [],
-        metadata: {
-          page: data.pagination?.page || 1,
-          per_page: data.pagination?.per_page || 25,
-          total_entries: data.pagination?.total_entries || 0,
-        },
+        page: data.pagination?.page || 1,
+        per_page: data.pagination?.per_page || 25,
+        total_entries: data.pagination?.total_entries || 0,
       },
     }
   },
@@ -105,9 +103,8 @@ export const apolloOpportunitySearchTool: ToolConfig<
       type: 'json',
       description: 'Array of opportunities matching the search criteria',
     },
-    metadata: {
-      type: 'json',
-      description: 'Pagination information including page, per_page, and total_entries',
-    },
+    page: { type: 'number', description: 'Current page number' },
+    per_page: { type: 'number', description: 'Results per page' },
+    total_entries: { type: 'number', description: 'Total matching entries' },
   },
 }
diff --git a/apps/sim/tools/apollo/opportunity_update.ts b/apps/sim/tools/apollo/opportunity_update.ts
index 8f19fcaf22..a03f83bf0b 100644
--- a/apps/sim/tools/apollo/opportunity_update.ts
+++ b/apps/sim/tools/apollo/opportunity_update.ts
@@ -96,16 +96,18 @@ export const apolloOpportunityUpdateTool: ToolConfig<
     return {
       success: true,
       output: {
-        opportunity: data.opportunity || {},
-        metadata: {
-          updated: !!data.opportunity,
-        },
+        opportunity: data.opportunity ?? null,
+        updated: !!data.opportunity,
       },
     }
   },
 
   outputs: {
-    opportunity: { type: 'json', description: 'Updated opportunity data from Apollo' },
-    metadata: { type: 'json', description: 'Update metadata including updated status' },
+    opportunity: {
+      type: 'json',
+      description: 'Updated opportunity data from Apollo',
+      optional: true,
+    },
+    updated: { type: 'boolean', description: 'Whether the opportunity was successfully updated' },
   },
 }
diff --git a/apps/sim/tools/apollo/organization_bulk_enrich.ts b/apps/sim/tools/apollo/organization_bulk_enrich.ts
index cdb06e0e1b..c72d31a0e8 100644
--- a/apps/sim/tools/apollo/organization_bulk_enrich.ts
+++ b/apps/sim/tools/apollo/organization_bulk_enrich.ts
@@ -53,19 +53,15 @@ export const apolloOrganizationBulkEnrichTool: ToolConfig<
       success: true,
       output: {
         organizations: data.matches || [],
-        metadata: {
-          total: data.matches?.length || 0,
-          enriched: data.matches?.filter((o: any) => o).length || 0,
-        },
+        total: data.matches?.length || 0,
+        enriched: data.matches?.filter((o: any) => o).length || 0,
       },
     }
   },
 
   outputs: {
     organizations: { type: 'json', description: 'Array of enriched organization data' },
-    metadata: {
-      type: 'json',
-      description: 'Bulk enrichment metadata including total and enriched counts',
-    },
+    total: { type: 'number', description: 'Total number of organizations processed' },
+    enriched: { type: 'number', description: 'Number of organizations successfully enriched' },
   },
 }
diff --git a/apps/sim/tools/apollo/organization_enrich.ts b/apps/sim/tools/apollo/organization_enrich.ts
index ded4f89629..093048b94e 100644
--- a/apps/sim/tools/apollo/organization_enrich.ts
+++ b/apps/sim/tools/apollo/organization_enrich.ts
@@ -71,15 +71,16 @@ export const apolloOrganizationEnrichTool: ToolConfig<
       success: true,
       output: {
         organization: data.organization || {},
-        metadata: {
-          enriched: !!data.organization,
-        },
+        enriched: !!data.organization,
       },
     }
   },
 
   outputs: {
     organization: { type: 'json', description: 'Enriched organization data from Apollo' },
-    metadata: { type: 'json', description: 'Enrichment metadata including enriched status' },
+    enriched: {
+      type: 'boolean',
+      description: 'Whether the organization was successfully enriched',
+    },
   },
 }
diff --git a/apps/sim/tools/apollo/organization_search.ts b/apps/sim/tools/apollo/organization_search.ts
index 3d94f80d91..96b08990ba 100644
--- a/apps/sim/tools/apollo/organization_search.ts
+++ b/apps/sim/tools/apollo/organization_search.ts
@@ -101,11 +101,9 @@ export const apolloOrganizationSearchTool: ToolConfig<
       success: true,
       output: {
         organizations: data.organizations || [],
-        metadata: {
-          page: data.pagination?.page || 1,
-          per_page: data.pagination?.per_page || 25,
-          total_entries: data.pagination?.total_entries || 0,
-        },
+        page: data.pagination?.page || 1,
+        per_page: data.pagination?.per_page || 25,
+        total_entries: data.pagination?.total_entries || 0,
       },
     }
   },
@@ -115,9 +113,8 @@ export const apolloOrganizationSearchTool: ToolConfig<
       type: 'json',
       description: 'Array of organizations matching the search criteria',
     },
-    metadata: {
-      type: 'json',
-      description: 'Pagination information including page, per_page, and total_entries',
-    },
+    page: { type: 'number', description: 'Current page number' },
+    per_page: { type: 'number', description: 'Results per page' },
+    total_entries: { type: 'number', description: 'Total matching entries' },
   },
 }
diff --git a/apps/sim/tools/apollo/people_bulk_enrich.ts b/apps/sim/tools/apollo/people_bulk_enrich.ts
index afc965ece9..cb6c35aa8e 100644
--- a/apps/sim/tools/apollo/people_bulk_enrich.ts
+++ b/apps/sim/tools/apollo/people_bulk_enrich.ts
@@ -67,19 +67,15 @@ export const apolloPeopleBulkEnrichTool: ToolConfig<
       success: true,
       output: {
         people: data.matches || [],
-        metadata: {
-          total: data.matches?.length || 0,
-          enriched: data.matches?.filter((p: any) => p).length || 0,
-        },
+        total: data.matches?.length || 0,
+        enriched: data.matches?.filter((p: any) => p).length || 0,
       },
     }
   },
 
   outputs: {
     people: { type: 'json', description: 'Array of enriched people data' },
-    metadata: {
-      type: 'json',
-      description: 'Bulk enrichment metadata including total and enriched counts',
-    },
+    total: { type: 'number', description: 'Total number of people processed' },
+    enriched: { type: 'number', description: 'Number of people successfully enriched' },
   },
 }
diff --git a/apps/sim/tools/apollo/people_enrich.ts b/apps/sim/tools/apollo/people_enrich.ts
index e10e474abd..7e48034af0 100644
--- a/apps/sim/tools/apollo/people_enrich.ts
+++ b/apps/sim/tools/apollo/people_enrich.ts
@@ -107,15 +107,13 @@ export const apolloPeopleEnrichTool: ToolConfig<
       success: true,
       output: {
         person: data.person || {},
-        metadata: {
-          enriched: !!data.person,
-        },
+        enriched: !!data.person,
       },
     }
   },
 
   outputs: {
     person: { type: 'json', description: 'Enriched person data from Apollo' },
-    metadata: { type: 'json', description: 'Enrichment metadata including enriched status' },
+    enriched: { type: 'boolean', description: 'Whether the person was successfully enriched' },
   },
 }
diff --git a/apps/sim/tools/apollo/people_search.ts b/apps/sim/tools/apollo/people_search.ts
index f4b14d51c2..f32a59ba6f 100644
--- a/apps/sim/tools/apollo/people_search.ts
+++ b/apps/sim/tools/apollo/people_search.ts
@@ -107,20 +107,17 @@ export const apolloPeopleSearchTool: ToolConfig<
       success: true,
       output: {
         people: data.people || [],
-        metadata: {
-          page: data.pagination?.page || 1,
-          per_page: data.pagination?.per_page || 25,
-          total_entries: data.pagination?.total_entries || 0,
-        },
+        page: data.pagination?.page || 1,
+        per_page: data.pagination?.per_page || 25,
+        total_entries: data.pagination?.total_entries || 0,
       },
     }
   },
 
   outputs: {
     people: { type: 'json', description: 'Array of people matching the search criteria' },
-    metadata: {
-      type: 'json',
-      description: 'Pagination information including page, per_page, and total_entries',
-    },
+    page: { type: 'number', description: 'Current page number' },
+    per_page: { type: 'number', description: 'Results per page' },
+    total_entries: { type: 'number', description: 'Total matching entries' },
   },
 }
diff --git a/apps/sim/tools/apollo/sequence_add_contacts.ts b/apps/sim/tools/apollo/sequence_add_contacts.ts
index b87a69f77e..3dd5f83f40 100644
--- a/apps/sim/tools/apollo/sequence_add_contacts.ts
+++ b/apps/sim/tools/apollo/sequence_add_contacts.ts
@@ -81,19 +81,15 @@ export const apolloSequenceAddContactsTool: ToolConfig<
       success: true,
       output: {
         contacts_added: data.contacts || params?.contact_ids || [],
-        metadata: {
-          sequence_id: params?.sequence_id || '',
-          total_added: data.contacts?.length || params?.contact_ids?.length || 0,
-        },
+        sequence_id: params?.sequence_id || '',
+        total_added: data.contacts?.length || params?.contact_ids?.length || 0,
       },
     }
   },
 
   outputs: {
     contacts_added: { type: 'json', description: 'Array of contact IDs added to the sequence' },
-    metadata: {
-      type: 'json',
-      description: 'Sequence metadata including sequence_id and total_added count',
-    },
+    sequence_id: { type: 'string', description: 'ID of the sequence contacts were added to' },
+    total_added: { type: 'number', description: 'Total number of contacts added' },
   },
 }
diff --git a/apps/sim/tools/apollo/sequence_search.ts b/apps/sim/tools/apollo/sequence_search.ts
index d358acd2a0..449bb5939e 100644
--- a/apps/sim/tools/apollo/sequence_search.ts
+++ b/apps/sim/tools/apollo/sequence_search.ts
@@ -74,11 +74,9 @@ export const apolloSequenceSearchTool: ToolConfig<
       success: true,
       output: {
         sequences: data.emailer_campaigns || [],
-        metadata: {
-          page: data.pagination?.page || 1,
-          per_page: data.pagination?.per_page || 25,
-          total_entries: data.pagination?.total_entries || 0,
-        },
+        page: data.pagination?.page || 1,
+        per_page: data.pagination?.per_page || 25,
+        total_entries: data.pagination?.total_entries || 0,
       },
     }
   },
@@ -88,9 +86,8 @@ export const apolloSequenceSearchTool: ToolConfig<
       type: 'json',
       description: 'Array of sequences/campaigns matching the search criteria',
     },
-    metadata: {
-      type: 'json',
-      description: 'Pagination information including page, per_page, and total_entries',
-    },
+    page: { type: 'number', description: 'Current page number' },
+    per_page: { type: 'number', description: 'Results per page' },
+    total_entries: { type: 'number', description: 'Total matching entries' },
   },
 }
diff --git a/apps/sim/tools/apollo/task_create.ts b/apps/sim/tools/apollo/task_create.ts
index 50f6dc017b..61b4587df3 100644
--- a/apps/sim/tools/apollo/task_create.ts
+++ b/apps/sim/tools/apollo/task_create.ts
@@ -84,20 +84,14 @@ export const apolloTaskCreateTool: ToolConfig<ApolloTaskCreateParams, ApolloTask
     return {
       success: true,
       output: {
-        task: data.task || {
-          note: '',
-          created: true,
-          message: 'Task created successfully. Apollo API does not return task details.',
-        },
-        metadata: {
-          created: data === true || !!data.task,
-        },
+        task: data.task ?? null,
+        created: data === true || !!data.task,
       },
     }
   },
 
   outputs: {
-    task: { type: 'json', description: 'Created task data from Apollo' },
-    metadata: { type: 'json', description: 'Creation metadata including created status' },
+    task: { type: 'json', description: 'Created task data from Apollo', optional: true },
+    created: { type: 'boolean', description: 'Whether the task was successfully created' },
   },
 }
diff --git a/apps/sim/tools/apollo/task_search.ts b/apps/sim/tools/apollo/task_search.ts
index 024515d10a..396ebc3f91 100644
--- a/apps/sim/tools/apollo/task_search.ts
+++ b/apps/sim/tools/apollo/task_search.ts
@@ -77,21 +77,18 @@ export const apolloTaskSearchTool: ToolConfig<ApolloTaskSearchParams, ApolloTask
     return {
       success: true,
       output: {
-        tasks: data.tasks || [],
-        metadata: {
-          page: data.pagination?.page || 1,
-          per_page: data.pagination?.per_page || 25,
-          total_entries: data.pagination?.total_entries || 0,
-        },
+        tasks: data.tasks ?? null,
+        pagination: data.pagination ?? null,
       },
     }
   },
 
   outputs: {
-    tasks: { type: 'json', description: 'Array of tasks matching the search criteria' },
-    metadata: {
+    tasks: {
       type: 'json',
-      description: 'Pagination information including page, per_page, and total_entries',
+      description: 'Array of tasks matching the search criteria',
+      optional: true,
     },
+    pagination: { type: 'json', description: 'Pagination information', optional: true },
   },
 }
diff --git a/apps/sim/tools/apollo/types.ts b/apps/sim/tools/apollo/types.ts
index fc1eebe018..6738fc0645 100644
--- a/apps/sim/tools/apollo/types.ts
+++ b/apps/sim/tools/apollo/types.ts
@@ -89,11 +89,9 @@ export interface ApolloPeopleSearchParams extends ApolloBaseParams {
 export interface ApolloPeopleSearchResponse extends ToolResponse {
   output: {
     people: ApolloPerson[]
-    metadata: {
-      page: number
-      per_page: number
-      total_entries: number
-    }
+    page: number
+    per_page: number
+    total_entries: number
   }
 }
 
@@ -112,9 +110,7 @@ export interface ApolloPeopleEnrichParams extends ApolloBaseParams {
 export interface ApolloPeopleEnrichResponse extends ToolResponse {
   output: {
     person: ApolloPerson
-    metadata: {
-      enriched: boolean
-    }
+    enriched: boolean
   }
 }
 
@@ -134,10 +130,8 @@ export interface ApolloPeopleBulkEnrichParams extends ApolloBaseParams {
 export interface ApolloPeopleBulkEnrichResponse extends ToolResponse {
   output: {
     people: ApolloPerson[]
-    metadata: {
-      total: number
-      enriched: number
-    }
+    total: number
+    enriched: number
   }
 }
 
@@ -154,11 +148,9 @@ export interface ApolloOrganizationSearchParams extends ApolloBaseParams {
 export interface ApolloOrganizationSearchResponse extends ToolResponse {
   output: {
     organizations: ApolloOrganization[]
-    metadata: {
-      page: number
-      per_page: number
-      total_entries: number
-    }
+    page: number
+    per_page: number
+    total_entries: number
   }
 }
 
@@ -171,9 +163,7 @@ export interface ApolloOrganizationEnrichParams extends ApolloBaseParams {
 export interface ApolloOrganizationEnrichResponse extends ToolResponse {
   output: {
     organization: ApolloOrganization
-    metadata: {
-      enriched: boolean
-    }
+    enriched: boolean
   }
 }
 
@@ -188,10 +178,8 @@ export interface ApolloOrganizationBulkEnrichParams extends ApolloBaseParams {
 export interface ApolloOrganizationBulkEnrichResponse extends ToolResponse {
   output: {
     organizations: ApolloOrganization[]
-    metadata: {
-      total: number
-      enriched: number
-    }
+    total: number
+    enriched: number
   }
 }
 
@@ -207,10 +195,8 @@ export interface ApolloContactCreateParams extends ApolloBaseParams {
 
 export interface ApolloContactCreateResponse extends ToolResponse {
   output: {
-    contact: ApolloContact
-    metadata: {
-      created: boolean
-    }
+    contact: ApolloContact | null
+    created: boolean
   }
 }
 
@@ -227,10 +213,8 @@ export interface ApolloContactUpdateParams extends ApolloBaseParams {
 
 export interface ApolloContactUpdateResponse extends ToolResponse {
   output: {
-    contact: ApolloContact
-    metadata: {
-      updated: boolean
-    }
+    contact: ApolloContact | null
+    updated: boolean
   }
 }
 
@@ -251,11 +235,9 @@ export interface ApolloContactBulkCreateResponse extends ToolResponse {
   output: {
     created_contacts: ApolloContact[]
     existing_contacts: ApolloContact[]
-    metadata: {
-      total_submitted: number
-      created: number
-      existing: number
-    }
+    total_submitted: number
+    created: number
+    existing: number
   }
 }
 
@@ -276,11 +258,9 @@ export interface ApolloContactBulkUpdateResponse extends ToolResponse {
   output: {
     updated_contacts: ApolloContact[]
     failed_contacts: Array<{ id: string; error: string }>
-    metadata: {
-      total_submitted: number
-      updated: number
-      failed: number
-    }
+    total_submitted: number
+    updated: number
+    failed: number
   }
 }
 
@@ -292,14 +272,17 @@ export interface ApolloContactSearchParams extends ApolloBaseParams {
   per_page?: number
 }
 
+export interface ApolloPagination {
+  page?: number
+  per_page?: number
+  total_entries?: number
+  total_pages?: number
+}
+
 export interface ApolloContactSearchResponse extends ToolResponse {
   output: {
-    contacts: ApolloContact[]
-    metadata: {
-      page: number
-      per_page: number
-      total_entries: number
-    }
+    contacts: ApolloContact[] | null
+    pagination: ApolloPagination | null
   }
 }
 
@@ -313,10 +296,8 @@ export interface ApolloAccountCreateParams extends ApolloBaseParams {
 
 export interface ApolloAccountCreateResponse extends ToolResponse {
   output: {
-    account: ApolloAccount
-    metadata: {
-      created: boolean
-    }
+    account: ApolloAccount | null
+    created: boolean
   }
 }
 
@@ -331,10 +312,8 @@ export interface ApolloAccountUpdateParams extends ApolloBaseParams {
 
 export interface ApolloAccountUpdateResponse extends ToolResponse {
   output: {
-    account: ApolloAccount
-    metadata: {
-      updated: boolean
-    }
+    account: ApolloAccount | null
+    updated: boolean
   }
 }
 
@@ -349,12 +328,8 @@ export interface ApolloAccountSearchParams extends ApolloBaseParams {
 
 export interface ApolloAccountSearchResponse extends ToolResponse {
   output: {
-    accounts: ApolloAccount[]
-    metadata: {
-      page: number
-      per_page: number
-      total_entries: number
-    }
+    accounts: ApolloAccount[] | null
+    pagination: ApolloPagination | null
   }
 }
 
@@ -372,11 +347,9 @@ export interface ApolloAccountBulkCreateResponse extends ToolResponse {
   output: {
     created_accounts: ApolloAccount[]
     failed_accounts: Array<{ name: string; error: string }>
-    metadata: {
-      total_submitted: number
-      created: number
-      failed: number
-    }
+    total_submitted: number
+    created: number
+    failed: number
   }
 }
 
@@ -395,11 +368,9 @@ export interface ApolloAccountBulkUpdateResponse extends ToolResponse {
   output: {
     updated_accounts: ApolloAccount[]
     failed_accounts: Array<{ id: string; error: string }>
-    metadata: {
-      total_submitted: number
-      updated: number
-      failed: number
-    }
+    total_submitted: number
+    updated: number
+    failed: number
   }
 }
 
@@ -414,10 +385,8 @@ export interface ApolloSequenceAddContactsParams extends ApolloBaseParams {
 export interface ApolloSequenceAddContactsResponse extends ToolResponse {
   output: {
     contacts_added: string[]
-    metadata: {
-      sequence_id: string
-      total_added: number
-    }
+    sequence_id: string
+    total_added: number
   }
 }
 
@@ -433,10 +402,8 @@ export interface ApolloTaskCreateParams extends ApolloBaseParams {
 
 export interface ApolloTaskCreateResponse extends ToolResponse {
   output: {
-    task: ApolloTask
-    metadata: {
-      created: boolean
-    }
+    task: ApolloTask | null
+    created: boolean
   }
 }
 
@@ -451,12 +418,8 @@ export interface ApolloTaskSearchParams extends ApolloBaseParams {
 
 export interface ApolloTaskSearchResponse extends ToolResponse {
   output: {
-    tasks: ApolloTask[]
-    metadata: {
-      page: number
-      per_page: number
-      total_entries: number
-    }
+    tasks: ApolloTask[] | null
+    pagination: ApolloPagination | null
   }
 }
 
@@ -470,9 +433,7 @@ export interface ApolloEmailAccountsResponse extends ToolResponse {
       email: string
       active: boolean
     }>
-    metadata: {
-      total: number
-    }
+    total: number
   }
 }
 
@@ -489,10 +450,8 @@ export interface ApolloOpportunityCreateParams extends ApolloBaseParams {
 
 export interface ApolloOpportunityCreateResponse extends ToolResponse {
   output: {
-    opportunity: ApolloOpportunity
-    metadata: {
-      created: boolean
-    }
+    opportunity: ApolloOpportunity | null
+    created: boolean
   }
 }
 
@@ -509,11 +468,9 @@ export interface ApolloOpportunitySearchParams extends ApolloBaseParams {
 export interface ApolloOpportunitySearchResponse extends ToolResponse {
   output: {
     opportunities: ApolloOpportunity[]
-    metadata: {
-      page: number
-      per_page: number
-      total_entries: number
-    }
+    page: number
+    per_page: number
+    total_entries: number
   }
 }
 
@@ -525,9 +482,7 @@ export interface ApolloOpportunityGetParams extends ApolloBaseParams {
 export interface ApolloOpportunityGetResponse extends ToolResponse {
   output: {
     opportunity: ApolloOpportunity
-    metadata: {
-      found: boolean
-    }
+    found: boolean
   }
 }
 
@@ -544,10 +499,8 @@ export interface ApolloOpportunityUpdateParams extends ApolloBaseParams {
 
 export interface ApolloOpportunityUpdateResponse extends ToolResponse {
   output: {
-    opportunity: ApolloOpportunity
-    metadata: {
-      updated: boolean
-    }
+    opportunity: ApolloOpportunity | null
+    updated: boolean
   }
 }
 
@@ -575,11 +528,9 @@ export interface ApolloSequenceSearchParams extends ApolloBaseParams {
 export interface ApolloSequenceSearchResponse extends ToolResponse {
   output: {
     sequences: ApolloSequence[]
-    metadata: {
-      page: number
-      per_page: number
-      total_entries: number
-    }
+    page: number
+    per_page: number
+    total_entries: number
   }
 }
 
diff --git a/apps/sim/tools/cursor/add_followup.ts b/apps/sim/tools/cursor/add_followup.ts
index 5291d57ade..5e161fc27f 100644
--- a/apps/sim/tools/cursor/add_followup.ts
+++ b/apps/sim/tools/cursor/add_followup.ts
@@ -1,12 +1,7 @@
 import type { AddFollowupParams, AddFollowupResponse } from '@/tools/cursor/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const addFollowupTool: ToolConfig<AddFollowupParams, AddFollowupResponse> = {
-  id: 'cursor_add_followup',
-  name: 'Cursor Add Follow-up',
-  description: 'Add a follow-up instruction to an existing cloud agent.',
-  version: '1.0.0',
-
+const addFollowupBase = {
   params: {
     apiKey: {
       type: 'string',
@@ -33,15 +28,15 @@ export const addFollowupTool: ToolConfig<AddFollowupParams, AddFollowupResponse>
       description: 'JSON array of image objects with base64 data and dimensions (max 5)',
     },
   },
-
   request: {
-    url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}/followup`,
+    url: (params: AddFollowupParams) =>
+      `https://api.cursor.com/v0/agents/${params.agentId}/followup`,
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: AddFollowupParams) => ({
       'Content-Type': 'application/json',
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
     }),
-    body: (params) => {
+    body: (params: AddFollowupParams) => {
       const body: Record<string, any> = {
         prompt: {
           text: params.followupPromptText,
@@ -59,6 +54,15 @@ export const addFollowupTool: ToolConfig<AddFollowupParams, AddFollowupResponse>
       return body
     },
   },
+} satisfies Pick<ToolConfig<AddFollowupParams, any>, 'params' | 'request'>
+
+export const addFollowupTool: ToolConfig<AddFollowupParams, AddFollowupResponse> = {
+  id: 'cursor_add_followup',
+  name: 'Cursor Add Follow-up',
+  description: 'Add a follow-up instruction to an existing cloud agent.',
+  version: '1.0.0',
+
+  ...addFollowupBase,
 
   transformResponse: async (response) => {
     const data = await response.json()
@@ -87,3 +91,32 @@ export const addFollowupTool: ToolConfig<AddFollowupParams, AddFollowupResponse>
     },
   },
 }
+
+interface AddFollowupV2Response {
+  success: boolean
+  output: {
+    id: string
+  }
+}
+
+export const addFollowupV2Tool: ToolConfig<AddFollowupParams, AddFollowupV2Response> = {
+  ...addFollowupBase,
+  id: 'cursor_add_followup_v2',
+  name: 'Cursor Add Follow-up',
+  description:
+    'Add a follow-up instruction to an existing cloud agent. Returns API-aligned fields only.',
+  version: '2.0.0',
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Agent ID' },
+  },
+}
diff --git a/apps/sim/tools/cursor/delete_agent.ts b/apps/sim/tools/cursor/delete_agent.ts
index ba6d10f7bb..2acf9ea0de 100644
--- a/apps/sim/tools/cursor/delete_agent.ts
+++ b/apps/sim/tools/cursor/delete_agent.ts
@@ -1,12 +1,7 @@
 import type { DeleteAgentParams, DeleteAgentResponse } from '@/tools/cursor/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const deleteAgentTool: ToolConfig<DeleteAgentParams, DeleteAgentResponse> = {
-  id: 'cursor_delete_agent',
-  name: 'Cursor Delete Agent',
-  description: 'Permanently delete a cloud agent. This action cannot be undone.',
-  version: '1.0.0',
-
+const deleteAgentBase = {
   params: {
     apiKey: {
       type: 'string',
@@ -21,14 +16,22 @@ export const deleteAgentTool: ToolConfig<DeleteAgentParams, DeleteAgentResponse>
       description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
     },
   },
-
   request: {
-    url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}`,
+    url: (params: DeleteAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId}`,
     method: 'DELETE',
-    headers: (params) => ({
+    headers: (params: DeleteAgentParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
     }),
   },
+} satisfies Pick<ToolConfig<DeleteAgentParams, any>, 'params' | 'request'>
+
+export const deleteAgentTool: ToolConfig<DeleteAgentParams, DeleteAgentResponse> = {
+  id: 'cursor_delete_agent',
+  name: 'Cursor Delete Agent',
+  description: 'Permanently delete a cloud agent. This action cannot be undone.',
+  version: '1.0.0',
+
+  ...deleteAgentBase,
 
   transformResponse: async (response) => {
     const data = await response.json()
@@ -57,3 +60,31 @@ export const deleteAgentTool: ToolConfig<DeleteAgentParams, DeleteAgentResponse>
     },
   },
 }
+
+interface DeleteAgentV2Response {
+  success: boolean
+  output: {
+    id: string
+  }
+}
+
+export const deleteAgentV2Tool: ToolConfig<DeleteAgentParams, DeleteAgentV2Response> = {
+  ...deleteAgentBase,
+  id: 'cursor_delete_agent_v2',
+  name: 'Cursor Delete Agent',
+  description: 'Permanently delete a cloud agent. Returns API-aligned fields only.',
+  version: '2.0.0',
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Agent ID' },
+  },
+}
diff --git a/apps/sim/tools/cursor/get_agent.ts b/apps/sim/tools/cursor/get_agent.ts
index 7dd62ff24b..920dec4a29 100644
--- a/apps/sim/tools/cursor/get_agent.ts
+++ b/apps/sim/tools/cursor/get_agent.ts
@@ -1,12 +1,7 @@
 import type { GetAgentParams, GetAgentResponse } from '@/tools/cursor/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const getAgentTool: ToolConfig<GetAgentParams, GetAgentResponse> = {
-  id: 'cursor_get_agent',
-  name: 'Cursor Get Agent',
-  description: 'Retrieve the current status and results of a cloud agent.',
-  version: '1.0.0',
-
+const getAgentBase = {
   params: {
     apiKey: {
       type: 'string',
@@ -21,14 +16,22 @@ export const getAgentTool: ToolConfig<GetAgentParams, GetAgentResponse> = {
       description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
     },
   },
-
   request: {
-    url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}`,
+    url: (params: GetAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId}`,
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: GetAgentParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
     }),
   },
+} satisfies Pick<ToolConfig<GetAgentParams, any>, 'params' | 'request'>
+
+export const getAgentTool: ToolConfig<GetAgentParams, GetAgentResponse> = {
+  id: 'cursor_get_agent',
+  name: 'Cursor Get Agent',
+  description: 'Retrieve the current status and results of a cloud agent.',
+  version: '1.0.0',
+
+  ...getAgentBase,
 
   transformResponse: async (response) => {
     const data = await response.json()
@@ -59,3 +62,50 @@ export const getAgentTool: ToolConfig<GetAgentParams, GetAgentResponse> = {
     },
   },
 }
+
+interface GetAgentV2Response {
+  success: boolean
+  output: {
+    id: string
+    name: string
+    status: string
+    source: Record<string, any>
+    target: Record<string, any>
+    summary?: string
+    createdAt: string
+  }
+}
+
+export const getAgentV2Tool: ToolConfig<GetAgentParams, GetAgentV2Response> = {
+  ...getAgentBase,
+  id: 'cursor_get_agent_v2',
+  name: 'Cursor Get Agent',
+  description:
+    'Retrieve the current status and results of a cloud agent. Returns API-aligned fields only.',
+  version: '2.0.0',
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        name: data.name,
+        status: data.status,
+        source: data.source,
+        target: data.target,
+        summary: data.summary ?? null,
+        createdAt: data.createdAt,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Agent ID' },
+    name: { type: 'string', description: 'Agent name' },
+    status: { type: 'string', description: 'Agent status' },
+    source: { type: 'json', description: 'Source repository info' },
+    target: { type: 'json', description: 'Target branch/PR info' },
+    summary: { type: 'string', description: 'Agent summary', optional: true },
+    createdAt: { type: 'string', description: 'Creation timestamp' },
+  },
+}
diff --git a/apps/sim/tools/cursor/get_conversation.ts b/apps/sim/tools/cursor/get_conversation.ts
index f9c231f656..32752ea7b3 100644
--- a/apps/sim/tools/cursor/get_conversation.ts
+++ b/apps/sim/tools/cursor/get_conversation.ts
@@ -1,13 +1,7 @@
 import type { GetConversationParams, GetConversationResponse } from '@/tools/cursor/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const getConversationTool: ToolConfig<GetConversationParams, GetConversationResponse> = {
-  id: 'cursor_get_conversation',
-  name: 'Cursor Get Conversation',
-  description:
-    'Retrieve the conversation history of a cloud agent, including all user prompts and assistant responses.',
-  version: '1.0.0',
-
+const getConversationBase = {
   params: {
     apiKey: {
       type: 'string',
@@ -22,14 +16,24 @@ export const getConversationTool: ToolConfig<GetConversationParams, GetConversat
       description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
     },
   },
-
   request: {
-    url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}/conversation`,
+    url: (params: GetConversationParams) =>
+      `https://api.cursor.com/v0/agents/${params.agentId}/conversation`,
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: GetConversationParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
     }),
   },
+} satisfies Pick<ToolConfig<GetConversationParams, any>, 'params' | 'request'>
+
+export const getConversationTool: ToolConfig<GetConversationParams, GetConversationResponse> = {
+  id: 'cursor_get_conversation',
+  name: 'Cursor Get Conversation',
+  description:
+    'Retrieve the conversation history of a cloud agent, including all user prompts and assistant responses.',
+  version: '1.0.0',
+
+  ...getConversationBase,
 
   transformResponse: async (response) => {
     const data = await response.json()
@@ -61,3 +65,35 @@ export const getConversationTool: ToolConfig<GetConversationParams, GetConversat
     },
   },
 }
+
+interface GetConversationV2Response {
+  success: boolean
+  output: {
+    id: string
+    messages: unknown[]
+  }
+}
+
+export const getConversationV2Tool: ToolConfig<GetConversationParams, GetConversationV2Response> = {
+  ...getConversationBase,
+  id: 'cursor_get_conversation_v2',
+  name: 'Cursor Get Conversation',
+  description:
+    'Retrieve the conversation history of a cloud agent, including all user prompts and assistant responses. Returns API-aligned fields only.',
+  version: '2.0.0',
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        messages: data.messages,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Agent ID' },
+    messages: { type: 'array', description: 'Array of conversation messages' },
+  },
+}
diff --git a/apps/sim/tools/cursor/index.ts b/apps/sim/tools/cursor/index.ts
index 009eaec6c5..2ec9cebfd1 100644
--- a/apps/sim/tools/cursor/index.ts
+++ b/apps/sim/tools/cursor/index.ts
@@ -1,10 +1,10 @@
-import { addFollowupTool } from '@/tools/cursor/add_followup'
-import { deleteAgentTool } from '@/tools/cursor/delete_agent'
-import { getAgentTool } from '@/tools/cursor/get_agent'
-import { getConversationTool } from '@/tools/cursor/get_conversation'
-import { launchAgentTool } from '@/tools/cursor/launch_agent'
-import { listAgentsTool } from '@/tools/cursor/list_agents'
-import { stopAgentTool } from '@/tools/cursor/stop_agent'
+import { addFollowupTool, addFollowupV2Tool } from '@/tools/cursor/add_followup'
+import { deleteAgentTool, deleteAgentV2Tool } from '@/tools/cursor/delete_agent'
+import { getAgentTool, getAgentV2Tool } from '@/tools/cursor/get_agent'
+import { getConversationTool, getConversationV2Tool } from '@/tools/cursor/get_conversation'
+import { launchAgentTool, launchAgentV2Tool } from '@/tools/cursor/launch_agent'
+import { listAgentsTool, listAgentsV2Tool } from '@/tools/cursor/list_agents'
+import { stopAgentTool, stopAgentV2Tool } from '@/tools/cursor/stop_agent'
 
 export const cursorListAgentsTool = listAgentsTool
 export const cursorGetAgentTool = getAgentTool
@@ -13,3 +13,11 @@ export const cursorLaunchAgentTool = launchAgentTool
 export const cursorAddFollowupTool = addFollowupTool
 export const cursorStopAgentTool = stopAgentTool
 export const cursorDeleteAgentTool = deleteAgentTool
+
+export const cursorListAgentsV2Tool = listAgentsV2Tool
+export const cursorGetAgentV2Tool = getAgentV2Tool
+export const cursorGetConversationV2Tool = getConversationV2Tool
+export const cursorLaunchAgentV2Tool = launchAgentV2Tool
+export const cursorAddFollowupV2Tool = addFollowupV2Tool
+export const cursorStopAgentV2Tool = stopAgentV2Tool
+export const cursorDeleteAgentV2Tool = deleteAgentV2Tool
diff --git a/apps/sim/tools/cursor/launch_agent.ts b/apps/sim/tools/cursor/launch_agent.ts
index 87a4887610..c4fbb030a9 100644
--- a/apps/sim/tools/cursor/launch_agent.ts
+++ b/apps/sim/tools/cursor/launch_agent.ts
@@ -1,13 +1,7 @@
 import type { LaunchAgentParams, LaunchAgentResponse } from '@/tools/cursor/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const launchAgentTool: ToolConfig<LaunchAgentParams, LaunchAgentResponse> = {
-  id: 'cursor_launch_agent',
-  name: 'Cursor Launch Agent',
-  description:
-    'Start a new cloud agent to work on a GitHub repository with the given instructions.',
-  version: '1.0.0',
-
+const launchAgentBase = {
   params: {
     apiKey: {
       type: 'string',
@@ -70,15 +64,14 @@ export const launchAgentTool: ToolConfig<LaunchAgentParams, LaunchAgentResponse>
       description: 'Skip requesting reviewers on the PR',
     },
   },
-
   request: {
     url: () => 'https://api.cursor.com/v0/agents',
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: LaunchAgentParams) => ({
       'Content-Type': 'application/json',
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
     }),
-    body: (params) => {
+    body: (params: LaunchAgentParams) => {
       const body: Record<string, any> = {
         source: {
           repository: params.repository,
@@ -119,6 +112,16 @@ export const launchAgentTool: ToolConfig<LaunchAgentParams, LaunchAgentResponse>
       return body
     },
   },
+} satisfies Pick<ToolConfig<LaunchAgentParams, any>, 'params' | 'request'>
+
+export const launchAgentTool: ToolConfig<LaunchAgentParams, LaunchAgentResponse> = {
+  id: 'cursor_launch_agent',
+  name: 'Cursor Launch Agent',
+  description:
+    'Start a new cloud agent to work on a GitHub repository with the given instructions.',
+  version: '1.0.0',
+
+  ...launchAgentBase,
 
   transformResponse: async (response) => {
     const data = await response.json()
@@ -148,3 +151,36 @@ export const launchAgentTool: ToolConfig<LaunchAgentParams, LaunchAgentResponse>
     },
   },
 }
+
+interface LaunchAgentV2Response {
+  success: boolean
+  output: {
+    id: string
+    url: string
+  }
+}
+
+export const launchAgentV2Tool: ToolConfig<LaunchAgentParams, LaunchAgentV2Response> = {
+  ...launchAgentBase,
+  id: 'cursor_launch_agent_v2',
+  name: 'Cursor Launch Agent',
+  description:
+    'Start a new cloud agent to work on a GitHub repository with the given instructions. Returns API-aligned fields only.',
+  version: '2.0.0',
+  transformResponse: async (response) => {
+    const data = await response.json()
+    const agentUrl = `https://cursor.com/agents?selectedBcId=${data.id}`
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        url: agentUrl,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Agent ID' },
+    url: { type: 'string', description: 'Agent URL' },
+  },
+}
diff --git a/apps/sim/tools/cursor/list_agents.ts b/apps/sim/tools/cursor/list_agents.ts
index 7f96f67812..9c52b754af 100644
--- a/apps/sim/tools/cursor/list_agents.ts
+++ b/apps/sim/tools/cursor/list_agents.ts
@@ -1,12 +1,7 @@
 import type { ListAgentsParams, ListAgentsResponse } from '@/tools/cursor/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const listAgentsTool: ToolConfig<ListAgentsParams, ListAgentsResponse> = {
-  id: 'cursor_list_agents',
-  name: 'Cursor List Agents',
-  description: 'List all cloud agents for the authenticated user with optional pagination.',
-  version: '1.0.0',
-
+const listAgentsBase = {
   params: {
     apiKey: {
       type: 'string',
@@ -27,19 +22,27 @@ export const listAgentsTool: ToolConfig<ListAgentsParams, ListAgentsResponse> =
       description: 'Pagination cursor from previous response',
     },
   },
-
   request: {
-    url: (params) => {
+    url: (params: ListAgentsParams) => {
       const url = new URL('https://api.cursor.com/v0/agents')
       if (params.limit) url.searchParams.set('limit', String(params.limit))
       if (params.cursor) url.searchParams.set('cursor', params.cursor)
       return url.toString()
     },
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: ListAgentsParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
     }),
   },
+} satisfies Pick<ToolConfig<ListAgentsParams, any>, 'params' | 'request'>
+
+export const listAgentsTool: ToolConfig<ListAgentsParams, ListAgentsResponse> = {
+  id: 'cursor_list_agents',
+  name: 'Cursor List Agents',
+  description: 'List all cloud agents for the authenticated user with optional pagination.',
+  version: '1.0.0',
+
+  ...listAgentsBase,
 
   transformResponse: async (response) => {
     const data = await response.json()
@@ -75,3 +78,35 @@ export const listAgentsTool: ToolConfig<ListAgentsParams, ListAgentsResponse> =
     },
   },
 }
+
+interface ListAgentsV2Response {
+  success: boolean
+  output: {
+    agents: unknown[]
+    nextCursor?: string
+  }
+}
+
+export const listAgentsV2Tool: ToolConfig<ListAgentsParams, ListAgentsV2Response> = {
+  ...listAgentsBase,
+  id: 'cursor_list_agents_v2',
+  name: 'Cursor List Agents',
+  description:
+    'List all cloud agents for the authenticated user with optional pagination. Returns API-aligned fields only.',
+  version: '2.0.0',
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        agents: data.agents,
+        nextCursor: data.nextCursor ?? null,
+      },
+    }
+  },
+  outputs: {
+    agents: { type: 'array', description: 'Array of agent objects' },
+    nextCursor: { type: 'string', description: 'Pagination cursor for next page', optional: true },
+  },
+}
diff --git a/apps/sim/tools/cursor/stop_agent.ts b/apps/sim/tools/cursor/stop_agent.ts
index 6680bb681f..728ca9af60 100644
--- a/apps/sim/tools/cursor/stop_agent.ts
+++ b/apps/sim/tools/cursor/stop_agent.ts
@@ -1,12 +1,7 @@
 import type { StopAgentParams, StopAgentResponse } from '@/tools/cursor/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const stopAgentTool: ToolConfig<StopAgentParams, StopAgentResponse> = {
-  id: 'cursor_stop_agent',
-  name: 'Cursor Stop Agent',
-  description: 'Stop a running cloud agent. This pauses the agent without deleting it.',
-  version: '1.0.0',
-
+const stopAgentBase = {
   params: {
     apiKey: {
       type: 'string',
@@ -21,14 +16,22 @@ export const stopAgentTool: ToolConfig<StopAgentParams, StopAgentResponse> = {
       description: 'Unique identifier for the cloud agent (e.g., bc_abc123)',
     },
   },
-
   request: {
-    url: (params) => `https://api.cursor.com/v0/agents/${params.agentId}/stop`,
+    url: (params: StopAgentParams) => `https://api.cursor.com/v0/agents/${params.agentId}/stop`,
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: StopAgentParams) => ({
       Authorization: `Basic ${Buffer.from(`${params.apiKey}:`).toString('base64')}`,
     }),
   },
+} satisfies Pick<ToolConfig<StopAgentParams, any>, 'params' | 'request'>
+
+export const stopAgentTool: ToolConfig<StopAgentParams, StopAgentResponse> = {
+  id: 'cursor_stop_agent',
+  name: 'Cursor Stop Agent',
+  description: 'Stop a running cloud agent. This pauses the agent without deleting it.',
+  version: '1.0.0',
+
+  ...stopAgentBase,
 
   transformResponse: async (response) => {
     const data = await response.json()
@@ -57,3 +60,31 @@ export const stopAgentTool: ToolConfig<StopAgentParams, StopAgentResponse> = {
     },
   },
 }
+
+interface StopAgentV2Response {
+  success: boolean
+  output: {
+    id: string
+  }
+}
+
+export const stopAgentV2Tool: ToolConfig<StopAgentParams, StopAgentV2Response> = {
+  ...stopAgentBase,
+  id: 'cursor_stop_agent_v2',
+  name: 'Cursor Stop Agent',
+  description: 'Stop a running cloud agent. Returns API-aligned fields only.',
+  version: '2.0.0',
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Agent ID' },
+  },
+}
diff --git a/apps/sim/tools/dynamodb/index.ts b/apps/sim/tools/dynamodb/index.ts
index 69e95f7901..dd19b4bbbf 100644
--- a/apps/sim/tools/dynamodb/index.ts
+++ b/apps/sim/tools/dynamodb/index.ts
@@ -1,5 +1,6 @@
 import { deleteTool } from './delete'
 import { getTool } from './get'
+import { introspectTool } from './introspect'
 import { putTool } from './put'
 import { queryTool } from './query'
 import { scanTool } from './scan'
@@ -7,6 +8,7 @@ import { updateTool } from './update'
 
 export const dynamodbDeleteTool = deleteTool
 export const dynamodbGetTool = getTool
+export const dynamodbIntrospectTool = introspectTool
 export const dynamodbPutTool = putTool
 export const dynamodbQueryTool = queryTool
 export const dynamodbScanTool = scanTool
diff --git a/apps/sim/tools/dynamodb/introspect.ts b/apps/sim/tools/dynamodb/introspect.ts
new file mode 100644
index 0000000000..70410b10a0
--- /dev/null
+++ b/apps/sim/tools/dynamodb/introspect.ts
@@ -0,0 +1,78 @@
+import type { DynamoDBIntrospectParams, DynamoDBIntrospectResponse } from '@/tools/dynamodb/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const introspectTool: ToolConfig<DynamoDBIntrospectParams, DynamoDBIntrospectResponse> = {
+  id: 'dynamodb_introspect',
+  name: 'DynamoDB Introspect',
+  description:
+    'Introspect DynamoDB to list tables or get detailed schema information for a specific table',
+  version: '1.0',
+
+  params: {
+    region: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'AWS region (e.g., us-east-1)',
+    },
+    accessKeyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'AWS access key ID',
+    },
+    secretAccessKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'AWS secret access key',
+    },
+    tableName: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Optional table name to get detailed schema. If not provided, lists all tables.',
+    },
+  },
+
+  request: {
+    url: '/api/tools/dynamodb/introspect',
+    method: 'POST',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      region: params.region,
+      accessKeyId: params.accessKeyId,
+      secretAccessKey: params.secretAccessKey,
+      ...(params.tableName && { tableName: params.tableName }),
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error || 'DynamoDB introspection failed')
+    }
+
+    return {
+      success: true,
+      output: {
+        message: data.message || 'Introspection completed successfully',
+        tables: data.tables || [],
+        tableDetails: data.tableDetails,
+      },
+      error: undefined,
+    }
+  },
+
+  outputs: {
+    message: { type: 'string', description: 'Operation status message' },
+    tables: { type: 'array', description: 'List of table names in the region' },
+    tableDetails: {
+      type: 'object',
+      description: 'Detailed schema information for a specific table',
+    },
+  },
+}
diff --git a/apps/sim/tools/dynamodb/types.ts b/apps/sim/tools/dynamodb/types.ts
index 175eaf6801..8c5677fd93 100644
--- a/apps/sim/tools/dynamodb/types.ts
+++ b/apps/sim/tools/dynamodb/types.ts
@@ -68,3 +68,45 @@ export interface DynamoDBScanResponse extends DynamoDBBaseResponse {}
 export interface DynamoDBUpdateResponse extends DynamoDBBaseResponse {}
 export interface DynamoDBDeleteResponse extends DynamoDBBaseResponse {}
 export interface DynamoDBResponse extends DynamoDBBaseResponse {}
+
+export interface DynamoDBIntrospectParams extends DynamoDBConnectionConfig {
+  tableName?: string
+}
+
+export interface DynamoDBKeySchema {
+  attributeName: string
+  keyType: 'HASH' | 'RANGE'
+}
+
+export interface DynamoDBAttributeDefinition {
+  attributeName: string
+  attributeType: 'S' | 'N' | 'B'
+}
+
+export interface DynamoDBGSI {
+  indexName: string
+  keySchema: DynamoDBKeySchema[]
+  projectionType: string
+  indexStatus: string
+}
+
+export interface DynamoDBTableSchema {
+  tableName: string
+  tableStatus: string
+  keySchema: DynamoDBKeySchema[]
+  attributeDefinitions: DynamoDBAttributeDefinition[]
+  globalSecondaryIndexes: DynamoDBGSI[]
+  localSecondaryIndexes: DynamoDBGSI[]
+  itemCount: number
+  tableSizeBytes: number
+  billingMode: string
+}
+
+export interface DynamoDBIntrospectResponse extends ToolResponse {
+  output: {
+    message: string
+    tables: string[]
+    tableDetails?: DynamoDBTableSchema
+  }
+  error?: string
+}
diff --git a/apps/sim/tools/elasticsearch/index.ts b/apps/sim/tools/elasticsearch/index.ts
index e625add917..30fee645e1 100644
--- a/apps/sim/tools/elasticsearch/index.ts
+++ b/apps/sim/tools/elasticsearch/index.ts
@@ -9,6 +9,7 @@ import { deleteIndexTool } from '@/tools/elasticsearch/delete_index'
 import { getDocumentTool } from '@/tools/elasticsearch/get_document'
 import { getIndexTool } from '@/tools/elasticsearch/get_index'
 import { indexDocumentTool } from '@/tools/elasticsearch/index_document'
+import { listIndicesTool } from '@/tools/elasticsearch/list_indices'
 import { searchTool } from '@/tools/elasticsearch/search'
 import { updateDocumentTool } from '@/tools/elasticsearch/update_document'
 
@@ -23,5 +24,6 @@ export const elasticsearchCountTool = countTool
 export const elasticsearchCreateIndexTool = createIndexTool
 export const elasticsearchDeleteIndexTool = deleteIndexTool
 export const elasticsearchGetIndexTool = getIndexTool
+export const elasticsearchListIndicesTool = listIndicesTool
 export const elasticsearchClusterHealthTool = clusterHealthTool
 export const elasticsearchClusterStatsTool = clusterStatsTool
diff --git a/apps/sim/tools/elasticsearch/list_indices.ts b/apps/sim/tools/elasticsearch/list_indices.ts
new file mode 100644
index 0000000000..5b08e03ec3
--- /dev/null
+++ b/apps/sim/tools/elasticsearch/list_indices.ts
@@ -0,0 +1,171 @@
+import type {
+  ElasticsearchListIndicesParams,
+  ElasticsearchListIndicesResponse,
+} from '@/tools/elasticsearch/types'
+import type { ToolConfig } from '@/tools/types'
+
+/**
+ * Builds the base URL for Elasticsearch connections.
+ * Supports both self-hosted and Elastic Cloud deployments.
+ */
+function buildBaseUrl(params: ElasticsearchListIndicesParams): string {
+  if (params.deploymentType === 'cloud' && params.cloudId) {
+    const parts = params.cloudId.split(':')
+    if (parts.length >= 2) {
+      try {
+        const decoded = Buffer.from(parts[1], 'base64').toString('utf-8')
+        const [esHost] = decoded.split('$')
+        if (esHost) {
+          return `https://${parts[0]}.${esHost}`
+        }
+      } catch {
+        // Fallback
+      }
+    }
+    throw new Error('Invalid Cloud ID format')
+  }
+
+  if (!params.host) {
+    throw new Error('Host is required for self-hosted deployments')
+  }
+
+  return params.host.replace(/\/$/, '')
+}
+
+/**
+ * Builds authentication headers for Elasticsearch requests.
+ * Supports API key and basic authentication methods.
+ */
+function buildAuthHeaders(params: ElasticsearchListIndicesParams): Record<string, string> {
+  const headers: Record<string, string> = {
+    'Content-Type': 'application/json',
+  }
+
+  if (params.authMethod === 'api_key' && params.apiKey) {
+    headers.Authorization = `ApiKey ${params.apiKey}`
+  } else if (params.authMethod === 'basic_auth' && params.username && params.password) {
+    const credentials = Buffer.from(`${params.username}:${params.password}`).toString('base64')
+    headers.Authorization = `Basic ${credentials}`
+  } else {
+    throw new Error('Invalid authentication configuration')
+  }
+
+  return headers
+}
+
+export const listIndicesTool: ToolConfig<
+  ElasticsearchListIndicesParams,
+  ElasticsearchListIndicesResponse
+> = {
+  id: 'elasticsearch_list_indices',
+  name: 'Elasticsearch List Indices',
+  description:
+    'List all indices in the Elasticsearch cluster with their health, status, and statistics.',
+  version: '1.0.0',
+
+  params: {
+    deploymentType: {
+      type: 'string',
+      required: true,
+      description: 'Deployment type: self_hosted or cloud',
+    },
+    host: {
+      type: 'string',
+      required: false,
+      description: 'Elasticsearch host URL (for self-hosted)',
+    },
+    cloudId: {
+      type: 'string',
+      required: false,
+      description: 'Elastic Cloud ID (for cloud deployments)',
+    },
+    authMethod: {
+      type: 'string',
+      required: true,
+      description: 'Authentication method: api_key or basic_auth',
+    },
+    apiKey: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Elasticsearch API key',
+    },
+    username: {
+      type: 'string',
+      required: false,
+      description: 'Username for basic auth',
+    },
+    password: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Password for basic auth',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const baseUrl = buildBaseUrl(params)
+      return `${baseUrl}/_cat/indices?format=json`
+    },
+    method: 'GET',
+    headers: (params) => buildAuthHeaders(params),
+  },
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const errorText = await response.text()
+      let errorMessage = `Elasticsearch error: ${response.status}`
+      try {
+        const errorJson = JSON.parse(errorText)
+        errorMessage = errorJson.error?.reason || errorJson.error?.type || errorMessage
+      } catch {
+        errorMessage = errorText || errorMessage
+      }
+      return {
+        success: false,
+        output: {
+          message: errorMessage,
+          indices: [],
+        },
+        error: errorMessage,
+      }
+    }
+
+    const data = await response.json()
+
+    const indices = data
+      .filter((item: Record<string, unknown>) => {
+        const indexName = item.index as string
+        return !indexName.startsWith('.')
+      })
+      .map((item: Record<string, unknown>) => ({
+        index: item.index as string,
+        health: item.health as string,
+        status: item.status as string,
+        docsCount: Number.parseInt(item['docs.count'] as string, 10) || 0,
+        storeSize: (item['store.size'] as string) || '0b',
+        primaryShards: Number.parseInt(item.pri as string, 10) || 0,
+        replicaShards: Number.parseInt(item.rep as string, 10) || 0,
+      }))
+
+    return {
+      success: true,
+      output: {
+        message: `Found ${indices.length} indices`,
+        indices,
+      },
+    }
+  },
+
+  outputs: {
+    message: {
+      type: 'string',
+      description: 'Summary message about the indices',
+    },
+    indices: {
+      type: 'json',
+      description: 'Array of index information objects',
+    },
+  },
+}
diff --git a/apps/sim/tools/elasticsearch/types.ts b/apps/sim/tools/elasticsearch/types.ts
index 9a5516994e..ffc119485a 100644
--- a/apps/sim/tools/elasticsearch/types.ts
+++ b/apps/sim/tools/elasticsearch/types.ts
@@ -110,6 +110,18 @@ export interface ElasticsearchClusterHealthParams extends ElasticsearchBaseParam
 
 export interface ElasticsearchClusterStatsParams extends ElasticsearchBaseParams {}
 
+export interface ElasticsearchListIndicesParams extends ElasticsearchBaseParams {}
+
+export interface ElasticsearchIndexInfo {
+  index: string
+  health: string
+  status: string
+  docsCount: number
+  storeSize: string
+  primaryShards: number
+  replicaShards: number
+}
+
 // Response types
 export interface ElasticsearchDocumentResponse extends ToolResponse {
   output: {
@@ -262,6 +274,14 @@ export interface ElasticsearchIndexStatsResponse extends ToolResponse {
   }
 }
 
+export interface ElasticsearchListIndicesResponse extends ToolResponse {
+  output: {
+    message: string
+    indices: ElasticsearchIndexInfo[]
+  }
+  error?: string
+}
+
 // Union type for all Elasticsearch responses
 export type ElasticsearchResponse =
   | ElasticsearchDocumentResponse
@@ -276,3 +296,4 @@ export type ElasticsearchResponse =
   | ElasticsearchClusterStatsResponse
   | ElasticsearchRefreshResponse
   | ElasticsearchIndexStatsResponse
+  | ElasticsearchListIndicesResponse
diff --git a/apps/sim/tools/github/add_assignees.ts b/apps/sim/tools/github/add_assignees.ts
index 21c031bde9..33665a70aa 100644
--- a/apps/sim/tools/github/add_assignees.ts
+++ b/apps/sim/tools/github/add_assignees.ts
@@ -106,3 +106,46 @@ URL: ${issue.html_url}`
     },
   },
 }
+
+export const addAssigneesV2Tool: ToolConfig<AddAssigneesParams, any> = {
+  id: 'github_add_assignees_v2',
+  name: addAssigneesTool.name,
+  description: addAssigneesTool.description,
+  version: '2.0.0',
+  params: addAssigneesTool.params,
+  request: addAssigneesTool.request,
+
+  transformResponse: async (response: Response) => {
+    const issue = await response.json()
+    return {
+      success: true,
+      output: {
+        id: issue.id,
+        number: issue.number,
+        title: issue.title,
+        state: issue.state,
+        html_url: issue.html_url,
+        body: issue.body ?? null,
+        user: issue.user,
+        labels: issue.labels ?? [],
+        assignees: issue.assignees ?? [],
+        created_at: issue.created_at,
+        updated_at: issue.updated_at,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Issue ID' },
+    number: { type: 'number', description: 'Issue number' },
+    title: { type: 'string', description: 'Issue title' },
+    state: { type: 'string', description: 'Issue state' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'Issue body', optional: true },
+    user: { type: 'json', description: 'Issue creator' },
+    labels: { type: 'array', description: 'Array of label objects' },
+    assignees: { type: 'array', description: 'Array of assignee objects' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/add_labels.ts b/apps/sim/tools/github/add_labels.ts
index 9feee76c0e..105a4ea2eb 100644
--- a/apps/sim/tools/github/add_labels.ts
+++ b/apps/sim/tools/github/add_labels.ts
@@ -94,3 +94,43 @@ All labels on issue: ${labels.join(', ')}`
     },
   },
 }
+
+export const addLabelsV2Tool: ToolConfig<AddLabelsParams, any> = {
+  id: 'github_add_labels_v2',
+  name: addLabelsTool.name,
+  description: addLabelsTool.description,
+  version: '2.0.0',
+  params: addLabelsTool.params,
+  request: addLabelsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const labels = await response.json()
+    return {
+      success: true,
+      output: {
+        items: labels.map((label: any) => ({
+          ...label,
+          description: label.description ?? null,
+        })),
+        count: labels.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of label objects on the issue',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Label ID' },
+          name: { type: 'string', description: 'Label name' },
+          color: { type: 'string', description: 'Label color' },
+          description: { type: 'string', description: 'Label description', optional: true },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of labels' },
+  },
+}
diff --git a/apps/sim/tools/github/cancel_workflow_run.ts b/apps/sim/tools/github/cancel_workflow_run.ts
index 24f813c2e6..e07d4e1b22 100644
--- a/apps/sim/tools/github/cancel_workflow_run.ts
+++ b/apps/sim/tools/github/cancel_workflow_run.ts
@@ -122,3 +122,26 @@ The run may have already completed or been cancelled.`
       },
     },
   }
+
+export const cancelWorkflowRunV2Tool: ToolConfig = {
+  id: 'github_cancel_workflow_run_v2',
+  name: cancelWorkflowRunTool.name,
+  description: cancelWorkflowRunTool.description,
+  version: '2.0.0',
+  params: cancelWorkflowRunTool.params,
+  request: cancelWorkflowRunTool.request,
+  oauth: cancelWorkflowRunTool.oauth,
+  transformResponse: async (response: Response, params) => {
+    return {
+      success: true,
+      output: {
+        cancelled: response.status === 202,
+        run_id: params?.run_id ?? null,
+      },
+    }
+  },
+  outputs: {
+    cancelled: { type: 'boolean', description: 'Whether cancellation was initiated' },
+    run_id: { type: 'number', description: 'Workflow run ID', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/close_issue.ts b/apps/sim/tools/github/close_issue.ts
index 2db0bb7090..2285f0bb89 100644
--- a/apps/sim/tools/github/close_issue.ts
+++ b/apps/sim/tools/github/close_issue.ts
@@ -113,3 +113,50 @@ URL: ${issue.html_url}`
     },
   },
 }
+
+export const closeIssueV2Tool: ToolConfig<CloseIssueParams, any> = {
+  id: 'github_close_issue_v2',
+  name: closeIssueTool.name,
+  description: closeIssueTool.description,
+  version: '2.0.0',
+  params: closeIssueTool.params,
+  request: closeIssueTool.request,
+
+  transformResponse: async (response: Response) => {
+    const issue = await response.json()
+    return {
+      success: true,
+      output: {
+        id: issue.id,
+        number: issue.number,
+        title: issue.title,
+        state: issue.state,
+        state_reason: issue.state_reason ?? null,
+        html_url: issue.html_url,
+        body: issue.body ?? null,
+        user: issue.user,
+        labels: issue.labels ?? [],
+        assignees: issue.assignees ?? [],
+        closed_at: issue.closed_at ?? null,
+        created_at: issue.created_at,
+        updated_at: issue.updated_at,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Issue ID' },
+    number: { type: 'number', description: 'Issue number' },
+    title: { type: 'string', description: 'Issue title' },
+    state: { type: 'string', description: 'Issue state (closed)' },
+    state_reason: { type: 'string', description: 'Reason for closing', optional: true },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'Issue body', optional: true },
+    user: { type: 'json', description: 'User who created the issue' },
+    labels: { type: 'array', description: 'Array of label objects' },
+    assignees: { type: 'array', description: 'Array of assignee objects' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/close_pr.ts b/apps/sim/tools/github/close_pr.ts
index 2cf3615772..ae8b15eede 100644
--- a/apps/sim/tools/github/close_pr.ts
+++ b/apps/sim/tools/github/close_pr.ts
@@ -90,3 +90,52 @@ URL: ${pr.html_url}`
     },
   },
 }
+
+export const closePRV2Tool: ToolConfig<ClosePRParams, any> = {
+  id: 'github_close_pr_v2',
+  name: closePRTool.name,
+  description: closePRTool.description,
+  version: '2.0.0',
+  params: closePRTool.params,
+  request: closePRTool.request,
+
+  transformResponse: async (response: Response) => {
+    const pr = await response.json()
+    return {
+      success: true,
+      output: {
+        id: pr.id,
+        number: pr.number,
+        title: pr.title,
+        state: pr.state,
+        html_url: pr.html_url,
+        body: pr.body ?? null,
+        user: pr.user,
+        head: pr.head,
+        base: pr.base,
+        draft: pr.draft,
+        merged: pr.merged,
+        closed_at: pr.closed_at ?? null,
+        created_at: pr.created_at,
+        updated_at: pr.updated_at,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'PR ID' },
+    number: { type: 'number', description: 'PR number' },
+    title: { type: 'string', description: 'PR title' },
+    state: { type: 'string', description: 'PR state (closed)' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'PR description', optional: true },
+    user: { type: 'json', description: 'User who created the PR' },
+    head: { type: 'json', description: 'Head branch info' },
+    base: { type: 'json', description: 'Base branch info' },
+    draft: { type: 'boolean', description: 'Whether PR is a draft' },
+    merged: { type: 'boolean', description: 'Whether PR is merged' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/comment.ts b/apps/sim/tools/github/comment.ts
index f5efef8bfd..9c5e575d57 100644
--- a/apps/sim/tools/github/comment.ts
+++ b/apps/sim/tools/github/comment.ts
@@ -139,3 +139,42 @@ export const commentTool: ToolConfig<CreateCommentParams, CreateCommentResponse>
     },
   },
 }
+
+export const commentV2Tool: ToolConfig = {
+  id: 'github_comment_v2',
+  name: commentTool.name,
+  description: commentTool.description,
+  version: '2.0.0',
+  params: commentTool.params,
+  request: commentTool.request,
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        body: data.body,
+        html_url: data.html_url,
+        user: data.user,
+        path: data.path ?? null,
+        line: data.line ?? data.position ?? null,
+        side: data.side ?? null,
+        commit_id: data.commit_id ?? null,
+        created_at: data.created_at,
+        updated_at: data.updated_at,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'Comment ID' },
+    body: { type: 'string', description: 'Comment body' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    user: { type: 'json', description: 'User who created the comment' },
+    path: { type: 'string', description: 'File path (if file comment)', optional: true },
+    line: { type: 'number', description: 'Line number', optional: true },
+    side: { type: 'string', description: 'Diff side', optional: true },
+    commit_id: { type: 'string', description: 'Commit ID', optional: true },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/create_branch.ts b/apps/sim/tools/github/create_branch.ts
index 08e45cf8a6..43c5d7d26a 100644
--- a/apps/sim/tools/github/create_branch.ts
+++ b/apps/sim/tools/github/create_branch.ts
@@ -91,3 +91,32 @@ URL: ${ref.url}`
     },
   },
 }
+
+export const createBranchV2Tool: ToolConfig<CreateBranchParams, any> = {
+  id: 'github_create_branch_v2',
+  name: createBranchTool.name,
+  description: createBranchTool.description,
+  version: '2.0.0',
+  params: createBranchTool.params,
+  request: createBranchTool.request,
+
+  transformResponse: async (response: Response) => {
+    const ref = await response.json()
+    return {
+      success: true,
+      output: {
+        ref: ref.ref,
+        node_id: ref.node_id,
+        url: ref.url,
+        object: ref.object,
+      },
+    }
+  },
+
+  outputs: {
+    ref: { type: 'string', description: 'Full reference name (refs/heads/branch)' },
+    node_id: { type: 'string', description: 'Git ref node ID' },
+    url: { type: 'string', description: 'API URL for the reference' },
+    object: { type: 'json', description: 'Git object with type and sha' },
+  },
+}
diff --git a/apps/sim/tools/github/create_file.ts b/apps/sim/tools/github/create_file.ts
index c2d66f9d2d..803c6e3d77 100644
--- a/apps/sim/tools/github/create_file.ts
+++ b/apps/sim/tools/github/create_file.ts
@@ -170,3 +170,27 @@ View file: ${data.content.html_url}`
     },
   },
 }
+
+export const createFileV2Tool: ToolConfig = {
+  id: 'github_create_file_v2',
+  name: createFileTool.name,
+  description: createFileTool.description,
+  version: '2.0.0',
+  params: createFileTool.params,
+  request: createFileTool.request,
+  oauth: createFileTool.oauth,
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        content: data.content,
+        commit: data.commit,
+      },
+    }
+  },
+  outputs: {
+    content: { type: 'json', description: 'Created file content info' },
+    commit: { type: 'json', description: 'Commit information' },
+  },
+}
diff --git a/apps/sim/tools/github/create_issue.ts b/apps/sim/tools/github/create_issue.ts
index 041d6dac0d..ef8908f2f9 100644
--- a/apps/sim/tools/github/create_issue.ts
+++ b/apps/sim/tools/github/create_issue.ts
@@ -141,3 +141,50 @@ ${assignees.length > 0 ? `Assignees: ${assignees.join(', ')}` : ''}`
     },
   },
 }
+
+export const createIssueV2Tool: ToolConfig<CreateIssueParams, any> = {
+  id: 'github_create_issue_v2',
+  name: createIssueTool.name,
+  description: createIssueTool.description,
+  version: '2.0.0',
+  params: createIssueTool.params,
+  request: createIssueTool.request,
+
+  transformResponse: async (response: Response) => {
+    const issue = await response.json()
+    return {
+      success: true,
+      output: {
+        id: issue.id,
+        number: issue.number,
+        title: issue.title,
+        state: issue.state,
+        html_url: issue.html_url,
+        body: issue.body ?? null,
+        user: issue.user,
+        labels: issue.labels ?? [],
+        assignees: issue.assignees ?? [],
+        milestone: issue.milestone ?? null,
+        created_at: issue.created_at,
+        updated_at: issue.updated_at,
+        closed_at: issue.closed_at ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Issue ID' },
+    number: { type: 'number', description: 'Issue number' },
+    title: { type: 'string', description: 'Issue title' },
+    state: { type: 'string', description: 'Issue state (open/closed)' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'Issue body/description', optional: true },
+    user: { type: 'json', description: 'User who created the issue' },
+    labels: { type: 'array', description: 'Array of label objects' },
+    assignees: { type: 'array', description: 'Array of assignee objects' },
+    milestone: { type: 'json', description: 'Milestone object', optional: true },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/create_pr.ts b/apps/sim/tools/github/create_pr.ts
index 4c1a8b7c72..8faced4eaa 100644
--- a/apps/sim/tools/github/create_pr.ts
+++ b/apps/sim/tools/github/create_pr.ts
@@ -118,3 +118,52 @@ URL: ${pr.html_url}`
     },
   },
 }
+
+export const createPRV2Tool: ToolConfig<CreatePRParams, any> = {
+  id: 'github_create_pr_v2',
+  name: createPRTool.name,
+  description: createPRTool.description,
+  version: '2.0.0',
+  params: createPRTool.params,
+  request: createPRTool.request,
+
+  transformResponse: async (response: Response) => {
+    const pr = await response.json()
+    return {
+      success: true,
+      output: {
+        id: pr.id,
+        number: pr.number,
+        title: pr.title,
+        state: pr.state,
+        html_url: pr.html_url,
+        body: pr.body ?? null,
+        user: pr.user,
+        head: pr.head,
+        base: pr.base,
+        draft: pr.draft,
+        merged: pr.merged,
+        mergeable: pr.mergeable ?? null,
+        created_at: pr.created_at,
+        updated_at: pr.updated_at,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Pull request ID' },
+    number: { type: 'number', description: 'Pull request number' },
+    title: { type: 'string', description: 'PR title' },
+    state: { type: 'string', description: 'PR state' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'PR description', optional: true },
+    user: { type: 'json', description: 'User who created the PR' },
+    head: { type: 'json', description: 'Head branch info' },
+    base: { type: 'json', description: 'Base branch info' },
+    draft: { type: 'boolean', description: 'Whether PR is a draft' },
+    merged: { type: 'boolean', description: 'Whether PR is merged' },
+    mergeable: { type: 'boolean', description: 'Whether PR is mergeable', optional: true },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/create_project.ts b/apps/sim/tools/github/create_project.ts
index f86fffab6f..cc119a19ff 100644
--- a/apps/sim/tools/github/create_project.ts
+++ b/apps/sim/tools/github/create_project.ts
@@ -146,3 +146,45 @@ export const createProjectTool: ToolConfig<CreateProjectParams, ProjectResponse>
     },
   },
 }
+
+export const createProjectV2Tool: ToolConfig = {
+  id: 'github_create_project_v2',
+  name: createProjectTool.name,
+  description: createProjectTool.description,
+  version: '2.0.0',
+  params: createProjectTool.params,
+  request: createProjectTool.request,
+  oauth: createProjectTool.oauth,
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    if (data.errors) {
+      return {
+        success: false,
+        output: { id: '', title: '', number: 0, url: '' },
+        error: data.errors[0].message,
+      }
+    }
+    const project = data.data?.createProjectV2?.projectV2 || {}
+    return {
+      success: true,
+      output: {
+        id: project.id,
+        title: project.title,
+        number: project.number,
+        url: project.url,
+        closed: project.closed,
+        public: project.public,
+        shortDescription: project.shortDescription ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Project node ID' },
+    title: { type: 'string', description: 'Project title' },
+    number: { type: 'number', description: 'Project number' },
+    url: { type: 'string', description: 'Project URL' },
+    closed: { type: 'boolean', description: 'Whether project is closed' },
+    public: { type: 'boolean', description: 'Whether project is public' },
+    shortDescription: { type: 'string', description: 'Short description', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/create_release.ts b/apps/sim/tools/github/create_release.ts
index 9f9396f8dd..be558784b7 100644
--- a/apps/sim/tools/github/create_release.ts
+++ b/apps/sim/tools/github/create_release.ts
@@ -155,3 +155,49 @@ Download URLs:
     },
   },
 }
+
+export const createReleaseV2Tool: ToolConfig = {
+  id: 'github_create_release_v2',
+  name: createReleaseTool.name,
+  description: createReleaseTool.description,
+  version: '2.0.0',
+  params: createReleaseTool.params,
+  request: createReleaseTool.request,
+  oauth: createReleaseTool.oauth,
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        tag_name: data.tag_name,
+        name: data.name,
+        body: data.body ?? null,
+        html_url: data.html_url,
+        tarball_url: data.tarball_url,
+        zipball_url: data.zipball_url,
+        draft: data.draft,
+        prerelease: data.prerelease,
+        author: data.author,
+        assets: data.assets,
+        created_at: data.created_at,
+        published_at: data.published_at ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'Release ID' },
+    tag_name: { type: 'string', description: 'Git tag name' },
+    name: { type: 'string', description: 'Release name' },
+    body: { type: 'string', description: 'Release description', optional: true },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    tarball_url: { type: 'string', description: 'Tarball download URL' },
+    zipball_url: { type: 'string', description: 'Zipball download URL' },
+    draft: { type: 'boolean', description: 'Whether this is a draft' },
+    prerelease: { type: 'boolean', description: 'Whether this is a prerelease' },
+    author: { type: 'json', description: 'Release author' },
+    assets: { type: 'array', description: 'Release assets' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    published_at: { type: 'string', description: 'Publication timestamp', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/delete_branch.ts b/apps/sim/tools/github/delete_branch.ts
index d218dc59e8..e61b5113a6 100644
--- a/apps/sim/tools/github/delete_branch.ts
+++ b/apps/sim/tools/github/delete_branch.ts
@@ -87,3 +87,28 @@ export const deleteBranchTool: ToolConfig<DeleteBranchParams, DeleteBranchRespon
     },
   },
 }
+
+export const deleteBranchV2Tool: ToolConfig<DeleteBranchParams, any> = {
+  id: 'github_delete_branch_v2',
+  name: deleteBranchTool.name,
+  description: deleteBranchTool.description,
+  version: '2.0.0',
+  params: deleteBranchTool.params,
+  request: deleteBranchTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    // DELETE returns 204 No Content on success
+    return {
+      success: true,
+      output: {
+        deleted: response.status === 204,
+        branch: params?.branch || '',
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether the branch was deleted' },
+    branch: { type: 'string', description: 'Name of the deleted branch' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_comment.ts b/apps/sim/tools/github/delete_comment.ts
index 05ae139bec..6b49cfa07e 100644
--- a/apps/sim/tools/github/delete_comment.ts
+++ b/apps/sim/tools/github/delete_comment.ts
@@ -72,3 +72,27 @@ export const deleteCommentTool: ToolConfig<DeleteCommentParams, DeleteCommentRes
     },
   },
 }
+
+export const deleteCommentV2Tool: ToolConfig<DeleteCommentParams, any> = {
+  id: 'github_delete_comment_v2',
+  name: deleteCommentTool.name,
+  description: deleteCommentTool.description,
+  version: '2.0.0',
+  params: deleteCommentTool.params,
+  request: deleteCommentTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    return {
+      success: true,
+      output: {
+        deleted: response.status === 204,
+        comment_id: params?.comment_id || 0,
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether deletion was successful' },
+    comment_id: { type: 'number', description: 'Deleted comment ID' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_file.ts b/apps/sim/tools/github/delete_file.ts
index c759510530..cf52b4b719 100644
--- a/apps/sim/tools/github/delete_file.ts
+++ b/apps/sim/tools/github/delete_file.ts
@@ -147,3 +147,28 @@ View commit: ${data.commit.html_url || 'N/A'}`
     },
   },
 }
+
+export const deleteFileV2Tool: ToolConfig<DeleteFileParams, any> = {
+  id: 'github_delete_file_v2',
+  name: deleteFileTool.name,
+  description: deleteFileTool.description,
+  version: '2.0.0',
+  params: deleteFileTool.params,
+  request: deleteFileTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        content: data.content ?? null, // null when file is deleted
+        commit: data.commit,
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'json', description: 'File content info (null for delete)', optional: true },
+    commit: { type: 'json', description: 'Commit information' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_project.ts b/apps/sim/tools/github/delete_project.ts
index c39e2806ff..e3698b255d 100644
--- a/apps/sim/tools/github/delete_project.ts
+++ b/apps/sim/tools/github/delete_project.ts
@@ -126,3 +126,42 @@ export const deleteProjectTool: ToolConfig<DeleteProjectParams, ProjectResponse>
     },
   },
 }
+
+export const deleteProjectV2Tool: ToolConfig<DeleteProjectParams, any> = {
+  id: 'github_delete_project_v2',
+  name: deleteProjectTool.name,
+  description: deleteProjectTool.description,
+  version: '2.0.0',
+  params: deleteProjectTool.params,
+  request: deleteProjectTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (data.errors) {
+      return {
+        success: false,
+        output: { id: '', title: '', number: 0, url: '' },
+        error: data.errors[0].message,
+      }
+    }
+
+    const project = data.data?.deleteProjectV2?.projectV2 || {}
+    return {
+      success: true,
+      output: {
+        id: project.id,
+        title: project.title,
+        number: project.number,
+        url: project.url,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Deleted project node ID' },
+    title: { type: 'string', description: 'Deleted project title' },
+    number: { type: 'number', description: 'Deleted project number' },
+    url: { type: 'string', description: 'Deleted project URL' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_release.ts b/apps/sim/tools/github/delete_release.ts
index 579c6a1e2e..bc7891d02e 100644
--- a/apps/sim/tools/github/delete_release.ts
+++ b/apps/sim/tools/github/delete_release.ts
@@ -96,3 +96,27 @@ Note: The associated Git tag has not been deleted and remains in the repository.
     },
   },
 }
+
+export const deleteReleaseV2Tool: ToolConfig<DeleteReleaseParams, any> = {
+  id: 'github_delete_release_v2',
+  name: deleteReleaseTool.name,
+  description: deleteReleaseTool.description,
+  version: '2.0.0',
+  params: deleteReleaseTool.params,
+  request: deleteReleaseTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    return {
+      success: true,
+      output: {
+        deleted: response.status === 204,
+        release_id: params?.release_id || 0,
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether the release was deleted' },
+    release_id: { type: 'number', description: 'ID of the deleted release' },
+  },
+}
diff --git a/apps/sim/tools/github/get_branch.ts b/apps/sim/tools/github/get_branch.ts
index bbafee5cfd..6da3544ad7 100644
--- a/apps/sim/tools/github/get_branch.ts
+++ b/apps/sim/tools/github/get_branch.ts
@@ -90,3 +90,34 @@ Protected: ${branch.protected ? 'Yes' : 'No'}`
     },
   },
 }
+
+export const getBranchV2Tool: ToolConfig<GetBranchParams, any> = {
+  id: 'github_get_branch_v2',
+  name: getBranchTool.name,
+  description: getBranchTool.description,
+  version: '2.0.0',
+  params: getBranchTool.params,
+  request: getBranchTool.request,
+
+  transformResponse: async (response: Response) => {
+    const branch = await response.json()
+    return {
+      success: true,
+      output: {
+        name: branch.name,
+        commit: branch.commit,
+        protected: branch.protected,
+        protection: branch.protection,
+        protection_url: branch.protection_url,
+      },
+    }
+  },
+
+  outputs: {
+    name: { type: 'string', description: 'Branch name' },
+    commit: { type: 'json', description: 'Commit object with sha, url, etc.' },
+    protected: { type: 'boolean', description: 'Whether branch is protected' },
+    protection: { type: 'json', description: 'Protection settings object' },
+    protection_url: { type: 'string', description: 'URL to protection settings' },
+  },
+}
diff --git a/apps/sim/tools/github/get_branch_protection.ts b/apps/sim/tools/github/get_branch_protection.ts
index de583986ab..7f1caf3f6d 100644
--- a/apps/sim/tools/github/get_branch_protection.ts
+++ b/apps/sim/tools/github/get_branch_protection.ts
@@ -181,3 +181,62 @@ Enforce Admins: ${protection.enforce_admins?.enabled ? 'Yes' : 'No'}`
     },
   },
 }
+
+export const getBranchProtectionV2Tool: ToolConfig<GetBranchProtectionParams, any> = {
+  id: 'github_get_branch_protection_v2',
+  name: getBranchProtectionTool.name,
+  description: getBranchProtectionTool.description,
+  version: '2.0.0',
+  params: getBranchProtectionTool.params,
+  request: getBranchProtectionTool.request,
+
+  transformResponse: async (response: Response) => {
+    const protection = await response.json()
+    return {
+      success: true,
+      output: {
+        url: protection.url,
+        required_status_checks: protection.required_status_checks ?? null,
+        enforce_admins: protection.enforce_admins,
+        required_pull_request_reviews: protection.required_pull_request_reviews ?? null,
+        restrictions: protection.restrictions ?? null,
+        required_linear_history: protection.required_linear_history ?? null,
+        allow_force_pushes: protection.allow_force_pushes ?? null,
+        allow_deletions: protection.allow_deletions ?? null,
+        block_creations: protection.block_creations ?? null,
+        required_conversation_resolution: protection.required_conversation_resolution ?? null,
+        required_signatures: protection.required_signatures ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    url: { type: 'string', description: 'Protection settings URL' },
+    required_status_checks: {
+      type: 'json',
+      description: 'Status check requirements',
+      optional: true,
+    },
+    enforce_admins: { type: 'json', description: 'Admin enforcement settings' },
+    required_pull_request_reviews: {
+      type: 'json',
+      description: 'PR review requirements',
+      optional: true,
+    },
+    restrictions: { type: 'json', description: 'Push restrictions', optional: true },
+    required_linear_history: {
+      type: 'json',
+      description: 'Linear history requirement',
+      optional: true,
+    },
+    allow_force_pushes: { type: 'json', description: 'Force push settings', optional: true },
+    allow_deletions: { type: 'json', description: 'Deletion settings', optional: true },
+    block_creations: { type: 'json', description: 'Creation blocking settings', optional: true },
+    required_conversation_resolution: {
+      type: 'json',
+      description: 'Conversation resolution requirement',
+      optional: true,
+    },
+    required_signatures: { type: 'json', description: 'Signature requirements', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/get_file_content.ts b/apps/sim/tools/github/get_file_content.ts
index a5956d6655..841e98d57f 100644
--- a/apps/sim/tools/github/get_file_content.ts
+++ b/apps/sim/tools/github/get_file_content.ts
@@ -136,3 +136,57 @@ ${contentPreview}`
     },
   },
 }
+
+export const getFileContentV2Tool: ToolConfig<GetFileContentParams, any> = {
+  id: 'github_get_file_content_v2',
+  name: getFileContentTool.name,
+  description: getFileContentTool.description,
+  version: '2.0.0',
+  params: getFileContentTool.params,
+  request: getFileContentTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    // Decode base64 content if present
+    let decodedContent = ''
+    if (data.content && data.encoding === 'base64') {
+      try {
+        decodedContent = Buffer.from(data.content, 'base64').toString('utf-8')
+      } catch {
+        decodedContent = data.content
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        name: data.name,
+        path: data.path,
+        sha: data.sha,
+        size: data.size,
+        type: data.type,
+        content: (decodedContent || data.content) ?? null,
+        encoding: data.encoding,
+        html_url: data.html_url,
+        download_url: data.download_url ?? null,
+        git_url: data.git_url,
+        _links: data._links,
+      },
+    }
+  },
+
+  outputs: {
+    name: { type: 'string', description: 'File name' },
+    path: { type: 'string', description: 'Full path in repository' },
+    sha: { type: 'string', description: 'Git blob SHA' },
+    size: { type: 'number', description: 'File size in bytes' },
+    type: { type: 'string', description: 'Content type (file/dir/symlink/submodule)' },
+    content: { type: 'string', description: 'Decoded file content', optional: true },
+    encoding: { type: 'string', description: 'Content encoding' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    download_url: { type: 'string', description: 'Direct download URL', optional: true },
+    git_url: { type: 'string', description: 'Git blob API URL' },
+    _links: { type: 'json', description: 'Related links' },
+  },
+}
diff --git a/apps/sim/tools/github/get_issue.ts b/apps/sim/tools/github/get_issue.ts
index e08fa82257..f0bd47c57e 100644
--- a/apps/sim/tools/github/get_issue.ts
+++ b/apps/sim/tools/github/get_issue.ts
@@ -104,3 +104,54 @@ ${issue.body || 'No description provided'}`
     },
   },
 }
+
+export const getIssueV2Tool: ToolConfig<GetIssueParams, any> = {
+  id: 'github_get_issue_v2',
+  name: getIssueTool.name,
+  description: getIssueTool.description,
+  version: '2.0.0',
+  params: getIssueTool.params,
+  request: getIssueTool.request,
+
+  transformResponse: async (response: Response) => {
+    const issue = await response.json()
+    return {
+      success: true,
+      output: {
+        id: issue.id,
+        number: issue.number,
+        title: issue.title,
+        state: issue.state,
+        html_url: issue.html_url,
+        body: issue.body ?? null,
+        user: issue.user,
+        labels: issue.labels ?? [],
+        assignees: issue.assignees ?? [],
+        milestone: issue.milestone ?? null,
+        comments: issue.comments,
+        created_at: issue.created_at,
+        updated_at: issue.updated_at,
+        closed_at: issue.closed_at ?? null,
+        closed_by: issue.closed_by ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Issue ID' },
+    number: { type: 'number', description: 'Issue number' },
+    title: { type: 'string', description: 'Issue title' },
+    state: { type: 'string', description: 'Issue state (open/closed)' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'Issue body/description', optional: true },
+    user: { type: 'json', description: 'User who created the issue' },
+    labels: { type: 'array', description: 'Array of label objects' },
+    assignees: { type: 'array', description: 'Array of assignee objects' },
+    milestone: { type: 'json', description: 'Milestone object', optional: true },
+    comments: { type: 'number', description: 'Number of comments' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+    closed_by: { type: 'json', description: 'User who closed the issue', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/get_pr_files.ts b/apps/sim/tools/github/get_pr_files.ts
index b0409433b8..b806341951 100644
--- a/apps/sim/tools/github/get_pr_files.ts
+++ b/apps/sim/tools/github/get_pr_files.ts
@@ -136,3 +136,50 @@ ${files
     },
   },
 }
+
+export const getPRFilesV2Tool: ToolConfig<GetPRFilesParams, any> = {
+  id: 'github_get_pr_files_v2',
+  name: getPRFilesTool.name,
+  description: getPRFilesTool.description,
+  version: '2.0.0',
+  params: getPRFilesTool.params,
+  request: getPRFilesTool.request,
+
+  transformResponse: async (response: Response) => {
+    const files = await response.json()
+    return {
+      success: true,
+      output: {
+        items: files ?? [],
+        count: files?.length ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of changed file objects',
+      items: {
+        type: 'object',
+        properties: {
+          filename: { type: 'string', description: 'File path' },
+          status: { type: 'string', description: 'Change status (added/modified/deleted/renamed)' },
+          additions: { type: 'number', description: 'Lines added' },
+          deletions: { type: 'number', description: 'Lines deleted' },
+          changes: { type: 'number', description: 'Total changes' },
+          patch: { type: 'string', description: 'File diff patch', optional: true },
+          sha: { type: 'string', description: 'File SHA' },
+          blob_url: { type: 'string', description: 'GitHub blob URL' },
+          raw_url: { type: 'string', description: 'Raw file URL' },
+          previous_filename: {
+            type: 'string',
+            description: 'Previous filename (for renamed files)',
+            optional: true,
+          },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Total number of files' },
+  },
+}
diff --git a/apps/sim/tools/github/get_project.ts b/apps/sim/tools/github/get_project.ts
index 75f221ca4b..0ebeb9763e 100644
--- a/apps/sim/tools/github/get_project.ts
+++ b/apps/sim/tools/github/get_project.ts
@@ -161,3 +161,86 @@ export const getProjectTool: ToolConfig<GetProjectParams, ProjectResponse> = {
     },
   },
 }
+
+export const getProjectV2Tool: ToolConfig<GetProjectParams, any> = {
+  id: 'github_get_project_v2',
+  name: getProjectTool.name,
+  description: getProjectTool.description,
+  version: '2.0.0',
+  params: getProjectTool.params,
+  request: getProjectTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (data.errors) {
+      return {
+        success: false,
+        output: {
+          id: '',
+          title: '',
+          number: 0,
+          url: '',
+          closed: false,
+          public: false,
+          shortDescription: '',
+          readme: '',
+          createdAt: '',
+          updatedAt: '',
+        },
+        error: data.errors[0].message,
+      }
+    }
+
+    const ownerData = data.data?.organization || data.data?.user
+    const project = ownerData?.projectV2
+
+    if (!project) {
+      return {
+        success: false,
+        output: {
+          id: '',
+          title: '',
+          number: 0,
+          url: '',
+          closed: false,
+          public: false,
+          shortDescription: '',
+          readme: '',
+          createdAt: '',
+          updatedAt: '',
+        },
+        error: 'Project not found',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        id: project.id,
+        title: project.title,
+        number: project.number,
+        url: project.url,
+        closed: project.closed,
+        public: project.public,
+        shortDescription: project.shortDescription ?? null,
+        readme: project.readme ?? null,
+        createdAt: project.createdAt,
+        updatedAt: project.updatedAt,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Project node ID' },
+    title: { type: 'string', description: 'Project title' },
+    number: { type: 'number', description: 'Project number' },
+    url: { type: 'string', description: 'Project URL' },
+    closed: { type: 'boolean', description: 'Whether project is closed' },
+    public: { type: 'boolean', description: 'Whether project is public' },
+    shortDescription: { type: 'string', description: 'Short description', optional: true },
+    readme: { type: 'string', description: 'Project readme', optional: true },
+    createdAt: { type: 'string', description: 'Creation timestamp' },
+    updatedAt: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/get_release.ts b/apps/sim/tools/github/get_release.ts
index 5371156b54..24dac4977c 100644
--- a/apps/sim/tools/github/get_release.ts
+++ b/apps/sim/tools/github/get_release.ts
@@ -109,3 +109,52 @@ Download URLs:
     },
   },
 }
+
+export const getReleaseV2Tool: ToolConfig<GetReleaseParams, any> = {
+  id: 'github_get_release_v2',
+  name: getReleaseTool.name,
+  description: getReleaseTool.description,
+  version: '2.0.0',
+  params: getReleaseTool.params,
+  request: getReleaseTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        tag_name: data.tag_name,
+        name: data.name,
+        body: data.body ?? null,
+        html_url: data.html_url,
+        tarball_url: data.tarball_url,
+        zipball_url: data.zipball_url,
+        draft: data.draft,
+        prerelease: data.prerelease,
+        author: data.author,
+        assets: data.assets,
+        created_at: data.created_at,
+        published_at: data.published_at ?? null,
+        target_commitish: data.target_commitish,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Release ID' },
+    tag_name: { type: 'string', description: 'Git tag name' },
+    name: { type: 'string', description: 'Release name' },
+    body: { type: 'string', description: 'Release description', optional: true },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    tarball_url: { type: 'string', description: 'Tarball download URL' },
+    zipball_url: { type: 'string', description: 'Zipball download URL' },
+    draft: { type: 'boolean', description: 'Whether this is a draft' },
+    prerelease: { type: 'boolean', description: 'Whether this is a prerelease' },
+    author: { type: 'json', description: 'Release author object' },
+    assets: { type: 'array', description: 'Array of release asset objects' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    published_at: { type: 'string', description: 'Publication timestamp', optional: true },
+    target_commitish: { type: 'string', description: 'Target commit/branch' },
+  },
+}
diff --git a/apps/sim/tools/github/get_tree.ts b/apps/sim/tools/github/get_tree.ts
index b1647fb526..72dd3b1b76 100644
--- a/apps/sim/tools/github/get_tree.ts
+++ b/apps/sim/tools/github/get_tree.ts
@@ -161,3 +161,67 @@ Total items: ${items.length}
     },
   },
 }
+
+export const getTreeV2Tool: ToolConfig<GetTreeParams, any> = {
+  id: 'github_get_tree_v2',
+  name: getTreeTool.name,
+  description: getTreeTool.description,
+  version: '2.0.0',
+  params: getTreeTool.params,
+  request: getTreeTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    // API returns array for directory, object for file
+    if (!Array.isArray(data)) {
+      return {
+        success: false,
+        output: { items: [], count: 0 },
+        error: 'Path points to a file. Use github_get_file_content to get file contents.',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        items: data.map((item: any) => ({
+          name: item.name,
+          path: item.path,
+          sha: item.sha,
+          size: item.size,
+          type: item.type,
+          html_url: item.html_url,
+          download_url: item.download_url ?? null,
+          git_url: item.git_url,
+          url: item.url,
+          _links: item._links,
+        })),
+        count: data.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of file/directory objects',
+      items: {
+        type: 'object',
+        properties: {
+          name: { type: 'string', description: 'File or directory name' },
+          path: { type: 'string', description: 'Full path in repository' },
+          sha: { type: 'string', description: 'Git object SHA' },
+          size: { type: 'number', description: 'Size in bytes' },
+          type: { type: 'string', description: 'Type (file/dir/symlink/submodule)' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          download_url: { type: 'string', description: 'Direct download URL', optional: true },
+          git_url: { type: 'string', description: 'Git blob API URL' },
+          url: { type: 'string', description: 'API URL for this item' },
+          _links: { type: 'json', description: 'Related links' },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Total number of items' },
+  },
+}
diff --git a/apps/sim/tools/github/get_workflow.ts b/apps/sim/tools/github/get_workflow.ts
index 51d46e10bd..84f5022a15 100644
--- a/apps/sim/tools/github/get_workflow.ts
+++ b/apps/sim/tools/github/get_workflow.ts
@@ -87,3 +87,46 @@ Updated: ${data.updated_at}`
     },
   },
 }
+
+export const getWorkflowV2Tool: ToolConfig<GetWorkflowParams, any> = {
+  id: 'github_get_workflow_v2',
+  name: getWorkflowTool.name,
+  description: getWorkflowTool.description,
+  version: '2.0.0',
+  params: getWorkflowTool.params,
+  request: getWorkflowTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        node_id: data.node_id,
+        name: data.name,
+        path: data.path,
+        state: data.state,
+        html_url: data.html_url,
+        badge_url: data.badge_url,
+        url: data.url,
+        created_at: data.created_at,
+        updated_at: data.updated_at,
+        deleted_at: data.deleted_at ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Workflow ID' },
+    node_id: { type: 'string', description: 'Workflow node ID' },
+    name: { type: 'string', description: 'Workflow name' },
+    path: { type: 'string', description: 'Path to workflow file' },
+    state: { type: 'string', description: 'Workflow state (active/disabled)' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    badge_url: { type: 'string', description: 'Badge URL' },
+    url: { type: 'string', description: 'API URL' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    deleted_at: { type: 'string', description: 'Deletion timestamp', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/get_workflow_run.ts b/apps/sim/tools/github/get_workflow_run.ts
index ff297ad00d..0285094717 100644
--- a/apps/sim/tools/github/get_workflow_run.ts
+++ b/apps/sim/tools/github/get_workflow_run.ts
@@ -93,3 +93,66 @@ Logs: ${data.logs_url}`
     },
   },
 }
+
+export const getWorkflowRunV2Tool: ToolConfig<GetWorkflowRunParams, any> = {
+  id: 'github_get_workflow_run_v2',
+  name: getWorkflowRunTool.name,
+  description: getWorkflowRunTool.description,
+  version: '2.0.0',
+  params: getWorkflowRunTool.params,
+  request: getWorkflowRunTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        name: data.name,
+        head_branch: data.head_branch,
+        head_sha: data.head_sha,
+        run_number: data.run_number,
+        run_attempt: data.run_attempt,
+        event: data.event,
+        status: data.status,
+        conclusion: data.conclusion ?? null,
+        workflow_id: data.workflow_id,
+        html_url: data.html_url,
+        logs_url: data.logs_url,
+        jobs_url: data.jobs_url,
+        artifacts_url: data.artifacts_url,
+        triggering_actor: data.triggering_actor,
+        pull_requests: data.pull_requests ?? [],
+        referenced_workflows: data.referenced_workflows ?? [],
+        head_commit: data.head_commit,
+        run_started_at: data.run_started_at,
+        created_at: data.created_at,
+        updated_at: data.updated_at,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Workflow run ID' },
+    name: { type: 'string', description: 'Workflow name' },
+    head_branch: { type: 'string', description: 'Branch name' },
+    head_sha: { type: 'string', description: 'Commit SHA' },
+    run_number: { type: 'number', description: 'Run number' },
+    run_attempt: { type: 'number', description: 'Run attempt number' },
+    event: { type: 'string', description: 'Trigger event type' },
+    status: { type: 'string', description: 'Run status' },
+    conclusion: { type: 'string', description: 'Run conclusion', optional: true },
+    workflow_id: { type: 'number', description: 'Workflow ID' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    logs_url: { type: 'string', description: 'Logs download URL' },
+    jobs_url: { type: 'string', description: 'Jobs API URL' },
+    artifacts_url: { type: 'string', description: 'Artifacts API URL' },
+    triggering_actor: { type: 'json', description: 'User who triggered the run' },
+    pull_requests: { type: 'array', description: 'Associated pull requests' },
+    referenced_workflows: { type: 'array', description: 'Referenced workflows' },
+    head_commit: { type: 'json', description: 'Head commit information' },
+    run_started_at: { type: 'string', description: 'Run start timestamp' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/index.ts b/apps/sim/tools/github/index.ts
index ba3a57da36..bd3ff3df89 100644
--- a/apps/sim/tools/github/index.ts
+++ b/apps/sim/tools/github/index.ts
@@ -1,105 +1,163 @@
-import { addAssigneesTool } from '@/tools/github/add_assignees'
-import { addLabelsTool } from '@/tools/github/add_labels'
-import { cancelWorkflowRunTool } from '@/tools/github/cancel_workflow_run'
-import { closeIssueTool } from '@/tools/github/close_issue'
-import { closePRTool } from '@/tools/github/close_pr'
-import { commentTool } from '@/tools/github/comment'
-import { createBranchTool } from '@/tools/github/create_branch'
-import { createFileTool } from '@/tools/github/create_file'
-import { createIssueTool } from '@/tools/github/create_issue'
-import { createPRTool } from '@/tools/github/create_pr'
-import { createProjectTool } from '@/tools/github/create_project'
-import { createReleaseTool } from '@/tools/github/create_release'
-import { deleteBranchTool } from '@/tools/github/delete_branch'
-import { deleteCommentTool } from '@/tools/github/delete_comment'
-import { deleteFileTool } from '@/tools/github/delete_file'
-import { deleteProjectTool } from '@/tools/github/delete_project'
-import { deleteReleaseTool } from '@/tools/github/delete_release'
-import { getBranchTool } from '@/tools/github/get_branch'
-import { getBranchProtectionTool } from '@/tools/github/get_branch_protection'
-import { getFileContentTool } from '@/tools/github/get_file_content'
-import { getIssueTool } from '@/tools/github/get_issue'
-import { getPRFilesTool } from '@/tools/github/get_pr_files'
-import { getProjectTool } from '@/tools/github/get_project'
-import { getReleaseTool } from '@/tools/github/get_release'
-import { getTreeTool } from '@/tools/github/get_tree'
-import { getWorkflowTool } from '@/tools/github/get_workflow'
-import { getWorkflowRunTool } from '@/tools/github/get_workflow_run'
-import { issueCommentTool } from '@/tools/github/issue_comment'
-import { latestCommitTool } from '@/tools/github/latest_commit'
-import { listBranchesTool } from '@/tools/github/list_branches'
-import { listIssueCommentsTool } from '@/tools/github/list_issue_comments'
-import { listIssuesTool } from '@/tools/github/list_issues'
-import { listPRCommentsTool } from '@/tools/github/list_pr_comments'
-import { listProjectsTool } from '@/tools/github/list_projects'
-import { listPRsTool } from '@/tools/github/list_prs'
-import { listReleasesTool } from '@/tools/github/list_releases'
-import { listWorkflowRunsTool } from '@/tools/github/list_workflow_runs'
-import { listWorkflowsTool } from '@/tools/github/list_workflows'
-import { mergePRTool } from '@/tools/github/merge_pr'
-import { prTool } from '@/tools/github/pr'
-import { removeLabelTool } from '@/tools/github/remove_label'
-import { repoInfoTool } from '@/tools/github/repo_info'
-import { requestReviewersTool } from '@/tools/github/request_reviewers'
-import { rerunWorkflowTool } from '@/tools/github/rerun_workflow'
-import { triggerWorkflowTool } from '@/tools/github/trigger_workflow'
-import { updateBranchProtectionTool } from '@/tools/github/update_branch_protection'
-import { updateCommentTool } from '@/tools/github/update_comment'
-import { updateFileTool } from '@/tools/github/update_file'
-import { updateIssueTool } from '@/tools/github/update_issue'
-import { updatePRTool } from '@/tools/github/update_pr'
-import { updateProjectTool } from '@/tools/github/update_project'
-import { updateReleaseTool } from '@/tools/github/update_release'
+import { addAssigneesTool, addAssigneesV2Tool } from '@/tools/github/add_assignees'
+import { addLabelsTool, addLabelsV2Tool } from '@/tools/github/add_labels'
+import { cancelWorkflowRunTool, cancelWorkflowRunV2Tool } from '@/tools/github/cancel_workflow_run'
+import { closeIssueTool, closeIssueV2Tool } from '@/tools/github/close_issue'
+import { closePRTool, closePRV2Tool } from '@/tools/github/close_pr'
+import { commentTool, commentV2Tool } from '@/tools/github/comment'
+import { createBranchTool, createBranchV2Tool } from '@/tools/github/create_branch'
+import { createFileTool, createFileV2Tool } from '@/tools/github/create_file'
+import { createIssueTool, createIssueV2Tool } from '@/tools/github/create_issue'
+import { createPRTool, createPRV2Tool } from '@/tools/github/create_pr'
+import { createProjectTool, createProjectV2Tool } from '@/tools/github/create_project'
+import { createReleaseTool, createReleaseV2Tool } from '@/tools/github/create_release'
+import { deleteBranchTool, deleteBranchV2Tool } from '@/tools/github/delete_branch'
+import { deleteCommentTool, deleteCommentV2Tool } from '@/tools/github/delete_comment'
+import { deleteFileTool, deleteFileV2Tool } from '@/tools/github/delete_file'
+import { deleteProjectTool, deleteProjectV2Tool } from '@/tools/github/delete_project'
+import { deleteReleaseTool, deleteReleaseV2Tool } from '@/tools/github/delete_release'
+import { getBranchTool, getBranchV2Tool } from '@/tools/github/get_branch'
+import {
+  getBranchProtectionTool,
+  getBranchProtectionV2Tool,
+} from '@/tools/github/get_branch_protection'
+import { getFileContentTool, getFileContentV2Tool } from '@/tools/github/get_file_content'
+import { getIssueTool, getIssueV2Tool } from '@/tools/github/get_issue'
+import { getPRFilesTool, getPRFilesV2Tool } from '@/tools/github/get_pr_files'
+import { getProjectTool, getProjectV2Tool } from '@/tools/github/get_project'
+import { getReleaseTool, getReleaseV2Tool } from '@/tools/github/get_release'
+import { getTreeTool, getTreeV2Tool } from '@/tools/github/get_tree'
+import { getWorkflowTool, getWorkflowV2Tool } from '@/tools/github/get_workflow'
+import { getWorkflowRunTool, getWorkflowRunV2Tool } from '@/tools/github/get_workflow_run'
+import { issueCommentTool, issueCommentV2Tool } from '@/tools/github/issue_comment'
+import { latestCommitTool, latestCommitV2Tool } from '@/tools/github/latest_commit'
+import { listBranchesTool, listBranchesV2Tool } from '@/tools/github/list_branches'
+import { listIssueCommentsTool, listIssueCommentsV2Tool } from '@/tools/github/list_issue_comments'
+import { listIssuesTool, listIssuesV2Tool } from '@/tools/github/list_issues'
+import { listPRCommentsTool, listPRCommentsV2Tool } from '@/tools/github/list_pr_comments'
+import { listProjectsTool, listProjectsV2Tool } from '@/tools/github/list_projects'
+import { listPRsTool, listPRsV2Tool } from '@/tools/github/list_prs'
+import { listReleasesTool, listReleasesV2Tool } from '@/tools/github/list_releases'
+import { listWorkflowRunsTool, listWorkflowRunsV2Tool } from '@/tools/github/list_workflow_runs'
+import { listWorkflowsTool, listWorkflowsV2Tool } from '@/tools/github/list_workflows'
+import { mergePRTool, mergePRV2Tool } from '@/tools/github/merge_pr'
+import { prTool, prV2Tool } from '@/tools/github/pr'
+import { removeLabelTool, removeLabelV2Tool } from '@/tools/github/remove_label'
+import { repoInfoTool, repoInfoV2Tool } from '@/tools/github/repo_info'
+import { requestReviewersTool, requestReviewersV2Tool } from '@/tools/github/request_reviewers'
+import { rerunWorkflowTool, rerunWorkflowV2Tool } from '@/tools/github/rerun_workflow'
+import { triggerWorkflowTool, triggerWorkflowV2Tool } from '@/tools/github/trigger_workflow'
+import {
+  updateBranchProtectionTool,
+  updateBranchProtectionV2Tool,
+} from '@/tools/github/update_branch_protection'
+import { updateCommentTool, updateCommentV2Tool } from '@/tools/github/update_comment'
+import { updateFileTool, updateFileV2Tool } from '@/tools/github/update_file'
+import { updateIssueTool, updateIssueV2Tool } from '@/tools/github/update_issue'
+import { updatePRTool, updatePRV2Tool } from '@/tools/github/update_pr'
+import { updateProjectTool, updateProjectV2Tool } from '@/tools/github/update_project'
+import { updateReleaseTool, updateReleaseV2Tool } from '@/tools/github/update_release'
 
 export const githubCancelWorkflowRunTool = cancelWorkflowRunTool
+export const githubCancelWorkflowRunV2Tool = cancelWorkflowRunV2Tool
 export const githubClosePRTool = closePRTool
+export const githubClosePRV2Tool = closePRV2Tool
 export const githubCommentTool = commentTool
+export const githubCommentV2Tool = commentV2Tool
 export const githubCreateBranchTool = createBranchTool
+export const githubCreateBranchV2Tool = createBranchV2Tool
 export const githubCreateFileTool = createFileTool
+export const githubCreateFileV2Tool = createFileV2Tool
 export const githubCreatePRTool = createPRTool
+export const githubCreatePRV2Tool = createPRV2Tool
 export const githubCreateProjectTool = createProjectTool
+export const githubCreateProjectV2Tool = createProjectV2Tool
 export const githubCreateReleaseTool = createReleaseTool
+export const githubCreateReleaseV2Tool = createReleaseV2Tool
 export const githubDeleteBranchTool = deleteBranchTool
+export const githubDeleteBranchV2Tool = deleteBranchV2Tool
 export const githubDeleteCommentTool = deleteCommentTool
+export const githubDeleteCommentV2Tool = deleteCommentV2Tool
 export const githubDeleteFileTool = deleteFileTool
+export const githubDeleteFileV2Tool = deleteFileV2Tool
 export const githubDeleteProjectTool = deleteProjectTool
+export const githubDeleteProjectV2Tool = deleteProjectV2Tool
 export const githubDeleteReleaseTool = deleteReleaseTool
+export const githubDeleteReleaseV2Tool = deleteReleaseV2Tool
 export const githubGetBranchTool = getBranchTool
+export const githubGetBranchV2Tool = getBranchV2Tool
 export const githubGetBranchProtectionTool = getBranchProtectionTool
+export const githubGetBranchProtectionV2Tool = getBranchProtectionV2Tool
 export const githubGetFileContentTool = getFileContentTool
+export const githubGetFileContentV2Tool = getFileContentV2Tool
 export const githubGetPRFilesTool = getPRFilesTool
+export const githubGetPRFilesV2Tool = getPRFilesV2Tool
 export const githubGetProjectTool = getProjectTool
+export const githubGetProjectV2Tool = getProjectV2Tool
 export const githubGetReleaseTool = getReleaseTool
+export const githubGetReleaseV2Tool = getReleaseV2Tool
 export const githubGetTreeTool = getTreeTool
+export const githubGetTreeV2Tool = getTreeV2Tool
 export const githubGetWorkflowTool = getWorkflowTool
+export const githubGetWorkflowV2Tool = getWorkflowV2Tool
 export const githubGetWorkflowRunTool = getWorkflowRunTool
+export const githubGetWorkflowRunV2Tool = getWorkflowRunV2Tool
 export const githubIssueCommentTool = issueCommentTool
+export const githubIssueCommentV2Tool = issueCommentV2Tool
 export const githubLatestCommitTool = latestCommitTool
+export const githubLatestCommitV2Tool = latestCommitV2Tool
 export const githubListBranchesTool = listBranchesTool
+export const githubListBranchesV2Tool = listBranchesV2Tool
 export const githubListIssueCommentsTool = listIssueCommentsTool
+export const githubListIssueCommentsV2Tool = listIssueCommentsV2Tool
 export const githubListPRCommentsTool = listPRCommentsTool
+export const githubListPRCommentsV2Tool = listPRCommentsV2Tool
 export const githubListPRsTool = listPRsTool
+export const githubListPRsV2Tool = listPRsV2Tool
 export const githubListProjectsTool = listProjectsTool
+export const githubListProjectsV2Tool = listProjectsV2Tool
 export const githubListReleasesTool = listReleasesTool
+export const githubListReleasesV2Tool = listReleasesV2Tool
 export const githubListWorkflowRunsTool = listWorkflowRunsTool
+export const githubListWorkflowRunsV2Tool = listWorkflowRunsV2Tool
 export const githubListWorkflowsTool = listWorkflowsTool
+export const githubListWorkflowsV2Tool = listWorkflowsV2Tool
 export const githubMergePRTool = mergePRTool
+export const githubMergePRV2Tool = mergePRV2Tool
 export const githubPrTool = prTool
+export const githubPrV2Tool = prV2Tool
 export const githubRepoInfoTool = repoInfoTool
+export const githubRepoInfoV2Tool = repoInfoV2Tool
 export const githubRequestReviewersTool = requestReviewersTool
+export const githubRequestReviewersV2Tool = requestReviewersV2Tool
 export const githubRerunWorkflowTool = rerunWorkflowTool
+export const githubRerunWorkflowV2Tool = rerunWorkflowV2Tool
 export const githubTriggerWorkflowTool = triggerWorkflowTool
+export const githubTriggerWorkflowV2Tool = triggerWorkflowV2Tool
 export const githubUpdateBranchProtectionTool = updateBranchProtectionTool
+export const githubUpdateBranchProtectionV2Tool = updateBranchProtectionV2Tool
 export const githubUpdateCommentTool = updateCommentTool
+export const githubUpdateCommentV2Tool = updateCommentV2Tool
 export const githubUpdateFileTool = updateFileTool
+export const githubUpdateFileV2Tool = updateFileV2Tool
 export const githubUpdatePRTool = updatePRTool
+export const githubUpdatePRV2Tool = updatePRV2Tool
 export const githubUpdateProjectTool = updateProjectTool
+export const githubUpdateProjectV2Tool = updateProjectV2Tool
 export const githubUpdateReleaseTool = updateReleaseTool
+export const githubUpdateReleaseV2Tool = updateReleaseV2Tool
 export const githubAddAssigneesTool = addAssigneesTool
+export const githubAddAssigneesV2Tool = addAssigneesV2Tool
 export const githubAddLabelsTool = addLabelsTool
+export const githubAddLabelsV2Tool = addLabelsV2Tool
 export const githubCloseIssueTool = closeIssueTool
+export const githubCloseIssueV2Tool = closeIssueV2Tool
 export const githubCreateIssueTool = createIssueTool
+export const githubCreateIssueV2Tool = createIssueV2Tool
 export const githubGetIssueTool = getIssueTool
+export const githubGetIssueV2Tool = getIssueV2Tool
 export const githubListIssuesTool = listIssuesTool
+export const githubListIssuesV2Tool = listIssuesV2Tool
 export const githubRemoveLabelTool = removeLabelTool
+export const githubRemoveLabelV2Tool = removeLabelV2Tool
 export const githubUpdateIssueTool = updateIssueTool
+export const githubUpdateIssueV2Tool = updateIssueV2Tool
diff --git a/apps/sim/tools/github/issue_comment.ts b/apps/sim/tools/github/issue_comment.ts
index 8228e359b3..293952c063 100644
--- a/apps/sim/tools/github/issue_comment.ts
+++ b/apps/sim/tools/github/issue_comment.ts
@@ -101,3 +101,35 @@ export const issueCommentTool: ToolConfig<CreateIssueCommentParams, IssueComment
     },
   },
 }
+
+export const issueCommentV2Tool: ToolConfig = {
+  id: 'github_issue_comment_v2',
+  name: issueCommentTool.name,
+  description: issueCommentTool.description,
+  version: '2.0.0',
+  params: issueCommentTool.params,
+  request: issueCommentTool.request,
+  oauth: issueCommentTool.oauth,
+  transformResponse: async (response: Response) => {
+    const comment = await response.json()
+    return {
+      success: true,
+      output: {
+        id: comment.id,
+        body: comment.body,
+        html_url: comment.html_url,
+        user: comment.user,
+        created_at: comment.created_at,
+        updated_at: comment.updated_at,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'Comment ID' },
+    body: { type: 'string', description: 'Comment body' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    user: { type: 'json', description: 'User who created the comment' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/latest_commit.ts b/apps/sim/tools/github/latest_commit.ts
index c4e7db0318..3938873de4 100644
--- a/apps/sim/tools/github/latest_commit.ts
+++ b/apps/sim/tools/github/latest_commit.ts
@@ -134,3 +134,34 @@ export const latestCommitTool: ToolConfig<LatestCommitParams, LatestCommitRespon
     },
   },
 }
+
+export const latestCommitV2Tool: ToolConfig = {
+  id: 'github_latest_commit_v2',
+  name: latestCommitTool.name,
+  description: latestCommitTool.description,
+  version: '2.0.0',
+  params: latestCommitTool.params,
+  request: latestCommitTool.request,
+  oauth: latestCommitTool.oauth,
+  transformResponse: async (response: Response) => {
+    const commits = await response.json()
+    const commit = commits[0]
+    return {
+      success: true,
+      output: {
+        sha: commit.sha,
+        html_url: commit.html_url,
+        commit: commit.commit,
+        author: commit.author ?? null,
+        committer: commit.committer ?? null,
+      },
+    }
+  },
+  outputs: {
+    sha: { type: 'string', description: 'Commit SHA' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    commit: { type: 'json', description: 'Commit info with message, author, committer' },
+    author: { type: 'json', description: 'Author user object', optional: true },
+    committer: { type: 'json', description: 'Committer user object', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/list_branches.ts b/apps/sim/tools/github/list_branches.ts
index fa35c39b28..4373b115f6 100644
--- a/apps/sim/tools/github/list_branches.ts
+++ b/apps/sim/tools/github/list_branches.ts
@@ -135,3 +135,39 @@ ${branchList}`
     },
   },
 }
+
+export const listBranchesV2Tool: ToolConfig<ListBranchesParams, any> = {
+  id: 'github_list_branches_v2',
+  name: listBranchesTool.name,
+  description: listBranchesTool.description,
+  version: '2.0.0',
+  params: listBranchesTool.params,
+  request: listBranchesTool.request,
+
+  transformResponse: async (response: Response) => {
+    const branches = await response.json()
+    return {
+      success: true,
+      output: {
+        items: branches ?? [],
+        count: branches?.length ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of branch objects',
+      items: {
+        type: 'object',
+        properties: {
+          name: { type: 'string', description: 'Branch name' },
+          commit: { type: 'object', description: 'Commit info with sha and url' },
+          protected: { type: 'boolean', description: 'Whether branch is protected' },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of branches returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_issue_comments.ts b/apps/sim/tools/github/list_issue_comments.ts
index c14a8fcb0a..4f7599d1be 100644
--- a/apps/sim/tools/github/list_issue_comments.ts
+++ b/apps/sim/tools/github/list_issue_comments.ts
@@ -138,3 +138,42 @@ export const listIssueCommentsTool: ToolConfig<ListIssueCommentsParams, Comments
     },
   },
 }
+
+export const listIssueCommentsV2Tool: ToolConfig<ListIssueCommentsParams, any> = {
+  id: 'github_list_issue_comments_v2',
+  name: listIssueCommentsTool.name,
+  description: listIssueCommentsTool.description,
+  version: '2.0.0',
+  params: listIssueCommentsTool.params,
+  request: listIssueCommentsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const comments = await response.json()
+    return {
+      success: true,
+      output: {
+        items: comments ?? [],
+        count: comments?.length ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of comment objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Comment ID' },
+          body: { type: 'string', description: 'Comment body' },
+          user: { type: 'object', description: 'User who created the comment' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of comments returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_issues.ts b/apps/sim/tools/github/list_issues.ts
index a962545e16..ce56d7ff8a 100644
--- a/apps/sim/tools/github/list_issues.ts
+++ b/apps/sim/tools/github/list_issues.ts
@@ -167,3 +167,57 @@ ${transformedIssues
     },
   },
 }
+
+export const listIssuesV2Tool: ToolConfig<ListIssuesParams, any> = {
+  id: 'github_list_issues_v2',
+  name: listIssuesTool.name,
+  description: listIssuesTool.description,
+  version: '2.0.0',
+  params: listIssuesTool.params,
+  request: listIssuesTool.request,
+
+  transformResponse: async (response: Response) => {
+    const issues = await response.json()
+    const items = issues.map((issue: any) => ({
+      ...issue,
+      body: issue.body ?? null,
+      milestone: issue.milestone ?? null,
+      closed_at: issue.closed_at ?? null,
+      labels: issue.labels ?? [],
+      assignees: issue.assignees ?? [],
+    }))
+    return {
+      success: true,
+      output: {
+        items,
+        count: issues.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of issue objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Issue ID' },
+          number: { type: 'number', description: 'Issue number' },
+          title: { type: 'string', description: 'Issue title' },
+          state: { type: 'string', description: 'Issue state (open/closed)' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          body: { type: 'string', description: 'Issue body', optional: true },
+          user: { type: 'object', description: 'User who created the issue' },
+          labels: { type: 'array', description: 'Array of label objects' },
+          assignees: { type: 'array', description: 'Array of assignee objects' },
+          milestone: { type: 'object', description: 'Milestone object', optional: true },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of issues returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_pr_comments.ts b/apps/sim/tools/github/list_pr_comments.ts
index 0d0808021b..9fdbc278cc 100644
--- a/apps/sim/tools/github/list_pr_comments.ts
+++ b/apps/sim/tools/github/list_pr_comments.ts
@@ -154,3 +154,45 @@ export const listPRCommentsTool: ToolConfig<ListPRCommentsParams, CommentsListRe
     },
   },
 }
+
+export const listPRCommentsV2Tool: ToolConfig<ListPRCommentsParams, any> = {
+  id: 'github_list_pr_comments_v2',
+  name: listPRCommentsTool.name,
+  description: listPRCommentsTool.description,
+  version: '2.0.0',
+  params: listPRCommentsTool.params,
+  request: listPRCommentsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const comments = await response.json()
+    return {
+      success: true,
+      output: {
+        items: comments ?? [],
+        count: comments?.length ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of review comment objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Comment ID' },
+          body: { type: 'string', description: 'Comment body' },
+          path: { type: 'string', description: 'File path' },
+          line: { type: 'number', description: 'Line number', optional: true },
+          user: { type: 'object', description: 'User who created the comment' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          diff_hunk: { type: 'string', description: 'Diff context' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of comments returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_projects.ts b/apps/sim/tools/github/list_projects.ts
index 9f25bc362e..98f7059644 100644
--- a/apps/sim/tools/github/list_projects.ts
+++ b/apps/sim/tools/github/list_projects.ts
@@ -163,3 +163,71 @@ export const listProjectsTool: ToolConfig<ListProjectsParams, ListProjectsRespon
     },
   },
 }
+
+export const listProjectsV2Tool: ToolConfig<ListProjectsParams, any> = {
+  id: 'github_list_projects_v2',
+  name: listProjectsTool.name,
+  description: listProjectsTool.description,
+  version: '2.0.0',
+  params: listProjectsTool.params,
+  request: listProjectsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (data.errors) {
+      return {
+        success: false,
+        output: { items: [], totalCount: 0 },
+        error: data.errors[0].message,
+      }
+    }
+
+    const ownerData = data.data?.organization || data.data?.user
+    const projectsData = ownerData?.projectsV2
+
+    if (!projectsData) {
+      return {
+        success: false,
+        output: { items: [], totalCount: 0 },
+        error: 'No projects data found',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        items: projectsData.nodes.map((project: any) => ({
+          id: project.id,
+          title: project.title,
+          number: project.number,
+          url: project.url,
+          closed: project.closed,
+          public: project.public,
+          shortDescription: project.shortDescription ?? null,
+        })),
+        totalCount: projectsData.totalCount,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of project objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Project node ID' },
+          title: { type: 'string', description: 'Project title' },
+          number: { type: 'number', description: 'Project number' },
+          url: { type: 'string', description: 'Project URL' },
+          closed: { type: 'boolean', description: 'Whether project is closed' },
+          public: { type: 'boolean', description: 'Whether project is public' },
+          shortDescription: { type: 'string', description: 'Short description', optional: true },
+        },
+      },
+    },
+    totalCount: { type: 'number', description: 'Total number of projects' },
+  },
+}
diff --git a/apps/sim/tools/github/list_prs.ts b/apps/sim/tools/github/list_prs.ts
index 32000673fa..068f57abb9 100644
--- a/apps/sim/tools/github/list_prs.ts
+++ b/apps/sim/tools/github/list_prs.ts
@@ -151,3 +151,46 @@ ${prs
     },
   },
 }
+
+export const listPRsV2Tool: ToolConfig<ListPRsParams, any> = {
+  id: 'github_list_prs_v2',
+  name: listPRsTool.name,
+  description: listPRsTool.description,
+  version: '2.0.0',
+  params: listPRsTool.params,
+  request: listPRsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const prs = await response.json()
+    return {
+      success: true,
+      output: {
+        items: prs ?? [],
+        count: prs?.length ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of pull request objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'PR ID' },
+          number: { type: 'number', description: 'PR number' },
+          title: { type: 'string', description: 'PR title' },
+          state: { type: 'string', description: 'PR state' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          user: { type: 'object', description: 'Author object' },
+          head: { type: 'object', description: 'Head branch info' },
+          base: { type: 'object', description: 'Base branch info' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of PRs returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_releases.ts b/apps/sim/tools/github/list_releases.ts
index e1048cf0b7..e541a51980 100644
--- a/apps/sim/tools/github/list_releases.ts
+++ b/apps/sim/tools/github/list_releases.ts
@@ -135,3 +135,53 @@ Summary of tags: ${releases.map((r: any) => r.tag_name).join(', ')}`
     },
   },
 }
+
+export const listReleasesV2Tool: ToolConfig<ListReleasesParams, any> = {
+  id: 'github_list_releases_v2',
+  name: listReleasesTool.name,
+  description: listReleasesTool.description,
+  version: '2.0.0',
+  params: listReleasesTool.params,
+  request: listReleasesTool.request,
+
+  transformResponse: async (response: Response) => {
+    const releases = await response.json()
+    return {
+      success: true,
+      output: {
+        items: releases.map((release: any) => ({
+          ...release,
+          body: release.body ?? null,
+          published_at: release.published_at ?? null,
+        })),
+        count: releases.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of release objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Release ID' },
+          tag_name: { type: 'string', description: 'Git tag name' },
+          name: { type: 'string', description: 'Release name' },
+          body: { type: 'string', description: 'Release description', optional: true },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          tarball_url: { type: 'string', description: 'Tarball download URL' },
+          zipball_url: { type: 'string', description: 'Zipball download URL' },
+          draft: { type: 'boolean', description: 'Whether this is a draft' },
+          prerelease: { type: 'boolean', description: 'Whether this is a prerelease' },
+          author: { type: 'object', description: 'Release author' },
+          assets: { type: 'array', description: 'Release assets' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          published_at: { type: 'string', description: 'Publication timestamp', optional: true },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of releases returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_workflow_runs.ts b/apps/sim/tools/github/list_workflow_runs.ts
index 94abda4087..ccb34d6b5c 100644
--- a/apps/sim/tools/github/list_workflow_runs.ts
+++ b/apps/sim/tools/github/list_workflow_runs.ts
@@ -184,3 +184,60 @@ ${data.workflow_runs
     },
   },
 }
+
+export const listWorkflowRunsV2Tool: ToolConfig<ListWorkflowRunsParams, any> = {
+  id: 'github_list_workflow_runs_v2',
+  name: listWorkflowRunsTool.name,
+  description: listWorkflowRunsTool.description,
+  version: '2.0.0',
+  params: listWorkflowRunsTool.params,
+  request: listWorkflowRunsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        total_count: data.total_count,
+        items: (data.workflow_runs ?? []).map((run: Record<string, unknown>) => ({
+          ...run,
+          conclusion: run.conclusion ?? null,
+          triggering_actor: run.triggering_actor,
+          pull_requests: run.pull_requests ?? [],
+          referenced_workflows: run.referenced_workflows ?? [],
+          head_commit: run.head_commit,
+          run_started_at: run.run_started_at,
+        })),
+      },
+    }
+  },
+
+  outputs: {
+    total_count: { type: 'number', description: 'Total number of workflow runs' },
+    items: {
+      type: 'array',
+      description: 'Array of workflow run objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Workflow run ID' },
+          name: { type: 'string', description: 'Workflow name' },
+          head_branch: { type: 'string', description: 'Branch name' },
+          head_sha: { type: 'string', description: 'Commit SHA' },
+          run_number: { type: 'number', description: 'Run number' },
+          event: { type: 'string', description: 'Trigger event' },
+          status: { type: 'string', description: 'Run status' },
+          conclusion: { type: 'string', description: 'Run conclusion', optional: true },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          triggering_actor: { type: 'json', description: 'User who triggered the run' },
+          pull_requests: { type: 'array', description: 'Associated pull requests' },
+          referenced_workflows: { type: 'array', description: 'Referenced workflows' },
+          head_commit: { type: 'json', description: 'Head commit information' },
+          run_started_at: { type: 'string', description: 'Run start timestamp' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/list_workflows.ts b/apps/sim/tools/github/list_workflows.ts
index 2c6938b4fb..c78c2bd1e3 100644
--- a/apps/sim/tools/github/list_workflows.ts
+++ b/apps/sim/tools/github/list_workflows.ts
@@ -133,3 +133,49 @@ ${data.workflows
     },
   },
 }
+
+export const listWorkflowsV2Tool: ToolConfig<ListWorkflowsParams, any> = {
+  id: 'github_list_workflows_v2',
+  name: listWorkflowsTool.name,
+  description: listWorkflowsTool.description,
+  version: '2.0.0',
+  params: listWorkflowsTool.params,
+  request: listWorkflowsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        total_count: data.total_count,
+        items: (data.workflows ?? []).map((workflow: Record<string, unknown>) => ({
+          ...workflow,
+          deleted_at: workflow.deleted_at ?? null,
+        })),
+      },
+    }
+  },
+
+  outputs: {
+    total_count: { type: 'number', description: 'Total number of workflows' },
+    items: {
+      type: 'array',
+      description: 'Array of workflow objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Workflow ID' },
+          node_id: { type: 'string', description: 'Workflow node ID' },
+          name: { type: 'string', description: 'Workflow name' },
+          path: { type: 'string', description: 'Path to workflow file' },
+          state: { type: 'string', description: 'Workflow state' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          badge_url: { type: 'string', description: 'Badge URL' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          deleted_at: { type: 'string', description: 'Deletion timestamp', optional: true },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/merge_pr.ts b/apps/sim/tools/github/merge_pr.ts
index 619c1169d0..ff11b6c61c 100644
--- a/apps/sim/tools/github/merge_pr.ts
+++ b/apps/sim/tools/github/merge_pr.ts
@@ -120,3 +120,43 @@ Message: ${result.message}`
     },
   },
 }
+
+export const mergePRV2Tool: ToolConfig<MergePRParams, any> = {
+  id: 'github_merge_pr_v2',
+  name: mergePRTool.name,
+  description: mergePRTool.description,
+  version: '2.0.0',
+  params: mergePRTool.params,
+  request: mergePRTool.request,
+
+  transformResponse: async (response: Response) => {
+    if (response.status === 405) {
+      const error = await response.json()
+      return {
+        success: false,
+        error: error.message || 'Pull request is not mergeable',
+        output: {
+          sha: null,
+          merged: false,
+          message: error.message || 'Pull request is not mergeable',
+        },
+      }
+    }
+
+    const result = await response.json()
+    return {
+      success: true,
+      output: {
+        sha: result.sha,
+        merged: result.merged,
+        message: result.message,
+      },
+    }
+  },
+
+  outputs: {
+    sha: { type: 'string', description: 'Merge commit SHA', optional: true },
+    merged: { type: 'boolean', description: 'Whether merge was successful' },
+    message: { type: 'string', description: 'Response message' },
+  },
+}
diff --git a/apps/sim/tools/github/pr.ts b/apps/sim/tools/github/pr.ts
index c83f982384..e40bada176 100644
--- a/apps/sim/tools/github/pr.ts
+++ b/apps/sim/tools/github/pr.ts
@@ -121,3 +121,79 @@ URL: ${pr.html_url}`
     },
   },
 }
+
+export const prV2Tool: ToolConfig<PROperationParams, any> = {
+  id: 'github_pr_v2',
+  name: prTool.name,
+  description: prTool.description,
+  version: '2.0.0',
+  params: prTool.params,
+  request: prTool.request,
+
+  transformResponse: async (response: Response) => {
+    const pr = await response.json()
+
+    // Fetch files changed
+    const filesResponse = await fetch(
+      `https://api.github.com/repos/${pr.base.repo.owner.login}/${pr.base.repo.name}/pulls/${pr.number}/files`
+    )
+    const files = await filesResponse.json()
+
+    return {
+      success: true,
+      output: {
+        id: pr.id,
+        number: pr.number,
+        title: pr.title,
+        state: pr.state,
+        html_url: pr.html_url,
+        diff_url: pr.diff_url,
+        body: pr.body ?? null,
+        user: pr.user,
+        head: pr.head,
+        base: pr.base,
+        merged: pr.merged,
+        mergeable: pr.mergeable ?? null,
+        merged_by: pr.merged_by ?? null,
+        comments: pr.comments,
+        review_comments: pr.review_comments,
+        commits: pr.commits,
+        additions: pr.additions,
+        deletions: pr.deletions,
+        changed_files: pr.changed_files,
+        created_at: pr.created_at,
+        updated_at: pr.updated_at,
+        closed_at: pr.closed_at ?? null,
+        merged_at: pr.merged_at ?? null,
+        files: files ?? [],
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Pull request ID' },
+    number: { type: 'number', description: 'Pull request number' },
+    title: { type: 'string', description: 'PR title' },
+    state: { type: 'string', description: 'PR state (open/closed)' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    diff_url: { type: 'string', description: 'Raw diff URL' },
+    body: { type: 'string', description: 'PR description', optional: true },
+    user: { type: 'json', description: 'User who created the PR' },
+    head: { type: 'json', description: 'Head branch info' },
+    base: { type: 'json', description: 'Base branch info' },
+    merged: { type: 'boolean', description: 'Whether PR is merged' },
+    mergeable: { type: 'boolean', description: 'Whether PR is mergeable', optional: true },
+    merged_by: { type: 'json', description: 'User who merged the PR', optional: true },
+    comments: { type: 'number', description: 'Number of comments' },
+    review_comments: { type: 'number', description: 'Number of review comments' },
+    commits: { type: 'number', description: 'Number of commits' },
+    additions: { type: 'number', description: 'Lines added' },
+    deletions: { type: 'number', description: 'Lines deleted' },
+    changed_files: { type: 'number', description: 'Number of changed files' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+    merged_at: { type: 'string', description: 'Merge timestamp', optional: true },
+    files: { type: 'array', description: 'Array of changed file objects' },
+  },
+}
diff --git a/apps/sim/tools/github/remove_label.ts b/apps/sim/tools/github/remove_label.ts
index e708060107..b31b10602f 100644
--- a/apps/sim/tools/github/remove_label.ts
+++ b/apps/sim/tools/github/remove_label.ts
@@ -100,3 +100,45 @@ ${labels.length > 0 ? `Remaining labels: ${labels.join(', ')}` : 'No labels rema
     },
   },
 }
+
+export const removeLabelV2Tool: ToolConfig = {
+  id: 'github_remove_label_v2',
+  name: removeLabelTool.name,
+  description: removeLabelTool.description,
+  version: '2.0.0',
+  params: removeLabelTool.params,
+  request: removeLabelTool.request,
+  oauth: removeLabelTool.oauth,
+  transformResponse: async (response: Response) => {
+    if (response.status === 200) {
+      const labels = await response.json()
+      return {
+        success: true,
+        output: {
+          items: labels.map((label: any) => ({
+            ...label,
+            description: label.description ?? null,
+          })),
+          count: labels.length,
+        },
+      }
+    }
+    return { success: true, output: { items: [], count: 0 } }
+  },
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Remaining labels on the issue',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Label ID' },
+          name: { type: 'string', description: 'Label name' },
+          color: { type: 'string', description: 'Label color' },
+          description: { type: 'string', description: 'Label description', optional: true },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of remaining labels' },
+  },
+}
diff --git a/apps/sim/tools/github/repo_info.ts b/apps/sim/tools/github/repo_info.ts
index 78dc0dcbdd..abe3abfe45 100644
--- a/apps/sim/tools/github/repo_info.ts
+++ b/apps/sim/tools/github/repo_info.ts
@@ -82,3 +82,70 @@ URL: ${data.html_url}`
     },
   },
 }
+
+export const repoInfoV2Tool: ToolConfig<BaseGitHubParams, any> = {
+  id: 'github_repo_info_v2',
+  name: repoInfoTool.name,
+  description: repoInfoTool.description,
+  version: '2.0.0',
+  params: repoInfoTool.params,
+  request: repoInfoTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        name: data.name,
+        full_name: data.full_name,
+        description: data.description ?? null,
+        html_url: data.html_url,
+        homepage: data.homepage ?? null,
+        language: data.language ?? null,
+        default_branch: data.default_branch,
+        visibility: data.visibility,
+        private: data.private,
+        fork: data.fork,
+        archived: data.archived,
+        disabled: data.disabled,
+        stargazers_count: data.stargazers_count,
+        watchers_count: data.watchers_count,
+        forks_count: data.forks_count,
+        open_issues_count: data.open_issues_count,
+        topics: data.topics ?? [],
+        created_at: data.created_at,
+        updated_at: data.updated_at,
+        pushed_at: data.pushed_at,
+        owner: data.owner,
+        license: data.license ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Repository ID' },
+    name: { type: 'string', description: 'Repository name' },
+    full_name: { type: 'string', description: 'Full repository name (owner/repo)' },
+    description: { type: 'string', description: 'Repository description', optional: true },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    homepage: { type: 'string', description: 'Homepage URL', optional: true },
+    language: { type: 'string', description: 'Primary programming language', optional: true },
+    default_branch: { type: 'string', description: 'Default branch name' },
+    visibility: { type: 'string', description: 'Repository visibility (public/private)' },
+    private: { type: 'boolean', description: 'Whether the repository is private' },
+    fork: { type: 'boolean', description: 'Whether this is a fork' },
+    archived: { type: 'boolean', description: 'Whether the repository is archived' },
+    disabled: { type: 'boolean', description: 'Whether the repository is disabled' },
+    stargazers_count: { type: 'number', description: 'Number of stars' },
+    watchers_count: { type: 'number', description: 'Number of watchers' },
+    forks_count: { type: 'number', description: 'Number of forks' },
+    open_issues_count: { type: 'number', description: 'Number of open issues' },
+    topics: { type: 'array', description: 'Repository topics' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    pushed_at: { type: 'string', description: 'Last push timestamp' },
+    owner: { type: 'json', description: 'Repository owner object' },
+    license: { type: 'json', description: 'License information', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/request_reviewers.ts b/apps/sim/tools/github/request_reviewers.ts
index 71fcd5b9fb..78c3b88353 100644
--- a/apps/sim/tools/github/request_reviewers.ts
+++ b/apps/sim/tools/github/request_reviewers.ts
@@ -145,3 +145,35 @@ Team Reviewers: ${teamsList}`
     },
   },
 }
+
+export const requestReviewersV2Tool: ToolConfig = {
+  id: 'github_request_reviewers_v2',
+  name: requestReviewersTool.name,
+  description: requestReviewersTool.description,
+  version: '2.0.0',
+  params: requestReviewersTool.params,
+  request: requestReviewersTool.request,
+  oauth: requestReviewersTool.oauth,
+  transformResponse: async (response: Response) => {
+    const pr = await response.json()
+    return {
+      success: true,
+      output: {
+        id: pr.id,
+        number: pr.number,
+        title: pr.title,
+        html_url: pr.html_url,
+        requested_reviewers: pr.requested_reviewers ?? [],
+        requested_teams: pr.requested_teams ?? [],
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'PR ID' },
+    number: { type: 'number', description: 'PR number' },
+    title: { type: 'string', description: 'PR title' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    requested_reviewers: { type: 'array', description: 'Array of requested reviewer objects' },
+    requested_teams: { type: 'array', description: 'Array of requested team objects' },
+  },
+}
diff --git a/apps/sim/tools/github/rerun_workflow.ts b/apps/sim/tools/github/rerun_workflow.ts
index 42f6baad07..379d96cb4f 100644
--- a/apps/sim/tools/github/rerun_workflow.ts
+++ b/apps/sim/tools/github/rerun_workflow.ts
@@ -100,3 +100,26 @@ The rerun should start shortly.`
     },
   },
 }
+
+export const rerunWorkflowV2Tool: ToolConfig = {
+  id: 'github_rerun_workflow_v2',
+  name: rerunWorkflowTool.name,
+  description: rerunWorkflowTool.description,
+  version: '2.0.0',
+  params: rerunWorkflowTool.params,
+  request: rerunWorkflowTool.request,
+  oauth: rerunWorkflowTool.oauth,
+  transformResponse: async (response: Response, params) => {
+    return {
+      success: true,
+      output: {
+        rerun_requested: response.status === 201,
+        run_id: params?.run_id ?? null,
+      },
+    }
+  },
+  outputs: {
+    rerun_requested: { type: 'boolean', description: 'Whether rerun was requested' },
+    run_id: { type: 'number', description: 'Workflow run ID', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/trigger_workflow.ts b/apps/sim/tools/github/trigger_workflow.ts
index c440c9ced5..c382ebf042 100644
--- a/apps/sim/tools/github/trigger_workflow.ts
+++ b/apps/sim/tools/github/trigger_workflow.ts
@@ -83,3 +83,28 @@ The workflow run should start shortly.`
     },
   },
 }
+
+export const triggerWorkflowV2Tool: ToolConfig = {
+  id: 'github_trigger_workflow_v2',
+  name: triggerWorkflowTool.name,
+  description: triggerWorkflowTool.description,
+  version: '2.0.0',
+  params: triggerWorkflowTool.params,
+  request: triggerWorkflowTool.request,
+  oauth: triggerWorkflowTool.oauth,
+  transformResponse: async (response: Response, params) => {
+    return {
+      success: true,
+      output: {
+        triggered: response.status === 204,
+        workflow_id: params?.workflow_id ?? null,
+        ref: params?.ref ?? null,
+      },
+    }
+  },
+  outputs: {
+    triggered: { type: 'boolean', description: 'Whether workflow was triggered' },
+    workflow_id: { type: 'string', description: 'Workflow ID or filename', optional: true },
+    ref: { type: 'string', description: 'Git reference used', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/update_branch_protection.ts b/apps/sim/tools/github/update_branch_protection.ts
index c49b277511..9cfda9cbb5 100644
--- a/apps/sim/tools/github/update_branch_protection.ts
+++ b/apps/sim/tools/github/update_branch_protection.ts
@@ -219,3 +219,51 @@ Enforce Admins: ${protection.enforce_admins?.enabled ? 'Yes' : 'No'}`
     },
   },
 }
+
+export const updateBranchProtectionV2Tool: ToolConfig = {
+  id: 'github_update_branch_protection_v2',
+  name: updateBranchProtectionTool.name,
+  description: updateBranchProtectionTool.description,
+  version: '2.0.0',
+  params: updateBranchProtectionTool.params,
+  request: updateBranchProtectionTool.request,
+  oauth: updateBranchProtectionTool.oauth,
+  transformResponse: async (response: Response) => {
+    const protection = await response.json()
+    return {
+      success: true,
+      output: {
+        url: protection.url,
+        required_status_checks: protection.required_status_checks ?? null,
+        enforce_admins: protection.enforce_admins,
+        required_pull_request_reviews: protection.required_pull_request_reviews ?? null,
+        restrictions: protection.restrictions ?? null,
+        required_linear_history: protection.required_linear_history ?? null,
+        allow_force_pushes: protection.allow_force_pushes ?? null,
+        allow_deletions: protection.allow_deletions ?? null,
+      },
+    }
+  },
+  outputs: {
+    url: { type: 'string', description: 'Protection URL' },
+    required_status_checks: {
+      type: 'json',
+      description: 'Status check requirements',
+      optional: true,
+    },
+    enforce_admins: { type: 'json', description: 'Admin enforcement settings' },
+    required_pull_request_reviews: {
+      type: 'json',
+      description: 'PR review requirements',
+      optional: true,
+    },
+    restrictions: { type: 'json', description: 'Push restrictions', optional: true },
+    required_linear_history: {
+      type: 'json',
+      description: 'Linear history requirement',
+      optional: true,
+    },
+    allow_force_pushes: { type: 'json', description: 'Force push settings', optional: true },
+    allow_deletions: { type: 'json', description: 'Deletion settings', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/update_comment.ts b/apps/sim/tools/github/update_comment.ts
index 75116b8d68..da1eb8fc86 100644
--- a/apps/sim/tools/github/update_comment.ts
+++ b/apps/sim/tools/github/update_comment.ts
@@ -101,3 +101,35 @@ export const updateCommentTool: ToolConfig<UpdateCommentParams, IssueCommentResp
     },
   },
 }
+
+export const updateCommentV2Tool: ToolConfig = {
+  id: 'github_update_comment_v2',
+  name: updateCommentTool.name,
+  description: updateCommentTool.description,
+  version: '2.0.0',
+  params: updateCommentTool.params,
+  request: updateCommentTool.request,
+  oauth: updateCommentTool.oauth,
+  transformResponse: async (response: Response) => {
+    const comment = await response.json()
+    return {
+      success: true,
+      output: {
+        id: comment.id,
+        body: comment.body,
+        html_url: comment.html_url,
+        user: comment.user,
+        created_at: comment.created_at,
+        updated_at: comment.updated_at,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'Comment ID' },
+    body: { type: 'string', description: 'Comment body' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    user: { type: 'json', description: 'User who updated the comment' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/update_file.ts b/apps/sim/tools/github/update_file.ts
index 4d4d6fde2f..470e1f571b 100644
--- a/apps/sim/tools/github/update_file.ts
+++ b/apps/sim/tools/github/update_file.ts
@@ -177,3 +177,27 @@ View file: ${data.content.html_url}`
     },
   },
 }
+
+export const updateFileV2Tool: ToolConfig = {
+  id: 'github_update_file_v2',
+  name: updateFileTool.name,
+  description: updateFileTool.description,
+  version: '2.0.0',
+  params: updateFileTool.params,
+  request: updateFileTool.request,
+  oauth: updateFileTool.oauth,
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        content: data.content,
+        commit: data.commit,
+      },
+    }
+  },
+  outputs: {
+    content: { type: 'json', description: 'Updated file content info' },
+    commit: { type: 'json', description: 'Commit information' },
+  },
+}
diff --git a/apps/sim/tools/github/update_issue.ts b/apps/sim/tools/github/update_issue.ts
index 0beb675051..84932c8345 100644
--- a/apps/sim/tools/github/update_issue.ts
+++ b/apps/sim/tools/github/update_issue.ts
@@ -137,3 +137,49 @@ ${assignees.length > 0 ? `Assignees: ${assignees.join(', ')}` : ''}`
     },
   },
 }
+
+export const updateIssueV2Tool: ToolConfig = {
+  id: 'github_update_issue_v2',
+  name: updateIssueTool.name,
+  description: updateIssueTool.description,
+  version: '2.0.0',
+  params: updateIssueTool.params,
+  request: updateIssueTool.request,
+  oauth: updateIssueTool.oauth,
+  transformResponse: async (response: Response) => {
+    const issue = await response.json()
+    return {
+      success: true,
+      output: {
+        id: issue.id,
+        number: issue.number,
+        title: issue.title,
+        state: issue.state,
+        html_url: issue.html_url,
+        body: issue.body ?? null,
+        user: issue.user,
+        labels: issue.labels ?? [],
+        assignees: issue.assignees ?? [],
+        milestone: issue.milestone ?? null,
+        created_at: issue.created_at,
+        updated_at: issue.updated_at,
+        closed_at: issue.closed_at ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'Issue ID' },
+    number: { type: 'number', description: 'Issue number' },
+    title: { type: 'string', description: 'Issue title' },
+    state: { type: 'string', description: 'Issue state' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'Issue body', optional: true },
+    user: { type: 'json', description: 'User who created the issue' },
+    labels: { type: 'array', description: 'Array of label objects' },
+    assignees: { type: 'array', description: 'Array of assignee objects' },
+    milestone: { type: 'json', description: 'Milestone object', optional: true },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/update_pr.ts b/apps/sim/tools/github/update_pr.ts
index 85e302bb19..1d42062a80 100644
--- a/apps/sim/tools/github/update_pr.ts
+++ b/apps/sim/tools/github/update_pr.ts
@@ -119,3 +119,49 @@ URL: ${pr.html_url}`
     },
   },
 }
+
+export const updatePRV2Tool: ToolConfig = {
+  id: 'github_update_pr_v2',
+  name: updatePRTool.name,
+  description: updatePRTool.description,
+  version: '2.0.0',
+  params: updatePRTool.params,
+  request: updatePRTool.request,
+  oauth: updatePRTool.oauth,
+  transformResponse: async (response: Response) => {
+    const pr = await response.json()
+    return {
+      success: true,
+      output: {
+        id: pr.id,
+        number: pr.number,
+        title: pr.title,
+        state: pr.state,
+        html_url: pr.html_url,
+        body: pr.body ?? null,
+        user: pr.user,
+        head: pr.head,
+        base: pr.base,
+        draft: pr.draft,
+        merged: pr.merged,
+        created_at: pr.created_at,
+        updated_at: pr.updated_at,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'PR ID' },
+    number: { type: 'number', description: 'PR number' },
+    title: { type: 'string', description: 'PR title' },
+    state: { type: 'string', description: 'PR state' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    body: { type: 'string', description: 'PR description', optional: true },
+    user: { type: 'json', description: 'User who created the PR' },
+    head: { type: 'json', description: 'Head branch info' },
+    base: { type: 'json', description: 'Base branch info' },
+    draft: { type: 'boolean', description: 'Whether PR is a draft' },
+    merged: { type: 'boolean', description: 'Whether PR is merged' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+  },
+}
diff --git a/apps/sim/tools/github/update_project.ts b/apps/sim/tools/github/update_project.ts
index 28968a8ca5..3b1793fc63 100644
--- a/apps/sim/tools/github/update_project.ts
+++ b/apps/sim/tools/github/update_project.ts
@@ -190,3 +190,45 @@ export const updateProjectTool: ToolConfig<UpdateProjectParams, ProjectResponse>
     },
   },
 }
+
+export const updateProjectV2Tool: ToolConfig = {
+  id: 'github_update_project_v2',
+  name: updateProjectTool.name,
+  description: updateProjectTool.description,
+  version: '2.0.0',
+  params: updateProjectTool.params,
+  request: updateProjectTool.request,
+  oauth: updateProjectTool.oauth,
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    if (data.errors) {
+      return {
+        success: false,
+        output: { id: '', title: '', number: 0, url: '' },
+        error: data.errors[0].message,
+      }
+    }
+    const project = data.data?.updateProjectV2?.projectV2 || {}
+    return {
+      success: true,
+      output: {
+        id: project.id,
+        title: project.title,
+        number: project.number,
+        url: project.url,
+        closed: project.closed,
+        public: project.public,
+        shortDescription: project.shortDescription ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Project node ID' },
+    title: { type: 'string', description: 'Project title' },
+    number: { type: 'number', description: 'Project number' },
+    url: { type: 'string', description: 'Project URL' },
+    closed: { type: 'boolean', description: 'Whether project is closed' },
+    public: { type: 'boolean', description: 'Whether project is public' },
+    shortDescription: { type: 'string', description: 'Short description', optional: true },
+  },
+}
diff --git a/apps/sim/tools/github/update_release.ts b/apps/sim/tools/github/update_release.ts
index 4e233cf5a2..f6601ece4c 100644
--- a/apps/sim/tools/github/update_release.ts
+++ b/apps/sim/tools/github/update_release.ts
@@ -159,3 +159,45 @@ Download URLs:
     },
   },
 }
+
+export const updateReleaseV2Tool: ToolConfig = {
+  id: 'github_update_release_v2',
+  name: updateReleaseTool.name,
+  description: updateReleaseTool.description,
+  version: '2.0.0',
+  params: updateReleaseTool.params,
+  request: updateReleaseTool.request,
+  oauth: updateReleaseTool.oauth,
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        tag_name: data.tag_name,
+        name: data.name,
+        body: data.body ?? null,
+        html_url: data.html_url,
+        tarball_url: data.tarball_url,
+        zipball_url: data.zipball_url,
+        draft: data.draft,
+        prerelease: data.prerelease,
+        created_at: data.created_at,
+        published_at: data.published_at ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'number', description: 'Release ID' },
+    tag_name: { type: 'string', description: 'Git tag name' },
+    name: { type: 'string', description: 'Release name' },
+    body: { type: 'string', description: 'Release description', optional: true },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    tarball_url: { type: 'string', description: 'Tarball download URL' },
+    zipball_url: { type: 'string', description: 'Zipball download URL' },
+    draft: { type: 'boolean', description: 'Whether this is a draft' },
+    prerelease: { type: 'boolean', description: 'Whether this is a prerelease' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    published_at: { type: 'string', description: 'Publication timestamp', optional: true },
+  },
+}
diff --git a/apps/sim/tools/gmail/add_label.ts b/apps/sim/tools/gmail/add_label.ts
index cf270927b5..3235c9e8aa 100644
--- a/apps/sim/tools/gmail/add_label.ts
+++ b/apps/sim/tools/gmail/add_label.ts
@@ -82,3 +82,45 @@ export const gmailAddLabelTool: ToolConfig<GmailLabelParams, GmailToolResponse>
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailAddLabelV2Tool: ToolConfig<GmailLabelParams, GmailModifyV2Response> = {
+  id: 'gmail_add_label_v2',
+  name: 'Gmail Add Label',
+  description: 'Add label(s) to a Gmail message. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailAddLabelTool.oauth,
+  params: gmailAddLabelTool.params,
+  request: gmailAddLabelTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailAddLabelTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Updated email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/archive.ts b/apps/sim/tools/gmail/archive.ts
index 9e495c865b..0a7f510e8d 100644
--- a/apps/sim/tools/gmail/archive.ts
+++ b/apps/sim/tools/gmail/archive.ts
@@ -75,3 +75,45 @@ export const gmailArchiveTool: ToolConfig<GmailMarkReadParams, GmailToolResponse
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailArchiveV2Tool: ToolConfig<GmailMarkReadParams, GmailModifyV2Response> = {
+  id: 'gmail_archive_v2',
+  name: 'Gmail Archive',
+  description: 'Archive a Gmail message (remove from inbox). Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailArchiveTool.oauth,
+  params: gmailArchiveTool.params,
+  request: gmailArchiveTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailArchiveTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Updated email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/delete.ts b/apps/sim/tools/gmail/delete.ts
index dbb1913b7e..434ed7c5db 100644
--- a/apps/sim/tools/gmail/delete.ts
+++ b/apps/sim/tools/gmail/delete.ts
@@ -75,3 +75,45 @@ export const gmailDeleteTool: ToolConfig<GmailMarkReadParams, GmailToolResponse>
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailDeleteV2Tool: ToolConfig<GmailMarkReadParams, GmailModifyV2Response> = {
+  id: 'gmail_delete_v2',
+  name: 'Gmail Delete',
+  description: 'Delete a Gmail message (move to trash). Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailDeleteTool.oauth,
+  params: gmailDeleteTool.params,
+  request: gmailDeleteTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailDeleteTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Updated email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/draft.ts b/apps/sim/tools/gmail/draft.ts
index b7c86f3d2b..7936ec50f4 100644
--- a/apps/sim/tools/gmail/draft.ts
+++ b/apps/sim/tools/gmail/draft.ts
@@ -139,3 +139,48 @@ export const gmailDraftTool: ToolConfig<GmailSendParams, GmailToolResponse> = {
     },
   },
 }
+
+interface GmailDraftV2Response {
+  success: boolean
+  output: {
+    draftId?: string
+    messageId?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailDraftV2Tool: ToolConfig<GmailSendParams, GmailDraftV2Response> = {
+  id: 'gmail_draft_v2',
+  name: 'Gmail Draft',
+  description: 'Draft emails using Gmail. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailDraftTool.oauth,
+  params: gmailDraftTool.params,
+  request: gmailDraftTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailDraftTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        draftId: metadata?.id ?? null,
+        messageId: metadata?.message?.id ?? null,
+        threadId: metadata?.message?.threadId ?? null,
+        labelIds: metadata?.message?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    draftId: { type: 'string', description: 'Draft ID', optional: true },
+    messageId: { type: 'string', description: 'Gmail message ID for the draft', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/index.ts b/apps/sim/tools/gmail/index.ts
index 78819b3330..3dfa89e4eb 100644
--- a/apps/sim/tools/gmail/index.ts
+++ b/apps/sim/tools/gmail/index.ts
@@ -1,27 +1,39 @@
-import { gmailAddLabelTool } from '@/tools/gmail/add_label'
-import { gmailArchiveTool } from '@/tools/gmail/archive'
-import { gmailDeleteTool } from '@/tools/gmail/delete'
-import { gmailDraftTool } from '@/tools/gmail/draft'
-import { gmailMarkReadTool } from '@/tools/gmail/mark_read'
-import { gmailMarkUnreadTool } from '@/tools/gmail/mark_unread'
-import { gmailMoveTool } from '@/tools/gmail/move'
-import { gmailReadTool } from '@/tools/gmail/read'
-import { gmailRemoveLabelTool } from '@/tools/gmail/remove_label'
-import { gmailSearchTool } from '@/tools/gmail/search'
-import { gmailSendTool } from '@/tools/gmail/send'
-import { gmailUnarchiveTool } from '@/tools/gmail/unarchive'
+import { gmailAddLabelTool, gmailAddLabelV2Tool } from '@/tools/gmail/add_label'
+import { gmailArchiveTool, gmailArchiveV2Tool } from '@/tools/gmail/archive'
+import { gmailDeleteTool, gmailDeleteV2Tool } from '@/tools/gmail/delete'
+import { gmailDraftTool, gmailDraftV2Tool } from '@/tools/gmail/draft'
+import { gmailMarkReadTool, gmailMarkReadV2Tool } from '@/tools/gmail/mark_read'
+import { gmailMarkUnreadTool, gmailMarkUnreadV2Tool } from '@/tools/gmail/mark_unread'
+import { gmailMoveTool, gmailMoveV2Tool } from '@/tools/gmail/move'
+import { gmailReadTool, gmailReadV2Tool } from '@/tools/gmail/read'
+import { gmailRemoveLabelTool, gmailRemoveLabelV2Tool } from '@/tools/gmail/remove_label'
+import { gmailSearchTool, gmailSearchV2Tool } from '@/tools/gmail/search'
+import { gmailSendTool, gmailSendV2Tool } from '@/tools/gmail/send'
+import { gmailUnarchiveTool, gmailUnarchiveV2Tool } from '@/tools/gmail/unarchive'
 
 export {
   gmailSendTool,
+  gmailSendV2Tool,
   gmailReadTool,
+  gmailReadV2Tool,
   gmailSearchTool,
+  gmailSearchV2Tool,
   gmailDraftTool,
+  gmailDraftV2Tool,
   gmailMoveTool,
+  gmailMoveV2Tool,
   gmailMarkReadTool,
+  gmailMarkReadV2Tool,
   gmailMarkUnreadTool,
+  gmailMarkUnreadV2Tool,
   gmailArchiveTool,
+  gmailArchiveV2Tool,
   gmailUnarchiveTool,
+  gmailUnarchiveV2Tool,
   gmailDeleteTool,
+  gmailDeleteV2Tool,
   gmailAddLabelTool,
+  gmailAddLabelV2Tool,
   gmailRemoveLabelTool,
+  gmailRemoveLabelV2Tool,
 }
diff --git a/apps/sim/tools/gmail/mark_read.ts b/apps/sim/tools/gmail/mark_read.ts
index 8f657f6640..7aac82cd3a 100644
--- a/apps/sim/tools/gmail/mark_read.ts
+++ b/apps/sim/tools/gmail/mark_read.ts
@@ -75,3 +75,45 @@ export const gmailMarkReadTool: ToolConfig<GmailMarkReadParams, GmailToolRespons
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailMarkReadV2Tool: ToolConfig<GmailMarkReadParams, GmailModifyV2Response> = {
+  id: 'gmail_mark_read_v2',
+  name: 'Gmail Mark as Read',
+  description: 'Mark a Gmail message as read. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailMarkReadTool.oauth,
+  params: gmailMarkReadTool.params,
+  request: gmailMarkReadTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailMarkReadTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Updated email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/mark_unread.ts b/apps/sim/tools/gmail/mark_unread.ts
index cf1b07d4bd..b11995f628 100644
--- a/apps/sim/tools/gmail/mark_unread.ts
+++ b/apps/sim/tools/gmail/mark_unread.ts
@@ -75,3 +75,45 @@ export const gmailMarkUnreadTool: ToolConfig<GmailMarkReadParams, GmailToolRespo
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailMarkUnreadV2Tool: ToolConfig<GmailMarkReadParams, GmailModifyV2Response> = {
+  id: 'gmail_mark_unread_v2',
+  name: 'Gmail Mark as Unread',
+  description: 'Mark a Gmail message as unread. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailMarkUnreadTool.oauth,
+  params: gmailMarkUnreadTool.params,
+  request: gmailMarkUnreadTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailMarkUnreadTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Updated email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/move.ts b/apps/sim/tools/gmail/move.ts
index e01edd5caf..2c50e263f6 100644
--- a/apps/sim/tools/gmail/move.ts
+++ b/apps/sim/tools/gmail/move.ts
@@ -89,3 +89,47 @@ export const gmailMoveTool: ToolConfig<GmailMoveParams, GmailToolResponse> = {
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailMoveV2Tool: ToolConfig<GmailMoveParams, GmailModifyV2Response> = {
+  id: 'gmail_move_v2',
+  name: 'Gmail Move',
+  description: 'Move emails between labels/folders in Gmail. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailMoveTool.oauth,
+  params: gmailMoveTool.params,
+  request: gmailMoveTool.request,
+  transformResponse: async (response: Response, params?: GmailMoveParams) => {
+    const legacy = await gmailMoveTool.transformResponse!(response, params)
+    if (!legacy.success) {
+      return { success: false, output: {}, error: legacy.error }
+    }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/read.ts b/apps/sim/tools/gmail/read.ts
index 76ca1af958..bdf701769d 100644
--- a/apps/sim/tools/gmail/read.ts
+++ b/apps/sim/tools/gmail/read.ts
@@ -267,3 +267,96 @@ export const gmailReadTool: ToolConfig<GmailReadParams, GmailToolResponse> = {
     attachments: { type: 'file[]', description: 'Attachments of the email' },
   },
 }
+
+interface GmailReadV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+    from?: string
+    to?: string
+    subject?: string
+    date?: string
+    body?: string
+    hasAttachments?: boolean
+    attachmentCount?: number
+    attachments?: GmailAttachment[]
+    results?: Array<Record<string, any>>
+  }
+}
+
+export const gmailReadV2Tool: ToolConfig<GmailReadParams, GmailReadV2Response> = {
+  id: 'gmail_read_v2',
+  name: 'Gmail Read',
+  description: 'Read emails from Gmail. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailReadTool.oauth,
+  params: gmailReadTool.params,
+  request: gmailReadTool.request,
+  transformResponse: async (response: Response, params?: GmailReadParams) => {
+    const legacy = await gmailReadTool.transformResponse!(response, params)
+    if (!legacy.success) {
+      return {
+        success: false,
+        output: {},
+        error: legacy.error,
+      }
+    }
+
+    const metadata = (legacy.output.metadata || {}) as any
+
+    return {
+      success: true,
+      output: {
+        id: metadata.id,
+        threadId: metadata.threadId,
+        labelIds: metadata.labelIds,
+        from: metadata.from,
+        to: metadata.to,
+        subject: metadata.subject,
+        date: metadata.date,
+        body: legacy.output.content,
+        hasAttachments: metadata.hasAttachments,
+        attachmentCount: metadata.attachmentCount,
+        attachments: legacy.output.attachments || [],
+        results: metadata.results,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Email labels',
+      optional: true,
+    },
+    from: { type: 'string', description: 'Sender email address', optional: true },
+    to: { type: 'string', description: 'Recipient email address', optional: true },
+    subject: { type: 'string', description: 'Email subject', optional: true },
+    date: { type: 'string', description: 'Email date', optional: true },
+    body: {
+      type: 'string',
+      description: 'Email body text (best-effort plain text)',
+      optional: true,
+    },
+    hasAttachments: {
+      type: 'boolean',
+      description: 'Whether the email has attachments',
+      optional: true,
+    },
+    attachmentCount: { type: 'number', description: 'Number of attachments', optional: true },
+    attachments: {
+      type: 'file[]',
+      description: 'Downloaded attachments (if enabled)',
+      optional: true,
+    },
+    results: {
+      type: 'json',
+      description: 'Summary results when reading multiple messages',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/remove_label.ts b/apps/sim/tools/gmail/remove_label.ts
index 5d5fe4ebac..3d1038bcbe 100644
--- a/apps/sim/tools/gmail/remove_label.ts
+++ b/apps/sim/tools/gmail/remove_label.ts
@@ -82,3 +82,45 @@ export const gmailRemoveLabelTool: ToolConfig<GmailLabelParams, GmailToolRespons
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailRemoveLabelV2Tool: ToolConfig<GmailLabelParams, GmailModifyV2Response> = {
+  id: 'gmail_remove_label_v2',
+  name: 'Gmail Remove Label',
+  description: 'Remove label(s) from a Gmail message. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailRemoveLabelTool.oauth,
+  params: gmailRemoveLabelTool.params,
+  request: gmailRemoveLabelTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailRemoveLabelTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Updated email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/search.ts b/apps/sim/tools/gmail/search.ts
index e46868541f..d62cd6502b 100644
--- a/apps/sim/tools/gmail/search.ts
+++ b/apps/sim/tools/gmail/search.ts
@@ -152,3 +152,41 @@ export const gmailSearchTool: ToolConfig<GmailSearchParams, GmailToolResponse> =
     },
   },
 }
+
+interface GmailSearchV2Response {
+  success: boolean
+  output: {
+    results: Array<Record<string, any>>
+  }
+}
+
+export const gmailSearchV2Tool: ToolConfig<GmailSearchParams, GmailSearchV2Response> = {
+  id: 'gmail_search_v2',
+  name: 'Gmail Search',
+  description: 'Search emails in Gmail. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailSearchTool.oauth,
+  params: gmailSearchTool.params,
+  request: gmailSearchTool.request,
+  transformResponse: async (response: Response, params?: GmailSearchParams) => {
+    const legacy = await gmailSearchTool.transformResponse!(response, params)
+    if (!legacy.success) {
+      return {
+        success: false,
+        output: { results: [] },
+        error: legacy.error,
+      }
+    }
+
+    const metadata = (legacy.output.metadata || {}) as any
+    return {
+      success: true,
+      output: {
+        results: metadata.results || [],
+      },
+    }
+  },
+  outputs: {
+    results: { type: 'json', description: 'Array of search results' },
+  },
+}
diff --git a/apps/sim/tools/gmail/send.ts b/apps/sim/tools/gmail/send.ts
index 7fb2cf0de0..06e390e41e 100644
--- a/apps/sim/tools/gmail/send.ts
+++ b/apps/sim/tools/gmail/send.ts
@@ -132,3 +132,52 @@ export const gmailSendTool: ToolConfig<GmailSendParams, GmailToolResponse> = {
     },
   },
 }
+
+interface GmailSendV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailSendV2Tool: ToolConfig<GmailSendParams, GmailSendV2Response> = {
+  id: 'gmail_send_v2',
+  name: 'Gmail Send',
+  description: 'Send emails using Gmail. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailSendTool.oauth,
+  params: gmailSendTool.params,
+  request: gmailSendTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailSendTool.transformResponse!(response)
+    if (!legacy.success) {
+      return {
+        success: false,
+        output: {},
+        error: legacy.error,
+      }
+    }
+
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/gmail/unarchive.ts b/apps/sim/tools/gmail/unarchive.ts
index 2b4fc4ad95..b3220671ab 100644
--- a/apps/sim/tools/gmail/unarchive.ts
+++ b/apps/sim/tools/gmail/unarchive.ts
@@ -75,3 +75,45 @@ export const gmailUnarchiveTool: ToolConfig<GmailMarkReadParams, GmailToolRespon
     },
   },
 }
+
+interface GmailModifyV2Response {
+  success: boolean
+  output: {
+    id?: string
+    threadId?: string
+    labelIds?: string[]
+  }
+}
+
+export const gmailUnarchiveV2Tool: ToolConfig<GmailMarkReadParams, GmailModifyV2Response> = {
+  id: 'gmail_unarchive_v2',
+  name: 'Gmail Unarchive',
+  description: 'Unarchive a Gmail message (move back to inbox). Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: gmailUnarchiveTool.oauth,
+  params: gmailUnarchiveTool.params,
+  request: gmailUnarchiveTool.request,
+  transformResponse: async (response) => {
+    const legacy = await gmailUnarchiveTool.transformResponse!(response)
+    if (!legacy.success) return { success: false, output: {}, error: legacy.error }
+    const metadata = legacy.output.metadata as any
+    return {
+      success: true,
+      output: {
+        id: metadata?.id ?? null,
+        threadId: metadata?.threadId ?? null,
+        labelIds: metadata?.labelIds ?? null,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Gmail message ID', optional: true },
+    threadId: { type: 'string', description: 'Gmail thread ID', optional: true },
+    labelIds: {
+      type: 'array',
+      items: { type: 'string' },
+      description: 'Updated email labels',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/google_calendar/create.ts b/apps/sim/tools/google_calendar/create.ts
index 3a0bf3c80c..e712470d20 100644
--- a/apps/sim/tools/google_calendar/create.ts
+++ b/apps/sim/tools/google_calendar/create.ts
@@ -191,3 +191,64 @@ export const createTool: ToolConfig<GoogleCalendarCreateParams, GoogleCalendarCr
     },
   },
 }
+
+interface GoogleCalendarCreateV2Response {
+  success: boolean
+  output: {
+    id: string
+    htmlLink: string
+    status: string
+    summary: string | null
+    description: string | null
+    location: string | null
+    start: any
+    end: any
+    attendees: any | null
+    creator: any
+    organizer: any
+  }
+}
+
+export const createV2Tool: ToolConfig<GoogleCalendarCreateParams, GoogleCalendarCreateV2Response> =
+  {
+    id: 'google_calendar_create_v2',
+    name: 'Google Calendar Create Event',
+    description: 'Create a new event in Google Calendar. Returns API-aligned fields only.',
+    version: '2.0.0',
+    oauth: createTool.oauth,
+    params: createTool.params,
+    request: createTool.request,
+    transformResponse: async (response: Response) => {
+      const data: GoogleCalendarApiEventResponse = await response.json()
+
+      return {
+        success: true,
+        output: {
+          id: data.id,
+          htmlLink: data.htmlLink,
+          status: data.status,
+          summary: data.summary ?? null,
+          description: data.description ?? null,
+          location: data.location ?? null,
+          start: data.start,
+          end: data.end,
+          attendees: data.attendees ?? null,
+          creator: data.creator,
+          organizer: data.organizer,
+        },
+      }
+    },
+    outputs: {
+      id: { type: 'string', description: 'Event ID' },
+      htmlLink: { type: 'string', description: 'Event link' },
+      status: { type: 'string', description: 'Event status' },
+      summary: { type: 'string', description: 'Event title', optional: true },
+      description: { type: 'string', description: 'Event description', optional: true },
+      location: { type: 'string', description: 'Event location', optional: true },
+      start: { type: 'json', description: 'Event start' },
+      end: { type: 'json', description: 'Event end' },
+      attendees: { type: 'json', description: 'Event attendees', optional: true },
+      creator: { type: 'json', description: 'Event creator' },
+      organizer: { type: 'json', description: 'Event organizer' },
+    },
+  }
diff --git a/apps/sim/tools/google_calendar/get.ts b/apps/sim/tools/google_calendar/get.ts
index a73d8f9df8..c9f0857685 100644
--- a/apps/sim/tools/google_calendar/get.ts
+++ b/apps/sim/tools/google_calendar/get.ts
@@ -82,3 +82,63 @@ export const getTool: ToolConfig<GoogleCalendarGetParams, GoogleCalendarGetRespo
     },
   },
 }
+
+interface GoogleCalendarGetV2Response {
+  success: boolean
+  output: {
+    id: string
+    htmlLink: string
+    status: string
+    summary: string | null
+    description: string | null
+    location: string | null
+    start: any
+    end: any
+    attendees: any | null
+    creator: any
+    organizer: any
+  }
+}
+
+export const getV2Tool: ToolConfig<GoogleCalendarGetParams, GoogleCalendarGetV2Response> = {
+  id: 'google_calendar_get_v2',
+  name: 'Google Calendar Get Event',
+  description: 'Get a specific event from Google Calendar. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: getTool.oauth,
+  params: getTool.params,
+  request: getTool.request,
+  transformResponse: async (response: Response) => {
+    const data: GoogleCalendarApiEventResponse = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        htmlLink: data.htmlLink,
+        status: data.status,
+        summary: data.summary ?? null,
+        description: data.description ?? null,
+        location: data.location ?? null,
+        start: data.start,
+        end: data.end,
+        attendees: data.attendees ?? null,
+        creator: data.creator,
+        organizer: data.organizer,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Event ID' },
+    htmlLink: { type: 'string', description: 'Event link' },
+    status: { type: 'string', description: 'Event status' },
+    summary: { type: 'string', description: 'Event title', optional: true },
+    description: { type: 'string', description: 'Event description', optional: true },
+    location: { type: 'string', description: 'Event location', optional: true },
+    start: { type: 'json', description: 'Event start' },
+    end: { type: 'json', description: 'Event end' },
+    attendees: { type: 'json', description: 'Event attendees', optional: true },
+    creator: { type: 'json', description: 'Event creator' },
+    organizer: { type: 'json', description: 'Event organizer' },
+  },
+}
diff --git a/apps/sim/tools/google_calendar/index.ts b/apps/sim/tools/google_calendar/index.ts
index 2cc7ab2a81..0f3105ae92 100644
--- a/apps/sim/tools/google_calendar/index.ts
+++ b/apps/sim/tools/google_calendar/index.ts
@@ -1,11 +1,17 @@
-import { createTool } from '@/tools/google_calendar/create'
-import { getTool } from '@/tools/google_calendar/get'
-import { inviteTool } from '@/tools/google_calendar/invite'
-import { listTool } from '@/tools/google_calendar/list'
-import { quickAddTool } from '@/tools/google_calendar/quick_add'
+import { createTool, createV2Tool } from '@/tools/google_calendar/create'
+import { getTool, getV2Tool } from '@/tools/google_calendar/get'
+import { inviteTool, inviteV2Tool } from '@/tools/google_calendar/invite'
+import { listTool, listV2Tool } from '@/tools/google_calendar/list'
+import { quickAddTool, quickAddV2Tool } from '@/tools/google_calendar/quick_add'
 
 export const googleCalendarCreateTool = createTool
 export const googleCalendarGetTool = getTool
 export const googleCalendarInviteTool = inviteTool
 export const googleCalendarListTool = listTool
 export const googleCalendarQuickAddTool = quickAddTool
+
+export const googleCalendarCreateV2Tool = createV2Tool
+export const googleCalendarGetV2Tool = getV2Tool
+export const googleCalendarInviteV2Tool = inviteV2Tool
+export const googleCalendarListV2Tool = listV2Tool
+export const googleCalendarQuickAddV2Tool = quickAddV2Tool
diff --git a/apps/sim/tools/google_calendar/invite.ts b/apps/sim/tools/google_calendar/invite.ts
index b48f260f48..5c702f2147 100644
--- a/apps/sim/tools/google_calendar/invite.ts
+++ b/apps/sim/tools/google_calendar/invite.ts
@@ -253,3 +253,162 @@ export const inviteTool: ToolConfig<GoogleCalendarInviteParams, GoogleCalendarIn
     },
   },
 }
+
+interface GoogleCalendarInviteV2Response {
+  success: boolean
+  output: {
+    id: string
+    htmlLink?: string
+    status?: string
+    summary?: string
+    description?: string
+    location?: string
+    start?: any
+    end?: any
+    attendees?: any
+    creator?: any
+    organizer?: any
+  }
+}
+
+export const inviteV2Tool: ToolConfig<GoogleCalendarInviteParams, GoogleCalendarInviteV2Response> =
+  {
+    id: 'google_calendar_invite_v2',
+    name: 'Google Calendar Invite Attendees',
+    description:
+      'Invite attendees to an existing Google Calendar event. Returns API-aligned fields only.',
+    version: '2.0.0',
+    oauth: inviteTool.oauth,
+    params: inviteTool.params,
+    request: inviteTool.request,
+    transformResponse: async (response: Response, params) => {
+      const existingEvent = await response.json()
+
+      if (!existingEvent.start || !existingEvent.end || !existingEvent.summary) {
+        throw new Error('Existing event is missing required fields (start, end, or summary)')
+      }
+
+      let newAttendeeList: string[] = []
+
+      if (params?.attendees) {
+        if (Array.isArray(params.attendees)) {
+          newAttendeeList = params.attendees.filter(
+            (email: string) => email && email.trim().length > 0
+          )
+        } else if (
+          typeof (params.attendees as any) === 'string' &&
+          (params.attendees as any).trim().length > 0
+        ) {
+          newAttendeeList = (params.attendees as any)
+            .split(',')
+            .map((email: string) => email.trim())
+            .filter((email: string) => email.length > 0)
+        }
+      }
+
+      const existingAttendees = existingEvent.attendees || []
+      let finalAttendees: Array<any> = []
+
+      const shouldReplace =
+        params?.replaceExisting === true || (params?.replaceExisting as any) === 'true'
+
+      if (shouldReplace) {
+        finalAttendees = newAttendeeList.map((email: string) => ({
+          email,
+          responseStatus: 'needsAction',
+        }))
+      } else {
+        finalAttendees = [...existingAttendees]
+
+        const existingEmails = new Set(
+          existingAttendees.map((attendee: any) => attendee.email?.toLowerCase() || '')
+        )
+
+        for (const newEmail of newAttendeeList) {
+          const emailLower = newEmail.toLowerCase()
+          if (!existingEmails.has(emailLower)) {
+            finalAttendees.push({
+              email: newEmail,
+              responseStatus: 'needsAction',
+            })
+          }
+        }
+      }
+
+      const updatedEvent = {
+        ...existingEvent,
+        attendees: finalAttendees,
+      }
+
+      const readOnlyFields = [
+        'id',
+        'etag',
+        'kind',
+        'created',
+        'updated',
+        'htmlLink',
+        'iCalUID',
+        'sequence',
+        'creator',
+        'organizer',
+      ]
+      readOnlyFields.forEach((field) => {
+        delete updatedEvent[field]
+      })
+
+      const calendarId = params?.calendarId || 'primary'
+      const queryParams = new URLSearchParams()
+      if (params?.sendUpdates !== undefined) {
+        queryParams.append('sendUpdates', params.sendUpdates)
+      }
+
+      const queryString = queryParams.toString()
+      const putUrl = `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(params?.eventId || '')}${queryString ? `?${queryString}` : ''}`
+
+      const putResponse = await fetch(putUrl, {
+        method: 'PUT',
+        headers: {
+          Authorization: `Bearer ${params?.accessToken}`,
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(updatedEvent),
+      })
+
+      if (!putResponse.ok) {
+        const errorData = await putResponse.json()
+        throw new Error(errorData.error?.message || 'Failed to invite attendees to calendar event')
+      }
+
+      const data = await putResponse.json()
+
+      return {
+        success: true,
+        output: {
+          id: data.id,
+          htmlLink: data.htmlLink,
+          status: data.status,
+          summary: data.summary ?? null,
+          description: data.description ?? null,
+          location: data.location ?? null,
+          start: data.start,
+          end: data.end,
+          attendees: data.attendees ?? null,
+          creator: data.creator,
+          organizer: data.organizer,
+        },
+      }
+    },
+    outputs: {
+      id: { type: 'string', description: 'Event ID' },
+      htmlLink: { type: 'string', description: 'Event link' },
+      status: { type: 'string', description: 'Event status' },
+      summary: { type: 'string', description: 'Event title', optional: true },
+      description: { type: 'string', description: 'Event description', optional: true },
+      location: { type: 'string', description: 'Event location', optional: true },
+      start: { type: 'json', description: 'Event start' },
+      end: { type: 'json', description: 'Event end' },
+      attendees: { type: 'json', description: 'Event attendees', optional: true },
+      creator: { type: 'json', description: 'Event creator' },
+      organizer: { type: 'json', description: 'Event organizer' },
+    },
+  }
diff --git a/apps/sim/tools/google_calendar/list.ts b/apps/sim/tools/google_calendar/list.ts
index 067af795c0..657620897c 100644
--- a/apps/sim/tools/google_calendar/list.ts
+++ b/apps/sim/tools/google_calendar/list.ts
@@ -118,3 +118,52 @@ export const listTool: ToolConfig<GoogleCalendarListParams, GoogleCalendarListRe
     },
   },
 }
+
+interface GoogleCalendarListV2Response {
+  success: boolean
+  output: {
+    nextPageToken: string | null
+    timeZone: string | null
+    events: Array<Record<string, any>>
+  }
+}
+
+export const listV2Tool: ToolConfig<GoogleCalendarListParams, GoogleCalendarListV2Response> = {
+  id: 'google_calendar_list_v2',
+  name: 'Google Calendar List Events',
+  description: 'List events from Google Calendar. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: listTool.oauth,
+  params: listTool.params,
+  request: listTool.request,
+  transformResponse: async (response: Response) => {
+    const data: GoogleCalendarApiListResponse = await response.json()
+    const events = data.items || []
+
+    return {
+      success: true,
+      output: {
+        nextPageToken: data.nextPageToken ?? null,
+        timeZone: data.timeZone ?? null,
+        events: events.map((event: GoogleCalendarApiEventResponse) => ({
+          id: event.id,
+          htmlLink: event.htmlLink,
+          status: event.status,
+          summary: event.summary ?? null,
+          description: event.description ?? null,
+          location: event.location ?? null,
+          start: event.start,
+          end: event.end,
+          attendees: event.attendees ?? null,
+          creator: event.creator,
+          organizer: event.organizer,
+        })),
+      },
+    }
+  },
+  outputs: {
+    nextPageToken: { type: 'string', description: 'Next page token', optional: true },
+    timeZone: { type: 'string', description: 'Calendar time zone', optional: true },
+    events: { type: 'json', description: 'List of events' },
+  },
+}
diff --git a/apps/sim/tools/google_calendar/quick_add.ts b/apps/sim/tools/google_calendar/quick_add.ts
index 5b12f7bded..ca8fbea9a2 100644
--- a/apps/sim/tools/google_calendar/quick_add.ts
+++ b/apps/sim/tools/google_calendar/quick_add.ts
@@ -1,3 +1,4 @@
+import { createLogger } from '@sim/logger'
 import {
   CALENDAR_API_BASE,
   type GoogleCalendarQuickAddParams,
@@ -5,6 +6,8 @@ import {
 } from '@/tools/google_calendar/types'
 import type { ToolConfig } from '@/tools/types'
 
+const logger = createLogger('GoogleCalendarQuickAddTool')
+
 export const quickAddTool: ToolConfig<
   GoogleCalendarQuickAddParams,
   GoogleCalendarQuickAddResponse
@@ -125,14 +128,13 @@ export const quickAddTool: ToolConfig<
             finalEventData = await updateResponse.json()
           } else {
             // If update fails, we still return the original event but log the error
-            console.warn(
-              'Failed to add attendees to quick-added event:',
-              await updateResponse.text()
-            )
+            logger.warn('Failed to add attendees to quick-added event', {
+              error: await updateResponse.text(),
+            })
           }
         } catch (error) {
           // If attendee update fails, we still return the original event
-          console.warn('Error adding attendees to quick-added event:', error)
+          logger.warn('Error adding attendees to quick-added event', { error })
         }
       }
     }
@@ -163,6 +165,137 @@ export const quickAddTool: ToolConfig<
       type: 'string',
       description: 'Event creation confirmation message from natural language',
     },
-    metadata: { type: 'json', description: 'Created event metadata including parsed details' },
+    metadata: {
+      type: 'json',
+      description: 'Created event metadata including parsed details',
+      properties: {
+        id: { type: 'string', description: 'Event ID' },
+        htmlLink: { type: 'string', description: 'URL to view the event in Google Calendar' },
+        status: { type: 'string', description: 'Event status (confirmed, tentative, cancelled)' },
+        summary: { type: 'string', description: 'Event title' },
+        description: { type: 'string', description: 'Event description' },
+        location: { type: 'string', description: 'Event location' },
+        start: { type: 'object', description: 'Event start time' },
+        end: { type: 'object', description: 'Event end time' },
+        attendees: { type: 'array', description: 'List of event attendees' },
+        creator: { type: 'object', description: 'Event creator info' },
+        organizer: { type: 'object', description: 'Event organizer info' },
+      },
+    },
+  },
+}
+
+interface GoogleCalendarQuickAddV2Response {
+  success: boolean
+  output: {
+    id: string
+    htmlLink?: string
+    status?: string
+    summary?: string
+    description?: string
+    location?: string
+    start?: any
+    end?: any
+    attendees?: any
+    creator?: any
+    organizer?: any
+  }
+}
+
+export const quickAddV2Tool: ToolConfig<
+  GoogleCalendarQuickAddParams,
+  GoogleCalendarQuickAddV2Response
+> = {
+  id: 'google_calendar_quick_add_v2',
+  name: 'Google Calendar Quick Add',
+  description: 'Create events from natural language text. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: quickAddTool.oauth,
+  params: quickAddTool.params,
+  request: quickAddTool.request,
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    let finalEventData = data
+    if (params?.attendees) {
+      let attendeeList: string[] = []
+      const attendees = params.attendees as string | string[]
+
+      if (Array.isArray(attendees)) {
+        attendeeList = attendees.filter((email: string) => email && email.trim().length > 0)
+      } else if (typeof attendees === 'string' && attendees.trim().length > 0) {
+        attendeeList = attendees
+          .split(',')
+          .map((email: string) => email.trim())
+          .filter((email: string) => email.length > 0)
+      }
+
+      if (attendeeList.length > 0) {
+        try {
+          const calendarId = params.calendarId || 'primary'
+          const eventId = data.id
+
+          const updateData = {
+            attendees: attendeeList.map((email: string) => ({ email })),
+          }
+
+          const updateQueryParams = new URLSearchParams()
+          if (params.sendUpdates !== undefined) {
+            updateQueryParams.append('sendUpdates', params.sendUpdates)
+          }
+
+          const updateUrl = `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${eventId}${updateQueryParams.toString() ? `?${updateQueryParams.toString()}` : ''}`
+
+          const updateResponse = await fetch(updateUrl, {
+            method: 'PATCH',
+            headers: {
+              Authorization: `Bearer ${params.accessToken}`,
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(updateData),
+          })
+
+          if (updateResponse.ok) {
+            finalEventData = await updateResponse.json()
+          } else {
+            logger.warn('Failed to add attendees to quick-added event', {
+              error: await updateResponse.text(),
+            })
+          }
+        } catch (error) {
+          logger.warn('Error adding attendees to quick-added event', { error })
+        }
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        id: finalEventData.id,
+        htmlLink: finalEventData.htmlLink,
+        status: finalEventData.status,
+        summary: finalEventData.summary ?? null,
+        description: finalEventData.description ?? null,
+        location: finalEventData.location ?? null,
+        start: finalEventData.start,
+        end: finalEventData.end,
+        attendees: finalEventData.attendees ?? null,
+        creator: finalEventData.creator,
+        organizer: finalEventData.organizer,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Event ID' },
+    htmlLink: { type: 'string', description: 'Event link' },
+    status: { type: 'string', description: 'Event status' },
+    summary: { type: 'string', description: 'Event title', optional: true },
+    description: { type: 'string', description: 'Event description', optional: true },
+    location: { type: 'string', description: 'Event location', optional: true },
+    start: { type: 'json', description: 'Event start' },
+    end: { type: 'json', description: 'Event end' },
+    attendees: { type: 'json', description: 'Event attendees', optional: true },
+    creator: { type: 'json', description: 'Event creator' },
+    organizer: { type: 'json', description: 'Event organizer' },
   },
 }
diff --git a/apps/sim/tools/google_docs/create.ts b/apps/sim/tools/google_docs/create.ts
index f17c3cbec1..4fbec19740 100644
--- a/apps/sim/tools/google_docs/create.ts
+++ b/apps/sim/tools/google_docs/create.ts
@@ -150,6 +150,12 @@ export const createTool: ToolConfig<GoogleDocsToolParams, GoogleDocsCreateRespon
     metadata: {
       type: 'json',
       description: 'Created document metadata including ID, title, and URL',
+      properties: {
+        documentId: { type: 'string', description: 'Google Docs document ID' },
+        title: { type: 'string', description: 'Document title' },
+        mimeType: { type: 'string', description: 'Document MIME type' },
+        url: { type: 'string', description: 'Document URL' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/google_docs/read.ts b/apps/sim/tools/google_docs/read.ts
index a78a77d93f..123250f47b 100644
--- a/apps/sim/tools/google_docs/read.ts
+++ b/apps/sim/tools/google_docs/read.ts
@@ -79,6 +79,15 @@ export const readTool: ToolConfig<GoogleDocsToolParams, GoogleDocsReadResponse>
 
   outputs: {
     content: { type: 'string', description: 'Extracted document text content' },
-    metadata: { type: 'json', description: 'Document metadata including ID, title, and URL' },
+    metadata: {
+      type: 'json',
+      description: 'Document metadata including ID, title, and URL',
+      properties: {
+        documentId: { type: 'string', description: 'Google Docs document ID' },
+        title: { type: 'string', description: 'Document title' },
+        mimeType: { type: 'string', description: 'Document MIME type' },
+        url: { type: 'string', description: 'Document URL' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/google_docs/write.ts b/apps/sim/tools/google_docs/write.ts
index c43255df49..4b0986b859 100644
--- a/apps/sim/tools/google_docs/write.ts
+++ b/apps/sim/tools/google_docs/write.ts
@@ -82,6 +82,12 @@ export const writeTool: ToolConfig<GoogleDocsToolParams, GoogleDocsWriteResponse
     metadata: {
       type: 'json',
       description: 'Updated document metadata including ID, title, and URL',
+      properties: {
+        documentId: { type: 'string', description: 'Google Docs document ID' },
+        title: { type: 'string', description: 'Document title' },
+        mimeType: { type: 'string', description: 'Document MIME type' },
+        url: { type: 'string', description: 'Document URL' },
+      },
     },
   },
 
diff --git a/apps/sim/tools/google_sheets/append.ts b/apps/sim/tools/google_sheets/append.ts
index aa8169a6f5..86e59afebe 100644
--- a/apps/sim/tools/google_sheets/append.ts
+++ b/apps/sim/tools/google_sheets/append.ts
@@ -216,6 +216,13 @@ export const appendTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsAppendRe
     updatedRows: { type: 'number', description: 'Number of rows updated' },
     updatedColumns: { type: 'number', description: 'Number of columns updated' },
     updatedCells: { type: 'number', description: 'Number of cells updated' },
-    metadata: { type: 'json', description: 'Spreadsheet metadata including ID and URL' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/google_sheets/read.ts b/apps/sim/tools/google_sheets/read.ts
index 6e2fe2c53e..1e591eac6f 100644
--- a/apps/sim/tools/google_sheets/read.ts
+++ b/apps/sim/tools/google_sheets/read.ts
@@ -101,6 +101,13 @@ export const readTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsReadRespon
 
   outputs: {
     data: { type: 'json', description: 'Sheet data including range and cell values' },
-    metadata: { type: 'json', description: 'Spreadsheet metadata including ID and URL' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/google_sheets/update.ts b/apps/sim/tools/google_sheets/update.ts
index a661576753..07eb18dd36 100644
--- a/apps/sim/tools/google_sheets/update.ts
+++ b/apps/sim/tools/google_sheets/update.ts
@@ -169,6 +169,13 @@ export const updateTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsUpdateRe
     updatedRows: { type: 'number', description: 'Number of rows updated' },
     updatedColumns: { type: 'number', description: 'Number of columns updated' },
     updatedCells: { type: 'number', description: 'Number of cells updated' },
-    metadata: { type: 'json', description: 'Spreadsheet metadata including ID and URL' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/google_sheets/write.ts b/apps/sim/tools/google_sheets/write.ts
index bae66ce8a1..3115418cac 100644
--- a/apps/sim/tools/google_sheets/write.ts
+++ b/apps/sim/tools/google_sheets/write.ts
@@ -167,6 +167,13 @@ export const writeTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsWriteResp
     updatedRows: { type: 'number', description: 'Number of rows updated' },
     updatedColumns: { type: 'number', description: 'Number of columns updated' },
     updatedCells: { type: 'number', description: 'Number of cells updated' },
-    metadata: { type: 'json', description: 'Spreadsheet metadata including ID and URL' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/hubspot/create_company.ts b/apps/sim/tools/hubspot/create_company.ts
index 85615c97c1..5141a49d18 100644
--- a/apps/sim/tools/hubspot/create_company.ts
+++ b/apps/sim/tools/hubspot/create_company.ts
@@ -89,10 +89,7 @@ export const hubspotCreateCompanyTool: ToolConfig<
       success: true,
       output: {
         company: data,
-        metadata: {
-          operation: 'create_company' as const,
-          companyId: data.id,
-        },
+        companyId: data.id,
         success: true,
       },
     }
@@ -100,7 +97,7 @@ export const hubspotCreateCompanyTool: ToolConfig<
 
   outputs: {
     company: { type: 'object', description: 'Created HubSpot company object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    companyId: { type: 'string', description: 'The created company ID' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/create_contact.ts b/apps/sim/tools/hubspot/create_contact.ts
index 8c529fa7c6..56118bd2d2 100644
--- a/apps/sim/tools/hubspot/create_contact.ts
+++ b/apps/sim/tools/hubspot/create_contact.ts
@@ -92,10 +92,7 @@ export const hubspotCreateContactTool: ToolConfig<
       success: true,
       output: {
         contact: data,
-        metadata: {
-          operation: 'create_contact' as const,
-          contactId: data.id,
-        },
+        contactId: data.id,
         success: true,
       },
     }
@@ -103,7 +100,7 @@ export const hubspotCreateContactTool: ToolConfig<
 
   outputs: {
     contact: { type: 'object', description: 'Created HubSpot contact object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    contactId: { type: 'string', description: 'The created contact ID' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/get_company.ts b/apps/sim/tools/hubspot/get_company.ts
index 556930c811..2464087f60 100644
--- a/apps/sim/tools/hubspot/get_company.ts
+++ b/apps/sim/tools/hubspot/get_company.ts
@@ -93,10 +93,7 @@ export const hubspotGetCompanyTool: ToolConfig<HubSpotGetCompanyParams, HubSpotG
         success: true,
         output: {
           company: data,
-          metadata: {
-            operation: 'get_company' as const,
-            companyId: data.id,
-          },
+          companyId: data.id,
           success: true,
         },
       }
@@ -104,7 +101,7 @@ export const hubspotGetCompanyTool: ToolConfig<HubSpotGetCompanyParams, HubSpotG
 
     outputs: {
       company: { type: 'object', description: 'HubSpot company object with properties' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      companyId: { type: 'string', description: 'The retrieved company ID' },
       success: { type: 'boolean', description: 'Operation success status' },
     },
   }
diff --git a/apps/sim/tools/hubspot/get_contact.ts b/apps/sim/tools/hubspot/get_contact.ts
index c6bdc85ff3..bff0fa454b 100644
--- a/apps/sim/tools/hubspot/get_contact.ts
+++ b/apps/sim/tools/hubspot/get_contact.ts
@@ -93,10 +93,7 @@ export const hubspotGetContactTool: ToolConfig<HubSpotGetContactParams, HubSpotG
         success: true,
         output: {
           contact: data,
-          metadata: {
-            operation: 'get_contact' as const,
-            contactId: data.id,
-          },
+          contactId: data.id,
           success: true,
         },
       }
@@ -104,7 +101,7 @@ export const hubspotGetContactTool: ToolConfig<HubSpotGetContactParams, HubSpotG
 
     outputs: {
       contact: { type: 'object', description: 'HubSpot contact object with properties' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      contactId: { type: 'string', description: 'The retrieved contact ID' },
       success: { type: 'boolean', description: 'Operation success status' },
     },
   }
diff --git a/apps/sim/tools/hubspot/get_users.ts b/apps/sim/tools/hubspot/get_users.ts
index ba244aab25..0d57ca11d8 100644
--- a/apps/sim/tools/hubspot/get_users.ts
+++ b/apps/sim/tools/hubspot/get_users.ts
@@ -69,10 +69,7 @@ export const hubspotGetUsersTool: ToolConfig<HubSpotGetUsersParams, HubSpotGetUs
       success: true,
       output: {
         users,
-        metadata: {
-          operation: 'get_users' as const,
-          totalItems: users.length,
-        },
+        totalItems: users.length,
         success: true,
       },
     }
@@ -80,7 +77,7 @@ export const hubspotGetUsersTool: ToolConfig<HubSpotGetUsersParams, HubSpotGetUs
 
   outputs: {
     users: { type: 'array', description: 'Array of HubSpot user objects' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    totalItems: { type: 'number', description: 'Total number of users returned' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/list_companies.ts b/apps/sim/tools/hubspot/list_companies.ts
index 321344be9d..9a18fca3ee 100644
--- a/apps/sim/tools/hubspot/list_companies.ts
+++ b/apps/sim/tools/hubspot/list_companies.ts
@@ -100,9 +100,8 @@ export const hubspotListCompaniesTool: ToolConfig<
       success: true,
       output: {
         companies: data.results || [],
-        paging: data.paging,
+        paging: data.paging ?? null,
         metadata: {
-          operation: 'list_companies' as const,
           totalReturned: data.results?.length || 0,
           hasMore: !!data.paging?.next,
         },
@@ -113,8 +112,8 @@ export const hubspotListCompaniesTool: ToolConfig<
 
   outputs: {
     companies: { type: 'array', description: 'Array of HubSpot company objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: { type: 'object', description: 'Pagination information', optional: true },
+    metadata: { type: 'object', description: 'Metadata with totalReturned and hasMore' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/list_contacts.ts b/apps/sim/tools/hubspot/list_contacts.ts
index 1cff6d00b7..20b31e5d4d 100644
--- a/apps/sim/tools/hubspot/list_contacts.ts
+++ b/apps/sim/tools/hubspot/list_contacts.ts
@@ -98,9 +98,8 @@ export const hubspotListContactsTool: ToolConfig<
       success: true,
       output: {
         contacts: data.results || [],
-        paging: data.paging,
+        paging: data.paging ?? null,
         metadata: {
-          operation: 'list_contacts' as const,
           totalReturned: data.results?.length || 0,
           hasMore: !!data.paging?.next,
         },
@@ -111,8 +110,8 @@ export const hubspotListContactsTool: ToolConfig<
 
   outputs: {
     contacts: { type: 'array', description: 'Array of HubSpot contact objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: { type: 'object', description: 'Pagination information', optional: true },
+    metadata: { type: 'object', description: 'Metadata with totalReturned and hasMore' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/list_deals.ts b/apps/sim/tools/hubspot/list_deals.ts
index b23e63add7..baa7aeec0d 100644
--- a/apps/sim/tools/hubspot/list_deals.ts
+++ b/apps/sim/tools/hubspot/list_deals.ts
@@ -94,9 +94,8 @@ export const hubspotListDealsTool: ToolConfig<HubSpotListDealsParams, HubSpotLis
       success: true,
       output: {
         deals: data.results || [],
-        paging: data.paging,
+        paging: data.paging ?? null,
         metadata: {
-          operation: 'list_deals' as const,
           totalReturned: data.results?.length || 0,
           hasMore: !!data.paging?.next,
         },
@@ -107,8 +106,8 @@ export const hubspotListDealsTool: ToolConfig<HubSpotListDealsParams, HubSpotLis
 
   outputs: {
     deals: { type: 'array', description: 'Array of HubSpot deal objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: { type: 'object', description: 'Pagination information', optional: true },
+    metadata: { type: 'object', description: 'Metadata with totalReturned and hasMore' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/search_companies.ts b/apps/sim/tools/hubspot/search_companies.ts
index cb4bdac309..2567022e31 100644
--- a/apps/sim/tools/hubspot/search_companies.ts
+++ b/apps/sim/tools/hubspot/search_companies.ts
@@ -145,29 +145,26 @@ export const hubspotSearchCompaniesTool: ToolConfig<
       throw new Error(data.message || 'Failed to search companies in HubSpot')
     }
 
-    const result = {
-      companies: data.results || [],
-      total: data.total,
-      paging: data.paging,
-      metadata: {
-        operation: 'search_companies' as const,
-        totalReturned: data.results?.length || 0,
-        total: data.total,
-      },
-    }
-
     return {
       success: true,
-      output: result,
-      ...result,
+      output: {
+        companies: data.results || [],
+        total: data.total ?? null,
+        paging: data.paging ?? null,
+        metadata: {
+          totalReturned: data.results?.length || 0,
+          hasMore: !!data.paging?.next,
+        },
+        success: true,
+      },
     }
   },
 
   outputs: {
     companies: { type: 'array', description: 'Array of matching HubSpot company objects' },
-    total: { type: 'number', description: 'Total number of matching companies' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    total: { type: 'number', description: 'Total number of matching companies', optional: true },
+    paging: { type: 'object', description: 'Pagination information', optional: true },
+    metadata: { type: 'object', description: 'Metadata with totalReturned and hasMore' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/search_contacts.ts b/apps/sim/tools/hubspot/search_contacts.ts
index e24f27e499..afbd7e8251 100644
--- a/apps/sim/tools/hubspot/search_contacts.ts
+++ b/apps/sim/tools/hubspot/search_contacts.ts
@@ -145,29 +145,26 @@ export const hubspotSearchContactsTool: ToolConfig<
       throw new Error(data.message || 'Failed to search contacts in HubSpot')
     }
 
-    const result = {
-      contacts: data.results || [],
-      total: data.total,
-      paging: data.paging,
-      metadata: {
-        operation: 'search_contacts' as const,
-        totalReturned: data.results?.length || 0,
-        total: data.total,
-      },
-    }
-
     return {
       success: true,
-      output: result,
-      ...result,
+      output: {
+        contacts: data.results || [],
+        total: data.total ?? null,
+        paging: data.paging ?? null,
+        metadata: {
+          totalReturned: data.results?.length || 0,
+          hasMore: !!data.paging?.next,
+        },
+        success: true,
+      },
     }
   },
 
   outputs: {
     contacts: { type: 'array', description: 'Array of matching HubSpot contact objects' },
-    total: { type: 'number', description: 'Total number of matching contacts' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    total: { type: 'number', description: 'Total number of matching contacts', optional: true },
+    paging: { type: 'object', description: 'Pagination information', optional: true },
+    metadata: { type: 'object', description: 'Metadata with totalReturned and hasMore' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/types.ts b/apps/sim/tools/hubspot/types.ts
index 23e3084997..007f59c3d1 100644
--- a/apps/sim/tools/hubspot/types.ts
+++ b/apps/sim/tools/hubspot/types.ts
@@ -31,10 +31,7 @@ export interface HubSpotPaging {
 export interface HubSpotGetUsersResponse extends ToolResponse {
   output: {
     users: HubSpotUser[]
-    metadata: {
-      operation: 'get_users'
-      totalItems?: number
-    }
+    totalItems?: number
     success: boolean
   }
 }
@@ -50,7 +47,6 @@ export interface HubSpotListContactsResponse extends ToolResponse {
     contacts: HubSpotContact[]
     paging?: HubSpotPaging
     metadata: {
-      operation: 'list_contacts'
       totalReturned: number
       hasMore: boolean
     }
@@ -70,10 +66,7 @@ export interface HubSpotListContactsParams {
 export interface HubSpotGetContactResponse extends ToolResponse {
   output: {
     contact: HubSpotContact
-    metadata: {
-      operation: 'get_contact'
-      contactId: string
-    }
+    contactId: string
     success: boolean
   }
 }
@@ -90,10 +83,7 @@ export interface HubSpotGetContactParams {
 export interface HubSpotCreateContactResponse extends ToolResponse {
   output: {
     contact: HubSpotContact
-    metadata: {
-      operation: 'create_contact'
-      contactId: string
-    }
+    contactId: string
     success: boolean
   }
 }
@@ -114,10 +104,7 @@ export interface HubSpotCreateContactParams {
 export interface HubSpotUpdateContactResponse extends ToolResponse {
   output: {
     contact: HubSpotContact
-    metadata: {
-      operation: 'update_contact'
-      contactId: string
-    }
+    contactId: string
     success: boolean
   }
 }
@@ -131,13 +118,15 @@ export interface HubSpotUpdateContactParams {
 
 // Search Contacts
 export interface HubSpotSearchContactsResponse extends ToolResponse {
-  contacts: HubSpotContact[]
-  total: number
-  paging?: HubSpotPaging
-  metadata: {
-    operation: 'search_contacts'
-    totalReturned: number
+  output: {
+    contacts: HubSpotContact[]
     total: number
+    paging?: HubSpotPaging
+    metadata: {
+      totalReturned: number
+      hasMore: boolean
+    }
+    success: boolean
   }
 }
 
@@ -168,7 +157,6 @@ export type HubSpotListCompaniesResponse = Omit<HubSpotListContactsResponse, 'ou
     companies: HubSpotContact[]
     paging?: HubSpotPaging
     metadata: {
-      operation: 'list_companies'
       totalReturned: number
       hasMore: boolean
     }
@@ -179,10 +167,7 @@ export type HubSpotGetCompanyParams = HubSpotGetContactParams & { companyId: str
 export type HubSpotGetCompanyResponse = Omit<HubSpotGetContactResponse, 'output'> & {
   output: {
     company: HubSpotContact
-    metadata: {
-      operation: 'get_company'
-      companyId: string
-    }
+    companyId: string
     success: boolean
   }
 }
@@ -190,10 +175,7 @@ export type HubSpotCreateCompanyParams = HubSpotCreateContactParams
 export type HubSpotCreateCompanyResponse = Omit<HubSpotCreateContactResponse, 'output'> & {
   output: {
     company: HubSpotContact
-    metadata: {
-      operation: 'create_company'
-      companyId: string
-    }
+    companyId: string
     success: boolean
   }
 }
@@ -201,22 +183,21 @@ export type HubSpotUpdateCompanyParams = HubSpotUpdateContactParams & { companyI
 export type HubSpotUpdateCompanyResponse = Omit<HubSpotUpdateContactResponse, 'output'> & {
   output: {
     company: HubSpotContact
-    metadata: {
-      operation: 'update_company'
-      companyId: string
-    }
+    companyId: string
     success: boolean
   }
 }
 export type HubSpotSearchCompaniesParams = HubSpotSearchContactsParams
 export interface HubSpotSearchCompaniesResponse extends ToolResponse {
-  companies: HubSpotContact[]
-  total: number
-  paging?: HubSpotPaging
-  metadata: {
-    operation: 'search_companies'
-    totalReturned: number
+  output: {
+    companies: HubSpotContact[]
     total: number
+    paging?: HubSpotPaging
+    metadata: {
+      totalReturned: number
+      hasMore: boolean
+    }
+    success: boolean
   }
 }
 
@@ -228,7 +209,6 @@ export type HubSpotListDealsResponse = Omit<HubSpotListContactsResponse, 'output
     deals: HubSpotContact[]
     paging?: HubSpotPaging
     metadata: {
-      operation: 'list_deals'
       totalReturned: number
       hasMore: boolean
     }
diff --git a/apps/sim/tools/hubspot/update_company.ts b/apps/sim/tools/hubspot/update_company.ts
index a2b9845b5b..bd67fbdb45 100644
--- a/apps/sim/tools/hubspot/update_company.ts
+++ b/apps/sim/tools/hubspot/update_company.ts
@@ -96,10 +96,7 @@ export const hubspotUpdateCompanyTool: ToolConfig<
       success: true,
       output: {
         company: data,
-        metadata: {
-          operation: 'update_company' as const,
-          companyId: data.id,
-        },
+        companyId: data.id,
         success: true,
       },
     }
@@ -107,7 +104,7 @@ export const hubspotUpdateCompanyTool: ToolConfig<
 
   outputs: {
     company: { type: 'object', description: 'Updated HubSpot company object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    companyId: { type: 'string', description: 'The updated company ID' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/hubspot/update_contact.ts b/apps/sim/tools/hubspot/update_contact.ts
index 1bcf8c2de2..8a1e8a76a3 100644
--- a/apps/sim/tools/hubspot/update_contact.ts
+++ b/apps/sim/tools/hubspot/update_contact.ts
@@ -96,10 +96,7 @@ export const hubspotUpdateContactTool: ToolConfig<
       success: true,
       output: {
         contact: data,
-        metadata: {
-          operation: 'update_contact' as const,
-          contactId: data.id,
-        },
+        contactId: data.id,
         success: true,
       },
     }
@@ -107,7 +104,7 @@ export const hubspotUpdateContactTool: ToolConfig<
 
   outputs: {
     contact: { type: 'object', description: 'Updated HubSpot contact object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    contactId: { type: 'string', description: 'The updated contact ID' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/intercom/create_company.ts b/apps/sim/tools/intercom/create_company.ts
index 37065562b6..5795afce3e 100644
--- a/apps/sim/tools/intercom/create_company.ts
+++ b/apps/sim/tools/intercom/create_company.ts
@@ -55,15 +55,7 @@ export interface IntercomCreateCompanyResponse {
   }
 }
 
-export const intercomCreateCompanyTool: ToolConfig<
-  IntercomCreateCompanyParams,
-  IntercomCreateCompanyResponse
-> = {
-  id: 'intercom_create_company',
-  name: 'Create Company in Intercom',
-  description: 'Create or update a company in Intercom',
-  version: '1.0.0',
-
+const createCompanyBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -131,13 +123,13 @@ export const intercomCreateCompanyTool: ToolConfig<
   request: {
     url: () => buildIntercomUrl('/companies'),
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: IntercomCreateCompanyParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
-    body: (params) => {
+    body: (params: IntercomCreateCompanyParams) => {
       const company: any = {
         company_id: params.company_id,
       }
@@ -162,6 +154,18 @@ export const intercomCreateCompanyTool: ToolConfig<
       return company
     },
   },
+} satisfies Pick<ToolConfig<IntercomCreateCompanyParams, any>, 'params' | 'request'>
+
+export const intercomCreateCompanyTool: ToolConfig<
+  IntercomCreateCompanyParams,
+  IntercomCreateCompanyResponse
+> = {
+  id: 'intercom_create_company',
+  name: 'Create Company in Intercom',
+  description: 'Create or update a company in Intercom',
+  version: '1.0.0',
+
+  ...createCompanyBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -237,3 +241,110 @@ export const intercomCreateCompanyTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomCreateCompanyV2Response {
+  success: boolean
+  output: {
+    company: {
+      id: string
+      type: string
+      app_id: string
+      company_id: string
+      name?: string
+      website?: string
+      plan: Record<string, any>
+      size?: number
+      industry?: string
+      monthly_spend: number
+      session_count: number
+      user_count: number
+      created_at: number
+      updated_at: number
+      remote_created_at?: number
+      custom_attributes: Record<string, any>
+      tags: {
+        type: string
+        tags: any[]
+      }
+      segments: {
+        type: string
+        segments: any[]
+      }
+      [key: string]: any
+    }
+    companyId: string
+  }
+}
+
+export const intercomCreateCompanyV2Tool: ToolConfig<
+  IntercomCreateCompanyParams,
+  IntercomCreateCompanyV2Response
+> = {
+  ...createCompanyBase,
+  id: 'intercom_create_company_v2',
+  name: 'Create Company in Intercom',
+  description: 'Create or update a company in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'create_company')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        company: data,
+        companyId: data.id,
+      },
+    }
+  },
+
+  outputs: {
+    company: {
+      type: 'object',
+      description: 'Created or updated company object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the company' },
+        type: { type: 'string', description: 'Object type (company)' },
+        app_id: { type: 'string', description: 'Intercom app ID' },
+        company_id: { type: 'string', description: 'Your unique identifier for the company' },
+        name: { type: 'string', description: 'Name of the company' },
+        website: { type: 'string', description: 'Company website URL' },
+        plan: { type: 'object', description: 'Company plan information' },
+        size: { type: 'number', description: 'Number of employees' },
+        industry: { type: 'string', description: 'Industry the company operates in' },
+        monthly_spend: { type: 'number', description: 'Monthly revenue from this company' },
+        session_count: { type: 'number', description: 'Number of sessions' },
+        user_count: { type: 'number', description: 'Number of users in the company' },
+        created_at: { type: 'number', description: 'Unix timestamp when company was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when company was last updated' },
+        remote_created_at: {
+          type: 'number',
+          description: 'Unix timestamp when company was created by you',
+        },
+        custom_attributes: { type: 'object', description: 'Custom attributes set on the company' },
+        tags: {
+          type: 'object',
+          description: 'Tags associated with the company',
+          properties: {
+            type: { type: 'string', description: 'Tag list type' },
+            tags: { type: 'array', description: 'Array of tag objects' },
+          },
+        },
+        segments: {
+          type: 'object',
+          description: 'Segments the company belongs to',
+          properties: {
+            type: { type: 'string', description: 'Segment list type' },
+            segments: { type: 'array', description: 'Array of segment objects' },
+          },
+        },
+      },
+    },
+    companyId: { type: 'string', description: 'ID of the created/updated company' },
+  },
+}
diff --git a/apps/sim/tools/intercom/create_contact.ts b/apps/sim/tools/intercom/create_contact.ts
index bedc05ff7f..6e9a15a99e 100644
--- a/apps/sim/tools/intercom/create_contact.ts
+++ b/apps/sim/tools/intercom/create_contact.ts
@@ -83,15 +83,7 @@ export interface IntercomCreateContactResponse {
   }
 }
 
-export const intercomCreateContactTool: ToolConfig<
-  IntercomCreateContactParams,
-  IntercomCreateContactResponse
-> = {
-  id: 'intercom_create_contact',
-  name: 'Create Contact in Intercom',
-  description: 'Create a new contact in Intercom with email, external_id, or role',
-  version: '1.0.0',
-
+const intercomCreateContactBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -210,6 +202,18 @@ export const intercomCreateContactTool: ToolConfig<
       return contact
     },
   },
+} satisfies Pick<ToolConfig<IntercomCreateContactParams, any>, 'params' | 'request'>
+
+export const intercomCreateContactTool: ToolConfig<
+  IntercomCreateContactParams,
+  IntercomCreateContactResponse
+> = {
+  id: 'intercom_create_contact',
+  name: 'Create Contact in Intercom',
+  description: 'Create a new contact in Intercom with email, external_id, or role',
+  version: '1.0.0',
+
+  ...intercomCreateContactBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -240,12 +244,20 @@ export const intercomCreateContactTool: ToolConfig<
         id: { type: 'string', description: 'Unique identifier for the contact' },
         type: { type: 'string', description: 'Object type (contact)' },
         role: { type: 'string', description: 'Role of the contact (user or lead)' },
-        email: { type: 'string', description: 'Email address of the contact' },
-        phone: { type: 'string', description: 'Phone number of the contact' },
-        name: { type: 'string', description: 'Name of the contact' },
-        avatar: { type: 'string', description: 'Avatar URL of the contact' },
-        owner_id: { type: 'string', description: 'ID of the admin assigned to this contact' },
-        external_id: { type: 'string', description: 'External identifier for the contact' },
+        email: { type: 'string', description: 'Email address of the contact', optional: true },
+        phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+        name: { type: 'string', description: 'Name of the contact', optional: true },
+        avatar: { type: 'string', description: 'Avatar URL of the contact', optional: true },
+        owner_id: {
+          type: 'string',
+          description: 'ID of the admin assigned to this contact',
+          optional: true,
+        },
+        external_id: {
+          type: 'string',
+          description: 'External identifier for the contact',
+          optional: true,
+        },
         created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
         updated_at: { type: 'number', description: 'Unix timestamp when contact was last updated' },
         signed_up_at: { type: 'number', description: 'Unix timestamp when user signed up' },
@@ -322,3 +334,130 @@ export const intercomCreateContactTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomCreateContactV2Response {
+  success: boolean
+  output: {
+    contact: IntercomCreateContactResponse['output']['contact']
+    contactId: string
+  }
+}
+
+export const intercomCreateContactV2Tool: ToolConfig<
+  IntercomCreateContactParams,
+  IntercomCreateContactV2Response
+> = {
+  ...intercomCreateContactBase,
+  id: 'intercom_create_contact_v2',
+  name: 'Create Contact in Intercom',
+  description:
+    'Create a new contact in Intercom with email, external_id, or role. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'create_contact')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        contact: data,
+        contactId: data.id,
+      },
+    }
+  },
+
+  outputs: {
+    contact: {
+      type: 'object',
+      description: 'Created contact object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the contact' },
+        type: { type: 'string', description: 'Object type (contact)' },
+        role: { type: 'string', description: 'Role of the contact (user or lead)' },
+        email: { type: 'string', description: 'Email address of the contact', optional: true },
+        phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+        name: { type: 'string', description: 'Name of the contact', optional: true },
+        avatar: { type: 'string', description: 'Avatar URL of the contact', optional: true },
+        owner_id: {
+          type: 'string',
+          description: 'ID of the admin assigned to this contact',
+          optional: true,
+        },
+        external_id: {
+          type: 'string',
+          description: 'External identifier for the contact',
+          optional: true,
+        },
+        created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when contact was last updated' },
+        signed_up_at: { type: 'number', description: 'Unix timestamp when user signed up' },
+        last_seen_at: { type: 'number', description: 'Unix timestamp when user was last seen' },
+        workspace_id: { type: 'string', description: 'Workspace ID the contact belongs to' },
+        custom_attributes: { type: 'object', description: 'Custom attributes set on the contact' },
+        tags: {
+          type: 'object',
+          description: 'Tags associated with the contact',
+          properties: {
+            type: { type: 'string', description: 'List type' },
+            url: { type: 'string', description: 'URL to fetch tags' },
+            data: { type: 'array', description: 'Array of tag objects' },
+            has_more: { type: 'boolean', description: 'Whether there are more tags' },
+            total_count: { type: 'number', description: 'Total number of tags' },
+          },
+        },
+        notes: {
+          type: 'object',
+          description: 'Notes associated with the contact',
+          properties: {
+            type: { type: 'string', description: 'List type' },
+            url: { type: 'string', description: 'URL to fetch notes' },
+            data: { type: 'array', description: 'Array of note objects' },
+            has_more: { type: 'boolean', description: 'Whether there are more notes' },
+            total_count: { type: 'number', description: 'Total number of notes' },
+          },
+        },
+        companies: {
+          type: 'object',
+          description: 'Companies associated with the contact',
+          properties: {
+            type: { type: 'string', description: 'List type' },
+            url: { type: 'string', description: 'URL to fetch companies' },
+            data: { type: 'array', description: 'Array of company objects' },
+            has_more: { type: 'boolean', description: 'Whether there are more companies' },
+            total_count: { type: 'number', description: 'Total number of companies' },
+          },
+        },
+        location: {
+          type: 'object',
+          description: 'Location information for the contact',
+          properties: {
+            type: { type: 'string', description: 'Location type' },
+            city: { type: 'string', description: 'City' },
+            region: { type: 'string', description: 'Region/State' },
+            country: { type: 'string', description: 'Country' },
+            country_code: { type: 'string', description: 'Country code' },
+            continent_code: { type: 'string', description: 'Continent code' },
+          },
+        },
+        social_profiles: {
+          type: 'object',
+          description: 'Social profiles of the contact',
+          properties: {
+            type: { type: 'string', description: 'List type' },
+            data: { type: 'array', description: 'Array of social profile objects' },
+          },
+        },
+        unsubscribed_from_emails: {
+          type: 'boolean',
+          description: 'Whether contact is unsubscribed from emails',
+        },
+      },
+    },
+    contactId: { type: 'string', description: 'ID of the created contact' },
+  },
+}
diff --git a/apps/sim/tools/intercom/create_message.ts b/apps/sim/tools/intercom/create_message.ts
index 1dc5de9383..2cea1ce073 100644
--- a/apps/sim/tools/intercom/create_message.ts
+++ b/apps/sim/tools/intercom/create_message.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildIntercomUrl, handleIntercomError } from './types'
 
-const logger = createLogger('IntercomCreateMessage')
-
 export interface IntercomCreateMessageParams {
   accessToken: string
   message_type: 'inapp' | 'email'
@@ -29,15 +26,16 @@ export interface IntercomCreateMessageResponse {
   }
 }
 
-export const intercomCreateMessageTool: ToolConfig<
-  IntercomCreateMessageParams,
-  IntercomCreateMessageResponse
-> = {
-  id: 'intercom_create_message',
-  name: 'Create Message in Intercom',
-  description: 'Create and send a new admin-initiated message in Intercom',
-  version: '1.0.0',
+export interface IntercomCreateMessageV2Response {
+  success: boolean
+  output: {
+    message: any
+    messageId: string
+    success: boolean
+  }
+}
 
+const createMessageBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -102,16 +100,15 @@ export const intercomCreateMessageTool: ToolConfig<
         'Unix timestamp for when the message was created. If not provided, current time is used.',
     },
   },
-
   request: {
     url: () => buildIntercomUrl('/messages'),
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: IntercomCreateMessageParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
-    body: (params) => {
+    body: (params: IntercomCreateMessageParams) => {
       // Map "inapp" to "in_app" as required by Intercom API
       const apiMessageType = params.message_type === 'inapp' ? 'in_app' : params.message_type
 
@@ -138,6 +135,18 @@ export const intercomCreateMessageTool: ToolConfig<
       return message
     },
   },
+} satisfies Pick<ToolConfig<IntercomCreateMessageParams, any>, 'params' | 'request'>
+
+export const intercomCreateMessageTool: ToolConfig<
+  IntercomCreateMessageParams,
+  IntercomCreateMessageResponse
+> = {
+  id: 'intercom_create_message',
+  name: 'Create Message in Intercom',
+  description: 'Create and send a new admin-initiated message in Intercom',
+  version: '1.0.0',
+
+  ...createMessageBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -185,3 +194,51 @@ export const intercomCreateMessageTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+export const intercomCreateMessageV2Tool: ToolConfig<
+  IntercomCreateMessageParams,
+  IntercomCreateMessageV2Response
+> = {
+  ...createMessageBase,
+  id: 'intercom_create_message_v2',
+  name: 'Create Message in Intercom',
+  description:
+    'Create and send a new admin-initiated message in Intercom. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'create_message')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        message: data,
+        messageId: data.id,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    message: {
+      type: 'object',
+      description: 'Created message object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the message' },
+        type: { type: 'string', description: 'Object type (message)' },
+        created_at: { type: 'number', description: 'Unix timestamp when message was created' },
+        body: { type: 'string', description: 'Body of the message' },
+        message_type: { type: 'string', description: 'Type of the message (in_app or email)' },
+        conversation_id: { type: 'string', description: 'ID of the conversation created' },
+        owner: { type: 'object', description: 'Owner of the message' },
+      },
+    },
+    messageId: { type: 'string', description: 'ID of the created message' },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/create_ticket.ts b/apps/sim/tools/intercom/create_ticket.ts
index 809472ce06..34fae4838d 100644
--- a/apps/sim/tools/intercom/create_ticket.ts
+++ b/apps/sim/tools/intercom/create_ticket.ts
@@ -27,15 +27,16 @@ export interface IntercomCreateTicketResponse {
   }
 }
 
-export const intercomCreateTicketTool: ToolConfig<
-  IntercomCreateTicketParams,
-  IntercomCreateTicketResponse
-> = {
-  id: 'intercom_create_ticket',
-  name: 'Create Ticket in Intercom',
-  description: 'Create a new ticket in Intercom',
-  version: '1.0.0',
+export interface IntercomCreateTicketV2Response {
+  success: boolean
+  output: {
+    ticket: any
+    ticketId: string
+    success: boolean
+  }
+}
 
+const createTicketBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -88,16 +89,15 @@ export const intercomCreateTicketTool: ToolConfig<
       description: 'When true, suppresses notifications when the ticket is created',
     },
   },
-
   request: {
     url: () => buildIntercomUrl('/tickets'),
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: IntercomCreateTicketParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
-    body: (params) => {
+    body: (params: IntercomCreateTicketParams) => {
       const ticket: any = {
         ticket_type_id: params.ticket_type_id,
       }
@@ -126,6 +126,18 @@ export const intercomCreateTicketTool: ToolConfig<
       return ticket
     },
   },
+} satisfies Pick<ToolConfig<IntercomCreateTicketParams, any>, 'params' | 'request'>
+
+export const intercomCreateTicketTool: ToolConfig<
+  IntercomCreateTicketParams,
+  IntercomCreateTicketResponse
+> = {
+  id: 'intercom_create_ticket',
+  name: 'Create Ticket in Intercom',
+  description: 'Create a new ticket in Intercom',
+  version: '1.0.0',
+
+  ...createTicketBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -156,7 +168,7 @@ export const intercomCreateTicketTool: ToolConfig<
         id: { type: 'string', description: 'Unique identifier for the ticket' },
         type: { type: 'string', description: 'Object type (ticket)' },
         ticket_id: { type: 'string', description: 'Ticket ID' },
-        ticket_type: { type: 'object', description: 'Type of the ticket' },
+        ticket_type: { type: 'object', description: 'Type of the ticket', optional: true },
         ticket_attributes: { type: 'object', description: 'Attributes of the ticket' },
         ticket_state: { type: 'string', description: 'State of the ticket' },
         ticket_state_internal_label: {
@@ -187,3 +199,64 @@ export const intercomCreateTicketTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+export const intercomCreateTicketV2Tool: ToolConfig<
+  IntercomCreateTicketParams,
+  IntercomCreateTicketV2Response
+> = {
+  ...createTicketBase,
+  id: 'intercom_create_ticket_v2',
+  name: 'Create Ticket in Intercom',
+  description: 'Create a new ticket in Intercom. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'create_ticket')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        ticket: data,
+        ticketId: data.id,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    ticket: {
+      type: 'object',
+      description: 'Created ticket object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the ticket' },
+        type: { type: 'string', description: 'Object type (ticket)' },
+        ticket_id: { type: 'string', description: 'Ticket ID' },
+        ticket_type: { type: 'object', description: 'Type of the ticket', optional: true },
+        ticket_attributes: { type: 'object', description: 'Attributes of the ticket' },
+        ticket_state: { type: 'string', description: 'State of the ticket' },
+        ticket_state_internal_label: {
+          type: 'string',
+          description: 'Internal label for ticket state',
+        },
+        ticket_state_external_label: {
+          type: 'string',
+          description: 'External label for ticket state',
+        },
+        created_at: { type: 'number', description: 'Unix timestamp when ticket was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when ticket was last updated' },
+        contacts: { type: 'object', description: 'Contacts associated with the ticket' },
+        admin_assignee_id: { type: 'string', description: 'ID of assigned admin' },
+        team_assignee_id: { type: 'string', description: 'ID of assigned team' },
+        is_shared: { type: 'boolean', description: 'Whether the ticket is shared' },
+        open: { type: 'boolean', description: 'Whether the ticket is open' },
+      },
+    },
+    ticketId: { type: 'string', description: 'ID of the created ticket' },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/delete_contact.ts b/apps/sim/tools/intercom/delete_contact.ts
index b1658f78cb..5b5bd94328 100644
--- a/apps/sim/tools/intercom/delete_contact.ts
+++ b/apps/sim/tools/intercom/delete_contact.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildIntercomUrl, handleIntercomError } from './types'
 
-const logger = createLogger('IntercomDeleteContact')
-
 export interface IntercomDeleteContactParams {
   accessToken: string
   contactId: string
@@ -21,15 +18,7 @@ export interface IntercomDeleteContactResponse {
   }
 }
 
-export const intercomDeleteContactTool: ToolConfig<
-  IntercomDeleteContactParams,
-  IntercomDeleteContactResponse
-> = {
-  id: 'intercom_delete_contact',
-  name: 'Delete Contact from Intercom',
-  description: 'Delete a contact from Intercom by ID',
-  version: '1.0.0',
-
+const intercomDeleteContactBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -46,14 +35,26 @@ export const intercomDeleteContactTool: ToolConfig<
   },
 
   request: {
-    url: (params) => buildIntercomUrl(`/contacts/${params.contactId}`),
+    url: (params: IntercomDeleteContactParams) => buildIntercomUrl(`/contacts/${params.contactId}`),
     method: 'DELETE',
-    headers: (params) => ({
+    headers: (params: IntercomDeleteContactParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
   },
+} satisfies Pick<ToolConfig<IntercomDeleteContactParams, any>, 'params' | 'request'>
+
+export const intercomDeleteContactTool: ToolConfig<
+  IntercomDeleteContactParams,
+  IntercomDeleteContactResponse
+> = {
+  id: 'intercom_delete_contact',
+  name: 'Delete Contact from Intercom',
+  description: 'Delete a contact from Intercom by ID',
+  version: '1.0.0',
+
+  ...intercomDeleteContactBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -89,3 +90,44 @@ export const intercomDeleteContactTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomDeleteContactV2Response {
+  success: boolean
+  output: {
+    id: string
+    deleted: boolean
+  }
+}
+
+export const intercomDeleteContactV2Tool: ToolConfig<
+  IntercomDeleteContactParams,
+  IntercomDeleteContactV2Response
+> = {
+  ...intercomDeleteContactBase,
+  id: 'intercom_delete_contact_v2',
+  name: 'Delete Contact from Intercom',
+  description: 'Delete a contact from Intercom by ID. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'delete_contact')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        deleted: true,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'ID of deleted contact' },
+    deleted: { type: 'boolean', description: 'Whether the contact was deleted' },
+  },
+}
diff --git a/apps/sim/tools/intercom/get_company.ts b/apps/sim/tools/intercom/get_company.ts
index 71dee66fa9..ae311a0742 100644
--- a/apps/sim/tools/intercom/get_company.ts
+++ b/apps/sim/tools/intercom/get_company.ts
@@ -20,15 +20,7 @@ export interface IntercomGetCompanyResponse {
   }
 }
 
-export const intercomGetCompanyTool: ToolConfig<
-  IntercomGetCompanyParams,
-  IntercomGetCompanyResponse
-> = {
-  id: 'intercom_get_company',
-  name: 'Get Company from Intercom',
-  description: 'Retrieve a single company by ID from Intercom',
-  version: '1.0.0',
-
+const getCompanyBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -45,15 +37,27 @@ export const intercomGetCompanyTool: ToolConfig<
   },
 
   request: {
-    url: (params) => buildIntercomUrl(`/companies/${params.companyId}`),
+    url: (params: IntercomGetCompanyParams) => buildIntercomUrl(`/companies/${params.companyId}`),
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: IntercomGetCompanyParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
   },
+} satisfies Pick<ToolConfig<IntercomGetCompanyParams, any>, 'params' | 'request'>
+
+export const intercomGetCompanyTool: ToolConfig<
+  IntercomGetCompanyParams,
+  IntercomGetCompanyResponse
+> = {
+  id: 'intercom_get_company',
+  name: 'Get Company from Intercom',
+  description: 'Retrieve a single company by ID from Intercom',
+  version: '1.0.0',
+
+  ...getCompanyBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -109,3 +113,63 @@ export const intercomGetCompanyTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomGetCompanyV2Response {
+  success: boolean
+  output: {
+    company: any
+  }
+}
+
+export const intercomGetCompanyV2Tool: ToolConfig<
+  IntercomGetCompanyParams,
+  IntercomGetCompanyV2Response
+> = {
+  ...getCompanyBase,
+  id: 'intercom_get_company_v2',
+  name: 'Get Company from Intercom',
+  description: 'Retrieve a single company by ID from Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'get_company')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        company: data,
+      },
+    }
+  },
+
+  outputs: {
+    company: {
+      type: 'object',
+      description: 'Company object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the company' },
+        type: { type: 'string', description: 'Object type (company)' },
+        app_id: { type: 'string', description: 'Intercom app ID' },
+        company_id: { type: 'string', description: 'Your unique identifier for the company' },
+        name: { type: 'string', description: 'Name of the company' },
+        website: { type: 'string', description: 'Company website URL' },
+        plan: { type: 'object', description: 'Company plan information' },
+        size: { type: 'number', description: 'Number of employees' },
+        industry: { type: 'string', description: 'Industry the company operates in' },
+        monthly_spend: { type: 'number', description: 'Monthly revenue from this company' },
+        session_count: { type: 'number', description: 'Number of sessions' },
+        user_count: { type: 'number', description: 'Number of users in the company' },
+        created_at: { type: 'number', description: 'Unix timestamp when company was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when company was last updated' },
+        custom_attributes: { type: 'object', description: 'Custom attributes set on the company' },
+        tags: { type: 'object', description: 'Tags associated with the company' },
+        segments: { type: 'object', description: 'Segments the company belongs to' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/intercom/get_contact.ts b/apps/sim/tools/intercom/get_contact.ts
index 7fcb5efe8c..bcba2d892b 100644
--- a/apps/sim/tools/intercom/get_contact.ts
+++ b/apps/sim/tools/intercom/get_contact.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildIntercomUrl, handleIntercomError } from './types'
 
-const logger = createLogger('IntercomGetContact')
-
 export interface IntercomGetContactParams {
   accessToken: string
   contactId: string
@@ -20,15 +17,7 @@ export interface IntercomGetContactResponse {
   }
 }
 
-export const intercomGetContactTool: ToolConfig<
-  IntercomGetContactParams,
-  IntercomGetContactResponse
-> = {
-  id: 'intercom_get_contact',
-  name: 'Get Single Contact from Intercom',
-  description: 'Get a single contact by ID from Intercom',
-  version: '1.0.0',
-
+const intercomGetContactBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -45,15 +34,27 @@ export const intercomGetContactTool: ToolConfig<
   },
 
   request: {
-    url: (params) => buildIntercomUrl(`/contacts/${params.contactId}`),
+    url: (params: IntercomGetContactParams) => buildIntercomUrl(`/contacts/${params.contactId}`),
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: IntercomGetContactParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
   },
+} satisfies Pick<ToolConfig<IntercomGetContactParams, any>, 'params' | 'request'>
+
+export const intercomGetContactTool: ToolConfig<
+  IntercomGetContactParams,
+  IntercomGetContactResponse
+> = {
+  id: 'intercom_get_contact',
+  name: 'Get Single Contact from Intercom',
+  description: 'Get a single contact by ID from Intercom',
+  version: '1.0.0',
+
+  ...intercomGetContactBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -83,12 +84,20 @@ export const intercomGetContactTool: ToolConfig<
         id: { type: 'string', description: 'Unique identifier for the contact' },
         type: { type: 'string', description: 'Object type (contact)' },
         role: { type: 'string', description: 'Role of the contact (user or lead)' },
-        email: { type: 'string', description: 'Email address of the contact' },
-        phone: { type: 'string', description: 'Phone number of the contact' },
-        name: { type: 'string', description: 'Name of the contact' },
-        avatar: { type: 'string', description: 'Avatar URL of the contact' },
-        owner_id: { type: 'string', description: 'ID of the admin assigned to this contact' },
-        external_id: { type: 'string', description: 'External identifier for the contact' },
+        email: { type: 'string', description: 'Email address of the contact', optional: true },
+        phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+        name: { type: 'string', description: 'Name of the contact', optional: true },
+        avatar: { type: 'string', description: 'Avatar URL of the contact', optional: true },
+        owner_id: {
+          type: 'string',
+          description: 'ID of the admin assigned to this contact',
+          optional: true,
+        },
+        external_id: {
+          type: 'string',
+          description: 'External identifier for the contact',
+          optional: true,
+        },
         created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
         updated_at: { type: 'number', description: 'Unix timestamp when contact was last updated' },
         workspace_id: { type: 'string', description: 'Workspace ID the contact belongs to' },
@@ -114,3 +123,76 @@ export const intercomGetContactTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomGetContactV2Response {
+  success: boolean
+  output: {
+    contact: any
+  }
+}
+
+export const intercomGetContactV2Tool: ToolConfig<
+  IntercomGetContactParams,
+  IntercomGetContactV2Response
+> = {
+  ...intercomGetContactBase,
+  id: 'intercom_get_contact_v2',
+  name: 'Get Single Contact from Intercom',
+  description: 'Get a single contact by ID from Intercom. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'get_contact')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        contact: data,
+      },
+    }
+  },
+
+  outputs: {
+    contact: {
+      type: 'object',
+      description: 'Contact object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the contact' },
+        type: { type: 'string', description: 'Object type (contact)' },
+        role: { type: 'string', description: 'Role of the contact (user or lead)' },
+        email: { type: 'string', description: 'Email address of the contact', optional: true },
+        phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+        name: { type: 'string', description: 'Name of the contact', optional: true },
+        avatar: { type: 'string', description: 'Avatar URL of the contact', optional: true },
+        owner_id: {
+          type: 'string',
+          description: 'ID of the admin assigned to this contact',
+          optional: true,
+        },
+        external_id: {
+          type: 'string',
+          description: 'External identifier for the contact',
+          optional: true,
+        },
+        created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when contact was last updated' },
+        workspace_id: { type: 'string', description: 'Workspace ID the contact belongs to' },
+        custom_attributes: { type: 'object', description: 'Custom attributes set on the contact' },
+        tags: { type: 'object', description: 'Tags associated with the contact' },
+        notes: { type: 'object', description: 'Notes associated with the contact' },
+        companies: { type: 'object', description: 'Companies associated with the contact' },
+        location: { type: 'object', description: 'Location information for the contact' },
+        social_profiles: { type: 'object', description: 'Social profiles of the contact' },
+        unsubscribed_from_emails: {
+          type: 'boolean',
+          description: 'Whether contact is unsubscribed from emails',
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/intercom/get_conversation.ts b/apps/sim/tools/intercom/get_conversation.ts
index ac15cea8d7..b5f708fd91 100644
--- a/apps/sim/tools/intercom/get_conversation.ts
+++ b/apps/sim/tools/intercom/get_conversation.ts
@@ -22,15 +22,7 @@ export interface IntercomGetConversationResponse {
   }
 }
 
-export const intercomGetConversationTool: ToolConfig<
-  IntercomGetConversationParams,
-  IntercomGetConversationResponse
-> = {
-  id: 'intercom_get_conversation',
-  name: 'Get Conversation from Intercom',
-  description: 'Retrieve a single conversation by ID from Intercom',
-  version: '1.0.0',
-
+const getConversationBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -58,9 +50,8 @@ export const intercomGetConversationTool: ToolConfig<
         'When true, conversation parts will be translated to the detected language of the conversation',
     },
   },
-
   request: {
-    url: (params) => {
+    url: (params: IntercomGetConversationParams) => {
       const url = buildIntercomUrl(`/conversations/${params.conversationId}`)
       const queryParams = new URLSearchParams()
 
@@ -72,13 +63,25 @@ export const intercomGetConversationTool: ToolConfig<
       return queryString ? `${url}?${queryString}` : url
     },
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: IntercomGetConversationParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
   },
+} satisfies Pick<ToolConfig<IntercomGetConversationParams, any>, 'params' | 'request'>
+
+export const intercomGetConversationTool: ToolConfig<
+  IntercomGetConversationParams,
+  IntercomGetConversationResponse
+> = {
+  id: 'intercom_get_conversation',
+  name: 'Get Conversation from Intercom',
+  description: 'Retrieve a single conversation by ID from Intercom',
+  version: '1.0.0',
+
+  ...getConversationBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -107,20 +110,28 @@ export const intercomGetConversationTool: ToolConfig<
       properties: {
         id: { type: 'string', description: 'Unique identifier for the conversation' },
         type: { type: 'string', description: 'Object type (conversation)' },
-        title: { type: 'string', description: 'Title of the conversation' },
+        title: { type: 'string', description: 'Title of the conversation', optional: true },
         created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
         updated_at: {
           type: 'number',
           description: 'Unix timestamp when conversation was last updated',
         },
-        waiting_since: { type: 'number', description: 'Unix timestamp when waiting for reply' },
-        snoozed_until: { type: 'number', description: 'Unix timestamp when snooze ends' },
+        waiting_since: {
+          type: 'number',
+          description: 'Unix timestamp when waiting for reply',
+          optional: true,
+        },
+        snoozed_until: {
+          type: 'number',
+          description: 'Unix timestamp when snooze ends',
+          optional: true,
+        },
         open: { type: 'boolean', description: 'Whether the conversation is open' },
         state: { type: 'string', description: 'State of the conversation' },
         read: { type: 'boolean', description: 'Whether the conversation has been read' },
         priority: { type: 'string', description: 'Priority of the conversation' },
-        admin_assignee_id: { type: 'number', description: 'ID of assigned admin' },
-        team_assignee_id: { type: 'string', description: 'ID of assigned team' },
+        admin_assignee_id: { type: 'number', description: 'ID of assigned admin', optional: true },
+        team_assignee_id: { type: 'string', description: 'ID of assigned team', optional: true },
         tags: { type: 'object', description: 'Tags on the conversation' },
         source: { type: 'object', description: 'Source of the conversation' },
         contacts: { type: 'object', description: 'Contacts in the conversation' },
@@ -139,3 +150,79 @@ export const intercomGetConversationTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomGetConversationV2Response {
+  success: boolean
+  output: {
+    conversation: any
+    success: boolean
+  }
+}
+
+export const intercomGetConversationV2Tool: ToolConfig<
+  IntercomGetConversationParams,
+  IntercomGetConversationV2Response
+> = {
+  ...getConversationBase,
+  id: 'intercom_get_conversation_v2',
+  name: 'Get Conversation from Intercom',
+  description: 'Retrieve a single conversation by ID from Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'get_conversation')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversation: data,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    conversation: {
+      type: 'object',
+      description: 'Conversation object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the conversation' },
+        type: { type: 'string', description: 'Object type (conversation)' },
+        title: { type: 'string', description: 'Title of the conversation', optional: true },
+        created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
+        updated_at: {
+          type: 'number',
+          description: 'Unix timestamp when conversation was last updated',
+        },
+        waiting_since: {
+          type: 'number',
+          description: 'Unix timestamp when waiting for reply',
+          optional: true,
+        },
+        snoozed_until: {
+          type: 'number',
+          description: 'Unix timestamp when snooze ends',
+          optional: true,
+        },
+        open: { type: 'boolean', description: 'Whether the conversation is open' },
+        state: { type: 'string', description: 'State of the conversation' },
+        read: { type: 'boolean', description: 'Whether the conversation has been read' },
+        priority: { type: 'string', description: 'Priority of the conversation' },
+        admin_assignee_id: { type: 'number', description: 'ID of assigned admin', optional: true },
+        team_assignee_id: { type: 'string', description: 'ID of assigned team', optional: true },
+        tags: { type: 'object', description: 'Tags on the conversation' },
+        source: { type: 'object', description: 'Source of the conversation' },
+        contacts: { type: 'object', description: 'Contacts in the conversation' },
+        teammates: { type: 'object', description: 'Teammates in the conversation' },
+        conversation_parts: { type: 'object', description: 'Parts of the conversation' },
+        statistics: { type: 'object', description: 'Conversation statistics' },
+      },
+    },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/get_ticket.ts b/apps/sim/tools/intercom/get_ticket.ts
index b056b94844..da111a6bf1 100644
--- a/apps/sim/tools/intercom/get_ticket.ts
+++ b/apps/sim/tools/intercom/get_ticket.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildIntercomUrl, handleIntercomError } from './types'
 
-const logger = createLogger('IntercomGetTicket')
-
 export interface IntercomGetTicketParams {
   accessToken: string
   ticketId: string
@@ -20,6 +17,42 @@ export interface IntercomGetTicketResponse {
   }
 }
 
+export interface IntercomGetTicketV2Response {
+  success: boolean
+  output: {
+    ticket: any
+    ticketId: string
+    success: boolean
+  }
+}
+
+const getTicketBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'Intercom API access token',
+    },
+    ticketId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Ticket ID to retrieve',
+    },
+  },
+  request: {
+    url: (params: IntercomGetTicketParams) => buildIntercomUrl(`/tickets/${params.ticketId}`),
+    method: 'GET',
+    headers: (params: IntercomGetTicketParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomGetTicketParams, any>, 'params' | 'request'>
+
 export const intercomGetTicketTool: ToolConfig<IntercomGetTicketParams, IntercomGetTicketResponse> =
   {
     id: 'intercom_get_ticket',
@@ -27,31 +60,7 @@ export const intercomGetTicketTool: ToolConfig<IntercomGetTicketParams, Intercom
     description: 'Retrieve a single ticket by ID from Intercom',
     version: '1.0.0',
 
-    params: {
-      accessToken: {
-        type: 'string',
-        required: true,
-        visibility: 'hidden',
-        description: 'Intercom API access token',
-      },
-      ticketId: {
-        type: 'string',
-        required: true,
-        visibility: 'user-or-llm',
-        description: 'Ticket ID to retrieve',
-      },
-    },
-
-    request: {
-      url: (params) => buildIntercomUrl(`/tickets/${params.ticketId}`),
-      method: 'GET',
-      headers: (params) => ({
-        Authorization: `Bearer ${params.accessToken}`,
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-        'Intercom-Version': '2.14',
-      }),
-    },
+    ...getTicketBase,
 
     transformResponse: async (response: Response) => {
       if (!response.ok) {
@@ -81,7 +90,7 @@ export const intercomGetTicketTool: ToolConfig<IntercomGetTicketParams, Intercom
           id: { type: 'string', description: 'Unique identifier for the ticket' },
           type: { type: 'string', description: 'Object type (ticket)' },
           ticket_id: { type: 'string', description: 'Ticket ID' },
-          ticket_type: { type: 'object', description: 'Type of the ticket' },
+          ticket_type: { type: 'object', description: 'Type of the ticket', optional: true },
           ticket_attributes: { type: 'object', description: 'Attributes of the ticket' },
           ticket_state: { type: 'string', description: 'State of the ticket' },
           ticket_state_internal_label: {
@@ -114,3 +123,67 @@ export const intercomGetTicketTool: ToolConfig<IntercomGetTicketParams, Intercom
       success: { type: 'boolean', description: 'Operation success status' },
     },
   }
+
+export const intercomGetTicketV2Tool: ToolConfig<
+  IntercomGetTicketParams,
+  IntercomGetTicketV2Response
+> = {
+  ...getTicketBase,
+  id: 'intercom_get_ticket_v2',
+  name: 'Get Ticket from Intercom',
+  description: 'Retrieve a single ticket by ID from Intercom. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'get_ticket')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        ticket: data,
+        ticketId: data.id,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    ticket: {
+      type: 'object',
+      description: 'Ticket object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the ticket' },
+        type: { type: 'string', description: 'Object type (ticket)' },
+        ticket_id: { type: 'string', description: 'Ticket ID' },
+        ticket_type: { type: 'object', description: 'Type of the ticket', optional: true },
+        ticket_attributes: { type: 'object', description: 'Attributes of the ticket' },
+        ticket_state: { type: 'string', description: 'State of the ticket' },
+        ticket_state_internal_label: {
+          type: 'string',
+          description: 'Internal label for ticket state',
+        },
+        ticket_state_external_label: {
+          type: 'string',
+          description: 'External label for ticket state',
+        },
+        created_at: { type: 'number', description: 'Unix timestamp when ticket was created' },
+        updated_at: {
+          type: 'number',
+          description: 'Unix timestamp when ticket was last updated',
+        },
+        contacts: { type: 'object', description: 'Contacts associated with the ticket' },
+        admin_assignee_id: { type: 'string', description: 'ID of assigned admin' },
+        team_assignee_id: { type: 'string', description: 'ID of assigned team' },
+        is_shared: { type: 'boolean', description: 'Whether the ticket is shared' },
+        open: { type: 'boolean', description: 'Whether the ticket is open' },
+      },
+    },
+    ticketId: { type: 'string', description: 'ID of the retrieved ticket' },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/index.ts b/apps/sim/tools/intercom/index.ts
index dab0671ba9..626c93cfff 100644
--- a/apps/sim/tools/intercom/index.ts
+++ b/apps/sim/tools/intercom/index.ts
@@ -1,22 +1,31 @@
 // Contact tools
 
 // Company tools
-export { intercomCreateCompanyTool } from './create_company'
-export { intercomCreateContactTool } from './create_contact'
+export { intercomCreateCompanyTool, intercomCreateCompanyV2Tool } from './create_company'
+export { intercomCreateContactTool, intercomCreateContactV2Tool } from './create_contact'
 // Message tools
-export { intercomCreateMessageTool } from './create_message'
+export { intercomCreateMessageTool, intercomCreateMessageV2Tool } from './create_message'
 // Ticket tools
-export { intercomCreateTicketTool } from './create_ticket'
-export { intercomDeleteContactTool } from './delete_contact'
-export { intercomGetCompanyTool } from './get_company'
-export { intercomGetContactTool } from './get_contact'
+export { intercomCreateTicketTool, intercomCreateTicketV2Tool } from './create_ticket'
+export { intercomDeleteContactTool, intercomDeleteContactV2Tool } from './delete_contact'
+export { intercomGetCompanyTool, intercomGetCompanyV2Tool } from './get_company'
+export { intercomGetContactTool, intercomGetContactV2Tool } from './get_contact'
 // Conversation tools
-export { intercomGetConversationTool } from './get_conversation'
-export { intercomGetTicketTool } from './get_ticket'
-export { intercomListCompaniesTool } from './list_companies'
-export { intercomListContactsTool } from './list_contacts'
-export { intercomListConversationsTool } from './list_conversations'
-export { intercomReplyConversationTool } from './reply_conversation'
-export { intercomSearchContactsTool } from './search_contacts'
-export { intercomSearchConversationsTool } from './search_conversations'
-export { intercomUpdateContactTool } from './update_contact'
+export { intercomGetConversationTool, intercomGetConversationV2Tool } from './get_conversation'
+export { intercomGetTicketTool, intercomGetTicketV2Tool } from './get_ticket'
+export { intercomListCompaniesTool, intercomListCompaniesV2Tool } from './list_companies'
+export { intercomListContactsTool, intercomListContactsV2Tool } from './list_contacts'
+export {
+  intercomListConversationsTool,
+  intercomListConversationsV2Tool,
+} from './list_conversations'
+export {
+  intercomReplyConversationTool,
+  intercomReplyConversationV2Tool,
+} from './reply_conversation'
+export { intercomSearchContactsTool, intercomSearchContactsV2Tool } from './search_contacts'
+export {
+  intercomSearchConversationsTool,
+  intercomSearchConversationsV2Tool,
+} from './search_conversations'
+export { intercomUpdateContactTool, intercomUpdateContactV2Tool } from './update_contact'
diff --git a/apps/sim/tools/intercom/list_companies.ts b/apps/sim/tools/intercom/list_companies.ts
index fc76c093b5..d06030405d 100644
--- a/apps/sim/tools/intercom/list_companies.ts
+++ b/apps/sim/tools/intercom/list_companies.ts
@@ -24,16 +24,7 @@ export interface IntercomListCompaniesResponse {
   }
 }
 
-export const intercomListCompaniesTool: ToolConfig<
-  IntercomListCompaniesParams,
-  IntercomListCompaniesResponse
-> = {
-  id: 'intercom_list_companies',
-  name: 'List Companies from Intercom',
-  description:
-    'List all companies from Intercom with pagination support. Note: This endpoint has a limit of 10,000 companies that can be returned using pagination. For datasets larger than 10,000 companies, use the Scroll API instead.',
-  version: '1.0.0',
-
+const listCompaniesBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -60,9 +51,8 @@ export const intercomListCompaniesTool: ToolConfig<
       description: 'Cursor for pagination (preferred over page-based pagination)',
     },
   },
-
   request: {
-    url: (params) => {
+    url: (params: IntercomListCompaniesParams) => {
       const url = buildIntercomUrl('/companies/list')
       const queryParams = new URLSearchParams()
 
@@ -74,13 +64,26 @@ export const intercomListCompaniesTool: ToolConfig<
       return queryString ? `${url}?${queryString}` : url
     },
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: IntercomListCompaniesParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
   },
+} satisfies Pick<ToolConfig<IntercomListCompaniesParams, any>, 'params' | 'request'>
+
+export const intercomListCompaniesTool: ToolConfig<
+  IntercomListCompaniesParams,
+  IntercomListCompaniesResponse
+> = {
+  id: 'intercom_list_companies',
+  name: 'List Companies from Intercom',
+  description:
+    'List all companies from Intercom with pagination support. Note: This endpoint has a limit of 10,000 companies that can be returned using pagination. For datasets larger than 10,000 companies, use the Scroll API instead.',
+  version: '1.0.0',
+
+  ...listCompaniesBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -156,3 +159,89 @@ export const intercomListCompaniesTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomListCompaniesV2Response {
+  success: boolean
+  output: {
+    companies: any[]
+    pages?: any
+    total_count?: number
+    success: boolean
+  }
+}
+
+export const intercomListCompaniesV2Tool: ToolConfig<
+  IntercomListCompaniesParams,
+  IntercomListCompaniesV2Response
+> = {
+  ...listCompaniesBase,
+  id: 'intercom_list_companies_v2',
+  name: 'List Companies from Intercom',
+  description:
+    'List all companies from Intercom with pagination support. Note: This endpoint has a limit of 10,000 companies that can be returned using pagination. For datasets larger than 10,000 companies, use the Scroll API instead.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'list_companies')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        companies: data.data || data.companies || [],
+        pages: data.pages,
+        total_count: data.total_count,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    companies: {
+      type: 'array',
+      description: 'Array of company objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique identifier for the company' },
+          type: { type: 'string', description: 'Object type (company)' },
+          app_id: { type: 'string', description: 'Intercom app ID' },
+          company_id: { type: 'string', description: 'Your unique identifier for the company' },
+          name: { type: 'string', description: 'Name of the company' },
+          website: { type: 'string', description: 'Company website URL' },
+          plan: { type: 'object', description: 'Company plan information' },
+          monthly_spend: { type: 'number', description: 'Monthly revenue from this company' },
+          session_count: { type: 'number', description: 'Number of sessions' },
+          user_count: { type: 'number', description: 'Number of users in the company' },
+          created_at: { type: 'number', description: 'Unix timestamp when company was created' },
+          updated_at: {
+            type: 'number',
+            description: 'Unix timestamp when company was last updated',
+          },
+          custom_attributes: {
+            type: 'object',
+            description: 'Custom attributes set on the company',
+          },
+          tags: { type: 'object', description: 'Tags associated with the company' },
+          segments: { type: 'object', description: 'Segments the company belongs to' },
+        },
+      },
+    },
+    pages: {
+      type: 'object',
+      description: 'Pagination information',
+      properties: {
+        type: { type: 'string', description: 'Pages type identifier' },
+        page: { type: 'number', description: 'Current page number' },
+        per_page: { type: 'number', description: 'Number of results per page' },
+        total_pages: { type: 'number', description: 'Total number of pages' },
+      },
+    },
+    total_count: { type: 'number', description: 'Total number of companies' },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/list_contacts.ts b/apps/sim/tools/intercom/list_contacts.ts
index db8abf41aa..44d7b5c06f 100644
--- a/apps/sim/tools/intercom/list_contacts.ts
+++ b/apps/sim/tools/intercom/list_contacts.ts
@@ -23,15 +23,7 @@ export interface IntercomListContactsResponse {
   }
 }
 
-export const intercomListContactsTool: ToolConfig<
-  IntercomListContactsParams,
-  IntercomListContactsResponse
-> = {
-  id: 'intercom_list_contacts',
-  name: 'List Contacts from Intercom',
-  description: 'List all contacts from Intercom with pagination support',
-  version: '1.0.0',
-
+const listContactsBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -54,7 +46,7 @@ export const intercomListContactsTool: ToolConfig<
   },
 
   request: {
-    url: (params) => {
+    url: (params: IntercomListContactsParams) => {
       const url = buildIntercomUrl('/contacts')
       const queryParams = new URLSearchParams()
 
@@ -65,13 +57,25 @@ export const intercomListContactsTool: ToolConfig<
       return queryString ? `${url}?${queryString}` : url
     },
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: IntercomListContactsParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
   },
+} satisfies Pick<ToolConfig<IntercomListContactsParams, any>, 'params' | 'request'>
+
+export const intercomListContactsTool: ToolConfig<
+  IntercomListContactsParams,
+  IntercomListContactsResponse
+> = {
+  id: 'intercom_list_contacts',
+  name: 'List Contacts from Intercom',
+  description: 'List all contacts from Intercom with pagination support',
+  version: '1.0.0',
+
+  ...listContactsBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -145,3 +149,89 @@ export const intercomListContactsTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomListContactsV2Response {
+  success: boolean
+  output: {
+    contacts: any[]
+    pages?: any
+    total_count?: number
+  }
+}
+
+export const intercomListContactsV2Tool: ToolConfig<
+  IntercomListContactsParams,
+  IntercomListContactsV2Response
+> = {
+  ...listContactsBase,
+  id: 'intercom_list_contacts_v2',
+  name: 'List Contacts from Intercom',
+  description: 'List all contacts from Intercom with pagination support',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'list_contacts')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        contacts: data.data ?? null,
+        pages: data.pages ?? null,
+        total_count: data.total_count ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    contacts: {
+      type: 'array',
+      description: 'Array of contact objects',
+      optional: true,
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique identifier for the contact' },
+          type: { type: 'string', description: 'Object type (contact)' },
+          role: { type: 'string', description: 'Role of the contact (user or lead)' },
+          email: { type: 'string', description: 'Email address of the contact', optional: true },
+          phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+          name: { type: 'string', description: 'Name of the contact', optional: true },
+          external_id: {
+            type: 'string',
+            description: 'External identifier for the contact',
+            optional: true,
+          },
+          created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
+          updated_at: {
+            type: 'number',
+            description: 'Unix timestamp when contact was last updated',
+          },
+          workspace_id: { type: 'string', description: 'Workspace ID the contact belongs to' },
+          custom_attributes: {
+            type: 'object',
+            description: 'Custom attributes set on the contact',
+          },
+          tags: { type: 'object', description: 'Tags associated with the contact', optional: true },
+          companies: { type: 'object', description: 'Companies associated with the contact' },
+        },
+      },
+    },
+    pages: {
+      type: 'object',
+      description: 'Pagination information',
+      optional: true,
+      properties: {
+        type: { type: 'string', description: 'Pages type identifier' },
+        page: { type: 'number', description: 'Current page number' },
+        per_page: { type: 'number', description: 'Number of results per page' },
+        total_pages: { type: 'number', description: 'Total number of pages' },
+      },
+    },
+    total_count: { type: 'number', description: 'Total number of contacts', optional: true },
+  },
+}
diff --git a/apps/sim/tools/intercom/list_conversations.ts b/apps/sim/tools/intercom/list_conversations.ts
index 51056fad6d..50542515de 100644
--- a/apps/sim/tools/intercom/list_conversations.ts
+++ b/apps/sim/tools/intercom/list_conversations.ts
@@ -25,15 +25,7 @@ export interface IntercomListConversationsResponse {
   }
 }
 
-export const intercomListConversationsTool: ToolConfig<
-  IntercomListConversationsParams,
-  IntercomListConversationsResponse
-> = {
-  id: 'intercom_list_conversations',
-  name: 'List Conversations from Intercom',
-  description: 'List all conversations from Intercom with pagination support',
-  version: '1.0.0',
-
+const listConversationsBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -66,9 +58,8 @@ export const intercomListConversationsTool: ToolConfig<
       description: 'Sort order: "asc" (ascending) or "desc" (descending)',
     },
   },
-
   request: {
-    url: (params) => {
+    url: (params: IntercomListConversationsParams) => {
       const url = buildIntercomUrl('/conversations')
       const queryParams = new URLSearchParams()
 
@@ -81,13 +72,25 @@ export const intercomListConversationsTool: ToolConfig<
       return queryString ? `${url}?${queryString}` : url
     },
     method: 'GET',
-    headers: (params) => ({
+    headers: (params: IntercomListConversationsParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
   },
+} satisfies Pick<ToolConfig<IntercomListConversationsParams, any>, 'params' | 'request'>
+
+export const intercomListConversationsTool: ToolConfig<
+  IntercomListConversationsParams,
+  IntercomListConversationsResponse
+> = {
+  id: 'intercom_list_conversations',
+  name: 'List Conversations from Intercom',
+  description: 'List all conversations from Intercom with pagination support',
+  version: '1.0.0',
+
+  ...listConversationsBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -163,3 +166,98 @@ export const intercomListConversationsTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomListConversationsV2Response {
+  success: boolean
+  output: {
+    conversations: any[]
+    pages?: any
+    total_count?: number
+    success: boolean
+  }
+}
+
+export const intercomListConversationsV2Tool: ToolConfig<
+  IntercomListConversationsParams,
+  IntercomListConversationsV2Response
+> = {
+  ...listConversationsBase,
+  id: 'intercom_list_conversations_v2',
+  name: 'List Conversations from Intercom',
+  description: 'List all conversations from Intercom with pagination support',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'list_conversations')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversations: data.conversations ?? null,
+        pages: data.pages ?? null,
+        total_count: data.total_count ?? null,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    conversations: {
+      type: 'array',
+      description: 'Array of conversation objects',
+      optional: true,
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique identifier for the conversation' },
+          type: { type: 'string', description: 'Object type (conversation)' },
+          title: { type: 'string', description: 'Title of the conversation', optional: true },
+          created_at: {
+            type: 'number',
+            description: 'Unix timestamp when conversation was created',
+          },
+          updated_at: {
+            type: 'number',
+            description: 'Unix timestamp when conversation was last updated',
+          },
+          waiting_since: {
+            type: 'number',
+            description: 'Unix timestamp when waiting for reply',
+            optional: true,
+          },
+          open: { type: 'boolean', description: 'Whether the conversation is open' },
+          state: { type: 'string', description: 'State of the conversation' },
+          read: { type: 'boolean', description: 'Whether the conversation has been read' },
+          priority: { type: 'string', description: 'Priority of the conversation' },
+          admin_assignee_id: {
+            type: 'number',
+            description: 'ID of assigned admin',
+            optional: true,
+          },
+          team_assignee_id: { type: 'string', description: 'ID of assigned team', optional: true },
+          tags: { type: 'object', description: 'Tags on the conversation' },
+          source: { type: 'object', description: 'Source of the conversation' },
+          contacts: { type: 'object', description: 'Contacts in the conversation' },
+        },
+      },
+    },
+    pages: {
+      type: 'object',
+      description: 'Pagination information',
+      optional: true,
+      properties: {
+        type: { type: 'string', description: 'Pages type identifier' },
+        page: { type: 'number', description: 'Current page number' },
+        per_page: { type: 'number', description: 'Number of results per page' },
+        total_pages: { type: 'number', description: 'Total number of pages' },
+      },
+    },
+    total_count: { type: 'number', description: 'Total number of conversations', optional: true },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/reply_conversation.ts b/apps/sim/tools/intercom/reply_conversation.ts
index dd9ab3a878..a6f8cb18f1 100644
--- a/apps/sim/tools/intercom/reply_conversation.ts
+++ b/apps/sim/tools/intercom/reply_conversation.ts
@@ -26,15 +26,7 @@ export interface IntercomReplyConversationResponse {
   }
 }
 
-export const intercomReplyConversationTool: ToolConfig<
-  IntercomReplyConversationParams,
-  IntercomReplyConversationResponse
-> = {
-  id: 'intercom_reply_conversation',
-  name: 'Reply to Conversation in Intercom',
-  description: 'Reply to a conversation as an admin in Intercom',
-  version: '1.0.0',
-
+const replyConversationBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -81,16 +73,16 @@ export const intercomReplyConversationTool: ToolConfig<
         'Unix timestamp for when the reply was created. If not provided, current time is used.',
     },
   },
-
   request: {
-    url: (params) => buildIntercomUrl(`/conversations/${params.conversationId}/reply`),
+    url: (params: IntercomReplyConversationParams) =>
+      buildIntercomUrl(`/conversations/${params.conversationId}/reply`),
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: IntercomReplyConversationParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
-    body: (params) => {
+    body: (params: IntercomReplyConversationParams) => {
       const reply: any = {
         message_type: params.message_type,
         type: 'admin',
@@ -111,6 +103,18 @@ export const intercomReplyConversationTool: ToolConfig<
       return reply
     },
   },
+} satisfies Pick<ToolConfig<IntercomReplyConversationParams, any>, 'params' | 'request'>
+
+export const intercomReplyConversationTool: ToolConfig<
+  IntercomReplyConversationParams,
+  IntercomReplyConversationResponse
+> = {
+  id: 'intercom_reply_conversation',
+  name: 'Reply to Conversation in Intercom',
+  description: 'Reply to a conversation as an admin in Intercom',
+  version: '1.0.0',
+
+  ...replyConversationBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -140,19 +144,23 @@ export const intercomReplyConversationTool: ToolConfig<
       properties: {
         id: { type: 'string', description: 'Unique identifier for the conversation' },
         type: { type: 'string', description: 'Object type (conversation)' },
-        title: { type: 'string', description: 'Title of the conversation' },
+        title: { type: 'string', description: 'Title of the conversation', optional: true },
         created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
         updated_at: {
           type: 'number',
           description: 'Unix timestamp when conversation was last updated',
         },
-        waiting_since: { type: 'number', description: 'Unix timestamp when waiting for reply' },
+        waiting_since: {
+          type: 'number',
+          description: 'Unix timestamp when waiting for reply',
+          optional: true,
+        },
         open: { type: 'boolean', description: 'Whether the conversation is open' },
         state: { type: 'string', description: 'State of the conversation' },
         read: { type: 'boolean', description: 'Whether the conversation has been read' },
         priority: { type: 'string', description: 'Priority of the conversation' },
-        admin_assignee_id: { type: 'number', description: 'ID of assigned admin' },
-        team_assignee_id: { type: 'string', description: 'ID of assigned team' },
+        admin_assignee_id: { type: 'number', description: 'ID of assigned admin', optional: true },
+        team_assignee_id: { type: 'string', description: 'ID of assigned team', optional: true },
         tags: { type: 'object', description: 'Tags on the conversation' },
         source: { type: 'object', description: 'Source of the conversation' },
         contacts: { type: 'object', description: 'Contacts in the conversation' },
@@ -170,3 +178,75 @@ export const intercomReplyConversationTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomReplyConversationV2Response {
+  success: boolean
+  output: {
+    conversation: any
+    conversationId: string
+    success: boolean
+  }
+}
+
+export const intercomReplyConversationV2Tool: ToolConfig<
+  IntercomReplyConversationParams,
+  IntercomReplyConversationV2Response
+> = {
+  ...replyConversationBase,
+  id: 'intercom_reply_conversation_v2',
+  name: 'Reply to Conversation in Intercom',
+  description: 'Reply to a conversation as an admin in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'reply_conversation')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversation: data,
+        conversationId: data.id,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    conversation: {
+      type: 'object',
+      description: 'Updated conversation object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the conversation' },
+        type: { type: 'string', description: 'Object type (conversation)' },
+        title: { type: 'string', description: 'Title of the conversation', optional: true },
+        created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
+        updated_at: {
+          type: 'number',
+          description: 'Unix timestamp when conversation was last updated',
+        },
+        waiting_since: {
+          type: 'number',
+          description: 'Unix timestamp when waiting for reply',
+          optional: true,
+        },
+        open: { type: 'boolean', description: 'Whether the conversation is open' },
+        state: { type: 'string', description: 'State of the conversation' },
+        read: { type: 'boolean', description: 'Whether the conversation has been read' },
+        priority: { type: 'string', description: 'Priority of the conversation' },
+        admin_assignee_id: { type: 'number', description: 'ID of assigned admin', optional: true },
+        team_assignee_id: { type: 'string', description: 'ID of assigned team', optional: true },
+        tags: { type: 'object', description: 'Tags on the conversation' },
+        source: { type: 'object', description: 'Source of the conversation' },
+        contacts: { type: 'object', description: 'Contacts in the conversation' },
+        conversation_parts: { type: 'object', description: 'Parts of the conversation' },
+      },
+    },
+    conversationId: { type: 'string', description: 'ID of the conversation' },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/search_contacts.ts b/apps/sim/tools/intercom/search_contacts.ts
index 46437a1ce4..5c4d7788c4 100644
--- a/apps/sim/tools/intercom/search_contacts.ts
+++ b/apps/sim/tools/intercom/search_contacts.ts
@@ -82,15 +82,7 @@ export interface IntercomSearchContactsResponse {
   }
 }
 
-export const intercomSearchContactsTool: ToolConfig<
-  IntercomSearchContactsParams,
-  IntercomSearchContactsResponse
-> = {
-  id: 'intercom_search_contacts',
-  name: 'Search Contacts in Intercom',
-  description: 'Search for contacts in Intercom using a query',
-  version: '1.0.0',
-
+const searchContactsBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -134,13 +126,13 @@ export const intercomSearchContactsTool: ToolConfig<
   request: {
     url: () => buildIntercomUrl('/contacts/search'),
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: IntercomSearchContactsParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
-    body: (params) => {
+    body: (params: IntercomSearchContactsParams) => {
       let query
       try {
         query = JSON.parse(params.query)
@@ -169,6 +161,18 @@ export const intercomSearchContactsTool: ToolConfig<
       return body
     },
   },
+} satisfies Pick<ToolConfig<IntercomSearchContactsParams, any>, 'params' | 'request'>
+
+export const intercomSearchContactsTool: ToolConfig<
+  IntercomSearchContactsParams,
+  IntercomSearchContactsResponse
+> = {
+  id: 'intercom_search_contacts',
+  name: 'Search Contacts in Intercom',
+  description: 'Search for contacts in Intercom using a query',
+  version: '1.0.0',
+
+  ...searchContactsBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -253,3 +257,172 @@ export const intercomSearchContactsTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomSearchContactsV2Response {
+  success: boolean
+  output: {
+    contacts: Array<{
+      id: string
+      type: string
+      role: string
+      email: string | null
+      phone: string | null
+      name: string | null
+      avatar: string | null
+      owner_id: string | null
+      external_id: string | null
+      created_at: number
+      updated_at: number
+      signed_up_at: number | null
+      last_seen_at: number | null
+      workspace_id: string
+      custom_attributes: Record<string, any>
+      tags: {
+        type: string
+        url: string
+        data: any[]
+        has_more: boolean
+        total_count: number
+      }
+      notes: {
+        type: string
+        url: string
+        data: any[]
+        has_more: boolean
+        total_count: number
+      }
+      companies: {
+        type: string
+        url: string
+        data: any[]
+        has_more: boolean
+        total_count: number
+      }
+      location: {
+        type: string
+        city: string | null
+        region: string | null
+        country: string | null
+        country_code: string | null
+        continent_code: string | null
+      }
+      social_profiles: {
+        type: string
+        data: any[]
+      }
+      unsubscribed_from_emails: boolean
+      [key: string]: any
+    }>
+    pages: {
+      type: string
+      page: number
+      per_page: number
+      total_pages: number
+    }
+    total_count: number
+  }
+}
+
+export const intercomSearchContactsV2Tool: ToolConfig<
+  IntercomSearchContactsParams,
+  IntercomSearchContactsV2Response
+> = {
+  ...searchContactsBase,
+  id: 'intercom_search_contacts_v2',
+  name: 'Search Contacts in Intercom',
+  description: 'Search for contacts in Intercom using a query',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'search_contacts')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        contacts: data.data ?? null,
+        pages: data.pages ?? null,
+        total_count: data.total_count ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    contacts: {
+      type: 'array',
+      description: 'Array of matching contact objects',
+      optional: true,
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique identifier for the contact' },
+          type: { type: 'string', description: 'Object type (contact)' },
+          role: { type: 'string', description: 'Role of the contact (user or lead)' },
+          email: { type: 'string', description: 'Email address of the contact', optional: true },
+          phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+          name: { type: 'string', description: 'Name of the contact', optional: true },
+          avatar: { type: 'string', description: 'Avatar URL of the contact', optional: true },
+          owner_id: {
+            type: 'string',
+            description: 'ID of the admin assigned to this contact',
+            optional: true,
+          },
+          external_id: {
+            type: 'string',
+            description: 'External identifier for the contact',
+            optional: true,
+          },
+          created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
+          updated_at: {
+            type: 'number',
+            description: 'Unix timestamp when contact was last updated',
+          },
+          signed_up_at: {
+            type: 'number',
+            description: 'Unix timestamp when user signed up',
+            optional: true,
+          },
+          last_seen_at: {
+            type: 'number',
+            description: 'Unix timestamp when user was last seen',
+            optional: true,
+          },
+          workspace_id: { type: 'string', description: 'Workspace ID the contact belongs to' },
+          custom_attributes: {
+            type: 'object',
+            description: 'Custom attributes set on the contact',
+          },
+          tags: { type: 'object', description: 'Tags associated with the contact', optional: true },
+          notes: { type: 'object', description: 'Notes associated with the contact' },
+          companies: { type: 'object', description: 'Companies associated with the contact' },
+          location: { type: 'object', description: 'Location information for the contact' },
+          social_profiles: { type: 'object', description: 'Social profiles of the contact' },
+          unsubscribed_from_emails: {
+            type: 'boolean',
+            description: 'Whether contact is unsubscribed from emails',
+          },
+        },
+      },
+    },
+    pages: {
+      type: 'object',
+      description: 'Pagination information',
+      optional: true,
+      properties: {
+        type: { type: 'string', description: 'Pages type identifier' },
+        page: { type: 'number', description: 'Current page number' },
+        per_page: { type: 'number', description: 'Number of results per page' },
+        total_pages: { type: 'number', description: 'Total number of pages' },
+      },
+    },
+    total_count: {
+      type: 'number',
+      description: 'Total number of matching contacts',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/intercom/search_conversations.ts b/apps/sim/tools/intercom/search_conversations.ts
index 22b4cb130a..8ab9c8f71c 100644
--- a/apps/sim/tools/intercom/search_conversations.ts
+++ b/apps/sim/tools/intercom/search_conversations.ts
@@ -26,15 +26,17 @@ export interface IntercomSearchConversationsResponse {
   }
 }
 
-export const intercomSearchConversationsTool: ToolConfig<
-  IntercomSearchConversationsParams,
-  IntercomSearchConversationsResponse
-> = {
-  id: 'intercom_search_conversations',
-  name: 'Search Conversations in Intercom',
-  description: 'Search for conversations in Intercom using a query',
-  version: '1.0.0',
+export interface IntercomSearchConversationsV2Response {
+  success: boolean
+  output: {
+    conversations: any[]
+    pages?: any
+    total_count?: number
+    success: boolean
+  }
+}
 
+const searchConversationsBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -73,17 +75,16 @@ export const intercomSearchConversationsTool: ToolConfig<
       description: 'Sort order: "ascending" or "descending"',
     },
   },
-
   request: {
     url: () => buildIntercomUrl('/conversations/search'),
     method: 'POST',
-    headers: (params) => ({
+    headers: (params: IntercomSearchConversationsParams) => ({
       Authorization: `Bearer ${params.accessToken}`,
       Accept: 'application/json',
       'Content-Type': 'application/json',
       'Intercom-Version': '2.14',
     }),
-    body: (params) => {
+    body: (params: IntercomSearchConversationsParams) => {
       let query
       try {
         query = JSON.parse(params.query)
@@ -112,6 +113,18 @@ export const intercomSearchConversationsTool: ToolConfig<
       return body
     },
   },
+} satisfies Pick<ToolConfig<IntercomSearchConversationsParams, any>, 'params' | 'request'>
+
+export const intercomSearchConversationsTool: ToolConfig<
+  IntercomSearchConversationsParams,
+  IntercomSearchConversationsResponse
+> = {
+  id: 'intercom_search_conversations',
+  name: 'Search Conversations in Intercom',
+  description: 'Search for conversations in Intercom using a query',
+  version: '1.0.0',
+
+  ...searchConversationsBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -190,3 +203,93 @@ export const intercomSearchConversationsTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+export const intercomSearchConversationsV2Tool: ToolConfig<
+  IntercomSearchConversationsParams,
+  IntercomSearchConversationsV2Response
+> = {
+  ...searchConversationsBase,
+  id: 'intercom_search_conversations_v2',
+  name: 'Search Conversations in Intercom',
+  description:
+    'Search for conversations in Intercom using a query. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'search_conversations')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversations: data.conversations ?? null,
+        pages: data.pages ?? null,
+        total_count: data.total_count ?? null,
+        success: true,
+      },
+    }
+  },
+
+  outputs: {
+    conversations: {
+      type: 'array',
+      description: 'Array of matching conversation objects',
+      optional: true,
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique identifier for the conversation' },
+          type: { type: 'string', description: 'Object type (conversation)' },
+          title: { type: 'string', description: 'Title of the conversation', optional: true },
+          created_at: {
+            type: 'number',
+            description: 'Unix timestamp when conversation was created',
+          },
+          updated_at: {
+            type: 'number',
+            description: 'Unix timestamp when conversation was last updated',
+          },
+          waiting_since: {
+            type: 'number',
+            description: 'Unix timestamp when waiting for reply',
+            optional: true,
+          },
+          open: { type: 'boolean', description: 'Whether the conversation is open' },
+          state: { type: 'string', description: 'State of the conversation' },
+          read: { type: 'boolean', description: 'Whether the conversation has been read' },
+          priority: { type: 'string', description: 'Priority of the conversation' },
+          admin_assignee_id: {
+            type: 'number',
+            description: 'ID of assigned admin',
+            optional: true,
+          },
+          team_assignee_id: { type: 'string', description: 'ID of assigned team', optional: true },
+          tags: { type: 'object', description: 'Tags on the conversation' },
+          source: { type: 'object', description: 'Source of the conversation' },
+          contacts: { type: 'object', description: 'Contacts in the conversation' },
+        },
+      },
+    },
+    pages: {
+      type: 'object',
+      description: 'Pagination information',
+      optional: true,
+      properties: {
+        type: { type: 'string', description: 'Pages type identifier' },
+        page: { type: 'number', description: 'Current page number' },
+        per_page: { type: 'number', description: 'Number of results per page' },
+        total_pages: { type: 'number', description: 'Total number of pages' },
+      },
+    },
+    total_count: {
+      type: 'number',
+      description: 'Total number of matching conversations',
+      optional: true,
+    },
+    success: { type: 'boolean', description: 'Operation success status' },
+  },
+}
diff --git a/apps/sim/tools/intercom/update_contact.ts b/apps/sim/tools/intercom/update_contact.ts
index 1d7556e723..7ac467d9fc 100644
--- a/apps/sim/tools/intercom/update_contact.ts
+++ b/apps/sim/tools/intercom/update_contact.ts
@@ -33,15 +33,7 @@ export interface IntercomUpdateContactResponse {
   }
 }
 
-export const intercomUpdateContactTool: ToolConfig<
-  IntercomUpdateContactParams,
-  IntercomUpdateContactResponse
-> = {
-  id: 'intercom_update_contact',
-  name: 'Update Contact in Intercom',
-  description: 'Update an existing contact in Intercom',
-  version: '1.0.0',
-
+const intercomUpdateContactBase = {
   params: {
     accessToken: {
       type: 'string',
@@ -165,6 +157,18 @@ export const intercomUpdateContactTool: ToolConfig<
       return contact
     },
   },
+} satisfies Pick<ToolConfig<IntercomUpdateContactParams, any>, 'params' | 'request'>
+
+export const intercomUpdateContactTool: ToolConfig<
+  IntercomUpdateContactParams,
+  IntercomUpdateContactResponse
+> = {
+  id: 'intercom_update_contact',
+  name: 'Update Contact in Intercom',
+  description: 'Update an existing contact in Intercom',
+  version: '1.0.0',
+
+  ...intercomUpdateContactBase,
 
   transformResponse: async (response: Response) => {
     if (!response.ok) {
@@ -195,12 +199,20 @@ export const intercomUpdateContactTool: ToolConfig<
         id: { type: 'string', description: 'Unique identifier for the contact' },
         type: { type: 'string', description: 'Object type (contact)' },
         role: { type: 'string', description: 'Role of the contact (user or lead)' },
-        email: { type: 'string', description: 'Email address of the contact' },
-        phone: { type: 'string', description: 'Phone number of the contact' },
-        name: { type: 'string', description: 'Name of the contact' },
-        avatar: { type: 'string', description: 'Avatar URL of the contact' },
-        owner_id: { type: 'string', description: 'ID of the admin assigned to this contact' },
-        external_id: { type: 'string', description: 'External identifier for the contact' },
+        email: { type: 'string', description: 'Email address of the contact', optional: true },
+        phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+        name: { type: 'string', description: 'Name of the contact', optional: true },
+        avatar: { type: 'string', description: 'Avatar URL of the contact', optional: true },
+        owner_id: {
+          type: 'string',
+          description: 'ID of the admin assigned to this contact',
+          optional: true,
+        },
+        external_id: {
+          type: 'string',
+          description: 'External identifier for the contact',
+          optional: true,
+        },
         created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
         updated_at: { type: 'number', description: 'Unix timestamp when contact was last updated' },
         workspace_id: { type: 'string', description: 'Workspace ID the contact belongs to' },
@@ -227,3 +239,79 @@ export const intercomUpdateContactTool: ToolConfig<
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
+
+interface IntercomUpdateContactV2Response {
+  success: boolean
+  output: {
+    contact: any
+    contactId: string
+  }
+}
+
+export const intercomUpdateContactV2Tool: ToolConfig<
+  IntercomUpdateContactParams,
+  IntercomUpdateContactV2Response
+> = {
+  ...intercomUpdateContactBase,
+  id: 'intercom_update_contact_v2',
+  name: 'Update Contact in Intercom',
+  description: 'Update an existing contact in Intercom. Returns API-aligned fields only.',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'update_contact')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        contact: data,
+        contactId: data.id,
+      },
+    }
+  },
+
+  outputs: {
+    contact: {
+      type: 'object',
+      description: 'Updated contact object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the contact' },
+        type: { type: 'string', description: 'Object type (contact)' },
+        role: { type: 'string', description: 'Role of the contact (user or lead)' },
+        email: { type: 'string', description: 'Email address of the contact', optional: true },
+        phone: { type: 'string', description: 'Phone number of the contact', optional: true },
+        name: { type: 'string', description: 'Name of the contact', optional: true },
+        avatar: { type: 'string', description: 'Avatar URL of the contact', optional: true },
+        owner_id: {
+          type: 'string',
+          description: 'ID of the admin assigned to this contact',
+          optional: true,
+        },
+        external_id: {
+          type: 'string',
+          description: 'External identifier for the contact',
+          optional: true,
+        },
+        created_at: { type: 'number', description: 'Unix timestamp when contact was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when contact was last updated' },
+        workspace_id: { type: 'string', description: 'Workspace ID the contact belongs to' },
+        custom_attributes: { type: 'object', description: 'Custom attributes set on the contact' },
+        tags: { type: 'object', description: 'Tags associated with the contact' },
+        notes: { type: 'object', description: 'Notes associated with the contact' },
+        companies: { type: 'object', description: 'Companies associated with the contact' },
+        location: { type: 'object', description: 'Location information for the contact' },
+        social_profiles: { type: 'object', description: 'Social profiles of the contact' },
+        unsubscribed_from_emails: {
+          type: 'boolean',
+          description: 'Whether contact is unsubscribed from emails',
+        },
+      },
+    },
+    contactId: { type: 'string', description: 'ID of the updated contact' },
+  },
+}
diff --git a/apps/sim/tools/lemlist/get_activities.ts b/apps/sim/tools/lemlist/get_activities.ts
new file mode 100644
index 0000000000..ee4f47d4c7
--- /dev/null
+++ b/apps/sim/tools/lemlist/get_activities.ts
@@ -0,0 +1,131 @@
+import type {
+  LemlistGetActivitiesParams,
+  LemlistGetActivitiesResponse,
+} from '@/tools/lemlist/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const getActivitiesTool: ToolConfig<
+  LemlistGetActivitiesParams,
+  LemlistGetActivitiesResponse
+> = {
+  id: 'lemlist_get_activities',
+  name: 'Lemlist Get Activities',
+  description:
+    'Retrieves campaign activities and steps performed, including email opens, clicks, replies, and other events.',
+  version: '1.0.0',
+
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Lemlist API key',
+    },
+    type: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Filter by activity type (e.g., emailOpened, emailClicked, emailReplied, paused)',
+    },
+    campaignId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by campaign ID',
+    },
+    leadId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by lead ID',
+    },
+    isFirst: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter for first activity only',
+    },
+    limit: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Number of results per request (max 100, default 100)',
+    },
+    offset: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Number of records to skip for pagination',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL('https://api.lemlist.com/api/activities')
+      url.searchParams.append('version', 'v2')
+
+      if (params.type) url.searchParams.append('type', params.type)
+      if (params.campaignId) url.searchParams.append('campaignId', params.campaignId)
+      if (params.leadId) url.searchParams.append('leadId', params.leadId)
+      if (params.isFirst !== undefined) url.searchParams.append('isFirst', String(params.isFirst))
+      if (params.limit !== undefined) url.searchParams.append('limit', String(params.limit))
+      if (params.offset !== undefined) url.searchParams.append('offset', String(params.offset))
+
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => {
+      const credentials = Buffer.from(`:${params.apiKey}`).toString('base64')
+      return {
+        Authorization: `Basic ${credentials}`,
+        'Content-Type': 'application/json',
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const activities = Array.isArray(data) ? data : []
+
+    return {
+      success: true,
+      output: {
+        activities: activities.map((activity: Record<string, unknown>) => ({
+          _id: (activity._id as string) ?? '',
+          type: (activity.type as string) ?? '',
+          leadId: (activity.leadId as string) ?? '',
+          campaignId: (activity.campaignId as string) ?? '',
+          sequenceId: (activity.sequenceId as string) ?? null,
+          stepId: (activity.stepId as string) ?? null,
+          createdAt: (activity.createdAt as string) ?? '',
+        })),
+        count: activities.length,
+      },
+    }
+  },
+
+  outputs: {
+    activities: {
+      type: 'array',
+      description: 'List of activities',
+      items: {
+        type: 'object',
+        properties: {
+          _id: { type: 'string', description: 'Activity ID' },
+          type: { type: 'string', description: 'Activity type' },
+          leadId: { type: 'string', description: 'Associated lead ID' },
+          campaignId: { type: 'string', description: 'Campaign ID' },
+          sequenceId: { type: 'string', description: 'Sequence ID', optional: true },
+          stepId: { type: 'string', description: 'Step ID', optional: true },
+          createdAt: { type: 'string', description: 'When the activity occurred' },
+        },
+      },
+    },
+    count: {
+      type: 'number',
+      description: 'Number of activities returned',
+    },
+  },
+}
diff --git a/apps/sim/tools/lemlist/get_lead.ts b/apps/sim/tools/lemlist/get_lead.ts
new file mode 100644
index 0000000000..69ff479c58
--- /dev/null
+++ b/apps/sim/tools/lemlist/get_lead.ts
@@ -0,0 +1,119 @@
+import type { LemlistGetLeadParams, LemlistGetLeadResponse } from '@/tools/lemlist/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const getLeadTool: ToolConfig<LemlistGetLeadParams, LemlistGetLeadResponse> = {
+  id: 'lemlist_get_lead',
+  name: 'Lemlist Get Lead',
+  description: 'Retrieves lead information by email address or lead ID.',
+  version: '1.0.0',
+
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Lemlist API key',
+    },
+    leadIdentifier: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Lead email address or lead ID',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const identifier = params.leadIdentifier || ''
+      const isEmail = identifier.includes('@')
+      if (isEmail) {
+        return `https://api.lemlist.com/api/leads/${encodeURIComponent(identifier)}`
+      }
+      return `https://api.lemlist.com/api/leads?id=${encodeURIComponent(identifier)}`
+    },
+    method: 'GET',
+    headers: (params) => {
+      const credentials = Buffer.from(`:${params.apiKey}`).toString('base64')
+      return {
+        Authorization: `Basic ${credentials}`,
+        'Content-Type': 'application/json',
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        _id: data._id ?? '',
+        email: data.email ?? '',
+        firstName: data.firstName ?? null,
+        lastName: data.lastName ?? null,
+        companyName: data.companyName ?? null,
+        jobTitle: data.jobTitle ?? null,
+        companyDomain: data.companyDomain ?? null,
+        isPaused: data.isPaused ?? false,
+        campaignId: data.campaignId ?? null,
+        contactId: data.contactId ?? null,
+        emailStatus: data.emailStatus ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    _id: {
+      type: 'string',
+      description: 'Lead ID',
+    },
+    email: {
+      type: 'string',
+      description: 'Lead email address',
+    },
+    firstName: {
+      type: 'string',
+      description: 'Lead first name',
+      optional: true,
+    },
+    lastName: {
+      type: 'string',
+      description: 'Lead last name',
+      optional: true,
+    },
+    companyName: {
+      type: 'string',
+      description: 'Company name',
+      optional: true,
+    },
+    jobTitle: {
+      type: 'string',
+      description: 'Job title',
+      optional: true,
+    },
+    companyDomain: {
+      type: 'string',
+      description: 'Company domain',
+      optional: true,
+    },
+    isPaused: {
+      type: 'boolean',
+      description: 'Whether the lead is paused',
+    },
+    campaignId: {
+      type: 'string',
+      description: 'Campaign ID the lead belongs to',
+      optional: true,
+    },
+    contactId: {
+      type: 'string',
+      description: 'Contact ID',
+      optional: true,
+    },
+    emailStatus: {
+      type: 'string',
+      description: 'Email deliverability status',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/lemlist/index.ts b/apps/sim/tools/lemlist/index.ts
new file mode 100644
index 0000000000..33b7984e7a
--- /dev/null
+++ b/apps/sim/tools/lemlist/index.ts
@@ -0,0 +1,4 @@
+export { getActivitiesTool as lemlistGetActivitiesTool } from '@/tools/lemlist/get_activities'
+export { getLeadTool as lemlistGetLeadTool } from '@/tools/lemlist/get_lead'
+export { sendEmailTool as lemlistSendEmailTool } from '@/tools/lemlist/send_email'
+export * from './types'
diff --git a/apps/sim/tools/lemlist/send_email.ts b/apps/sim/tools/lemlist/send_email.ts
new file mode 100644
index 0000000000..e5f0bee3b6
--- /dev/null
+++ b/apps/sim/tools/lemlist/send_email.ts
@@ -0,0 +1,106 @@
+import type { LemlistSendEmailParams, LemlistSendEmailResponse } from '@/tools/lemlist/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const sendEmailTool: ToolConfig<LemlistSendEmailParams, LemlistSendEmailResponse> = {
+  id: 'lemlist_send_email',
+  name: 'Lemlist Send Email',
+  description: 'Sends an email to a contact through the Lemlist inbox.',
+  version: '1.0.0',
+
+  params: {
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Lemlist API key',
+    },
+    sendUserId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Identifier for the user sending the message',
+    },
+    sendUserEmail: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Email address of the sender',
+    },
+    sendUserMailboxId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Mailbox identifier for the sender',
+    },
+    contactId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Recipient contact identifier',
+    },
+    leadId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Associated lead identifier',
+    },
+    subject: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Email subject line',
+    },
+    message: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Email message body in HTML format',
+    },
+    cc: {
+      type: 'json',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Array of CC email addresses',
+    },
+  },
+
+  request: {
+    url: () => 'https://api.lemlist.com/api/inbox/email',
+    method: 'POST',
+    headers: (params) => {
+      const credentials = Buffer.from(`:${params.apiKey}`).toString('base64')
+      return {
+        Authorization: `Basic ${credentials}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => ({
+      sendUserId: params.sendUserId?.trim(),
+      sendUserEmail: params.sendUserEmail?.trim(),
+      sendUserMailboxId: params.sendUserMailboxId?.trim(),
+      contactId: params.contactId?.trim(),
+      leadId: params.leadId?.trim(),
+      subject: params.subject?.trim(),
+      message: params.message,
+      cc: params.cc ?? [],
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        ok: data.ok ?? true,
+      },
+    }
+  },
+
+  outputs: {
+    ok: {
+      type: 'boolean',
+      description: 'Whether the email was sent successfully',
+    },
+  },
+}
diff --git a/apps/sim/tools/lemlist/types.ts b/apps/sim/tools/lemlist/types.ts
new file mode 100644
index 0000000000..77c121df1c
--- /dev/null
+++ b/apps/sim/tools/lemlist/types.ts
@@ -0,0 +1,75 @@
+import type { ToolResponse } from '@/tools/types'
+
+export interface LemlistBaseParams {
+  apiKey: string
+}
+
+export interface LemlistGetActivitiesParams extends LemlistBaseParams {
+  type?: string
+  campaignId?: string
+  leadId?: string
+  isFirst?: boolean
+  limit?: number
+  offset?: number
+}
+
+export interface LemlistActivity {
+  _id: string
+  type: string
+  leadId: string
+  campaignId: string
+  sequenceId: string | null
+  stepId: string | null
+  createdAt: string
+}
+
+export interface LemlistGetActivitiesResponse extends ToolResponse {
+  output: {
+    activities: LemlistActivity[]
+    count: number
+  }
+}
+
+export interface LemlistGetLeadParams extends LemlistBaseParams {
+  leadIdentifier: string
+}
+
+export interface LemlistLead {
+  _id: string
+  email: string
+  firstName: string | null
+  lastName: string | null
+  companyName: string | null
+  jobTitle: string | null
+  companyDomain: string | null
+  isPaused: boolean
+  campaignId: string | null
+  contactId: string | null
+  emailStatus: string | null
+}
+
+export interface LemlistGetLeadResponse extends ToolResponse {
+  output: LemlistLead
+}
+
+export interface LemlistSendEmailParams extends LemlistBaseParams {
+  sendUserId: string
+  sendUserEmail: string
+  sendUserMailboxId: string
+  contactId: string
+  leadId: string
+  subject: string
+  message: string
+  cc?: string[]
+}
+
+export interface LemlistSendEmailResponse extends ToolResponse {
+  output: {
+    ok: boolean
+  }
+}
+
+export type LemlistResponse =
+  | LemlistGetActivitiesResponse
+  | LemlistGetLeadResponse
+  | LemlistSendEmailResponse
diff --git a/apps/sim/tools/mailchimp/add_member.ts b/apps/sim/tools/mailchimp/add_member.ts
index 45ce315bd9..de1ab772ea 100644
--- a/apps/sim/tools/mailchimp/add_member.ts
+++ b/apps/sim/tools/mailchimp/add_member.ts
@@ -17,10 +17,7 @@ export interface MailchimpAddMemberResponse {
   success: boolean
   output: {
     member: MailchimpMember
-    metadata: {
-      operation: 'add_member'
-      subscriberHash: string
-    }
+    subscriber_hash: string
     success: boolean
   }
 }
@@ -118,10 +115,7 @@ export const mailchimpAddMemberTool: ToolConfig<
       success: true,
       output: {
         member: data,
-        metadata: {
-          operation: 'add_member' as const,
-          subscriberHash: data.id,
-        },
+        subscriber_hash: data.id,
         success: true,
       },
     }
@@ -133,8 +127,8 @@ export const mailchimpAddMemberTool: ToolConfig<
       type: 'object',
       description: 'Added member data',
       properties: {
-        member: { type: 'object', description: 'Added member object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        member: { type: 'json', description: 'Added member object' },
+        subscriber_hash: { type: 'string', description: 'Subscriber hash ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/add_member_tags.ts b/apps/sim/tools/mailchimp/add_member_tags.ts
index 2584d99116..936284f7ec 100644
--- a/apps/sim/tools/mailchimp/add_member_tags.ts
+++ b/apps/sim/tools/mailchimp/add_member_tags.ts
@@ -14,10 +14,6 @@ export interface MailchimpAddMemberTagsParams {
 export interface MailchimpAddMemberTagsResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'add_member_tags'
-      subscriberHash: string
-    }
     success: boolean
   }
 }
@@ -90,10 +86,6 @@ export const mailchimpAddMemberTagsTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'add_member_tags' as const,
-          subscriberHash: '',
-        },
         success: true,
       },
     }
@@ -105,7 +97,6 @@ export const mailchimpAddMemberTagsTool: ToolConfig<
       type: 'object',
       description: 'Tag addition confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/add_or_update_member.ts b/apps/sim/tools/mailchimp/add_or_update_member.ts
index abdfd2e750..0763c8dd4e 100644
--- a/apps/sim/tools/mailchimp/add_or_update_member.ts
+++ b/apps/sim/tools/mailchimp/add_or_update_member.ts
@@ -18,10 +18,7 @@ export interface MailchimpAddOrUpdateMemberResponse {
   success: boolean
   output: {
     member: MailchimpMember
-    metadata: {
-      operation: 'add_or_update_member'
-      subscriberHash: string
-    }
+    subscriber_hash: string
     success: boolean
   }
 }
@@ -126,10 +123,7 @@ export const mailchimpAddOrUpdateMemberTool: ToolConfig<
       success: true,
       output: {
         member: data,
-        metadata: {
-          operation: 'add_or_update_member' as const,
-          subscriberHash: data.id,
-        },
+        subscriber_hash: data.id,
         success: true,
       },
     }
@@ -141,8 +135,8 @@ export const mailchimpAddOrUpdateMemberTool: ToolConfig<
       type: 'object',
       description: 'Member data',
       properties: {
-        member: { type: 'object', description: 'Member object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        member: { type: 'json', description: 'Member object' },
+        subscriber_hash: { type: 'string', description: 'Subscriber hash ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/add_segment_member.ts b/apps/sim/tools/mailchimp/add_segment_member.ts
index 020f6d7981..b9eaa5d168 100644
--- a/apps/sim/tools/mailchimp/add_segment_member.ts
+++ b/apps/sim/tools/mailchimp/add_segment_member.ts
@@ -15,10 +15,6 @@ export interface MailchimpAddSegmentMemberResponse {
   success: boolean
   output: {
     member: MailchimpMember
-    metadata: {
-      operation: 'add_segment_member'
-      segmentId: string
-    }
     success: boolean
   }
 }
@@ -87,10 +83,6 @@ export const mailchimpAddSegmentMemberTool: ToolConfig<
       success: true,
       output: {
         member: data,
-        metadata: {
-          operation: 'add_segment_member' as const,
-          segmentId: '',
-        },
         success: true,
       },
     }
@@ -102,8 +94,7 @@ export const mailchimpAddSegmentMemberTool: ToolConfig<
       type: 'object',
       description: 'Added member data',
       properties: {
-        member: { type: 'object', description: 'Added member object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        member: { type: 'json', description: 'Added member object' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts b/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts
index ed0d6b603c..82bdcbc3b9 100644
--- a/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts
+++ b/apps/sim/tools/mailchimp/add_subscriber_to_automation.ts
@@ -16,11 +16,6 @@ export interface MailchimpAddSubscriberToAutomationResponse {
   success: boolean
   output: {
     subscriber: MailchimpMember
-    metadata: {
-      operation: 'add_subscriber_to_automation'
-      workflowId: string
-      workflowEmailId: string
-    }
     success: boolean
   }
 }
@@ -89,11 +84,6 @@ export const mailchimpAddSubscriberToAutomationTool: ToolConfig<
       success: true,
       output: {
         subscriber: data,
-        metadata: {
-          operation: 'add_subscriber_to_automation' as const,
-          workflowId: '',
-          workflowEmailId: '',
-        },
         success: true,
       },
     }
@@ -105,8 +95,7 @@ export const mailchimpAddSubscriberToAutomationTool: ToolConfig<
       type: 'object',
       description: 'Subscriber queue data',
       properties: {
-        subscriber: { type: 'object', description: 'Subscriber object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        subscriber: { type: 'json', description: 'Subscriber object' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/archive_member.ts b/apps/sim/tools/mailchimp/archive_member.ts
index 8189ee394c..2892474d07 100644
--- a/apps/sim/tools/mailchimp/archive_member.ts
+++ b/apps/sim/tools/mailchimp/archive_member.ts
@@ -13,10 +13,6 @@ export interface MailchimpArchiveMemberParams {
 export interface MailchimpArchiveMemberResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'archive_member'
-      subscriberHash: string
-    }
     success: boolean
   }
 }
@@ -73,10 +69,6 @@ export const mailchimpArchiveMemberTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'archive_member' as const,
-          subscriberHash: '',
-        },
         success: true,
       },
     }
@@ -88,7 +80,6 @@ export const mailchimpArchiveMemberTool: ToolConfig<
       type: 'object',
       description: 'Archive confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_audience.ts b/apps/sim/tools/mailchimp/create_audience.ts
index 789f98ea2d..d2131eb7c9 100644
--- a/apps/sim/tools/mailchimp/create_audience.ts
+++ b/apps/sim/tools/mailchimp/create_audience.ts
@@ -18,10 +18,7 @@ export interface MailchimpCreateAudienceResponse {
   success: boolean
   output: {
     list: MailchimpAudience
-    metadata: {
-      operation: 'create_audience'
-      listId: string
-    }
+    list_id: string
     success: boolean
   }
 }
@@ -120,10 +117,7 @@ export const mailchimpCreateAudienceTool: ToolConfig<
       success: true,
       output: {
         list: data,
-        metadata: {
-          operation: 'create_audience' as const,
-          listId: data.id,
-        },
+        list_id: data.id,
         success: true,
       },
     }
@@ -135,8 +129,8 @@ export const mailchimpCreateAudienceTool: ToolConfig<
       type: 'object',
       description: 'Created audience data',
       properties: {
-        list: { type: 'object', description: 'Created audience/list object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        list: { type: 'json', description: 'Created audience/list object' },
+        list_id: { type: 'string', description: 'Created audience/list ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_batch_operation.ts b/apps/sim/tools/mailchimp/create_batch_operation.ts
index 591627b611..bf53c828f4 100644
--- a/apps/sim/tools/mailchimp/create_batch_operation.ts
+++ b/apps/sim/tools/mailchimp/create_batch_operation.ts
@@ -14,10 +14,7 @@ export interface MailchimpCreateBatchOperationResponse {
   success: boolean
   output: {
     batch: MailchimpBatchOperation
-    metadata: {
-      operation: 'create_batch_operation'
-      batchId: string
-    }
+    batch_id: string
     success: boolean
   }
 }
@@ -77,10 +74,7 @@ export const mailchimpCreateBatchOperationTool: ToolConfig<
       success: true,
       output: {
         batch: data,
-        metadata: {
-          operation: 'create_batch_operation' as const,
-          batchId: data.id,
-        },
+        batch_id: data.id,
         success: true,
       },
     }
@@ -92,8 +86,8 @@ export const mailchimpCreateBatchOperationTool: ToolConfig<
       type: 'object',
       description: 'Created batch operation data',
       properties: {
-        batch: { type: 'object', description: 'Created batch operation object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        batch: { type: 'json', description: 'Created batch operation object' },
+        batch_id: { type: 'string', description: 'Created batch operation ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_campaign.ts b/apps/sim/tools/mailchimp/create_campaign.ts
index f164d2b8d4..ef7b63a1b6 100644
--- a/apps/sim/tools/mailchimp/create_campaign.ts
+++ b/apps/sim/tools/mailchimp/create_campaign.ts
@@ -15,10 +15,7 @@ export interface MailchimpCreateCampaignResponse {
   success: boolean
   output: {
     campaign: MailchimpCampaign
-    metadata: {
-      operation: 'create_campaign'
-      campaignId: string
-    }
+    campaign_id: string
     success: boolean
   }
 }
@@ -103,10 +100,7 @@ export const mailchimpCreateCampaignTool: ToolConfig<
       success: true,
       output: {
         campaign: data,
-        metadata: {
-          operation: 'create_campaign' as const,
-          campaignId: data.id,
-        },
+        campaign_id: data.id,
         success: true,
       },
     }
@@ -118,8 +112,8 @@ export const mailchimpCreateCampaignTool: ToolConfig<
       type: 'object',
       description: 'Created campaign data',
       properties: {
-        campaign: { type: 'object', description: 'Created campaign object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        campaign: { type: 'json', description: 'Created campaign object' },
+        campaign_id: { type: 'string', description: 'Created campaign ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_interest.ts b/apps/sim/tools/mailchimp/create_interest.ts
index cb7c0fdb08..69dc67326c 100644
--- a/apps/sim/tools/mailchimp/create_interest.ts
+++ b/apps/sim/tools/mailchimp/create_interest.ts
@@ -16,10 +16,7 @@ export interface MailchimpCreateInterestResponse {
   success: boolean
   output: {
     interest: MailchimpInterest
-    metadata: {
-      operation: 'create_interest'
-      interestId: string
-    }
+    interest_id: string
     success: boolean
   }
 }
@@ -88,10 +85,7 @@ export const mailchimpCreateInterestTool: ToolConfig<
       success: true,
       output: {
         interest: data,
-        metadata: {
-          operation: 'create_interest' as const,
-          interestId: data.id,
-        },
+        interest_id: data.id,
         success: true,
       },
     }
@@ -103,8 +97,8 @@ export const mailchimpCreateInterestTool: ToolConfig<
       type: 'object',
       description: 'Created interest data',
       properties: {
-        interest: { type: 'object', description: 'Created interest object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        interest: { type: 'json', description: 'Created interest object' },
+        interest_id: { type: 'string', description: 'Created interest ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_interest_category.ts b/apps/sim/tools/mailchimp/create_interest_category.ts
index 5464c9fb4f..d164f6ba02 100644
--- a/apps/sim/tools/mailchimp/create_interest_category.ts
+++ b/apps/sim/tools/mailchimp/create_interest_category.ts
@@ -16,10 +16,7 @@ export interface MailchimpCreateInterestCategoryResponse {
   success: boolean
   output: {
     category: MailchimpInterestCategory
-    metadata: {
-      operation: 'create_interest_category'
-      interestCategoryId: string
-    }
+    interest_category_id: string
     success: boolean
   }
 }
@@ -86,10 +83,7 @@ export const mailchimpCreateInterestCategoryTool: ToolConfig<
       success: true,
       output: {
         category: data,
-        metadata: {
-          operation: 'create_interest_category' as const,
-          interestCategoryId: data.id,
-        },
+        interest_category_id: data.id,
         success: true,
       },
     }
@@ -101,8 +95,8 @@ export const mailchimpCreateInterestCategoryTool: ToolConfig<
       type: 'object',
       description: 'Created interest category data',
       properties: {
-        category: { type: 'object', description: 'Created interest category object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        category: { type: 'json', description: 'Created interest category object' },
+        interest_category_id: { type: 'string', description: 'Created interest category ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_landing_page.ts b/apps/sim/tools/mailchimp/create_landing_page.ts
index 8df73d805a..d674456e53 100644
--- a/apps/sim/tools/mailchimp/create_landing_page.ts
+++ b/apps/sim/tools/mailchimp/create_landing_page.ts
@@ -15,10 +15,7 @@ export interface MailchimpCreateLandingPageResponse {
   success: boolean
   output: {
     landingPage: MailchimpLandingPage
-    metadata: {
-      operation: 'create_landing_page'
-      pageId: string
-    }
+    page_id: string
     success: boolean
   }
 }
@@ -83,10 +80,7 @@ export const mailchimpCreateLandingPageTool: ToolConfig<
       success: true,
       output: {
         landingPage: data,
-        metadata: {
-          operation: 'create_landing_page' as const,
-          pageId: data.id,
-        },
+        page_id: data.id,
         success: true,
       },
     }
@@ -98,8 +92,8 @@ export const mailchimpCreateLandingPageTool: ToolConfig<
       type: 'object',
       description: 'Created landing page data',
       properties: {
-        landingPage: { type: 'object', description: 'Created landing page object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        landingPage: { type: 'json', description: 'Created landing page object' },
+        page_id: { type: 'string', description: 'Created landing page ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_merge_field.ts b/apps/sim/tools/mailchimp/create_merge_field.ts
index a5352c7ed3..142a3f8449 100644
--- a/apps/sim/tools/mailchimp/create_merge_field.ts
+++ b/apps/sim/tools/mailchimp/create_merge_field.ts
@@ -16,10 +16,7 @@ export interface MailchimpCreateMergeFieldResponse {
   success: boolean
   output: {
     mergeField: MailchimpMergeField
-    metadata: {
-      operation: 'create_merge_field'
-      mergeId: string
-    }
+    merge_id: string
     success: boolean
   }
 }
@@ -86,10 +83,7 @@ export const mailchimpCreateMergeFieldTool: ToolConfig<
       success: true,
       output: {
         mergeField: data,
-        metadata: {
-          operation: 'create_merge_field' as const,
-          mergeId: data.merge_id,
-        },
+        merge_id: data.merge_id,
         success: true,
       },
     }
@@ -101,8 +95,8 @@ export const mailchimpCreateMergeFieldTool: ToolConfig<
       type: 'object',
       description: 'Created merge field data',
       properties: {
-        mergeField: { type: 'object', description: 'Created merge field object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        mergeField: { type: 'json', description: 'Created merge field object' },
+        merge_id: { type: 'string', description: 'Created merge field ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_segment.ts b/apps/sim/tools/mailchimp/create_segment.ts
index b45553982c..abec5bf5c2 100644
--- a/apps/sim/tools/mailchimp/create_segment.ts
+++ b/apps/sim/tools/mailchimp/create_segment.ts
@@ -16,10 +16,7 @@ export interface MailchimpCreateSegmentResponse {
   success: boolean
   output: {
     segment: MailchimpSegment
-    metadata: {
-      operation: 'create_segment'
-      segmentId: string
-    }
+    segment_id: string
     success: boolean
   }
 }
@@ -97,10 +94,7 @@ export const mailchimpCreateSegmentTool: ToolConfig<
       success: true,
       output: {
         segment: data,
-        metadata: {
-          operation: 'create_segment' as const,
-          segmentId: data.id,
-        },
+        segment_id: data.id,
         success: true,
       },
     }
@@ -112,8 +106,8 @@ export const mailchimpCreateSegmentTool: ToolConfig<
       type: 'object',
       description: 'Created segment data',
       properties: {
-        segment: { type: 'object', description: 'Created segment object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        segment: { type: 'json', description: 'Created segment object' },
+        segment_id: { type: 'string', description: 'Created segment ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/create_template.ts b/apps/sim/tools/mailchimp/create_template.ts
index 41c7b62068..6dd2a65746 100644
--- a/apps/sim/tools/mailchimp/create_template.ts
+++ b/apps/sim/tools/mailchimp/create_template.ts
@@ -14,10 +14,7 @@ export interface MailchimpCreateTemplateResponse {
   success: boolean
   output: {
     template: any
-    metadata: {
-      operation: 'create_template'
-      templateId: string
-    }
+    template_id: string
     success: boolean
   }
 }
@@ -77,10 +74,7 @@ export const mailchimpCreateTemplateTool: ToolConfig<
       success: true,
       output: {
         template: data,
-        metadata: {
-          operation: 'create_template' as const,
-          templateId: data.id,
-        },
+        template_id: data.id,
         success: true,
       },
     }
@@ -92,8 +86,8 @@ export const mailchimpCreateTemplateTool: ToolConfig<
       type: 'object',
       description: 'Created template data',
       properties: {
-        template: { type: 'object', description: 'Created template object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        template: { type: 'json', description: 'Created template object' },
+        template_id: { type: 'string', description: 'Created template ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/delete_audience.ts b/apps/sim/tools/mailchimp/delete_audience.ts
index cb9934c9d7..64b0ad4f17 100644
--- a/apps/sim/tools/mailchimp/delete_audience.ts
+++ b/apps/sim/tools/mailchimp/delete_audience.ts
@@ -11,13 +11,6 @@ export interface MailchimpDeleteAudienceParams {
 
 export interface MailchimpDeleteAudienceResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_audience'
-      listId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteAudienceTool: ToolConfig<
@@ -61,25 +54,10 @@ export const mailchimpDeleteAudienceTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_audience' as const,
-          listId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the audience was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_batch_operation.ts b/apps/sim/tools/mailchimp/delete_batch_operation.ts
index 9ca85bd235..ba12ad85bb 100644
--- a/apps/sim/tools/mailchimp/delete_batch_operation.ts
+++ b/apps/sim/tools/mailchimp/delete_batch_operation.ts
@@ -11,13 +11,6 @@ export interface MailchimpDeleteBatchOperationParams {
 
 export interface MailchimpDeleteBatchOperationResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_batch_operation'
-      batchId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteBatchOperationTool: ToolConfig<
@@ -61,25 +54,13 @@ export const mailchimpDeleteBatchOperationTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_batch_operation' as const,
-          batchId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
+    success: {
+      type: 'boolean',
+      description: 'Whether the batch operation was successfully deleted',
     },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_campaign.ts b/apps/sim/tools/mailchimp/delete_campaign.ts
index b6f8f1d9eb..077138c151 100644
--- a/apps/sim/tools/mailchimp/delete_campaign.ts
+++ b/apps/sim/tools/mailchimp/delete_campaign.ts
@@ -11,13 +11,6 @@ export interface MailchimpDeleteCampaignParams {
 
 export interface MailchimpDeleteCampaignResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_campaign'
-      campaignId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteCampaignTool: ToolConfig<
@@ -61,25 +54,10 @@ export const mailchimpDeleteCampaignTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_campaign' as const,
-          campaignId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the campaign was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_interest.ts b/apps/sim/tools/mailchimp/delete_interest.ts
index cf8f50c8ab..9a69d5864e 100644
--- a/apps/sim/tools/mailchimp/delete_interest.ts
+++ b/apps/sim/tools/mailchimp/delete_interest.ts
@@ -13,13 +13,6 @@ export interface MailchimpDeleteInterestParams {
 
 export interface MailchimpDeleteInterestResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_interest'
-      interestId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteInterestTool: ToolConfig<
@@ -79,25 +72,10 @@ export const mailchimpDeleteInterestTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_interest' as const,
-          interestId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the interest was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_interest_category.ts b/apps/sim/tools/mailchimp/delete_interest_category.ts
index 23fbc37a1d..f1918a43dd 100644
--- a/apps/sim/tools/mailchimp/delete_interest_category.ts
+++ b/apps/sim/tools/mailchimp/delete_interest_category.ts
@@ -12,13 +12,6 @@ export interface MailchimpDeleteInterestCategoryParams {
 
 export interface MailchimpDeleteInterestCategoryResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_interest_category'
-      interestCategoryId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteInterestCategoryTool: ToolConfig<
@@ -72,25 +65,13 @@ export const mailchimpDeleteInterestCategoryTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_interest_category' as const,
-          interestCategoryId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
+    success: {
+      type: 'boolean',
+      description: 'Whether the interest category was successfully deleted',
     },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_landing_page.ts b/apps/sim/tools/mailchimp/delete_landing_page.ts
index 61ea6e47c6..c63894f934 100644
--- a/apps/sim/tools/mailchimp/delete_landing_page.ts
+++ b/apps/sim/tools/mailchimp/delete_landing_page.ts
@@ -11,13 +11,6 @@ export interface MailchimpDeleteLandingPageParams {
 
 export interface MailchimpDeleteLandingPageResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_landing_page'
-      pageId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteLandingPageTool: ToolConfig<
@@ -61,25 +54,10 @@ export const mailchimpDeleteLandingPageTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_landing_page' as const,
-          pageId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the landing page was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_member.ts b/apps/sim/tools/mailchimp/delete_member.ts
index a74da3f52c..72090b5ab7 100644
--- a/apps/sim/tools/mailchimp/delete_member.ts
+++ b/apps/sim/tools/mailchimp/delete_member.ts
@@ -12,13 +12,6 @@ export interface MailchimpDeleteMemberParams {
 
 export interface MailchimpDeleteMemberResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_member'
-      subscriberHash: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteMemberTool: ToolConfig<
@@ -69,25 +62,10 @@ export const mailchimpDeleteMemberTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_member' as const,
-          subscriberHash: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the member was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_merge_field.ts b/apps/sim/tools/mailchimp/delete_merge_field.ts
index f04a2492de..f7a0f5201d 100644
--- a/apps/sim/tools/mailchimp/delete_merge_field.ts
+++ b/apps/sim/tools/mailchimp/delete_merge_field.ts
@@ -12,13 +12,6 @@ export interface MailchimpDeleteMergeFieldParams {
 
 export interface MailchimpDeleteMergeFieldResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_merge_field'
-      mergeId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteMergeFieldTool: ToolConfig<
@@ -69,25 +62,10 @@ export const mailchimpDeleteMergeFieldTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_merge_field' as const,
-          mergeId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the merge field was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_segment.ts b/apps/sim/tools/mailchimp/delete_segment.ts
index 3e89c20bad..4d4f91f880 100644
--- a/apps/sim/tools/mailchimp/delete_segment.ts
+++ b/apps/sim/tools/mailchimp/delete_segment.ts
@@ -12,13 +12,6 @@ export interface MailchimpDeleteSegmentParams {
 
 export interface MailchimpDeleteSegmentResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_segment'
-      segmentId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteSegmentTool: ToolConfig<
@@ -69,25 +62,10 @@ export const mailchimpDeleteSegmentTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_segment' as const,
-          segmentId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the segment was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/delete_template.ts b/apps/sim/tools/mailchimp/delete_template.ts
index effb32ca1c..33cf01ccca 100644
--- a/apps/sim/tools/mailchimp/delete_template.ts
+++ b/apps/sim/tools/mailchimp/delete_template.ts
@@ -11,13 +11,6 @@ export interface MailchimpDeleteTemplateParams {
 
 export interface MailchimpDeleteTemplateResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'delete_template'
-      templateId: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpDeleteTemplateTool: ToolConfig<
@@ -61,25 +54,10 @@ export const mailchimpDeleteTemplateTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'delete_template' as const,
-          templateId: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Deletion confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the template was successfully deleted' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/get_audience.ts b/apps/sim/tools/mailchimp/get_audience.ts
index ebe9a5f16e..5b9fb183b9 100644
--- a/apps/sim/tools/mailchimp/get_audience.ts
+++ b/apps/sim/tools/mailchimp/get_audience.ts
@@ -14,11 +14,7 @@ export interface MailchimpGetAudienceResponse {
   success: boolean
   output: {
     list: MailchimpAudience
-    metadata: {
-      operation: 'get_audience'
-      listId: string
-    }
-    success: boolean
+    list_id: string
   }
 }
 
@@ -67,24 +63,19 @@ export const mailchimpGetAudienceTool: ToolConfig<
       success: true,
       output: {
         list: data,
-        metadata: {
-          operation: 'get_audience' as const,
-          listId: data.id,
-        },
-        success: true,
+        list_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the audience was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Audience data and metadata',
+      description: 'Audience data',
       properties: {
-        list: { type: 'object', description: 'Audience/list object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        list: { type: 'json', description: 'Audience/list object' },
+        list_id: { type: 'string', description: 'The unique ID of the audience' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_audiences.ts b/apps/sim/tools/mailchimp/get_audiences.ts
index dcb4497179..f8ca125fe2 100644
--- a/apps/sim/tools/mailchimp/get_audiences.ts
+++ b/apps/sim/tools/mailchimp/get_audiences.ts
@@ -15,12 +15,8 @@ export interface MailchimpGetAudiencesResponse {
   success: boolean
   output: {
     lists: MailchimpAudience[]
-    totalItems: number
-    metadata: {
-      operation: 'get_audiences'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -84,26 +80,24 @@ export const mailchimpGetAudiencesTool: ToolConfig<
       success: true,
       output: {
         lists,
-        totalItems: data.total_items || lists.length,
-        metadata: {
-          operation: 'get_audiences' as const,
-          totalReturned: lists.length,
-        },
-        success: true,
+        total_items: data.total_items || lists.length,
+        total_returned: lists.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the audiences were successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Audiences data and metadata',
+      description: 'Audiences data',
       properties: {
-        lists: { type: 'array', description: 'Array of audience/list objects' },
-        totalItems: { type: 'number', description: 'Total number of lists' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        lists: { type: 'json', description: 'Array of audience/list objects' },
+        total_items: { type: 'number', description: 'Total number of lists' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of lists returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_automation.ts b/apps/sim/tools/mailchimp/get_automation.ts
index fc4736392a..82062b5e95 100644
--- a/apps/sim/tools/mailchimp/get_automation.ts
+++ b/apps/sim/tools/mailchimp/get_automation.ts
@@ -14,11 +14,7 @@ export interface MailchimpGetAutomationResponse {
   success: boolean
   output: {
     automation: MailchimpAutomation
-    metadata: {
-      operation: 'get_automation'
-      workflowId: string
-    }
-    success: boolean
+    workflow_id: string
   }
 }
 
@@ -67,24 +63,19 @@ export const mailchimpGetAutomationTool: ToolConfig<
       success: true,
       output: {
         automation: data,
-        metadata: {
-          operation: 'get_automation' as const,
-          workflowId: data.id,
-        },
-        success: true,
+        workflow_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the automation was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Automation data and metadata',
+      description: 'Automation data',
       properties: {
-        automation: { type: 'object', description: 'Automation object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        automation: { type: 'json', description: 'Automation object' },
+        workflow_id: { type: 'string', description: 'The unique ID of the automation workflow' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_automations.ts b/apps/sim/tools/mailchimp/get_automations.ts
index f27b396d92..d2df8aa48d 100644
--- a/apps/sim/tools/mailchimp/get_automations.ts
+++ b/apps/sim/tools/mailchimp/get_automations.ts
@@ -15,12 +15,8 @@ export interface MailchimpGetAutomationsResponse {
   success: boolean
   output: {
     automations: MailchimpAutomation[]
-    totalItems: number
-    metadata: {
-      operation: 'get_automations'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -84,26 +80,27 @@ export const mailchimpGetAutomationsTool: ToolConfig<
       success: true,
       output: {
         automations,
-        totalItems: data.total_items || automations.length,
-        metadata: {
-          operation: 'get_automations' as const,
-          totalReturned: automations.length,
-        },
-        success: true,
+        total_items: data.total_items || automations.length,
+        total_returned: automations.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the automations were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Automations data and metadata',
+      description: 'Automations data',
       properties: {
-        automations: { type: 'array', description: 'Array of automation objects' },
-        totalItems: { type: 'number', description: 'Total number of automations' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        automations: { type: 'json', description: 'Array of automation objects' },
+        total_items: { type: 'number', description: 'Total number of automations' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of automations returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_batch_operation.ts b/apps/sim/tools/mailchimp/get_batch_operation.ts
index abd63a5f65..1784878aec 100644
--- a/apps/sim/tools/mailchimp/get_batch_operation.ts
+++ b/apps/sim/tools/mailchimp/get_batch_operation.ts
@@ -14,11 +14,7 @@ export interface MailchimpGetBatchOperationResponse {
   success: boolean
   output: {
     batch: MailchimpBatchOperation
-    metadata: {
-      operation: 'get_batch_operation'
-      batchId: string
-    }
-    success: boolean
+    batch_id: string
   }
 }
 
@@ -67,24 +63,22 @@ export const mailchimpGetBatchOperationTool: ToolConfig<
       success: true,
       output: {
         batch: data,
-        metadata: {
-          operation: 'get_batch_operation' as const,
-          batchId: data.id,
-        },
-        success: true,
+        batch_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the batch operation was successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Batch operation data and metadata',
+      description: 'Batch operation data',
       properties: {
-        batch: { type: 'object', description: 'Batch operation object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        batch: { type: 'json', description: 'Batch operation object' },
+        batch_id: { type: 'string', description: 'The unique ID of the batch operation' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_batch_operations.ts b/apps/sim/tools/mailchimp/get_batch_operations.ts
index 652d6461ca..ea5f6b76e7 100644
--- a/apps/sim/tools/mailchimp/get_batch_operations.ts
+++ b/apps/sim/tools/mailchimp/get_batch_operations.ts
@@ -15,12 +15,8 @@ export interface MailchimpGetBatchOperationsResponse {
   success: boolean
   output: {
     batches: MailchimpBatchOperation[]
-    totalItems: number
-    metadata: {
-      operation: 'get_batch_operations'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -84,26 +80,27 @@ export const mailchimpGetBatchOperationsTool: ToolConfig<
       success: true,
       output: {
         batches,
-        totalItems: data.total_items || batches.length,
-        metadata: {
-          operation: 'get_batch_operations' as const,
-          totalReturned: batches.length,
-        },
-        success: true,
+        total_items: data.total_items || batches.length,
+        total_returned: batches.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the batch operations were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Batch operations data and metadata',
+      description: 'Batch operations data',
       properties: {
-        batches: { type: 'array', description: 'Array of batch operation objects' },
-        totalItems: { type: 'number', description: 'Total number of batch operations' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        batches: { type: 'json', description: 'Array of batch operation objects' },
+        total_items: { type: 'number', description: 'Total number of batch operations' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of batch operations returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_campaign.ts b/apps/sim/tools/mailchimp/get_campaign.ts
index b52a6ca3b1..1562566f6d 100644
--- a/apps/sim/tools/mailchimp/get_campaign.ts
+++ b/apps/sim/tools/mailchimp/get_campaign.ts
@@ -13,11 +13,7 @@ export interface MailchimpGetCampaignResponse {
   success: boolean
   output: {
     campaign: MailchimpCampaign
-    metadata: {
-      operation: 'get_campaign'
-      campaignId: string
-    }
-    success: boolean
+    campaign_id: string
   }
 }
 
@@ -66,24 +62,19 @@ export const mailchimpGetCampaignTool: ToolConfig<
       success: true,
       output: {
         campaign: data,
-        metadata: {
-          operation: 'get_campaign' as const,
-          campaignId: data.id,
-        },
-        success: true,
+        campaign_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the campaign was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Campaign data and metadata',
+      description: 'Campaign data',
       properties: {
-        campaign: { type: 'object', description: 'Campaign object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        campaign: { type: 'json', description: 'Campaign object' },
+        campaign_id: { type: 'string', description: 'The unique ID of the campaign' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_campaign_content.ts b/apps/sim/tools/mailchimp/get_campaign_content.ts
index eb91a1facf..978ffbe415 100644
--- a/apps/sim/tools/mailchimp/get_campaign_content.ts
+++ b/apps/sim/tools/mailchimp/get_campaign_content.ts
@@ -13,11 +13,6 @@ export interface MailchimpGetCampaignContentResponse {
   success: boolean
   output: {
     content: MailchimpCampaignContent
-    metadata: {
-      operation: 'get_campaign_content'
-      campaignId: string
-    }
-    success: boolean
   }
 }
 
@@ -66,24 +61,20 @@ export const mailchimpGetCampaignContentTool: ToolConfig<
       success: true,
       output: {
         content: data,
-        metadata: {
-          operation: 'get_campaign_content' as const,
-          campaignId: '',
-        },
-        success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the campaign content was successfully retrieved',
+    },
     output: {
       type: 'object',
       description: 'Campaign content data',
       properties: {
-        content: { type: 'object', description: 'Campaign content object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        content: { type: 'json', description: 'Campaign content object' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_campaign_report.ts b/apps/sim/tools/mailchimp/get_campaign_report.ts
index e9ffd2447f..2babba6891 100644
--- a/apps/sim/tools/mailchimp/get_campaign_report.ts
+++ b/apps/sim/tools/mailchimp/get_campaign_report.ts
@@ -13,11 +13,7 @@ export interface MailchimpGetCampaignReportResponse {
   success: boolean
   output: {
     report: MailchimpCampaignReport
-    metadata: {
-      operation: 'get_campaign_report'
-      campaignId: string
-    }
-    success: boolean
+    campaign_id: string
   }
 }
 
@@ -66,24 +62,22 @@ export const mailchimpGetCampaignReportTool: ToolConfig<
       success: true,
       output: {
         report: data,
-        metadata: {
-          operation: 'get_campaign_report' as const,
-          campaignId: data.campaign_id,
-        },
-        success: true,
+        campaign_id: data.campaign_id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the campaign report was successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Campaign report data and metadata',
+      description: 'Campaign report data',
       properties: {
-        report: { type: 'object', description: 'Campaign report object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        report: { type: 'json', description: 'Campaign report object' },
+        campaign_id: { type: 'string', description: 'The unique ID of the campaign' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_campaign_reports.ts b/apps/sim/tools/mailchimp/get_campaign_reports.ts
index 20924e192e..ee5fe8c297 100644
--- a/apps/sim/tools/mailchimp/get_campaign_reports.ts
+++ b/apps/sim/tools/mailchimp/get_campaign_reports.ts
@@ -14,12 +14,8 @@ export interface MailchimpGetCampaignReportsResponse {
   success: boolean
   output: {
     reports: MailchimpCampaignReport[]
-    totalItems: number
-    metadata: {
-      operation: 'get_campaign_reports'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -83,26 +79,27 @@ export const mailchimpGetCampaignReportsTool: ToolConfig<
       success: true,
       output: {
         reports,
-        totalItems: data.total_items || reports.length,
-        metadata: {
-          operation: 'get_campaign_reports' as const,
-          totalReturned: reports.length,
-        },
-        success: true,
+        total_items: data.total_items || reports.length,
+        total_returned: reports.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the campaign reports were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Campaign reports data and metadata',
+      description: 'Campaign reports data',
       properties: {
-        reports: { type: 'array', description: 'Array of campaign report objects' },
-        totalItems: { type: 'number', description: 'Total number of reports' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        reports: { type: 'json', description: 'Array of campaign report objects' },
+        total_items: { type: 'number', description: 'Total number of reports' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of reports returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_campaigns.ts b/apps/sim/tools/mailchimp/get_campaigns.ts
index 596fc3b570..aa9d8dcaa2 100644
--- a/apps/sim/tools/mailchimp/get_campaigns.ts
+++ b/apps/sim/tools/mailchimp/get_campaigns.ts
@@ -16,12 +16,8 @@ export interface MailchimpGetCampaignsResponse {
   success: boolean
   output: {
     campaigns: MailchimpCampaign[]
-    totalItems: number
-    metadata: {
-      operation: 'get_campaigns'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -99,26 +95,24 @@ export const mailchimpGetCampaignsTool: ToolConfig<
       success: true,
       output: {
         campaigns,
-        totalItems: data.total_items || campaigns.length,
-        metadata: {
-          operation: 'get_campaigns' as const,
-          totalReturned: campaigns.length,
-        },
-        success: true,
+        total_items: data.total_items || campaigns.length,
+        total_returned: campaigns.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the campaigns were successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Campaigns data and metadata',
+      description: 'Campaigns data',
       properties: {
-        campaigns: { type: 'array', description: 'Array of campaign objects' },
-        totalItems: { type: 'number', description: 'Total number of campaigns' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        campaigns: { type: 'json', description: 'Array of campaign objects' },
+        total_items: { type: 'number', description: 'Total number of campaigns' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of campaigns returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_interest.ts b/apps/sim/tools/mailchimp/get_interest.ts
index d7e56a9751..53500d1781 100644
--- a/apps/sim/tools/mailchimp/get_interest.ts
+++ b/apps/sim/tools/mailchimp/get_interest.ts
@@ -16,11 +16,7 @@ export interface MailchimpGetInterestResponse {
   success: boolean
   output: {
     interest: MailchimpInterest
-    metadata: {
-      operation: 'get_interest'
-      interestId: string
-    }
-    success: boolean
+    interest_id: string
   }
 }
 
@@ -86,24 +82,19 @@ export const mailchimpGetInterestTool: ToolConfig<
       success: true,
       output: {
         interest: data,
-        metadata: {
-          operation: 'get_interest' as const,
-          interestId: data.id,
-        },
-        success: true,
+        interest_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the interest was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Interest data and metadata',
+      description: 'Interest data',
       properties: {
-        interest: { type: 'object', description: 'Interest object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        interest: { type: 'json', description: 'Interest object' },
+        interest_id: { type: 'string', description: 'The unique ID of the interest' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_interest_categories.ts b/apps/sim/tools/mailchimp/get_interest_categories.ts
index c624041ce2..9f9f23133f 100644
--- a/apps/sim/tools/mailchimp/get_interest_categories.ts
+++ b/apps/sim/tools/mailchimp/get_interest_categories.ts
@@ -15,12 +15,8 @@ export interface MailchimpGetInterestCategoriesResponse {
   success: boolean
   output: {
     categories: any[]
-    totalItems: number
-    metadata: {
-      operation: 'get_interest_categories'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -90,26 +86,27 @@ export const mailchimpGetInterestCategoriesTool: ToolConfig<
       success: true,
       output: {
         categories,
-        totalItems: data.total_items || categories.length,
-        metadata: {
-          operation: 'get_interest_categories' as const,
-          totalReturned: categories.length,
-        },
-        success: true,
+        total_items: data.total_items || categories.length,
+        total_returned: categories.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the interest categories were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Interest categories data and metadata',
+      description: 'Interest categories data',
       properties: {
-        categories: { type: 'array', description: 'Array of interest category objects' },
-        totalItems: { type: 'number', description: 'Total number of categories' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        categories: { type: 'json', description: 'Array of interest category objects' },
+        total_items: { type: 'number', description: 'Total number of categories' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of categories returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_interest_category.ts b/apps/sim/tools/mailchimp/get_interest_category.ts
index 24248d8fd6..a2277434fa 100644
--- a/apps/sim/tools/mailchimp/get_interest_category.ts
+++ b/apps/sim/tools/mailchimp/get_interest_category.ts
@@ -15,11 +15,7 @@ export interface MailchimpGetInterestCategoryResponse {
   success: boolean
   output: {
     category: MailchimpInterestCategory
-    metadata: {
-      operation: 'get_interest_category'
-      interestCategoryId: string
-    }
-    success: boolean
+    interest_category_id: string
   }
 }
 
@@ -78,24 +74,25 @@ export const mailchimpGetInterestCategoryTool: ToolConfig<
       success: true,
       output: {
         category: data,
-        metadata: {
-          operation: 'get_interest_category' as const,
-          interestCategoryId: data.id,
-        },
-        success: true,
+        interest_category_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the interest category was successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Interest category data and metadata',
+      description: 'Interest category data',
       properties: {
-        category: { type: 'object', description: 'Interest category object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        category: { type: 'json', description: 'Interest category object' },
+        interest_category_id: {
+          type: 'string',
+          description: 'The unique ID of the interest category',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_interests.ts b/apps/sim/tools/mailchimp/get_interests.ts
index 54446457b1..7e0f8d5a48 100644
--- a/apps/sim/tools/mailchimp/get_interests.ts
+++ b/apps/sim/tools/mailchimp/get_interests.ts
@@ -16,12 +16,8 @@ export interface MailchimpGetInterestsResponse {
   success: boolean
   output: {
     interests: any[]
-    totalItems: number
-    metadata: {
-      operation: 'get_interests'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -100,26 +96,24 @@ export const mailchimpGetInterestsTool: ToolConfig<
       success: true,
       output: {
         interests,
-        totalItems: data.total_items || interests.length,
-        metadata: {
-          operation: 'get_interests' as const,
-          totalReturned: interests.length,
-        },
-        success: true,
+        total_items: data.total_items || interests.length,
+        total_returned: interests.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the interests were successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Interests data and metadata',
+      description: 'Interests data',
       properties: {
-        interests: { type: 'array', description: 'Array of interest objects' },
-        totalItems: { type: 'number', description: 'Total number of interests' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        interests: { type: 'json', description: 'Array of interest objects' },
+        total_items: { type: 'number', description: 'Total number of interests' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of interests returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_landing_page.ts b/apps/sim/tools/mailchimp/get_landing_page.ts
index c624f106bb..4b4f3a2ad4 100644
--- a/apps/sim/tools/mailchimp/get_landing_page.ts
+++ b/apps/sim/tools/mailchimp/get_landing_page.ts
@@ -14,11 +14,7 @@ export interface MailchimpGetLandingPageResponse {
   success: boolean
   output: {
     landingPage: MailchimpLandingPage
-    metadata: {
-      operation: 'get_landing_page'
-      pageId: string
-    }
-    success: boolean
+    page_id: string
   }
 }
 
@@ -67,24 +63,22 @@ export const mailchimpGetLandingPageTool: ToolConfig<
       success: true,
       output: {
         landingPage: data,
-        metadata: {
-          operation: 'get_landing_page' as const,
-          pageId: data.id,
-        },
-        success: true,
+        page_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the landing page was successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Landing page data and metadata',
+      description: 'Landing page data',
       properties: {
-        landingPage: { type: 'object', description: 'Landing page object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        landingPage: { type: 'json', description: 'Landing page object' },
+        page_id: { type: 'string', description: 'The unique ID of the landing page' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_landing_pages.ts b/apps/sim/tools/mailchimp/get_landing_pages.ts
index 548c4eb1b6..ccc777bba7 100644
--- a/apps/sim/tools/mailchimp/get_landing_pages.ts
+++ b/apps/sim/tools/mailchimp/get_landing_pages.ts
@@ -15,12 +15,8 @@ export interface MailchimpGetLandingPagesResponse {
   success: boolean
   output: {
     landingPages: MailchimpLandingPage[]
-    totalItems: number
-    metadata: {
-      operation: 'get_landing_pages'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -84,26 +80,27 @@ export const mailchimpGetLandingPagesTool: ToolConfig<
       success: true,
       output: {
         landingPages,
-        totalItems: data.total_items || landingPages.length,
-        metadata: {
-          operation: 'get_landing_pages' as const,
-          totalReturned: landingPages.length,
-        },
-        success: true,
+        total_items: data.total_items || landingPages.length,
+        total_returned: landingPages.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the landing pages were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Landing pages data and metadata',
+      description: 'Landing pages data',
       properties: {
-        landingPages: { type: 'array', description: 'Array of landing page objects' },
-        totalItems: { type: 'number', description: 'Total number of landing pages' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        landingPages: { type: 'json', description: 'Array of landing page objects' },
+        total_items: { type: 'number', description: 'Total number of landing pages' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of landing pages returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_member.ts b/apps/sim/tools/mailchimp/get_member.ts
index e19ae22fd6..dd886f6b16 100644
--- a/apps/sim/tools/mailchimp/get_member.ts
+++ b/apps/sim/tools/mailchimp/get_member.ts
@@ -14,11 +14,7 @@ export interface MailchimpGetMemberResponse {
   success: boolean
   output: {
     member: MailchimpMember
-    metadata: {
-      operation: 'get_member'
-      subscriberHash: string
-    }
-    success: boolean
+    subscriber_hash: string
   }
 }
 
@@ -74,24 +70,22 @@ export const mailchimpGetMemberTool: ToolConfig<
       success: true,
       output: {
         member: data,
-        metadata: {
-          operation: 'get_member' as const,
-          subscriberHash: data.id,
-        },
-        success: true,
+        subscriber_hash: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the member was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Member data and metadata',
+      description: 'Member data',
       properties: {
-        member: { type: 'object', description: 'Member object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        member: { type: 'json', description: 'Member object' },
+        subscriber_hash: {
+          type: 'string',
+          description: 'The MD5 hash of the member email address',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_member_tags.ts b/apps/sim/tools/mailchimp/get_member_tags.ts
index 06f17b6189..93966daf32 100644
--- a/apps/sim/tools/mailchimp/get_member_tags.ts
+++ b/apps/sim/tools/mailchimp/get_member_tags.ts
@@ -14,12 +14,8 @@ export interface MailchimpGetMemberTagsResponse {
   success: boolean
   output: {
     tags: MailchimpTag[]
-    totalItems: number
-    metadata: {
-      operation: 'get_member_tags'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -79,26 +75,24 @@ export const mailchimpGetMemberTagsTool: ToolConfig<
       success: true,
       output: {
         tags,
-        totalItems: data.total_items || tags.length,
-        metadata: {
-          operation: 'get_member_tags' as const,
-          totalReturned: tags.length,
-        },
-        success: true,
+        total_items: data.total_items || tags.length,
+        total_returned: tags.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the member tags were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Member tags data and metadata',
+      description: 'Member tags data',
       properties: {
-        tags: { type: 'array', description: 'Array of tag objects' },
-        totalItems: { type: 'number', description: 'Total number of tags' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        tags: { type: 'json', description: 'Array of tag objects' },
+        total_items: { type: 'number', description: 'Total number of tags' },
+        total_returned: { type: 'number', description: 'Number of tags returned in this response' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_members.ts b/apps/sim/tools/mailchimp/get_members.ts
index 42e7220d15..259531f416 100644
--- a/apps/sim/tools/mailchimp/get_members.ts
+++ b/apps/sim/tools/mailchimp/get_members.ts
@@ -16,12 +16,8 @@ export interface MailchimpGetMembersResponse {
   success: boolean
   output: {
     members: MailchimpMember[]
-    totalItems: number
-    metadata: {
-      operation: 'get_members'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -98,26 +94,24 @@ export const mailchimpGetMembersTool: ToolConfig<
       success: true,
       output: {
         members,
-        totalItems: data.total_items || members.length,
-        metadata: {
-          operation: 'get_members' as const,
-          totalReturned: members.length,
-        },
-        success: true,
+        total_items: data.total_items || members.length,
+        total_returned: members.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the members were successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Members data and metadata',
+      description: 'Members data',
       properties: {
-        members: { type: 'array', description: 'Array of member objects' },
-        totalItems: { type: 'number', description: 'Total number of members' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        members: { type: 'json', description: 'Array of member objects' },
+        total_items: { type: 'number', description: 'Total number of members' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of members returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_merge_field.ts b/apps/sim/tools/mailchimp/get_merge_field.ts
index 25bd428808..fc4b12dfc7 100644
--- a/apps/sim/tools/mailchimp/get_merge_field.ts
+++ b/apps/sim/tools/mailchimp/get_merge_field.ts
@@ -14,11 +14,7 @@ export interface MailchimpGetMergeFieldResponse {
   success: boolean
   output: {
     mergeField: any
-    metadata: {
-      operation: 'get_merge_field'
-      mergeId: string
-    }
-    success: boolean
+    merge_id: string
   }
 }
 
@@ -74,24 +70,19 @@ export const mailchimpGetMergeFieldTool: ToolConfig<
       success: true,
       output: {
         mergeField: data,
-        metadata: {
-          operation: 'get_merge_field' as const,
-          mergeId: data.merge_id,
-        },
-        success: true,
+        merge_id: data.merge_id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the merge field was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Merge field data and metadata',
+      description: 'Merge field data',
       properties: {
-        mergeField: { type: 'object', description: 'Merge field object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        mergeField: { type: 'json', description: 'Merge field object' },
+        merge_id: { type: 'string', description: 'The unique ID of the merge field' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_merge_fields.ts b/apps/sim/tools/mailchimp/get_merge_fields.ts
index 9b234314d8..479ffd832c 100644
--- a/apps/sim/tools/mailchimp/get_merge_fields.ts
+++ b/apps/sim/tools/mailchimp/get_merge_fields.ts
@@ -16,12 +16,8 @@ export interface MailchimpGetMergeFieldsResponse {
   success: boolean
   output: {
     mergeFields: MailchimpMergeField[]
-    totalItems: number
-    metadata: {
-      operation: 'get_merge_fields'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -91,26 +87,27 @@ export const mailchimpGetMergeFieldsTool: ToolConfig<
       success: true,
       output: {
         mergeFields,
-        totalItems: data.total_items || mergeFields.length,
-        metadata: {
-          operation: 'get_merge_fields' as const,
-          totalReturned: mergeFields.length,
-        },
-        success: true,
+        total_items: data.total_items || mergeFields.length,
+        total_returned: mergeFields.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the merge fields were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Merge fields data and metadata',
+      description: 'Merge fields data',
       properties: {
-        mergeFields: { type: 'array', description: 'Array of merge field objects' },
-        totalItems: { type: 'number', description: 'Total number of merge fields' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        mergeFields: { type: 'json', description: 'Array of merge field objects' },
+        total_items: { type: 'number', description: 'Total number of merge fields' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of merge fields returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_segment.ts b/apps/sim/tools/mailchimp/get_segment.ts
index a9e18f1e9f..2917da26a7 100644
--- a/apps/sim/tools/mailchimp/get_segment.ts
+++ b/apps/sim/tools/mailchimp/get_segment.ts
@@ -15,11 +15,7 @@ export interface MailchimpGetSegmentResponse {
   success: boolean
   output: {
     segment: MailchimpSegment
-    metadata: {
-      operation: 'get_segment'
-      segmentId: string
-    }
-    success: boolean
+    segment_id: string
   }
 }
 
@@ -75,24 +71,19 @@ export const mailchimpGetSegmentTool: ToolConfig<
       success: true,
       output: {
         segment: data,
-        metadata: {
-          operation: 'get_segment' as const,
-          segmentId: data.id,
-        },
-        success: true,
+        segment_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the segment was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Segment data and metadata',
+      description: 'Segment data',
       properties: {
-        segment: { type: 'object', description: 'Segment object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        segment: { type: 'json', description: 'Segment object' },
+        segment_id: { type: 'string', description: 'The unique ID of the segment' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_segment_members.ts b/apps/sim/tools/mailchimp/get_segment_members.ts
index 7bbd7c3768..ea215401b9 100644
--- a/apps/sim/tools/mailchimp/get_segment_members.ts
+++ b/apps/sim/tools/mailchimp/get_segment_members.ts
@@ -17,12 +17,8 @@ export interface MailchimpGetSegmentMembersResponse {
   success: boolean
   output: {
     members: MailchimpMember[]
-    totalItems: number
-    metadata: {
-      operation: 'get_segment_members'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -101,26 +97,27 @@ export const mailchimpGetSegmentMembersTool: ToolConfig<
       success: true,
       output: {
         members,
-        totalItems: data.total_items || members.length,
-        metadata: {
-          operation: 'get_segment_members' as const,
-          totalReturned: members.length,
-        },
-        success: true,
+        total_items: data.total_items || members.length,
+        total_returned: members.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: {
+      type: 'boolean',
+      description: 'Whether the segment members were successfully retrieved',
+    },
     output: {
       type: 'object',
-      description: 'Segment members data and metadata',
+      description: 'Segment members data',
       properties: {
-        members: { type: 'array', description: 'Array of member objects' },
-        totalItems: { type: 'number', description: 'Total number of members' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        members: { type: 'json', description: 'Array of member objects' },
+        total_items: { type: 'number', description: 'Total number of members' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of members returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_segments.ts b/apps/sim/tools/mailchimp/get_segments.ts
index dc806eb3d3..d2aef507d8 100644
--- a/apps/sim/tools/mailchimp/get_segments.ts
+++ b/apps/sim/tools/mailchimp/get_segments.ts
@@ -15,12 +15,8 @@ export interface MailchimpGetSegmentsResponse {
   success: boolean
   output: {
     segments: any[]
-    totalItems: number
-    metadata: {
-      operation: 'get_segments'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -90,26 +86,24 @@ export const mailchimpGetSegmentsTool: ToolConfig<
       success: true,
       output: {
         segments,
-        totalItems: data.total_items || segments.length,
-        metadata: {
-          operation: 'get_segments' as const,
-          totalReturned: segments.length,
-        },
-        success: true,
+        total_items: data.total_items || segments.length,
+        total_returned: segments.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the segments were successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Segments data and metadata',
+      description: 'Segments data',
       properties: {
-        segments: { type: 'array', description: 'Array of segment objects' },
-        totalItems: { type: 'number', description: 'Total number of segments' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        segments: { type: 'json', description: 'Array of segment objects' },
+        total_items: { type: 'number', description: 'Total number of segments' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of segments returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_template.ts b/apps/sim/tools/mailchimp/get_template.ts
index 7b7c8eb11b..4a11ee5c37 100644
--- a/apps/sim/tools/mailchimp/get_template.ts
+++ b/apps/sim/tools/mailchimp/get_template.ts
@@ -14,11 +14,7 @@ export interface MailchimpGetTemplateResponse {
   success: boolean
   output: {
     template: MailchimpTemplate
-    metadata: {
-      operation: 'get_template'
-      templateId: string
-    }
-    success: boolean
+    template_id: string
   }
 }
 
@@ -67,24 +63,19 @@ export const mailchimpGetTemplateTool: ToolConfig<
       success: true,
       output: {
         template: data,
-        metadata: {
-          operation: 'get_template' as const,
-          templateId: data.id,
-        },
-        success: true,
+        template_id: data.id,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the template was successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Template data and metadata',
+      description: 'Template data',
       properties: {
-        template: { type: 'object', description: 'Template object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        template: { type: 'json', description: 'Template object' },
+        template_id: { type: 'string', description: 'The unique ID of the template' },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/get_templates.ts b/apps/sim/tools/mailchimp/get_templates.ts
index 200300a7a9..9b23a71ec0 100644
--- a/apps/sim/tools/mailchimp/get_templates.ts
+++ b/apps/sim/tools/mailchimp/get_templates.ts
@@ -15,12 +15,8 @@ export interface MailchimpGetTemplatesResponse {
   success: boolean
   output: {
     templates: MailchimpTemplate[]
-    totalItems: number
-    metadata: {
-      operation: 'get_templates'
-      totalReturned: number
-    }
-    success: boolean
+    total_items: number
+    total_returned: number
   }
 }
 
@@ -84,26 +80,24 @@ export const mailchimpGetTemplatesTool: ToolConfig<
       success: true,
       output: {
         templates,
-        totalItems: data.total_items || templates.length,
-        metadata: {
-          operation: 'get_templates' as const,
-          totalReturned: templates.length,
-        },
-        success: true,
+        total_items: data.total_items || templates.length,
+        total_returned: templates.length,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
+    success: { type: 'boolean', description: 'Whether the templates were successfully retrieved' },
     output: {
       type: 'object',
-      description: 'Templates data and metadata',
+      description: 'Templates data',
       properties: {
-        templates: { type: 'array', description: 'Array of template objects' },
-        totalItems: { type: 'number', description: 'Total number of templates' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        templates: { type: 'json', description: 'Array of template objects' },
+        total_items: { type: 'number', description: 'Total number of templates' },
+        total_returned: {
+          type: 'number',
+          description: 'Number of templates returned in this response',
+        },
       },
     },
   },
diff --git a/apps/sim/tools/mailchimp/pause_automation.ts b/apps/sim/tools/mailchimp/pause_automation.ts
index c433b14cc4..fb506bf80d 100644
--- a/apps/sim/tools/mailchimp/pause_automation.ts
+++ b/apps/sim/tools/mailchimp/pause_automation.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpPauseAutomation')
-
 export interface MailchimpPauseAutomationParams {
   apiKey: string
   workflowId: string
@@ -12,10 +9,6 @@ export interface MailchimpPauseAutomationParams {
 export interface MailchimpPauseAutomationResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'pause_automation'
-      workflowId: string
-    }
     success: boolean
   }
 }
@@ -66,10 +59,6 @@ export const mailchimpPauseAutomationTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'pause_automation' as const,
-          workflowId: '',
-        },
         success: true,
       },
     }
@@ -81,7 +70,6 @@ export const mailchimpPauseAutomationTool: ToolConfig<
       type: 'object',
       description: 'Pause confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/publish_landing_page.ts b/apps/sim/tools/mailchimp/publish_landing_page.ts
index f780b908e6..bfb881cb44 100644
--- a/apps/sim/tools/mailchimp/publish_landing_page.ts
+++ b/apps/sim/tools/mailchimp/publish_landing_page.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpPublishLandingPage')
-
 export interface MailchimpPublishLandingPageParams {
   apiKey: string
   pageId: string
@@ -12,10 +9,6 @@ export interface MailchimpPublishLandingPageParams {
 export interface MailchimpPublishLandingPageResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'publish_landing_page'
-      pageId: string
-    }
     success: boolean
   }
 }
@@ -63,10 +56,6 @@ export const mailchimpPublishLandingPageTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'publish_landing_page' as const,
-          pageId: '',
-        },
         success: true,
       },
     }
@@ -78,7 +67,6 @@ export const mailchimpPublishLandingPageTool: ToolConfig<
       type: 'object',
       description: 'Publish confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/remove_member_tags.ts b/apps/sim/tools/mailchimp/remove_member_tags.ts
index 205e329d53..433cd6aeb0 100644
--- a/apps/sim/tools/mailchimp/remove_member_tags.ts
+++ b/apps/sim/tools/mailchimp/remove_member_tags.ts
@@ -14,10 +14,6 @@ export interface MailchimpRemoveMemberTagsParams {
 export interface MailchimpRemoveMemberTagsResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'remove_member_tags'
-      subscriberHash: string
-    }
     success: boolean
   }
 }
@@ -90,10 +86,6 @@ export const mailchimpRemoveMemberTagsTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'remove_member_tags' as const,
-          subscriberHash: '',
-        },
         success: true,
       },
     }
@@ -105,7 +97,6 @@ export const mailchimpRemoveMemberTagsTool: ToolConfig<
       type: 'object',
       description: 'Tag removal confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/remove_segment_member.ts b/apps/sim/tools/mailchimp/remove_segment_member.ts
index 9e32d580e6..b053be8879 100644
--- a/apps/sim/tools/mailchimp/remove_segment_member.ts
+++ b/apps/sim/tools/mailchimp/remove_segment_member.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpRemoveSegmentMember')
-
 export interface MailchimpRemoveSegmentMemberParams {
   apiKey: string
   listId: string
@@ -14,10 +11,6 @@ export interface MailchimpRemoveSegmentMemberParams {
 export interface MailchimpRemoveSegmentMemberResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'remove_segment_member'
-      subscriberHash: string
-    }
     success: boolean
   }
 }
@@ -80,10 +73,6 @@ export const mailchimpRemoveSegmentMemberTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'remove_segment_member' as const,
-          subscriberHash: '',
-        },
         success: true,
       },
     }
@@ -95,7 +84,6 @@ export const mailchimpRemoveSegmentMemberTool: ToolConfig<
       type: 'object',
       description: 'Removal confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/replicate_campaign.ts b/apps/sim/tools/mailchimp/replicate_campaign.ts
index 359bbb5e7a..2dd9a95b3e 100644
--- a/apps/sim/tools/mailchimp/replicate_campaign.ts
+++ b/apps/sim/tools/mailchimp/replicate_campaign.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpReplicateCampaign')
-
 export interface MailchimpReplicateCampaignParams {
   apiKey: string
   campaignId: string
@@ -12,11 +9,8 @@ export interface MailchimpReplicateCampaignParams {
 export interface MailchimpReplicateCampaignResponse {
   success: boolean
   output: {
-    campaign: any
-    metadata: {
-      operation: 'replicate_campaign'
-      campaignId: string
-    }
+    campaign: unknown
+    campaign_id: string
     success: boolean
   }
 }
@@ -67,10 +61,7 @@ export const mailchimpReplicateCampaignTool: ToolConfig<
       success: true,
       output: {
         campaign: data,
-        metadata: {
-          operation: 'replicate_campaign' as const,
-          campaignId: data.id,
-        },
+        campaign_id: data.id,
         success: true,
       },
     }
@@ -83,7 +74,7 @@ export const mailchimpReplicateCampaignTool: ToolConfig<
       description: 'Replicated campaign data',
       properties: {
         campaign: { type: 'object', description: 'Replicated campaign object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        campaign_id: { type: 'string', description: 'Campaign ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/schedule_campaign.ts b/apps/sim/tools/mailchimp/schedule_campaign.ts
index fcd8ad630c..13b5c67501 100644
--- a/apps/sim/tools/mailchimp/schedule_campaign.ts
+++ b/apps/sim/tools/mailchimp/schedule_campaign.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpScheduleCampaign')
-
 export interface MailchimpScheduleCampaignParams {
   apiKey: string
   campaignId: string
@@ -12,14 +9,6 @@ export interface MailchimpScheduleCampaignParams {
 
 export interface MailchimpScheduleCampaignResponse {
   success: boolean
-  output: {
-    metadata: {
-      operation: 'schedule_campaign'
-      campaignId: string
-      scheduleTime: string
-    }
-    success: boolean
-  }
 }
 
 export const mailchimpScheduleCampaignTool: ToolConfig<
@@ -73,26 +62,10 @@ export const mailchimpScheduleCampaignTool: ToolConfig<
 
     return {
       success: true,
-      output: {
-        metadata: {
-          operation: 'schedule_campaign' as const,
-          campaignId: '',
-          scheduleTime: '',
-        },
-        success: true,
-      },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Operation success status' },
-    output: {
-      type: 'object',
-      description: 'Schedule confirmation',
-      properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
-      },
-    },
+    success: { type: 'boolean', description: 'Whether the campaign was successfully scheduled' },
   },
 }
diff --git a/apps/sim/tools/mailchimp/send_campaign.ts b/apps/sim/tools/mailchimp/send_campaign.ts
index acccf287e0..fdc0a18040 100644
--- a/apps/sim/tools/mailchimp/send_campaign.ts
+++ b/apps/sim/tools/mailchimp/send_campaign.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpSendCampaign')
-
 export interface MailchimpSendCampaignParams {
   apiKey: string
   campaignId: string
@@ -12,10 +9,6 @@ export interface MailchimpSendCampaignParams {
 export interface MailchimpSendCampaignResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'send_campaign'
-      campaignId: string
-    }
     success: boolean
   }
 }
@@ -63,10 +56,6 @@ export const mailchimpSendCampaignTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'send_campaign' as const,
-          campaignId: '',
-        },
         success: true,
       },
     }
@@ -78,7 +67,6 @@ export const mailchimpSendCampaignTool: ToolConfig<
       type: 'object',
       description: 'Send confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/set_campaign_content.ts b/apps/sim/tools/mailchimp/set_campaign_content.ts
index 9c13ebf85e..1c0b4b04ec 100644
--- a/apps/sim/tools/mailchimp/set_campaign_content.ts
+++ b/apps/sim/tools/mailchimp/set_campaign_content.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError, type MailchimpCampaignContent } from './types'
 
-const logger = createLogger('MailchimpSetCampaignContent')
-
 export interface MailchimpSetCampaignContentParams {
   apiKey: string
   campaignId: string
@@ -16,10 +13,6 @@ export interface MailchimpSetCampaignContentResponse {
   success: boolean
   output: {
     content: MailchimpCampaignContent
-    metadata: {
-      operation: 'set_campaign_content'
-      campaignId: string
-    }
     success: boolean
   }
 }
@@ -96,10 +89,6 @@ export const mailchimpSetCampaignContentTool: ToolConfig<
       success: true,
       output: {
         content: data,
-        metadata: {
-          operation: 'set_campaign_content' as const,
-          campaignId: '',
-        },
         success: true,
       },
     }
@@ -112,7 +101,6 @@ export const mailchimpSetCampaignContentTool: ToolConfig<
       description: 'Campaign content data',
       properties: {
         content: { type: 'object', description: 'Campaign content object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/start_automation.ts b/apps/sim/tools/mailchimp/start_automation.ts
index 9c78b254a4..8d3226d4c6 100644
--- a/apps/sim/tools/mailchimp/start_automation.ts
+++ b/apps/sim/tools/mailchimp/start_automation.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpStartAutomation')
-
 export interface MailchimpStartAutomationParams {
   apiKey: string
   workflowId: string
@@ -12,10 +9,6 @@ export interface MailchimpStartAutomationParams {
 export interface MailchimpStartAutomationResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'start_automation'
-      workflowId: string
-    }
     success: boolean
   }
 }
@@ -66,10 +59,6 @@ export const mailchimpStartAutomationTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'start_automation' as const,
-          workflowId: '',
-        },
         success: true,
       },
     }
@@ -81,7 +70,6 @@ export const mailchimpStartAutomationTool: ToolConfig<
       type: 'object',
       description: 'Start confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/types.ts b/apps/sim/tools/mailchimp/types.ts
index aa13ec97ed..8632a94dd1 100644
--- a/apps/sim/tools/mailchimp/types.ts
+++ b/apps/sim/tools/mailchimp/types.ts
@@ -13,7 +13,7 @@ export interface MailchimpPaginationParams {
 }
 
 export interface MailchimpPagingInfo {
-  totalItems: number
+  total_items: number
 }
 
 export interface MailchimpResponse<T> {
@@ -21,8 +21,7 @@ export interface MailchimpResponse<T> {
   output: {
     data?: T
     paging?: MailchimpPagingInfo
-    metadata: {
-      operation: string
+    metadata?: {
       [key: string]: unknown
     }
     success: boolean
diff --git a/apps/sim/tools/mailchimp/unarchive_member.ts b/apps/sim/tools/mailchimp/unarchive_member.ts
index ab84b0159b..62be61062c 100644
--- a/apps/sim/tools/mailchimp/unarchive_member.ts
+++ b/apps/sim/tools/mailchimp/unarchive_member.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError, type MailchimpMember } from './types'
 
-const logger = createLogger('MailchimpUnarchiveMember')
-
 export interface MailchimpUnarchiveMemberParams {
   apiKey: string
   listId: string
@@ -16,10 +13,7 @@ export interface MailchimpUnarchiveMemberResponse {
   success: boolean
   output: {
     member: MailchimpMember
-    metadata: {
-      operation: 'unarchive_member'
-      subscriberHash: string
-    }
+    subscriber_hash: string
     success: boolean
   }
 }
@@ -92,10 +86,7 @@ export const mailchimpUnarchiveMemberTool: ToolConfig<
       success: true,
       output: {
         member: data,
-        metadata: {
-          operation: 'unarchive_member' as const,
-          subscriberHash: data.id,
-        },
+        subscriber_hash: data.id,
         success: true,
       },
     }
@@ -108,7 +99,7 @@ export const mailchimpUnarchiveMemberTool: ToolConfig<
       description: 'Unarchived member data',
       properties: {
         member: { type: 'object', description: 'Unarchived member object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        subscriber_hash: { type: 'string', description: 'Subscriber hash' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/unpublish_landing_page.ts b/apps/sim/tools/mailchimp/unpublish_landing_page.ts
index aaf48d4a01..f4f6618d57 100644
--- a/apps/sim/tools/mailchimp/unpublish_landing_page.ts
+++ b/apps/sim/tools/mailchimp/unpublish_landing_page.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpUnpublishLandingPage')
-
 export interface MailchimpUnpublishLandingPageParams {
   apiKey: string
   pageId: string
@@ -12,10 +9,6 @@ export interface MailchimpUnpublishLandingPageParams {
 export interface MailchimpUnpublishLandingPageResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'unpublish_landing_page'
-      pageId: string
-    }
     success: boolean
   }
 }
@@ -63,10 +56,6 @@ export const mailchimpUnpublishLandingPageTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'unpublish_landing_page' as const,
-          pageId: '',
-        },
         success: true,
       },
     }
@@ -78,7 +67,6 @@ export const mailchimpUnpublishLandingPageTool: ToolConfig<
       type: 'object',
       description: 'Unpublish confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/unschedule_campaign.ts b/apps/sim/tools/mailchimp/unschedule_campaign.ts
index 473798bdbc..e305731ede 100644
--- a/apps/sim/tools/mailchimp/unschedule_campaign.ts
+++ b/apps/sim/tools/mailchimp/unschedule_campaign.ts
@@ -1,9 +1,6 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpUnscheduleCampaign')
-
 export interface MailchimpUnscheduleCampaignParams {
   apiKey: string
   campaignId: string
@@ -12,10 +9,6 @@ export interface MailchimpUnscheduleCampaignParams {
 export interface MailchimpUnscheduleCampaignResponse {
   success: boolean
   output: {
-    metadata: {
-      operation: 'unschedule_campaign'
-      campaignId: string
-    }
     success: boolean
   }
 }
@@ -63,10 +56,6 @@ export const mailchimpUnscheduleCampaignTool: ToolConfig<
     return {
       success: true,
       output: {
-        metadata: {
-          operation: 'unschedule_campaign' as const,
-          campaignId: '',
-        },
         success: true,
       },
     }
@@ -78,7 +67,6 @@ export const mailchimpUnscheduleCampaignTool: ToolConfig<
       type: 'object',
       description: 'Unschedule confirmation',
       properties: {
-        metadata: { type: 'object', description: 'Operation metadata' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_audience.ts b/apps/sim/tools/mailchimp/update_audience.ts
index 935fd81fdd..d14b4ad8eb 100644
--- a/apps/sim/tools/mailchimp/update_audience.ts
+++ b/apps/sim/tools/mailchimp/update_audience.ts
@@ -18,10 +18,7 @@ export interface MailchimpUpdateAudienceResponse {
   success: boolean
   output: {
     list: MailchimpAudience
-    metadata: {
-      operation: 'update_audience'
-      listId: string
-    }
+    list_id: string
     success: boolean
   }
 }
@@ -113,10 +110,7 @@ export const mailchimpUpdateAudienceTool: ToolConfig<
       success: true,
       output: {
         list: data,
-        metadata: {
-          operation: 'update_audience' as const,
-          listId: data.id,
-        },
+        list_id: data.id,
         success: true,
       },
     }
@@ -129,7 +123,7 @@ export const mailchimpUpdateAudienceTool: ToolConfig<
       description: 'Updated audience data',
       properties: {
         list: { type: 'object', description: 'Updated audience/list object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        list_id: { type: 'string', description: 'List ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_campaign.ts b/apps/sim/tools/mailchimp/update_campaign.ts
index cb008ddc53..6bf3835456 100644
--- a/apps/sim/tools/mailchimp/update_campaign.ts
+++ b/apps/sim/tools/mailchimp/update_campaign.ts
@@ -15,10 +15,7 @@ export interface MailchimpUpdateCampaignResponse {
   success: boolean
   output: {
     campaign: MailchimpCampaign
-    metadata: {
-      operation: 'update_campaign'
-      campaignId: string
-    }
+    campaign_id: string
     success: boolean
   }
 }
@@ -101,10 +98,7 @@ export const mailchimpUpdateCampaignTool: ToolConfig<
       success: true,
       output: {
         campaign: data,
-        metadata: {
-          operation: 'update_campaign' as const,
-          campaignId: data.id,
-        },
+        campaign_id: data.id,
         success: true,
       },
     }
@@ -117,7 +111,7 @@ export const mailchimpUpdateCampaignTool: ToolConfig<
       description: 'Updated campaign data',
       properties: {
         campaign: { type: 'object', description: 'Updated campaign object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        campaign_id: { type: 'string', description: 'Campaign ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_interest.ts b/apps/sim/tools/mailchimp/update_interest.ts
index 00369edc3b..ea28ea4041 100644
--- a/apps/sim/tools/mailchimp/update_interest.ts
+++ b/apps/sim/tools/mailchimp/update_interest.ts
@@ -1,10 +1,7 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import type { MailchimpInterest } from './types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpUpdateInterest')
-
 export interface MailchimpUpdateInterestParams {
   apiKey: string
   listId: string
@@ -17,10 +14,7 @@ export interface MailchimpUpdateInterestResponse {
   success: boolean
   output: {
     interest: MailchimpInterest
-    metadata: {
-      operation: 'update_interest'
-      interestId: string
-    }
+    interest_id: string
     success: boolean
   }
 }
@@ -99,10 +93,7 @@ export const mailchimpUpdateInterestTool: ToolConfig<
       success: true,
       output: {
         interest: data,
-        metadata: {
-          operation: 'update_interest' as const,
-          interestId: data.id,
-        },
+        interest_id: data.id,
         success: true,
       },
     }
@@ -115,7 +106,7 @@ export const mailchimpUpdateInterestTool: ToolConfig<
       description: 'Updated interest data',
       properties: {
         interest: { type: 'object', description: 'Updated interest object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        interest_id: { type: 'string', description: 'Interest ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_interest_category.ts b/apps/sim/tools/mailchimp/update_interest_category.ts
index c0cad15078..673b409687 100644
--- a/apps/sim/tools/mailchimp/update_interest_category.ts
+++ b/apps/sim/tools/mailchimp/update_interest_category.ts
@@ -1,10 +1,7 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import type { MailchimpInterestCategory } from './types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpUpdateInterestCategory')
-
 export interface MailchimpUpdateInterestCategoryParams {
   apiKey: string
   listId: string
@@ -16,10 +13,7 @@ export interface MailchimpUpdateInterestCategoryResponse {
   success: boolean
   output: {
     category: MailchimpInterestCategory
-    metadata: {
-      operation: 'update_interest_category'
-      interestCategoryId: string
-    }
+    interest_category_id: string
     success: boolean
   }
 }
@@ -92,10 +86,7 @@ export const mailchimpUpdateInterestCategoryTool: ToolConfig<
       success: true,
       output: {
         category: data,
-        metadata: {
-          operation: 'update_interest_category' as const,
-          interestCategoryId: data.id,
-        },
+        interest_category_id: data.id,
         success: true,
       },
     }
@@ -108,7 +99,7 @@ export const mailchimpUpdateInterestCategoryTool: ToolConfig<
       description: 'Updated interest category data',
       properties: {
         category: { type: 'object', description: 'Updated interest category object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        interest_category_id: { type: 'string', description: 'Interest category ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_landing_page.ts b/apps/sim/tools/mailchimp/update_landing_page.ts
index 3fe6f2ecfd..ceb54f9369 100644
--- a/apps/sim/tools/mailchimp/update_landing_page.ts
+++ b/apps/sim/tools/mailchimp/update_landing_page.ts
@@ -1,10 +1,7 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import type { MailchimpLandingPage } from './types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpUpdateLandingPage')
-
 export interface MailchimpUpdateLandingPageParams {
   apiKey: string
   pageId: string
@@ -15,10 +12,7 @@ export interface MailchimpUpdateLandingPageResponse {
   success: boolean
   output: {
     landingPage: MailchimpLandingPage
-    metadata: {
-      operation: 'update_landing_page'
-      pageId: string
-    }
+    page_id: string
     success: boolean
   }
 }
@@ -81,10 +75,7 @@ export const mailchimpUpdateLandingPageTool: ToolConfig<
       success: true,
       output: {
         landingPage: data,
-        metadata: {
-          operation: 'update_landing_page' as const,
-          pageId: data.id,
-        },
+        page_id: data.id,
         success: true,
       },
     }
@@ -97,7 +88,7 @@ export const mailchimpUpdateLandingPageTool: ToolConfig<
       description: 'Updated landing page data',
       properties: {
         landingPage: { type: 'object', description: 'Updated landing page object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        page_id: { type: 'string', description: 'Landing page ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_member.ts b/apps/sim/tools/mailchimp/update_member.ts
index 5424207af4..eba1d493d1 100644
--- a/apps/sim/tools/mailchimp/update_member.ts
+++ b/apps/sim/tools/mailchimp/update_member.ts
@@ -18,10 +18,7 @@ export interface MailchimpUpdateMemberResponse {
   success: boolean
   output: {
     member: MailchimpMember
-    metadata: {
-      operation: 'update_member'
-      subscriberHash: string
-    }
+    subscriber_hash: string
     success: boolean
   }
 }
@@ -126,10 +123,7 @@ export const mailchimpUpdateMemberTool: ToolConfig<
       success: true,
       output: {
         member: data,
-        metadata: {
-          operation: 'update_member' as const,
-          subscriberHash: data.id,
-        },
+        subscriber_hash: data.id,
         success: true,
       },
     }
@@ -142,7 +136,7 @@ export const mailchimpUpdateMemberTool: ToolConfig<
       description: 'Updated member data',
       properties: {
         member: { type: 'object', description: 'Updated member object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        subscriber_hash: { type: 'string', description: 'Subscriber hash' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_merge_field.ts b/apps/sim/tools/mailchimp/update_merge_field.ts
index 1f0d26fda6..7a754f071b 100644
--- a/apps/sim/tools/mailchimp/update_merge_field.ts
+++ b/apps/sim/tools/mailchimp/update_merge_field.ts
@@ -1,10 +1,7 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import type { MailchimpMergeField } from './types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpUpdateMergeField')
-
 export interface MailchimpUpdateMergeFieldParams {
   apiKey: string
   listId: string
@@ -16,10 +13,7 @@ export interface MailchimpUpdateMergeFieldResponse {
   success: boolean
   output: {
     mergeField: MailchimpMergeField
-    metadata: {
-      operation: 'update_merge_field'
-      mergeId: string
-    }
+    merge_id: string
     success: boolean
   }
 }
@@ -89,10 +83,7 @@ export const mailchimpUpdateMergeFieldTool: ToolConfig<
       success: true,
       output: {
         mergeField: data,
-        metadata: {
-          operation: 'update_merge_field' as const,
-          mergeId: data.merge_id,
-        },
+        merge_id: data.merge_id,
         success: true,
       },
     }
@@ -105,7 +96,7 @@ export const mailchimpUpdateMergeFieldTool: ToolConfig<
       description: 'Updated merge field data',
       properties: {
         mergeField: { type: 'object', description: 'Updated merge field object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        merge_id: { type: 'string', description: 'Merge field ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_segment.ts b/apps/sim/tools/mailchimp/update_segment.ts
index 4107c9851d..04bf671c10 100644
--- a/apps/sim/tools/mailchimp/update_segment.ts
+++ b/apps/sim/tools/mailchimp/update_segment.ts
@@ -17,10 +17,7 @@ export interface MailchimpUpdateSegmentResponse {
   success: boolean
   output: {
     segment: MailchimpSegment
-    metadata: {
-      operation: 'update_segment'
-      segmentId: string
-    }
+    segment_id: string
     success: boolean
   }
 }
@@ -105,10 +102,7 @@ export const mailchimpUpdateSegmentTool: ToolConfig<
       success: true,
       output: {
         segment: data,
-        metadata: {
-          operation: 'update_segment' as const,
-          segmentId: data.id,
-        },
+        segment_id: data.id,
         success: true,
       },
     }
@@ -121,7 +115,7 @@ export const mailchimpUpdateSegmentTool: ToolConfig<
       description: 'Updated segment data',
       properties: {
         segment: { type: 'object', description: 'Updated segment object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        segment_id: { type: 'string', description: 'Segment ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/mailchimp/update_template.ts b/apps/sim/tools/mailchimp/update_template.ts
index ef505128ad..6ccc33a76d 100644
--- a/apps/sim/tools/mailchimp/update_template.ts
+++ b/apps/sim/tools/mailchimp/update_template.ts
@@ -1,10 +1,7 @@
-import { createLogger } from '@sim/logger'
 import type { ToolConfig } from '@/tools/types'
 import type { MailchimpTemplate } from './types'
 import { buildMailchimpUrl, handleMailchimpError } from './types'
 
-const logger = createLogger('MailchimpUpdateTemplate')
-
 export interface MailchimpUpdateTemplateParams {
   apiKey: string
   templateId: string
@@ -16,10 +13,7 @@ export interface MailchimpUpdateTemplateResponse {
   success: boolean
   output: {
     template: MailchimpTemplate
-    metadata: {
-      operation: 'update_template'
-      templateId: string
-    }
+    template_id: string
     success: boolean
   }
 }
@@ -89,10 +83,7 @@ export const mailchimpUpdateTemplateTool: ToolConfig<
       success: true,
       output: {
         template: data,
-        metadata: {
-          operation: 'update_template' as const,
-          templateId: data.id,
-        },
+        template_id: data.id,
         success: true,
       },
     }
@@ -105,7 +96,7 @@ export const mailchimpUpdateTemplateTool: ToolConfig<
       description: 'Updated template data',
       properties: {
         template: { type: 'object', description: 'Updated template object' },
-        metadata: { type: 'object', description: 'Operation metadata' },
+        template_id: { type: 'string', description: 'Template ID' },
         success: { type: 'boolean', description: 'Operation success' },
       },
     },
diff --git a/apps/sim/tools/microsoft_planner/create_bucket.ts b/apps/sim/tools/microsoft_planner/create_bucket.ts
index ede3565ebb..1d101fd2d4 100644
--- a/apps/sim/tools/microsoft_planner/create_bucket.ts
+++ b/apps/sim/tools/microsoft_planner/create_bucket.ts
@@ -95,6 +95,13 @@ export const createBucketTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether the bucket was created successfully' },
     bucket: { type: 'object', description: 'The created bucket object with all properties' },
-    metadata: { type: 'object', description: 'Metadata including bucketId and planId' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including bucketId and planId',
+      properties: {
+        bucketId: { type: 'string', description: 'Created bucket ID' },
+        planId: { type: 'string', description: 'Parent plan ID' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/create_task.ts b/apps/sim/tools/microsoft_planner/create_task.ts
index 6bee878791..067b841776 100644
--- a/apps/sim/tools/microsoft_planner/create_task.ts
+++ b/apps/sim/tools/microsoft_planner/create_task.ts
@@ -145,6 +145,14 @@ export const createTaskTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether the task was created successfully' },
     task: { type: 'object', description: 'The created task object with all properties' },
-    metadata: { type: 'object', description: 'Metadata including planId, taskId, and taskUrl' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including planId, taskId, and taskUrl',
+      properties: {
+        planId: { type: 'string', description: 'Parent plan ID' },
+        taskId: { type: 'string', description: 'Created task ID' },
+        taskUrl: { type: 'string', description: 'Microsoft Graph API URL for the task' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/get_task_details.ts b/apps/sim/tools/microsoft_planner/get_task_details.ts
index cc040baaf6..e512189d2e 100644
--- a/apps/sim/tools/microsoft_planner/get_task_details.ts
+++ b/apps/sim/tools/microsoft_planner/get_task_details.ts
@@ -88,6 +88,12 @@ export const getTaskDetailsTool: ToolConfig<
       type: 'string',
       description: 'The ETag value for this task details - use this for update operations',
     },
-    metadata: { type: 'object', description: 'Metadata including taskId' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including taskId',
+      properties: {
+        taskId: { type: 'string', description: 'Task ID' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/list_buckets.ts b/apps/sim/tools/microsoft_planner/list_buckets.ts
index b08901569e..7cd6fa434c 100644
--- a/apps/sim/tools/microsoft_planner/list_buckets.ts
+++ b/apps/sim/tools/microsoft_planner/list_buckets.ts
@@ -66,7 +66,7 @@ export const listBucketsTool: ToolConfig<
       output: {
         buckets,
         metadata: {
-          planId: buckets.length > 0 ? buckets[0].planId : undefined,
+          planId: buckets.length > 0 ? buckets[0].planId : null,
           count: buckets.length,
         },
       },
@@ -78,6 +78,13 @@ export const listBucketsTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether buckets were retrieved successfully' },
     buckets: { type: 'array', description: 'Array of bucket objects' },
-    metadata: { type: 'object', description: 'Metadata including planId and count' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including planId and count',
+      properties: {
+        planId: { type: 'string', description: 'Plan ID', optional: true },
+        count: { type: 'number', description: 'Number of buckets returned' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/list_plans.ts b/apps/sim/tools/microsoft_planner/list_plans.ts
index 81df8a5fb3..404a77a7ef 100644
--- a/apps/sim/tools/microsoft_planner/list_plans.ts
+++ b/apps/sim/tools/microsoft_planner/list_plans.ts
@@ -69,6 +69,13 @@ export const listPlansTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether plans were retrieved successfully' },
     plans: { type: 'array', description: 'Array of plan objects shared with the current user' },
-    metadata: { type: 'object', description: 'Metadata including userId and count' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including userId and count',
+      properties: {
+        count: { type: 'number', description: 'Number of plans returned' },
+        userId: { type: 'string', description: 'User ID' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/read_bucket.ts b/apps/sim/tools/microsoft_planner/read_bucket.ts
index b0e3659386..2ba8046ee4 100644
--- a/apps/sim/tools/microsoft_planner/read_bucket.ts
+++ b/apps/sim/tools/microsoft_planner/read_bucket.ts
@@ -76,6 +76,13 @@ export const readBucketTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether the bucket was retrieved successfully' },
     bucket: { type: 'object', description: 'The bucket object with all properties' },
-    metadata: { type: 'object', description: 'Metadata including bucketId and planId' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including bucketId and planId',
+      properties: {
+        bucketId: { type: 'string', description: 'Bucket ID' },
+        planId: { type: 'string', description: 'Parent plan ID' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/read_plan.ts b/apps/sim/tools/microsoft_planner/read_plan.ts
index 8b67aa7cd6..ea1f51a841 100644
--- a/apps/sim/tools/microsoft_planner/read_plan.ts
+++ b/apps/sim/tools/microsoft_planner/read_plan.ts
@@ -76,6 +76,13 @@ export const readPlanTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether the plan was retrieved successfully' },
     plan: { type: 'object', description: 'The plan object with all properties' },
-    metadata: { type: 'object', description: 'Metadata including planId and planUrl' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including planId and planUrl',
+      properties: {
+        planId: { type: 'string', description: 'Plan ID' },
+        planUrl: { type: 'string', description: 'Microsoft Graph API URL for the plan' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/read_task.ts b/apps/sim/tools/microsoft_planner/read_task.ts
index aea4ae5cc5..0f15f88ec1 100644
--- a/apps/sim/tools/microsoft_planner/read_task.ts
+++ b/apps/sim/tools/microsoft_planner/read_task.ts
@@ -101,7 +101,7 @@ export const readTaskTool: ToolConfig<MicrosoftPlannerToolParams, MicrosoftPlann
     const rawTasks = data.value ? data.value : Array.isArray(data) ? data : [data]
 
     const tasks = rawTasks.map((task: any) => {
-      let etagValue = task['@odata.etag']
+      let etagValue = task['@odata.etag'] ?? null
       logger.info('ETag value extracted (raw):', {
         raw: etagValue,
         type: typeof etagValue,
@@ -119,12 +119,12 @@ export const readTaskTool: ToolConfig<MicrosoftPlannerToolParams, MicrosoftPlann
         id: task.id,
         title: task.title,
         planId: task.planId,
-        bucketId: task.bucketId,
+        bucketId: task.bucketId ?? null,
         percentComplete: task.percentComplete,
         priority: task.priority,
-        dueDateTime: task.dueDateTime,
+        dueDateTime: task.dueDateTime ?? null,
         createdDateTime: task.createdDateTime,
-        completedDateTime: task.completedDateTime,
+        completedDateTime: task.completedDateTime ?? null,
         hasDescription: task.hasDescription,
         assignments: task.assignments ? Object.keys(task.assignments) : [],
         etag: etagValue,
@@ -136,12 +136,12 @@ export const readTaskTool: ToolConfig<MicrosoftPlannerToolParams, MicrosoftPlann
       output: {
         tasks,
         metadata: {
-          planId: tasks.length > 0 ? tasks[0].planId : '',
-          userId: data.value ? undefined : 'me',
+          planId: tasks.length > 0 ? tasks[0].planId : null,
+          userId: data.value ? null : 'me',
           planUrl:
             tasks.length > 0
               ? `https://graph.microsoft.com/v1.0/planner/plans/${tasks[0].planId}`
-              : undefined,
+              : null,
         },
       },
     }
@@ -153,6 +153,18 @@ export const readTaskTool: ToolConfig<MicrosoftPlannerToolParams, MicrosoftPlann
   outputs: {
     success: { type: 'boolean', description: 'Whether tasks were retrieved successfully' },
     tasks: { type: 'array', description: 'Array of task objects with filtered properties' },
-    metadata: { type: 'object', description: 'Metadata including planId, userId, and planUrl' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including planId, userId, and planUrl',
+      properties: {
+        planId: { type: 'string', description: 'Plan ID', optional: true },
+        userId: { type: 'string', description: 'User ID', optional: true },
+        planUrl: {
+          type: 'string',
+          description: 'Microsoft Graph API URL for the plan',
+          optional: true,
+        },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/types.ts b/apps/sim/tools/microsoft_planner/types.ts
index e365f6631a..884273d81d 100644
--- a/apps/sim/tools/microsoft_planner/types.ts
+++ b/apps/sim/tools/microsoft_planner/types.ts
@@ -98,8 +98,8 @@ export interface PlannerTaskDetails {
 export interface MicrosoftPlannerMetadata {
   planId?: string
   taskId?: string
-  userId?: string
-  planUrl?: string
+  userId?: string | null
+  planUrl?: string | null
   taskUrl?: string
   bucketId?: string
   groupId?: string
diff --git a/apps/sim/tools/microsoft_planner/update_bucket.ts b/apps/sim/tools/microsoft_planner/update_bucket.ts
index 10d151feba..c3215fe3a4 100644
--- a/apps/sim/tools/microsoft_planner/update_bucket.ts
+++ b/apps/sim/tools/microsoft_planner/update_bucket.ts
@@ -120,6 +120,13 @@ export const updateBucketTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether the bucket was updated successfully' },
     bucket: { type: 'object', description: 'The updated bucket object with all properties' },
-    metadata: { type: 'object', description: 'Metadata including bucketId and planId' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including bucketId and planId',
+      properties: {
+        bucketId: { type: 'string', description: 'Updated bucket ID' },
+        planId: { type: 'string', description: 'Parent plan ID' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/update_task.ts b/apps/sim/tools/microsoft_planner/update_task.ts
index 782c5e6134..70e329a906 100644
--- a/apps/sim/tools/microsoft_planner/update_task.ts
+++ b/apps/sim/tools/microsoft_planner/update_task.ts
@@ -204,7 +204,7 @@ export const updateTaskTool: ToolConfig<
     logger.info('Updated task:', task)
 
     // Extract and clean the new etag for subsequent operations
-    let newEtag = task['@odata.etag']
+    let newEtag = task['@odata.etag'] ?? null
     if (newEtag && typeof newEtag === 'string' && newEtag.includes('\\"')) {
       newEtag = newEtag.replace(/\\"/g, '"')
     }
@@ -235,7 +235,16 @@ export const updateTaskTool: ToolConfig<
     etag: {
       type: 'string',
       description: 'New ETag after update - use this for subsequent operations',
+      optional: true,
+    },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including taskId, planId, and taskUrl',
+      properties: {
+        taskId: { type: 'string', description: 'Updated task ID' },
+        planId: { type: 'string', description: 'Parent plan ID' },
+        taskUrl: { type: 'string', description: 'Microsoft Graph API URL for the task' },
+      },
     },
-    metadata: { type: 'object', description: 'Metadata including taskId, planId, and taskUrl' },
   },
 }
diff --git a/apps/sim/tools/microsoft_planner/update_task_details.ts b/apps/sim/tools/microsoft_planner/update_task_details.ts
index ab5f6b75f2..1e3c97cae0 100644
--- a/apps/sim/tools/microsoft_planner/update_task_details.ts
+++ b/apps/sim/tools/microsoft_planner/update_task_details.ts
@@ -173,6 +173,12 @@ export const updateTaskDetailsTool: ToolConfig<
       type: 'object',
       description: 'The updated task details object with all properties',
     },
-    metadata: { type: 'object', description: 'Metadata including taskId' },
+    metadata: {
+      type: 'object',
+      description: 'Metadata including taskId',
+      properties: {
+        taskId: { type: 'string', description: 'Task ID' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/microsoft_teams/get_message.ts b/apps/sim/tools/microsoft_teams/get_message.ts
index 662b5f8ee9..dd101aefef 100644
--- a/apps/sim/tools/microsoft_teams/get_message.ts
+++ b/apps/sim/tools/microsoft_teams/get_message.ts
@@ -53,7 +53,21 @@ export const getMessageTool: ToolConfig<
   outputs: {
     success: { type: 'boolean', description: 'Whether the retrieval was successful' },
     content: { type: 'string', description: 'The message content' },
-    metadata: { type: 'object', description: 'Message metadata including sender, timestamp, etc.' },
+    metadata: {
+      type: 'object',
+      description: 'Message metadata including sender, timestamp, etc.',
+      properties: {
+        messageId: { type: 'string', description: 'Message ID' },
+        content: { type: 'string', description: 'Message content' },
+        createdTime: { type: 'string', description: 'Message creation timestamp' },
+        url: { type: 'string', description: 'Web URL to the message' },
+        teamId: { type: 'string', description: 'Team ID' },
+        channelId: { type: 'string', description: 'Channel ID' },
+        chatId: { type: 'string', description: 'Chat ID' },
+        messages: { type: 'array', description: 'Array of message details' },
+        messageCount: { type: 'number', description: 'Number of messages' },
+      },
+    },
   },
 
   request: {
diff --git a/apps/sim/tools/mistral/parser.ts b/apps/sim/tools/mistral/parser.ts
index 4856801d78..3f964dd180 100644
--- a/apps/sim/tools/mistral/parser.ts
+++ b/apps/sim/tools/mistral/parser.ts
@@ -343,9 +343,11 @@ export const mistralParserTool: ToolConfig<MistralParserInput, MistralParserOutp
                   ? mistralData.usage_info.pages_processed
                   : Number(mistralData.usage_info.pages_processed),
               docSizeBytes:
-                typeof mistralData.usage_info.doc_size_bytes === 'number'
-                  ? mistralData.usage_info.doc_size_bytes
-                  : Number(mistralData.usage_info.doc_size_bytes),
+                mistralData.usage_info.doc_size_bytes == null
+                  ? null
+                  : typeof mistralData.usage_info.doc_size_bytes === 'number'
+                    ? mistralData.usage_info.doc_size_bytes
+                    : Number(mistralData.usage_info.doc_size_bytes),
             }
           : undefined
 
@@ -394,6 +396,22 @@ export const mistralParserTool: ToolConfig<MistralParserInput, MistralParserOutp
     metadata: {
       type: 'object',
       description: 'Processing metadata including jobId, fileType, pageCount, and usage info',
+      properties: {
+        jobId: { type: 'string', description: 'Unique job identifier' },
+        fileType: { type: 'string', description: 'File type (e.g., pdf)' },
+        fileName: { type: 'string', description: 'Original file name' },
+        source: { type: 'string', description: 'Source type (url)' },
+        pageCount: { type: 'number', description: 'Number of pages processed' },
+        model: { type: 'string', description: 'Mistral model used' },
+        resultType: { type: 'string', description: 'Output format (markdown, text, json)' },
+        processedAt: { type: 'string', description: 'Processing timestamp' },
+        sourceUrl: { type: 'string', description: 'Source URL if applicable', optional: true },
+        usageInfo: {
+          type: 'object',
+          description: 'Usage statistics from OCR processing',
+          optional: true,
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/mistral/types.ts b/apps/sim/tools/mistral/types.ts
index e179de87bb..8fe0f20bfa 100644
--- a/apps/sim/tools/mistral/types.ts
+++ b/apps/sim/tools/mistral/types.ts
@@ -40,7 +40,7 @@ export interface MistralOcrUsageInfo {
   pagesProcessed: number
 
   /** Size of the document in bytes */
-  docSizeBytes: number
+  docSizeBytes: number | null
 }
 
 /**
diff --git a/apps/sim/tools/mongodb/index.ts b/apps/sim/tools/mongodb/index.ts
index 8407b7772c..56c9c2a740 100644
--- a/apps/sim/tools/mongodb/index.ts
+++ b/apps/sim/tools/mongodb/index.ts
@@ -1,12 +1,14 @@
 import { deleteTool } from './delete'
 import { executeTool } from './execute'
 import { insertTool } from './insert'
+import { introspectTool } from './introspect'
 import { queryTool } from './query'
 import { updateTool } from './update'
 
 export const mongodbDeleteTool = deleteTool
 export const mongodbExecuteTool = executeTool
 export const mongodbInsertTool = insertTool
+export const mongodbIntrospectTool = introspectTool
 export const mongodbQueryTool = queryTool
 export const mongodbUpdateTool = updateTool
 
diff --git a/apps/sim/tools/mongodb/introspect.ts b/apps/sim/tools/mongodb/introspect.ts
new file mode 100644
index 0000000000..8452d68e17
--- /dev/null
+++ b/apps/sim/tools/mongodb/introspect.ts
@@ -0,0 +1,98 @@
+import type { MongoDBIntrospectParams, MongoDBIntrospectResponse } from '@/tools/mongodb/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const introspectTool: ToolConfig<MongoDBIntrospectParams, MongoDBIntrospectResponse> = {
+  id: 'mongodb_introspect',
+  name: 'MongoDB Introspect',
+  description: 'Introspect MongoDB database to list databases, collections, and indexes',
+  version: '1.0',
+
+  params: {
+    host: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'MongoDB server hostname or IP address',
+    },
+    port: {
+      type: 'number',
+      required: true,
+      visibility: 'user-only',
+      description: 'MongoDB server port (default: 27017)',
+    },
+    database: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Database name to introspect (optional - if not provided, lists all databases)',
+    },
+    username: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'MongoDB username',
+    },
+    password: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'MongoDB password',
+    },
+    authSource: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Authentication database',
+    },
+    ssl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'SSL connection mode (disabled, required, preferred)',
+    },
+  },
+
+  request: {
+    url: '/api/tools/mongodb/introspect',
+    method: 'POST',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      host: params.host,
+      port: Number(params.port),
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      authSource: params.authSource,
+      ssl: params.ssl || 'preferred',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error || 'MongoDB introspect failed')
+    }
+
+    return {
+      success: true,
+      output: {
+        message: data.message || 'Introspection completed successfully',
+        databases: data.databases || [],
+        collections: data.collections || [],
+      },
+      error: undefined,
+    }
+  },
+
+  outputs: {
+    message: { type: 'string', description: 'Operation status message' },
+    databases: { type: 'array', description: 'Array of database names' },
+    collections: {
+      type: 'array',
+      description: 'Array of collection info with name, type, document count, and indexes',
+    },
+  },
+}
diff --git a/apps/sim/tools/mongodb/types.ts b/apps/sim/tools/mongodb/types.ts
index 98ff1ecfe3..2465458736 100644
--- a/apps/sim/tools/mongodb/types.ts
+++ b/apps/sim/tools/mongodb/types.ts
@@ -41,6 +41,28 @@ export interface MongoDBExecuteParams extends MongoDBConnectionConfig {
   pipeline: string
 }
 
+export interface MongoDBIntrospectParams {
+  host: string
+  port: number
+  database?: string
+  username?: string
+  password?: string
+  authSource?: string
+  ssl?: 'disabled' | 'required' | 'preferred'
+}
+
+export interface MongoDBCollectionInfo {
+  name: string
+  type: string
+  documentCount: number
+  indexes: Array<{
+    name: string
+    key: Record<string, number>
+    unique: boolean
+    sparse?: boolean
+  }>
+}
+
 export interface MongoDBBaseResponse extends ToolResponse {
   output: {
     message: string
@@ -61,3 +83,12 @@ export interface MongoDBUpdateResponse extends MongoDBBaseResponse {}
 export interface MongoDBDeleteResponse extends MongoDBBaseResponse {}
 export interface MongoDBExecuteResponse extends MongoDBBaseResponse {}
 export interface MongoDBResponse extends MongoDBBaseResponse {}
+
+export interface MongoDBIntrospectResponse extends ToolResponse {
+  output: {
+    message: string
+    databases: string[]
+    collections: MongoDBCollectionInfo[]
+  }
+  error?: string
+}
diff --git a/apps/sim/tools/mysql/index.ts b/apps/sim/tools/mysql/index.ts
index 1e388a67ee..603c4bc9c0 100644
--- a/apps/sim/tools/mysql/index.ts
+++ b/apps/sim/tools/mysql/index.ts
@@ -1,12 +1,14 @@
 import { deleteTool } from './delete'
 import { executeTool } from './execute'
 import { insertTool } from './insert'
+import { introspectTool } from './introspect'
 import { queryTool } from './query'
 import { updateTool } from './update'
 
 export const mysqlDeleteTool = deleteTool
 export const mysqlExecuteTool = executeTool
 export const mysqlInsertTool = insertTool
+export const mysqlIntrospectTool = introspectTool
 export const mysqlQueryTool = queryTool
 export const mysqlUpdateTool = updateTool
 
diff --git a/apps/sim/tools/mysql/introspect.ts b/apps/sim/tools/mysql/introspect.ts
new file mode 100644
index 0000000000..207030b7cd
--- /dev/null
+++ b/apps/sim/tools/mysql/introspect.ts
@@ -0,0 +1,92 @@
+import type { MySQLIntrospectParams, MySQLIntrospectResponse } from '@/tools/mysql/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const introspectTool: ToolConfig<MySQLIntrospectParams, MySQLIntrospectResponse> = {
+  id: 'mysql_introspect',
+  name: 'MySQL Introspect',
+  description:
+    'Introspect MySQL database schema to retrieve table structures, columns, and relationships',
+  version: '1.0',
+
+  params: {
+    host: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'MySQL server hostname or IP address',
+    },
+    port: {
+      type: 'number',
+      required: true,
+      visibility: 'user-only',
+      description: 'MySQL server port (default: 3306)',
+    },
+    database: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Database name to connect to',
+    },
+    username: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Database username',
+    },
+    password: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Database password',
+    },
+    ssl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'SSL connection mode (disabled, required, preferred)',
+    },
+  },
+
+  request: {
+    url: '/api/tools/mysql/introspect',
+    method: 'POST',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      host: params.host,
+      port: Number(params.port),
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl || 'required',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error || 'MySQL introspection failed')
+    }
+
+    return {
+      success: true,
+      output: {
+        message: data.message || 'Schema introspection completed successfully',
+        tables: data.tables || [],
+        databases: data.databases || [],
+      },
+      error: undefined,
+    }
+  },
+
+  outputs: {
+    message: { type: 'string', description: 'Operation status message' },
+    tables: {
+      type: 'array',
+      description: 'Array of table schemas with columns, keys, and indexes',
+    },
+    databases: { type: 'array', description: 'List of available databases on the server' },
+  },
+}
diff --git a/apps/sim/tools/mysql/types.ts b/apps/sim/tools/mysql/types.ts
index 97edaf0ce2..25afe02314 100644
--- a/apps/sim/tools/mysql/types.ts
+++ b/apps/sim/tools/mysql/types.ts
@@ -48,3 +48,30 @@ export interface MySQLUpdateResponse extends MySQLBaseResponse {}
 export interface MySQLDeleteResponse extends MySQLBaseResponse {}
 export interface MySQLExecuteResponse extends MySQLBaseResponse {}
 export interface MySQLResponse extends MySQLBaseResponse {}
+
+export interface MySQLIntrospectParams extends MySQLConnectionConfig {}
+
+export interface MySQLTableColumn {
+  name: string
+  type: string
+  nullable: boolean
+  default: string | null
+  isPrimaryKey: boolean
+  isForeignKey: boolean
+  autoIncrement: boolean
+  references?: { table: string; column: string }
+}
+
+export interface MySQLTableSchema {
+  name: string
+  database: string
+  columns: MySQLTableColumn[]
+  primaryKey: string[]
+  foreignKeys: Array<{ column: string; referencesTable: string; referencesColumn: string }>
+  indexes: Array<{ name: string; columns: string[]; unique: boolean }>
+}
+
+export interface MySQLIntrospectResponse extends ToolResponse {
+  output: { message: string; tables: MySQLTableSchema[]; databases: string[] }
+  error?: string
+}
diff --git a/apps/sim/tools/neo4j/index.ts b/apps/sim/tools/neo4j/index.ts
index ba5c38830c..6288ab0f01 100644
--- a/apps/sim/tools/neo4j/index.ts
+++ b/apps/sim/tools/neo4j/index.ts
@@ -1,6 +1,7 @@
 import { createTool } from './create'
 import { deleteTool } from './delete'
 import { executeTool } from './execute'
+import { introspectTool } from './introspect'
 import { mergeTool } from './merge'
 import { queryTool } from './query'
 import { updateTool } from './update'
@@ -8,6 +9,7 @@ import { updateTool } from './update'
 export const neo4jCreateTool = createTool
 export const neo4jDeleteTool = deleteTool
 export const neo4jExecuteTool = executeTool
+export const neo4jIntrospectTool = introspectTool
 export const neo4jMergeTool = mergeTool
 export const neo4jQueryTool = queryTool
 export const neo4jUpdateTool = updateTool
diff --git a/apps/sim/tools/neo4j/introspect.ts b/apps/sim/tools/neo4j/introspect.ts
new file mode 100644
index 0000000000..fbc9cff228
--- /dev/null
+++ b/apps/sim/tools/neo4j/introspect.ts
@@ -0,0 +1,103 @@
+import type { Neo4jIntrospectParams, Neo4jIntrospectResponse } from '@/tools/neo4j/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const introspectTool: ToolConfig<Neo4jIntrospectParams, Neo4jIntrospectResponse> = {
+  id: 'neo4j_introspect',
+  name: 'Neo4j Introspect',
+  description:
+    'Introspect a Neo4j database to discover its schema including node labels, relationship types, properties, constraints, and indexes.',
+  version: '1.0',
+
+  params: {
+    host: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Neo4j server hostname or IP address',
+    },
+    port: {
+      type: 'number',
+      required: true,
+      visibility: 'user-only',
+      description: 'Neo4j server port (default: 7687 for Bolt protocol)',
+    },
+    database: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Database name to connect to',
+    },
+    username: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Neo4j username',
+    },
+    password: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Neo4j password',
+    },
+    encryption: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Connection encryption mode (enabled, disabled)',
+    },
+  },
+
+  request: {
+    url: '/api/tools/neo4j/introspect',
+    method: 'POST',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      host: params.host,
+      port: Number(params.port),
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      encryption: params.encryption || 'disabled',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error || 'Neo4j introspection failed')
+    }
+
+    return {
+      success: true,
+      output: {
+        message: data.message || 'Introspection completed successfully',
+        labels: data.labels || [],
+        relationshipTypes: data.relationshipTypes || [],
+        nodeSchemas: data.nodeSchemas || [],
+        relationshipSchemas: data.relationshipSchemas || [],
+        constraints: data.constraints || [],
+        indexes: data.indexes || [],
+      },
+      error: undefined,
+    }
+  },
+
+  outputs: {
+    message: { type: 'string', description: 'Operation status message' },
+    labels: { type: 'array', description: 'Array of node labels in the database' },
+    relationshipTypes: {
+      type: 'array',
+      description: 'Array of relationship types in the database',
+    },
+    nodeSchemas: { type: 'array', description: 'Array of node schemas with their properties' },
+    relationshipSchemas: {
+      type: 'array',
+      description: 'Array of relationship schemas with their properties',
+    },
+    constraints: { type: 'array', description: 'Array of database constraints' },
+    indexes: { type: 'array', description: 'Array of database indexes' },
+  },
+}
diff --git a/apps/sim/tools/neo4j/types.ts b/apps/sim/tools/neo4j/types.ts
index 2546c4310d..9c7782dfa6 100644
--- a/apps/sim/tools/neo4j/types.ts
+++ b/apps/sim/tools/neo4j/types.ts
@@ -73,3 +73,28 @@ export interface Neo4jUpdateResponse extends Neo4jBaseResponse {}
 export interface Neo4jDeleteResponse extends Neo4jBaseResponse {}
 export interface Neo4jExecuteResponse extends Neo4jBaseResponse {}
 export interface Neo4jResponse extends Neo4jBaseResponse {}
+
+export interface Neo4jIntrospectParams extends Neo4jConnectionConfig {}
+
+export interface Neo4jNodeSchema {
+  label: string
+  properties: Array<{ name: string; types: string[] }>
+}
+
+export interface Neo4jRelationshipSchema {
+  type: string
+  properties: Array<{ name: string; types: string[] }>
+}
+
+export interface Neo4jIntrospectResponse extends ToolResponse {
+  output: {
+    message: string
+    labels: string[]
+    relationshipTypes: string[]
+    nodeSchemas: Neo4jNodeSchema[]
+    relationshipSchemas: Neo4jRelationshipSchema[]
+    constraints: Array<{ name: string; type: string; entityType: string; properties: string[] }>
+    indexes: Array<{ name: string; type: string; entityType: string; properties: string[] }>
+  }
+  error?: string
+}
diff --git a/apps/sim/tools/notion/add_database_row.ts b/apps/sim/tools/notion/add_database_row.ts
new file mode 100644
index 0000000000..85044e59a5
--- /dev/null
+++ b/apps/sim/tools/notion/add_database_row.ts
@@ -0,0 +1,108 @@
+import type { NotionAddDatabaseRowParams } from '@/tools/notion/types'
+import type { ToolConfig } from '@/tools/types'
+
+interface NotionAddDatabaseRowResponse {
+  success: boolean
+  output: {
+    id: string
+    url: string
+    title: string
+    created_time: string
+    last_edited_time: string
+  }
+}
+
+export const notionAddDatabaseRowTool: ToolConfig<
+  NotionAddDatabaseRowParams,
+  NotionAddDatabaseRowResponse
+> = {
+  id: 'notion_add_database_row_v2',
+  name: 'Add Notion Database Row',
+  description: 'Add a new row to a Notion database with specified properties',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'notion',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'Notion OAuth access token',
+    },
+    databaseId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'ID of the database to add the row to',
+    },
+    properties: {
+      type: 'json',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Row properties as JSON object matching the database schema (e.g., {"Name": {"title": [{"text": {"content": "Task 1"}}]}, "Status": {"select": {"name": "Done"}}})',
+    },
+  },
+
+  request: {
+    url: () => 'https://api.notion.com/v1/pages',
+    method: 'POST',
+    headers: (params: NotionAddDatabaseRowParams) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Notion-Version': '2022-06-28',
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params: NotionAddDatabaseRowParams) => {
+      return {
+        parent: {
+          type: 'database_id',
+          database_id: params.databaseId,
+        },
+        properties: params.properties,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    // Extract title from properties if available
+    let rowTitle = 'Untitled'
+    for (const [, value] of Object.entries(data.properties || {})) {
+      const prop = value as any
+      if (prop.type === 'title' && prop.title?.length > 0) {
+        rowTitle = prop.title.map((t: any) => t.plain_text || '').join('')
+        break
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        url: data.url,
+        title: rowTitle,
+        created_time: data.created_time,
+        last_edited_time: data.last_edited_time,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Page/row ID' },
+    url: { type: 'string', description: 'Page/row URL' },
+    title: { type: 'string', description: 'Row title' },
+    created_time: { type: 'string', description: 'Creation timestamp' },
+    last_edited_time: { type: 'string', description: 'Last edit timestamp' },
+  },
+}
diff --git a/apps/sim/tools/notion/create_database.ts b/apps/sim/tools/notion/create_database.ts
index 57297481d2..931b876e5a 100644
--- a/apps/sim/tools/notion/create_database.ts
+++ b/apps/sim/tools/notion/create_database.ts
@@ -32,7 +32,7 @@ export const notionCreateDatabaseTool: ToolConfig<NotionCreateDatabaseParams, No
       description: 'Title for the new database',
     },
     properties: {
-      type: 'string',
+      type: 'json',
       required: false,
       visibility: 'user-or-llm',
       description:
@@ -55,25 +55,11 @@ export const notionCreateDatabaseTool: ToolConfig<NotionCreateDatabaseParams, No
       }
     },
     body: (params: NotionCreateDatabaseParams) => {
-      let parsedProperties
-
-      // Handle properties - use provided JSON or default to Name property
-      if (params.properties?.trim()) {
-        try {
-          parsedProperties = JSON.parse(params.properties)
-        } catch (error) {
-          throw new Error(
-            `Invalid properties JSON: ${error instanceof Error ? error.message : String(error)}`
-          )
-        }
-      } else {
-        // Default properties with a Name column
-        parsedProperties = {
-          Name: {
-            title: {},
-          },
-        }
-      }
+      // Use provided properties or default to Name property
+      const properties =
+        params.properties && Object.keys(params.properties).length > 0
+          ? params.properties
+          : { Name: { title: {} } }
 
       const body = {
         parent: {
@@ -88,7 +74,7 @@ export const notionCreateDatabaseTool: ToolConfig<NotionCreateDatabaseParams, No
             },
           },
         ],
-        properties: parsedProperties,
+        properties,
       }
 
       return body
@@ -144,3 +130,52 @@ export const notionCreateDatabaseTool: ToolConfig<NotionCreateDatabaseParams, No
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionCreateDatabaseV2Response {
+  success: boolean
+  output: {
+    id: string
+    title: string
+    url: string
+    created_time: string
+    properties: Record<string, any>
+  }
+}
+
+export const notionCreateDatabaseV2Tool: ToolConfig<
+  NotionCreateDatabaseParams,
+  NotionCreateDatabaseV2Response
+> = {
+  id: 'notion_create_database_v2',
+  name: 'Create Notion Database',
+  description: 'Create a new database in Notion with custom properties',
+  version: '2.0.0',
+  oauth: notionCreateDatabaseTool.oauth,
+  params: notionCreateDatabaseTool.params,
+  request: notionCreateDatabaseTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    const title = data.title?.map((t: any) => t.plain_text || '').join('') || 'Untitled Database'
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        title,
+        url: data.url,
+        created_time: data.created_time,
+        properties: data.properties || {},
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Database ID' },
+    title: { type: 'string', description: 'Database title' },
+    url: { type: 'string', description: 'Database URL' },
+    created_time: { type: 'string', description: 'Creation timestamp' },
+    properties: { type: 'object', description: 'Database properties schema' },
+  },
+}
diff --git a/apps/sim/tools/notion/create_page.ts b/apps/sim/tools/notion/create_page.ts
index aade06ffe7..19d2bd4acd 100644
--- a/apps/sim/tools/notion/create_page.ts
+++ b/apps/sim/tools/notion/create_page.ts
@@ -143,3 +143,63 @@ export const notionCreatePageTool: ToolConfig<NotionCreatePageParams, NotionResp
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionCreatePageV2Response {
+  success: boolean
+  output: {
+    id: string
+    title: string
+    url: string
+    created_time: string
+    last_edited_time: string
+  }
+}
+
+export const notionCreatePageV2Tool: ToolConfig<
+  NotionCreatePageParams,
+  NotionCreatePageV2Response
+> = {
+  id: 'notion_create_page_v2',
+  name: 'Notion Page Creator',
+  description: 'Create a new page in Notion',
+  version: '2.0.0',
+  oauth: notionCreatePageTool.oauth,
+  params: notionCreatePageTool.params,
+  request: notionCreatePageTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    let pageTitle = 'Untitled'
+
+    if (data.properties?.title) {
+      const titleProperty = data.properties.title
+      if (
+        titleProperty.title &&
+        Array.isArray(titleProperty.title) &&
+        titleProperty.title.length > 0
+      ) {
+        pageTitle = titleProperty.title.map((t: any) => t.plain_text || '').join('')
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        title: pageTitle,
+        url: data.url,
+        created_time: data.created_time,
+        last_edited_time: data.last_edited_time,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Page ID' },
+    title: { type: 'string', description: 'Page title' },
+    url: { type: 'string', description: 'Page URL' },
+    created_time: { type: 'string', description: 'Creation timestamp' },
+    last_edited_time: { type: 'string', description: 'Last edit timestamp' },
+  },
+}
diff --git a/apps/sim/tools/notion/index.ts b/apps/sim/tools/notion/index.ts
index 8adaa3091a..83516740e5 100644
--- a/apps/sim/tools/notion/index.ts
+++ b/apps/sim/tools/notion/index.ts
@@ -1,13 +1,18 @@
-import { notionCreateDatabaseTool } from '@/tools/notion/create_database'
-import { notionCreatePageTool } from '@/tools/notion/create_page'
-import { notionQueryDatabaseTool } from '@/tools/notion/query_database'
-import { notionReadTool } from '@/tools/notion/read'
-import { notionReadDatabaseTool } from '@/tools/notion/read_database'
-import { notionSearchTool } from '@/tools/notion/search'
-import { notionUpdatePageTool } from '@/tools/notion/update_page'
-import { notionWriteTool } from '@/tools/notion/write'
+import { notionAddDatabaseRowTool } from '@/tools/notion/add_database_row'
+import {
+  notionCreateDatabaseTool,
+  notionCreateDatabaseV2Tool,
+} from '@/tools/notion/create_database'
+import { notionCreatePageTool, notionCreatePageV2Tool } from '@/tools/notion/create_page'
+import { notionQueryDatabaseTool, notionQueryDatabaseV2Tool } from '@/tools/notion/query_database'
+import { notionReadTool, notionReadV2Tool } from '@/tools/notion/read'
+import { notionReadDatabaseTool, notionReadDatabaseV2Tool } from '@/tools/notion/read_database'
+import { notionSearchTool, notionSearchV2Tool } from '@/tools/notion/search'
+import { notionUpdatePageTool, notionUpdatePageV2Tool } from '@/tools/notion/update_page'
+import { notionWriteTool, notionWriteV2Tool } from '@/tools/notion/write'
 
 export {
+  // Legacy tools
   notionReadTool,
   notionReadDatabaseTool,
   notionWriteTool,
@@ -16,4 +21,14 @@ export {
   notionQueryDatabaseTool,
   notionSearchTool,
   notionCreateDatabaseTool,
+  // V2 tools
+  notionReadV2Tool,
+  notionReadDatabaseV2Tool,
+  notionWriteV2Tool,
+  notionCreatePageV2Tool,
+  notionUpdatePageV2Tool,
+  notionQueryDatabaseV2Tool,
+  notionSearchV2Tool,
+  notionCreateDatabaseV2Tool,
+  notionAddDatabaseRowTool,
 }
diff --git a/apps/sim/tools/notion/query_database.ts b/apps/sim/tools/notion/query_database.ts
index 3618913a9a..2fd33da72f 100644
--- a/apps/sim/tools/notion/query_database.ts
+++ b/apps/sim/tools/notion/query_database.ts
@@ -162,3 +162,62 @@ export const notionQueryDatabaseTool: ToolConfig<NotionQueryDatabaseParams, Noti
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionQueryDatabaseV2Response {
+  success: boolean
+  output: {
+    results: any[]
+    has_more: boolean
+    next_cursor: string | null
+    total_results: number
+  }
+}
+
+export const notionQueryDatabaseV2Tool: ToolConfig<
+  NotionQueryDatabaseParams,
+  NotionQueryDatabaseV2Response
+> = {
+  id: 'notion_query_database_v2',
+  name: 'Query Notion Database',
+  description: 'Query and filter Notion database entries with advanced filtering',
+  version: '2.0.0',
+  oauth: notionQueryDatabaseTool.oauth,
+  params: notionQueryDatabaseTool.params,
+  request: notionQueryDatabaseTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    const results = data.results || []
+
+    return {
+      success: true,
+      output: {
+        results,
+        has_more: data.has_more || false,
+        next_cursor: data.next_cursor || null,
+        total_results: results.length,
+      },
+    }
+  },
+
+  outputs: {
+    results: {
+      type: 'array',
+      description: 'Array of Notion page objects from the database',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Page ID' },
+          properties: { type: 'object', description: 'Page properties' },
+          created_time: { type: 'string', description: 'Creation timestamp' },
+          last_edited_time: { type: 'string', description: 'Last edit timestamp' },
+          url: { type: 'string', description: 'Page URL' },
+        },
+      },
+    },
+    has_more: { type: 'boolean', description: 'Whether more results are available' },
+    next_cursor: { type: 'string', description: 'Cursor for pagination', optional: true },
+    total_results: { type: 'number', description: 'Number of results returned' },
+  },
+}
diff --git a/apps/sim/tools/notion/read.ts b/apps/sim/tools/notion/read.ts
index 70c84163ab..72dcea3e8c 100644
--- a/apps/sim/tools/notion/read.ts
+++ b/apps/sim/tools/notion/read.ts
@@ -168,3 +168,132 @@ export const notionReadTool: ToolConfig<NotionReadParams, NotionResponse> = {
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionReadV2Response {
+  success: boolean
+  output: {
+    content: string
+    title: string
+    url: string
+    created_time: string
+    last_edited_time: string
+  }
+}
+
+export const notionReadV2Tool: ToolConfig<NotionReadParams, NotionReadV2Response> = {
+  id: 'notion_read_v2',
+  name: 'Notion Reader',
+  description: 'Read content from a Notion page',
+  version: '2.0.0',
+  oauth: notionReadTool.oauth,
+  params: notionReadTool.params,
+  request: notionReadTool.request,
+
+  transformResponse: async (response: Response, params?: NotionReadParams) => {
+    const data = await response.json()
+    let pageTitle = 'Untitled'
+
+    if (data.properties?.title) {
+      const titleProperty = data.properties.title
+      if (
+        titleProperty.title &&
+        Array.isArray(titleProperty.title) &&
+        titleProperty.title.length > 0
+      ) {
+        pageTitle = titleProperty.title.map((t: any) => t.plain_text || '').join('')
+      }
+    }
+
+    const pageId = params?.pageId
+    const accessToken = params?.accessToken
+
+    if (!pageId || !accessToken) {
+      return {
+        success: true,
+        output: {
+          content: '',
+          title: pageTitle,
+          url: data.url,
+          created_time: data.created_time,
+          last_edited_time: data.last_edited_time,
+        },
+      }
+    }
+
+    const blocksResponse = await fetch(
+      `https://api.notion.com/v1/blocks/${pageId}/children?page_size=100`,
+      {
+        method: 'GET',
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          'Notion-Version': '2022-06-28',
+          'Content-Type': 'application/json',
+        },
+      }
+    )
+
+    if (!blocksResponse.ok) {
+      return {
+        success: true,
+        output: {
+          content: '',
+          title: pageTitle,
+          url: data.url,
+          created_time: data.created_time,
+          last_edited_time: data.last_edited_time,
+        },
+      }
+    }
+
+    const blocksData = await blocksResponse.json()
+    const blocks = blocksData.results || []
+    const content = blocks
+      .map((block: any) => {
+        if (block.type === 'paragraph') {
+          return block.paragraph.rich_text.map((text: any) => text.plain_text).join('')
+        }
+        if (block.type === 'heading_1') {
+          return `# ${block.heading_1.rich_text.map((text: any) => text.plain_text).join('')}`
+        }
+        if (block.type === 'heading_2') {
+          return `## ${block.heading_2.rich_text.map((text: any) => text.plain_text).join('')}`
+        }
+        if (block.type === 'heading_3') {
+          return `### ${block.heading_3.rich_text.map((text: any) => text.plain_text).join('')}`
+        }
+        if (block.type === 'bulleted_list_item') {
+          return `• ${block.bulleted_list_item.rich_text.map((text: any) => text.plain_text).join('')}`
+        }
+        if (block.type === 'numbered_list_item') {
+          return `1. ${block.numbered_list_item.rich_text.map((text: any) => text.plain_text).join('')}`
+        }
+        if (block.type === 'to_do') {
+          const checked = block.to_do.checked ? '[x]' : '[ ]'
+          return `${checked} ${block.to_do.rich_text.map((text: any) => text.plain_text).join('')}`
+        }
+        return ''
+      })
+      .filter(Boolean)
+      .join('\n\n')
+
+    return {
+      success: true,
+      output: {
+        content,
+        title: pageTitle,
+        url: data.url,
+        created_time: data.created_time,
+        last_edited_time: data.last_edited_time,
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Page content in markdown format' },
+    title: { type: 'string', description: 'Page title' },
+    url: { type: 'string', description: 'Page URL' },
+    created_time: { type: 'string', description: 'Creation timestamp' },
+    last_edited_time: { type: 'string', description: 'Last edit timestamp' },
+  },
+}
diff --git a/apps/sim/tools/notion/read_database.ts b/apps/sim/tools/notion/read_database.ts
index 91d78b37fe..c46479e479 100644
--- a/apps/sim/tools/notion/read_database.ts
+++ b/apps/sim/tools/notion/read_database.ts
@@ -101,3 +101,55 @@ export const notionReadDatabaseTool: ToolConfig<NotionReadDatabaseParams, Notion
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionReadDatabaseV2Response {
+  success: boolean
+  output: {
+    id: string
+    title: string
+    url: string
+    created_time: string
+    last_edited_time: string
+    properties: Record<string, any>
+  }
+}
+
+export const notionReadDatabaseV2Tool: ToolConfig<
+  NotionReadDatabaseParams,
+  NotionReadDatabaseV2Response
+> = {
+  id: 'notion_read_database_v2',
+  name: 'Read Notion Database',
+  description: 'Read database information and structure from Notion',
+  version: '2.0.0',
+  oauth: notionReadDatabaseTool.oauth,
+  params: notionReadDatabaseTool.params,
+  request: notionReadDatabaseTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    const title = data.title?.map((t: any) => t.plain_text || '').join('') || 'Untitled Database'
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        title,
+        url: data.url,
+        created_time: data.created_time,
+        last_edited_time: data.last_edited_time,
+        properties: data.properties || {},
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Database ID' },
+    title: { type: 'string', description: 'Database title' },
+    url: { type: 'string', description: 'Database URL' },
+    created_time: { type: 'string', description: 'Creation timestamp' },
+    last_edited_time: { type: 'string', description: 'Last edit timestamp' },
+    properties: { type: 'object', description: 'Database properties schema' },
+  },
+}
diff --git a/apps/sim/tools/notion/search.ts b/apps/sim/tools/notion/search.ts
index 259f23f5f1..492f211f22 100644
--- a/apps/sim/tools/notion/search.ts
+++ b/apps/sim/tools/notion/search.ts
@@ -133,3 +133,59 @@ export const notionSearchTool: ToolConfig<NotionSearchParams, NotionResponse> =
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionSearchV2Response {
+  success: boolean
+  output: {
+    results: any[]
+    has_more: boolean
+    next_cursor: string | null
+    total_results: number
+  }
+}
+
+export const notionSearchV2Tool: ToolConfig<NotionSearchParams, NotionSearchV2Response> = {
+  id: 'notion_search_v2',
+  name: 'Search Notion Workspace',
+  description: 'Search across all pages and databases in Notion workspace',
+  version: '2.0.0',
+  oauth: notionSearchTool.oauth,
+  params: notionSearchTool.params,
+  request: notionSearchTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    const results = data.results || []
+
+    return {
+      success: true,
+      output: {
+        results,
+        has_more: data.has_more || false,
+        next_cursor: data.next_cursor || null,
+        total_results: results.length,
+      },
+    }
+  },
+
+  outputs: {
+    results: {
+      type: 'array',
+      description: 'Array of search results (pages and databases)',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Object ID' },
+          object: { type: 'string', description: 'Object type (page or database)' },
+          url: { type: 'string', description: 'Object URL' },
+          created_time: { type: 'string', description: 'Creation timestamp' },
+          last_edited_time: { type: 'string', description: 'Last edit timestamp' },
+        },
+      },
+    },
+    has_more: { type: 'boolean', description: 'Whether more results are available' },
+    next_cursor: { type: 'string', description: 'Cursor for pagination', optional: true },
+    total_results: { type: 'number', description: 'Number of results returned' },
+  },
+}
diff --git a/apps/sim/tools/notion/types.ts b/apps/sim/tools/notion/types.ts
index c3bb0f30fa..df88063a26 100644
--- a/apps/sim/tools/notion/types.ts
+++ b/apps/sim/tools/notion/types.ts
@@ -62,7 +62,7 @@ export interface NotionSearchParams {
 export interface NotionCreateDatabaseParams {
   parentId: string
   title: string
-  properties?: string
+  properties?: Record<string, any>
   accessToken: string
 }
 
@@ -70,3 +70,9 @@ export interface NotionReadDatabaseParams {
   databaseId: string
   accessToken: string
 }
+
+export interface NotionAddDatabaseRowParams {
+  databaseId: string
+  properties: Record<string, any>
+  accessToken: string
+}
diff --git a/apps/sim/tools/notion/update_page.ts b/apps/sim/tools/notion/update_page.ts
index 1363aaba66..25288c0cd3 100644
--- a/apps/sim/tools/notion/update_page.ts
+++ b/apps/sim/tools/notion/update_page.ts
@@ -96,3 +96,60 @@ export const notionUpdatePageTool: ToolConfig<NotionUpdatePageParams, NotionResp
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionUpdatePageV2Response {
+  success: boolean
+  output: {
+    id: string
+    title: string
+    url: string
+    last_edited_time: string
+  }
+}
+
+export const notionUpdatePageV2Tool: ToolConfig<
+  NotionUpdatePageParams,
+  NotionUpdatePageV2Response
+> = {
+  id: 'notion_update_page_v2',
+  name: 'Notion Page Updater',
+  description: 'Update properties of a Notion page',
+  version: '2.0.0',
+  oauth: notionUpdatePageTool.oauth,
+  params: notionUpdatePageTool.params,
+  request: notionUpdatePageTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    let pageTitle = 'Untitled'
+
+    if (data.properties?.title) {
+      const titleProperty = data.properties.title
+      if (
+        titleProperty.title &&
+        Array.isArray(titleProperty.title) &&
+        titleProperty.title.length > 0
+      ) {
+        pageTitle = titleProperty.title.map((t: any) => t.plain_text || '').join('')
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        title: pageTitle,
+        url: data.url,
+        last_edited_time: data.last_edited_time,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Page ID' },
+    title: { type: 'string', description: 'Page title' },
+    url: { type: 'string', description: 'Page URL' },
+    last_edited_time: { type: 'string', description: 'Last edit timestamp' },
+  },
+}
diff --git a/apps/sim/tools/notion/write.ts b/apps/sim/tools/notion/write.ts
index bc65c47eb5..acb70699dd 100644
--- a/apps/sim/tools/notion/write.ts
+++ b/apps/sim/tools/notion/write.ts
@@ -87,3 +87,35 @@ export const notionWriteTool: ToolConfig<NotionWriteParams, NotionResponse> = {
     },
   },
 }
+
+// V2 Tool with API-aligned outputs
+interface NotionWriteV2Response {
+  success: boolean
+  output: {
+    appended: boolean
+  }
+}
+
+export const notionWriteV2Tool: ToolConfig<NotionWriteParams, NotionWriteV2Response> = {
+  id: 'notion_write_v2',
+  name: 'Notion Content Appender',
+  description: 'Append content to a Notion page',
+  version: '2.0.0',
+  oauth: notionWriteTool.oauth,
+  params: notionWriteTool.params,
+  request: notionWriteTool.request,
+
+  transformResponse: async (response: Response) => {
+    await response.json()
+    return {
+      success: response.ok,
+      output: {
+        appended: response.ok,
+      },
+    }
+  },
+
+  outputs: {
+    appended: { type: 'boolean', description: 'Whether content was successfully appended' },
+  },
+}
diff --git a/apps/sim/tools/params.ts b/apps/sim/tools/params.ts
index 28f561ae08..e4a92e67ed 100644
--- a/apps/sim/tools/params.ts
+++ b/apps/sim/tools/params.ts
@@ -163,7 +163,7 @@ export function getToolParametersConfig(
           id: 'workflowId',
           type: 'string',
           required: true,
-          visibility: 'user-or-llm',
+          visibility: 'user-only',
           description: 'The ID of the workflow to execute',
           uiComponent: {
             type: 'workflow-selector',
diff --git a/apps/sim/tools/pipedrive/create_activity.ts b/apps/sim/tools/pipedrive/create_activity.ts
index 78e936508e..63c9ab5986 100644
--- a/apps/sim/tools/pipedrive/create_activity.ts
+++ b/apps/sim/tools/pipedrive/create_activity.ts
@@ -122,18 +122,14 @@ export const pipedriveCreateActivityTool: ToolConfig<
     return {
       success: true,
       output: {
-        activity: data.data,
-        metadata: {
-          operation: 'create_activity' as const,
-        },
+        activity: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    activity: { type: 'object', description: 'The created activity object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    activity: { type: 'object', description: 'The created activity object', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/create_deal.ts b/apps/sim/tools/pipedrive/create_deal.ts
index e0b4762a33..77e7e8e094 100644
--- a/apps/sim/tools/pipedrive/create_deal.ts
+++ b/apps/sim/tools/pipedrive/create_deal.ts
@@ -122,18 +122,14 @@ export const pipedriveCreateDealTool: ToolConfig<
     return {
       success: true,
       output: {
-        deal: data.data,
-        metadata: {
-          operation: 'create_deal' as const,
-        },
+        deal: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    deal: { type: 'object', description: 'The created deal object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    deal: { type: 'object', description: 'The created deal object', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/create_lead.ts b/apps/sim/tools/pipedrive/create_lead.ts
index 649bbe7484..0804c0f51e 100644
--- a/apps/sim/tools/pipedrive/create_lead.ts
+++ b/apps/sim/tools/pipedrive/create_lead.ts
@@ -131,18 +131,14 @@ export const pipedriveCreateLeadTool: ToolConfig<
     return {
       success: true,
       output: {
-        lead: data.data,
-        metadata: {
-          operation: 'create_lead' as const,
-        },
+        lead: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    lead: { type: 'object', description: 'The created lead object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    lead: { type: 'object', description: 'The created lead object', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/create_project.ts b/apps/sim/tools/pipedrive/create_project.ts
index 70395fba6a..4211616f01 100644
--- a/apps/sim/tools/pipedrive/create_project.ts
+++ b/apps/sim/tools/pipedrive/create_project.ts
@@ -87,18 +87,14 @@ export const pipedriveCreateProjectTool: ToolConfig<
     return {
       success: true,
       output: {
-        project: data.data,
-        metadata: {
-          operation: 'create_project' as const,
-        },
+        project: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    project: { type: 'object', description: 'The created project object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    project: { type: 'object', description: 'The created project object', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/delete_lead.ts b/apps/sim/tools/pipedrive/delete_lead.ts
index 10c2635bb6..581ecdab3d 100644
--- a/apps/sim/tools/pipedrive/delete_lead.ts
+++ b/apps/sim/tools/pipedrive/delete_lead.ts
@@ -62,18 +62,14 @@ export const pipedriveDeleteLeadTool: ToolConfig<
     return {
       success: true,
       output: {
-        data: data.data,
-        metadata: {
-          operation: 'delete_lead' as const,
-        },
+        data: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    data: { type: 'object', description: 'Deletion confirmation data' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    data: { type: 'object', description: 'Deletion confirmation data', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_activities.ts b/apps/sim/tools/pipedrive/get_activities.ts
index 554f64a6ce..977765de35 100644
--- a/apps/sim/tools/pipedrive/get_activities.ts
+++ b/apps/sim/tools/pipedrive/get_activities.ts
@@ -103,10 +103,7 @@ export const pipedriveGetActivitiesTool: ToolConfig<
       success: true,
       output: {
         activities,
-        metadata: {
-          operation: 'get_activities' as const,
-          totalItems: activities.length,
-        },
+        total_items: activities.length,
         success: true,
       },
     }
@@ -114,7 +111,7 @@ export const pipedriveGetActivitiesTool: ToolConfig<
 
   outputs: {
     activities: { type: 'array', description: 'Array of activity objects from Pipedrive' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    total_items: { type: 'number', description: 'Total number of activities returned' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_all_deals.ts b/apps/sim/tools/pipedrive/get_all_deals.ts
index c9457a6a3f..2307188976 100644
--- a/apps/sim/tools/pipedrive/get_all_deals.ts
+++ b/apps/sim/tools/pipedrive/get_all_deals.ts
@@ -108,9 +108,8 @@ export const pipedriveGetAllDealsTool: ToolConfig<
       output: {
         deals,
         metadata: {
-          operation: 'get_all_deals' as const,
-          totalItems: deals.length,
-          hasMore,
+          total_items: deals.length,
+          has_more: hasMore,
         },
         success: true,
       },
@@ -119,7 +118,10 @@ export const pipedriveGetAllDealsTool: ToolConfig<
 
   outputs: {
     deals: { type: 'array', description: 'Array of deal objects from Pipedrive' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    metadata: {
+      type: 'object',
+      description: 'Pagination metadata for the response',
+    },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_deal.ts b/apps/sim/tools/pipedrive/get_deal.ts
index 26600e67a4..5250949940 100644
--- a/apps/sim/tools/pipedrive/get_deal.ts
+++ b/apps/sim/tools/pipedrive/get_deal.ts
@@ -51,18 +51,14 @@ export const pipedriveGetDealTool: ToolConfig<PipedriveGetDealParams, PipedriveG
     return {
       success: true,
       output: {
-        deal: data.data,
-        metadata: {
-          operation: 'get_deal' as const,
-        },
+        deal: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    deal: { type: 'object', description: 'Deal object with full details' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    deal: { type: 'object', description: 'Deal object with full details', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_files.ts b/apps/sim/tools/pipedrive/get_files.ts
index 0c24a1d558..776e08fff5 100644
--- a/apps/sim/tools/pipedrive/get_files.ts
+++ b/apps/sim/tools/pipedrive/get_files.ts
@@ -84,10 +84,7 @@ export const pipedriveGetFilesTool: ToolConfig<PipedriveGetFilesParams, Pipedriv
         success: true,
         output: {
           files,
-          metadata: {
-            operation: 'get_files' as const,
-            totalItems: files.length,
-          },
+          total_items: files.length,
           success: true,
         },
       }
@@ -95,7 +92,7 @@ export const pipedriveGetFilesTool: ToolConfig<PipedriveGetFilesParams, Pipedriv
 
     outputs: {
       files: { type: 'array', description: 'Array of file objects from Pipedrive' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      total_items: { type: 'number', description: 'Total number of files returned' },
       success: { type: 'boolean', description: 'Operation success status' },
     },
   }
diff --git a/apps/sim/tools/pipedrive/get_leads.ts b/apps/sim/tools/pipedrive/get_leads.ts
index 1a024fee91..9426bdb413 100644
--- a/apps/sim/tools/pipedrive/get_leads.ts
+++ b/apps/sim/tools/pipedrive/get_leads.ts
@@ -110,10 +110,7 @@ export const pipedriveGetLeadsTool: ToolConfig<PipedriveGetLeadsParams, Pipedriv
         return {
           success: true,
           output: {
-            lead: data.data,
-            metadata: {
-              operation: 'get_leads' as const,
-            },
+            lead: data.data ?? null,
             success: true,
           },
         }
@@ -126,19 +123,28 @@ export const pipedriveGetLeadsTool: ToolConfig<PipedriveGetLeadsParams, Pipedriv
         success: true,
         output: {
           leads,
-          metadata: {
-            operation: 'get_leads' as const,
-            totalItems: leads.length,
-          },
+          total_items: leads.length,
           success: true,
         },
       }
     },
 
     outputs: {
-      leads: { type: 'array', description: 'Array of lead objects (when listing all)' },
-      lead: { type: 'object', description: 'Single lead object (when lead_id is provided)' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      leads: {
+        type: 'array',
+        description: 'Array of lead objects (when listing all)',
+        optional: true,
+      },
+      lead: {
+        type: 'object',
+        description: 'Single lead object (when lead_id is provided)',
+        optional: true,
+      },
+      total_items: {
+        type: 'number',
+        description: 'Total number of leads returned',
+        optional: true,
+      },
       success: { type: 'boolean', description: 'Operation success status' },
     },
   }
diff --git a/apps/sim/tools/pipedrive/get_mail_messages.ts b/apps/sim/tools/pipedrive/get_mail_messages.ts
index 64858fc540..e101d6d3f5 100644
--- a/apps/sim/tools/pipedrive/get_mail_messages.ts
+++ b/apps/sim/tools/pipedrive/get_mail_messages.ts
@@ -80,10 +80,7 @@ export const pipedriveGetMailMessagesTool: ToolConfig<
       success: true,
       output: {
         messages: threads,
-        metadata: {
-          operation: 'get_mail_messages' as const,
-          totalItems: threads.length,
-        },
+        total_items: threads.length,
         success: true,
       },
     }
@@ -91,7 +88,7 @@ export const pipedriveGetMailMessagesTool: ToolConfig<
 
   outputs: {
     messages: { type: 'array', description: 'Array of mail thread objects from Pipedrive mailbox' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    total_items: { type: 'number', description: 'Total number of mail threads returned' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_mail_thread.ts b/apps/sim/tools/pipedrive/get_mail_thread.ts
index cd69fdb2b3..c686d25770 100644
--- a/apps/sim/tools/pipedrive/get_mail_thread.ts
+++ b/apps/sim/tools/pipedrive/get_mail_thread.ts
@@ -67,9 +67,8 @@ export const pipedriveGetMailThreadTool: ToolConfig<
       output: {
         messages,
         metadata: {
-          operation: 'get_mail_thread' as const,
-          threadId: params?.thread_id || '',
-          totalItems: messages.length,
+          thread_id: params?.thread_id || '',
+          total_items: messages.length,
         },
         success: true,
       },
@@ -78,7 +77,10 @@ export const pipedriveGetMailThreadTool: ToolConfig<
 
   outputs: {
     messages: { type: 'array', description: 'Array of mail message objects from the thread' },
-    metadata: { type: 'object', description: 'Operation metadata including thread ID' },
+    metadata: {
+      type: 'object',
+      description: 'Thread and pagination metadata',
+    },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_pipeline_deals.ts b/apps/sim/tools/pipedrive/get_pipeline_deals.ts
index 46c9f7e7ed..073e6763b8 100644
--- a/apps/sim/tools/pipedrive/get_pipeline_deals.ts
+++ b/apps/sim/tools/pipedrive/get_pipeline_deals.ts
@@ -89,9 +89,8 @@ export const pipedriveGetPipelineDealsTool: ToolConfig<
       output: {
         deals,
         metadata: {
-          operation: 'get_pipeline_deals' as const,
-          pipelineId: params?.pipeline_id || '',
-          totalItems: deals.length,
+          pipeline_id: params?.pipeline_id || '',
+          total_items: deals.length,
         },
         success: true,
       },
@@ -100,7 +99,10 @@ export const pipedriveGetPipelineDealsTool: ToolConfig<
 
   outputs: {
     deals: { type: 'array', description: 'Array of deal objects from the pipeline' },
-    metadata: { type: 'object', description: 'Operation metadata including pipeline ID' },
+    metadata: {
+      type: 'object',
+      description: 'Pipeline and pagination metadata',
+    },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_pipelines.ts b/apps/sim/tools/pipedrive/get_pipelines.ts
index 2edbf6a9cd..844545f053 100644
--- a/apps/sim/tools/pipedrive/get_pipelines.ts
+++ b/apps/sim/tools/pipedrive/get_pipelines.ts
@@ -89,10 +89,7 @@ export const pipedriveGetPipelinesTool: ToolConfig<
       success: true,
       output: {
         pipelines,
-        metadata: {
-          operation: 'get_pipelines' as const,
-          totalItems: pipelines.length,
-        },
+        total_items: pipelines.length,
         success: true,
       },
     }
@@ -100,7 +97,7 @@ export const pipedriveGetPipelinesTool: ToolConfig<
 
   outputs: {
     pipelines: { type: 'array', description: 'Array of pipeline objects from Pipedrive' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    total_items: { type: 'number', description: 'Total number of pipelines returned' },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/get_projects.ts b/apps/sim/tools/pipedrive/get_projects.ts
index 16c4fda4fd..11f314fe2a 100644
--- a/apps/sim/tools/pipedrive/get_projects.ts
+++ b/apps/sim/tools/pipedrive/get_projects.ts
@@ -86,10 +86,7 @@ export const pipedriveGetProjectsTool: ToolConfig<
       return {
         success: true,
         output: {
-          project: data.data,
-          metadata: {
-            operation: 'get_projects' as const,
-          },
+          project: data.data ?? null,
           success: true,
         },
       }
@@ -102,19 +99,28 @@ export const pipedriveGetProjectsTool: ToolConfig<
       success: true,
       output: {
         projects,
-        metadata: {
-          operation: 'get_projects' as const,
-          totalItems: projects.length,
-        },
+        total_items: projects.length,
         success: true,
       },
     }
   },
 
   outputs: {
-    projects: { type: 'array', description: 'Array of project objects (when listing all)' },
-    project: { type: 'object', description: 'Single project object (when project_id is provided)' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    projects: {
+      type: 'array',
+      description: 'Array of project objects (when listing all)',
+      optional: true,
+    },
+    project: {
+      type: 'object',
+      description: 'Single project object (when project_id is provided)',
+      optional: true,
+    },
+    total_items: {
+      type: 'number',
+      description: 'Total number of projects returned',
+      optional: true,
+    },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/types.ts b/apps/sim/tools/pipedrive/types.ts
index cfea1dfcd3..e1e5090c42 100644
--- a/apps/sim/tools/pipedrive/types.ts
+++ b/apps/sim/tools/pipedrive/types.ts
@@ -119,9 +119,8 @@ export interface PipedriveGetAllDealsParams {
 export interface PipedriveGetAllDealsOutput {
   deals: PipedriveDeal[]
   metadata: {
-    operation: 'get_all_deals'
-    totalItems: number
-    hasMore: boolean
+    total_items: number
+    has_more: boolean
   }
   success: boolean
 }
@@ -138,9 +137,6 @@ export interface PipedriveGetDealParams {
 
 export interface PipedriveGetDealOutput {
   deal: PipedriveDeal
-  metadata: {
-    operation: 'get_deal'
-  }
   success: boolean
 }
 
@@ -164,9 +160,6 @@ export interface PipedriveCreateDealParams {
 
 export interface PipedriveCreateDealOutput {
   deal: PipedriveDeal
-  metadata: {
-    operation: 'create_deal'
-  }
   success: boolean
 }
 
@@ -187,9 +180,6 @@ export interface PipedriveUpdateDealParams {
 
 export interface PipedriveUpdateDealOutput {
   deal: PipedriveDeal
-  metadata: {
-    operation: 'update_deal'
-  }
   success: boolean
 }
 
@@ -208,10 +198,7 @@ export interface PipedriveGetFilesParams {
 
 export interface PipedriveGetFilesOutput {
   files: PipedriveFile[]
-  metadata: {
-    operation: 'get_files'
-    totalItems: number
-  }
+  total_items: number
   success: boolean
 }
 
@@ -227,10 +214,7 @@ export interface PipedriveGetMailMessagesParams {
 
 export interface PipedriveGetMailMessagesOutput {
   messages: PipedriveMailMessage[]
-  metadata: {
-    operation: 'get_mail_messages'
-    totalItems: number
-  }
+  total_items: number
   success: boolean
 }
 
@@ -247,9 +231,8 @@ export interface PipedriveGetMailThreadParams {
 export interface PipedriveGetMailThreadOutput {
   messages: PipedriveMailMessage[]
   metadata: {
-    operation: 'get_mail_thread'
-    threadId: string
-    totalItems: number
+    thread_id: string
+    total_items: number
   }
   success: boolean
 }
@@ -269,10 +252,7 @@ export interface PipedriveGetPipelinesParams {
 
 export interface PipedriveGetPipelinesOutput {
   pipelines: PipedrivePipeline[]
-  metadata: {
-    operation: 'get_pipelines'
-    totalItems: number
-  }
+  total_items: number
   success: boolean
 }
 
@@ -292,9 +272,8 @@ export interface PipedriveGetPipelineDealsParams {
 export interface PipedriveGetPipelineDealsOutput {
   deals: PipedriveDeal[]
   metadata: {
-    operation: 'get_pipeline_deals'
-    pipelineId: string
-    totalItems: number
+    pipeline_id: string
+    total_items: number
   }
   success: boolean
 }
@@ -314,10 +293,7 @@ export interface PipedriveGetProjectsParams {
 export interface PipedriveGetProjectsOutput {
   projects?: PipedriveProject[]
   project?: PipedriveProject
-  metadata: {
-    operation: 'get_projects'
-    totalItems?: number
-  }
+  total_items?: number
   success: boolean
 }
 
@@ -336,9 +312,6 @@ export interface PipedriveCreateProjectParams {
 
 export interface PipedriveCreateProjectOutput {
   project: PipedriveProject
-  metadata: {
-    operation: 'create_project'
-  }
   success: boolean
 }
 
@@ -359,10 +332,7 @@ export interface PipedriveGetActivitiesParams {
 
 export interface PipedriveGetActivitiesOutput {
   activities: PipedriveActivity[]
-  metadata: {
-    operation: 'get_activities'
-    totalItems: number
-  }
+  total_items: number
   success: boolean
 }
 
@@ -386,9 +356,6 @@ export interface PipedriveCreateActivityParams {
 
 export interface PipedriveCreateActivityOutput {
   activity: PipedriveActivity
-  metadata: {
-    operation: 'create_activity'
-  }
   success: boolean
 }
 
@@ -410,9 +377,6 @@ export interface PipedriveUpdateActivityParams {
 
 export interface PipedriveUpdateActivityOutput {
   activity: PipedriveActivity
-  metadata: {
-    operation: 'update_activity'
-  }
   success: boolean
 }
 
@@ -434,10 +398,7 @@ export interface PipedriveGetLeadsParams {
 export interface PipedriveGetLeadsOutput {
   leads?: PipedriveLead[]
   lead?: PipedriveLead
-  metadata: {
-    operation: 'get_leads'
-    totalItems?: number
-  }
+  total_items?: number
   success: boolean
 }
 
@@ -460,9 +421,6 @@ export interface PipedriveCreateLeadParams {
 
 export interface PipedriveCreateLeadOutput {
   lead: PipedriveLead
-  metadata: {
-    operation: 'create_lead'
-  }
   success: boolean
 }
 
@@ -486,9 +444,6 @@ export interface PipedriveUpdateLeadParams {
 
 export interface PipedriveUpdateLeadOutput {
   lead: PipedriveLead
-  metadata: {
-    operation: 'update_lead'
-  }
   success: boolean
 }
 
@@ -504,9 +459,6 @@ export interface PipedriveDeleteLeadParams {
 
 export interface PipedriveDeleteLeadOutput {
   data: any
-  metadata: {
-    operation: 'delete_lead'
-  }
   success: boolean
 }
 
diff --git a/apps/sim/tools/pipedrive/update_activity.ts b/apps/sim/tools/pipedrive/update_activity.ts
index a08ff90cbe..fe915b344b 100644
--- a/apps/sim/tools/pipedrive/update_activity.ts
+++ b/apps/sim/tools/pipedrive/update_activity.ts
@@ -106,18 +106,14 @@ export const pipedriveUpdateActivityTool: ToolConfig<
     return {
       success: true,
       output: {
-        activity: data.data,
-        metadata: {
-          operation: 'update_activity' as const,
-        },
+        activity: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    activity: { type: 'object', description: 'The updated activity object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    activity: { type: 'object', description: 'The updated activity object', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/update_deal.ts b/apps/sim/tools/pipedrive/update_deal.ts
index d2a2a6b356..5f907e84b9 100644
--- a/apps/sim/tools/pipedrive/update_deal.ts
+++ b/apps/sim/tools/pipedrive/update_deal.ts
@@ -99,18 +99,14 @@ export const pipedriveUpdateDealTool: ToolConfig<
     return {
       success: true,
       output: {
-        deal: data.data,
-        metadata: {
-          operation: 'update_deal' as const,
-        },
+        deal: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    deal: { type: 'object', description: 'The updated deal object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    deal: { type: 'object', description: 'The updated deal object', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/pipedrive/update_lead.ts b/apps/sim/tools/pipedrive/update_lead.ts
index 99f3fed89b..4c19efa48a 100644
--- a/apps/sim/tools/pipedrive/update_lead.ts
+++ b/apps/sim/tools/pipedrive/update_lead.ts
@@ -132,18 +132,14 @@ export const pipedriveUpdateLeadTool: ToolConfig<
     return {
       success: true,
       output: {
-        lead: data.data,
-        metadata: {
-          operation: 'update_lead' as const,
-        },
+        lead: data.data ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    lead: { type: 'object', description: 'The updated lead object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    lead: { type: 'object', description: 'The updated lead object', optional: true },
     success: { type: 'boolean', description: 'Operation success status' },
   },
 }
diff --git a/apps/sim/tools/postgresql/index.ts b/apps/sim/tools/postgresql/index.ts
index ea54708a8d..07561c45e8 100644
--- a/apps/sim/tools/postgresql/index.ts
+++ b/apps/sim/tools/postgresql/index.ts
@@ -1,11 +1,13 @@
 import { deleteTool } from './delete'
 import { executeTool } from './execute'
 import { insertTool } from './insert'
+import { introspectTool } from './introspect'
 import { queryTool } from './query'
 import { updateTool } from './update'
 
 export const postgresDeleteTool = deleteTool
 export const postgresExecuteTool = executeTool
 export const postgresInsertTool = insertTool
+export const postgresIntrospectTool = introspectTool
 export const postgresQueryTool = queryTool
 export const postgresUpdateTool = updateTool
diff --git a/apps/sim/tools/postgresql/introspect.ts b/apps/sim/tools/postgresql/introspect.ts
new file mode 100644
index 0000000000..08fa8c2e4e
--- /dev/null
+++ b/apps/sim/tools/postgresql/introspect.ts
@@ -0,0 +1,99 @@
+import type { PostgresIntrospectParams, PostgresIntrospectResponse } from '@/tools/postgresql/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const introspectTool: ToolConfig<PostgresIntrospectParams, PostgresIntrospectResponse> = {
+  id: 'postgresql_introspect',
+  name: 'PostgreSQL Introspect',
+  description:
+    'Introspect PostgreSQL database schema to retrieve table structures, columns, and relationships',
+  version: '1.0',
+
+  params: {
+    host: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'PostgreSQL server hostname or IP address',
+    },
+    port: {
+      type: 'number',
+      required: true,
+      visibility: 'user-only',
+      description: 'PostgreSQL server port (default: 5432)',
+    },
+    database: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Database name to connect to',
+    },
+    username: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Database username',
+    },
+    password: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Database password',
+    },
+    ssl: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'SSL connection mode (disabled, required, preferred)',
+    },
+    schema: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Schema to introspect (default: public)',
+    },
+  },
+
+  request: {
+    url: '/api/tools/postgresql/introspect',
+    method: 'POST',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      host: params.host,
+      port: Number(params.port),
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl || 'required',
+      schema: params.schema || 'public',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error || 'PostgreSQL introspection failed')
+    }
+
+    return {
+      success: true,
+      output: {
+        message: data.message || 'Schema introspection completed successfully',
+        tables: data.tables || [],
+        schemas: data.schemas || [],
+      },
+      error: undefined,
+    }
+  },
+
+  outputs: {
+    message: { type: 'string', description: 'Operation status message' },
+    tables: {
+      type: 'array',
+      description: 'Array of table schemas with columns, keys, and indexes',
+    },
+    schemas: { type: 'array', description: 'List of available schemas in the database' },
+  },
+}
diff --git a/apps/sim/tools/postgresql/types.ts b/apps/sim/tools/postgresql/types.ts
index 18d1ad9d23..124eb037e1 100644
--- a/apps/sim/tools/postgresql/types.ts
+++ b/apps/sim/tools/postgresql/types.ts
@@ -33,6 +33,10 @@ export interface PostgresExecuteParams extends PostgresConnectionConfig {
   query: string
 }
 
+export interface PostgresIntrospectParams extends PostgresConnectionConfig {
+  schema?: string
+}
+
 export interface PostgresBaseResponse extends ToolResponse {
   output: {
     message: string
@@ -47,4 +51,44 @@ export interface PostgresInsertResponse extends PostgresBaseResponse {}
 export interface PostgresUpdateResponse extends PostgresBaseResponse {}
 export interface PostgresDeleteResponse extends PostgresBaseResponse {}
 export interface PostgresExecuteResponse extends PostgresBaseResponse {}
+
+export interface TableColumn {
+  name: string
+  type: string
+  nullable: boolean
+  default: string | null
+  isPrimaryKey: boolean
+  isForeignKey: boolean
+  references?: {
+    table: string
+    column: string
+  }
+}
+
+export interface TableSchema {
+  name: string
+  schema: string
+  columns: TableColumn[]
+  primaryKey: string[]
+  foreignKeys: Array<{
+    column: string
+    referencesTable: string
+    referencesColumn: string
+  }>
+  indexes: Array<{
+    name: string
+    columns: string[]
+    unique: boolean
+  }>
+}
+
+export interface PostgresIntrospectResponse extends ToolResponse {
+  output: {
+    message: string
+    tables: TableSchema[]
+    schemas: string[]
+  }
+  error?: string
+}
+
 export interface PostgresResponse extends PostgresBaseResponse {}
diff --git a/apps/sim/tools/posthog/batch_events.ts b/apps/sim/tools/posthog/batch_events.ts
index 72a9c05b9c..0eeea5d9b7 100644
--- a/apps/sim/tools/posthog/batch_events.ts
+++ b/apps/sim/tools/posthog/batch_events.ts
@@ -10,7 +10,7 @@ export interface PostHogBatchEventsResponse {
   success: boolean
   output: {
     status: string
-    eventsProcessed: number
+    events_processed: number
   }
 }
 
@@ -76,7 +76,7 @@ export const batchEventsTool: ToolConfig<PostHogBatchEventsParams, PostHogBatchE
         success: true,
         output: {
           status: 'Batch events captured successfully',
-          eventsProcessed: data.status === 1 ? JSON.parse(data.batch || '[]').length : 0,
+          events_processed: data.status === 1 ? JSON.parse(data.batch || '[]').length : 0,
         },
       }
     }
@@ -86,7 +86,7 @@ export const batchEventsTool: ToolConfig<PostHogBatchEventsParams, PostHogBatchE
       success: false,
       output: {
         status: 'Failed to capture batch events',
-        eventsProcessed: 0,
+        events_processed: 0,
       },
       error: error || 'Unknown error occurred',
     }
@@ -97,7 +97,7 @@ export const batchEventsTool: ToolConfig<PostHogBatchEventsParams, PostHogBatchE
       type: 'string',
       description: 'Status message indicating whether the batch was captured successfully',
     },
-    eventsProcessed: {
+    events_processed: {
       type: 'number',
       description: 'Number of events processed in the batch',
     },
diff --git a/apps/sim/tools/posthog/evaluate_flags.ts b/apps/sim/tools/posthog/evaluate_flags.ts
index 9dd62822e2..690f347082 100644
--- a/apps/sim/tools/posthog/evaluate_flags.ts
+++ b/apps/sim/tools/posthog/evaluate_flags.ts
@@ -14,9 +14,9 @@ interface FlagEvaluation {
 }
 
 interface EvaluateFlagsResponse {
-  featureFlags: FlagEvaluation
-  featureFlagPayloads: Record<string, any>
-  errorsWhileComputingFlags: boolean
+  feature_flags: FlagEvaluation
+  feature_flag_payloads: Record<string, any>
+  errors_while_computing_flags: boolean
 }
 
 export const evaluateFlagsTool: ToolConfig<EvaluateFlagsParams, EvaluateFlagsResponse> = {
@@ -113,23 +113,23 @@ export const evaluateFlagsTool: ToolConfig<EvaluateFlagsParams, EvaluateFlagsRes
     const data = await response.json()
 
     return {
-      featureFlags: data.featureFlags || {},
-      featureFlagPayloads: data.featureFlagPayloads || {},
-      errorsWhileComputingFlags: data.errorsWhileComputingFlags || false,
+      feature_flags: data.featureFlags || {},
+      feature_flag_payloads: data.featureFlagPayloads || {},
+      errors_while_computing_flags: data.errorsWhileComputingFlags || false,
     }
   },
 
   outputs: {
-    featureFlags: {
+    feature_flags: {
       type: 'object',
       description:
         'Feature flag evaluations (key-value pairs where values are boolean or string variants)',
     },
-    featureFlagPayloads: {
+    feature_flag_payloads: {
       type: 'object',
       description: 'Additional payloads attached to feature flags',
     },
-    errorsWhileComputingFlags: {
+    errors_while_computing_flags: {
       type: 'boolean',
       description: 'Whether there were errors while computing flags',
     },
diff --git a/apps/sim/tools/posthog/get_event_definition.ts b/apps/sim/tools/posthog/get_event_definition.ts
index a9aaf7b261..a13448b575 100644
--- a/apps/sim/tools/posthog/get_event_definition.ts
+++ b/apps/sim/tools/posthog/get_event_definition.ts
@@ -84,15 +84,15 @@ export const getEventDefinitionTool: ToolConfig<PostHogGetEventDefinitionParams,
         name: data.name,
         description: data.description || '',
         tags: data.tags || [],
-        volume_30_day: data.volume_30_day,
-        query_usage_30_day: data.query_usage_30_day,
+        volume_30_day: data.volume_30_day ?? null,
+        query_usage_30_day: data.query_usage_30_day ?? null,
         created_at: data.created_at,
-        last_seen_at: data.last_seen_at,
+        last_seen_at: data.last_seen_at ?? null,
         updated_at: data.updated_at,
-        updated_by: data.updated_by,
+        updated_by: data.updated_by ?? null,
         verified: data.verified || false,
-        verified_at: data.verified_at,
-        verified_by: data.verified_by,
+        verified_at: data.verified_at ?? null,
+        verified_by: data.verified_by ?? null,
       }
     },
 
@@ -116,10 +116,12 @@ export const getEventDefinitionTool: ToolConfig<PostHogGetEventDefinitionParams,
       volume_30_day: {
         type: 'number',
         description: 'Number of events received in the last 30 days',
+        optional: true,
       },
       query_usage_30_day: {
         type: 'number',
         description: 'Number of times this event was queried in the last 30 days',
+        optional: true,
       },
       created_at: {
         type: 'string',
@@ -128,6 +130,7 @@ export const getEventDefinitionTool: ToolConfig<PostHogGetEventDefinitionParams,
       last_seen_at: {
         type: 'string',
         description: 'ISO timestamp when the event was last seen',
+        optional: true,
       },
       updated_at: {
         type: 'string',
@@ -136,6 +139,7 @@ export const getEventDefinitionTool: ToolConfig<PostHogGetEventDefinitionParams,
       updated_by: {
         type: 'object',
         description: 'User who last updated the event',
+        optional: true,
       },
       verified: {
         type: 'boolean',
@@ -144,10 +148,12 @@ export const getEventDefinitionTool: ToolConfig<PostHogGetEventDefinitionParams,
       verified_at: {
         type: 'string',
         description: 'ISO timestamp when the event was verified',
+        optional: true,
       },
       verified_by: {
         type: 'string',
         description: 'User who verified the event',
+        optional: true,
       },
     },
   }
diff --git a/apps/sim/tools/posthog/get_organization.ts b/apps/sim/tools/posthog/get_organization.ts
index 4de18d9792..6c7f599b7e 100644
--- a/apps/sim/tools/posthog/get_organization.ts
+++ b/apps/sim/tools/posthog/get_organization.ts
@@ -101,9 +101,9 @@ export const getOrganizationTool: ToolConfig<
           domain_whitelist: data.domain_whitelist || [],
           is_member_join_email_enabled: data.is_member_join_email_enabled,
           metadata: data.metadata || {},
-          customer_id: data.customer_id,
+          customer_id: data.customer_id ?? null,
           available_features: data.available_features || [],
-          usage: data.usage || null,
+          usage: data.usage ?? null,
         },
       },
     }
@@ -141,12 +141,12 @@ export const getOrganizationTool: ToolConfig<
           description: 'Whether member join emails are enabled',
         },
         metadata: { type: 'object', description: 'Organization metadata' },
-        customer_id: { type: 'string', description: 'Customer ID for billing' },
+        customer_id: { type: 'string', description: 'Customer ID for billing', optional: true },
         available_features: {
           type: 'array',
           description: 'List of available feature flags for organization',
         },
-        usage: { type: 'object', description: 'Organization usage statistics' },
+        usage: { type: 'object', description: 'Organization usage statistics', optional: true },
       },
     },
   },
diff --git a/apps/sim/tools/posthog/get_property_definition.ts b/apps/sim/tools/posthog/get_property_definition.ts
index 5ca40bc2f3..0f1057b01d 100644
--- a/apps/sim/tools/posthog/get_property_definition.ts
+++ b/apps/sim/tools/posthog/get_property_definition.ts
@@ -91,18 +91,18 @@ export const getPropertyDefinitionTool: ToolConfig<
       description: data.description || '',
       tags: data.tags || [],
       is_numerical: data.is_numerical || false,
-      is_seen_on_filtered_events: data.is_seen_on_filtered_events,
+      is_seen_on_filtered_events: data.is_seen_on_filtered_events ?? null,
       property_type: data.property_type,
       type: data.type,
-      volume_30_day: data.volume_30_day,
-      query_usage_30_day: data.query_usage_30_day,
+      volume_30_day: data.volume_30_day ?? null,
+      query_usage_30_day: data.query_usage_30_day ?? null,
       created_at: data.created_at,
       updated_at: data.updated_at,
-      updated_by: data.updated_by,
+      updated_by: data.updated_by ?? null,
       verified: data.verified || false,
-      verified_at: data.verified_at,
-      verified_by: data.verified_by,
-      example: data.example,
+      verified_at: data.verified_at ?? null,
+      verified_by: data.verified_by ?? null,
+      example: data.example ?? null,
     }
   },
 
@@ -130,6 +130,7 @@ export const getPropertyDefinitionTool: ToolConfig<
     is_seen_on_filtered_events: {
       type: 'boolean',
       description: 'Whether the property is seen on filtered events',
+      optional: true,
     },
     property_type: {
       type: 'string',
@@ -142,10 +143,12 @@ export const getPropertyDefinitionTool: ToolConfig<
     volume_30_day: {
       type: 'number',
       description: 'Number of times property was seen in the last 30 days',
+      optional: true,
     },
     query_usage_30_day: {
       type: 'number',
       description: 'Number of times this property was queried in the last 30 days',
+      optional: true,
     },
     created_at: {
       type: 'string',
@@ -158,6 +161,7 @@ export const getPropertyDefinitionTool: ToolConfig<
     updated_by: {
       type: 'object',
       description: 'User who last updated the property',
+      optional: true,
     },
     verified: {
       type: 'boolean',
@@ -166,14 +170,17 @@ export const getPropertyDefinitionTool: ToolConfig<
     verified_at: {
       type: 'string',
       description: 'ISO timestamp when the property was verified',
+      optional: true,
     },
     verified_by: {
       type: 'string',
       description: 'User who verified the property',
+      optional: true,
     },
     example: {
       type: 'string',
       description: 'Example value for the property',
+      optional: true,
     },
   },
 }
diff --git a/apps/sim/tools/posthog/list_event_definitions.ts b/apps/sim/tools/posthog/list_event_definitions.ts
index e1e6898c02..1248d8e94d 100644
--- a/apps/sim/tools/posthog/list_event_definitions.ts
+++ b/apps/sim/tools/posthog/list_event_definitions.ts
@@ -108,19 +108,19 @@ export const listEventDefinitionsTool: ToolConfig<
 
     return {
       count: data.count,
-      next: data.next,
-      previous: data.previous,
+      next: data.next ?? null,
+      previous: data.previous ?? null,
       results: data.results.map((event: any) => ({
         id: event.id,
         name: event.name,
         description: event.description || '',
         tags: event.tags || [],
-        volume_30_day: event.volume_30_day,
-        query_usage_30_day: event.query_usage_30_day,
+        volume_30_day: event.volume_30_day ?? null,
+        query_usage_30_day: event.query_usage_30_day ?? null,
         created_at: event.created_at,
-        last_seen_at: event.last_seen_at,
+        last_seen_at: event.last_seen_at ?? null,
         updated_at: event.updated_at,
-        updated_by: event.updated_by,
+        updated_by: event.updated_by ?? null,
       })),
     }
   },
@@ -133,10 +133,12 @@ export const listEventDefinitionsTool: ToolConfig<
     next: {
       type: 'string',
       description: 'URL for the next page of results',
+      optional: true,
     },
     previous: {
       type: 'string',
       description: 'URL for the previous page of results',
+      optional: true,
     },
     results: {
       type: 'array',
@@ -151,18 +153,25 @@ export const listEventDefinitionsTool: ToolConfig<
           volume_30_day: {
             type: 'number',
             description: 'Number of events received in the last 30 days',
+            optional: true,
           },
           query_usage_30_day: {
             type: 'number',
             description: 'Number of times this event was queried in the last 30 days',
+            optional: true,
           },
           created_at: { type: 'string', description: 'ISO timestamp when the event was created' },
           last_seen_at: {
             type: 'string',
             description: 'ISO timestamp when the event was last seen',
+            optional: true,
           },
           updated_at: { type: 'string', description: 'ISO timestamp when the event was updated' },
-          updated_by: { type: 'object', description: 'User who last updated the event' },
+          updated_by: {
+            type: 'object',
+            description: 'User who last updated the event',
+            optional: true,
+          },
         },
       },
     },
diff --git a/apps/sim/tools/posthog/list_experiments.ts b/apps/sim/tools/posthog/list_experiments.ts
index 2ebb70625e..657dbf66e0 100644
--- a/apps/sim/tools/posthog/list_experiments.ts
+++ b/apps/sim/tools/posthog/list_experiments.ts
@@ -93,8 +93,8 @@ export const listExperimentsTool: ToolConfig<ListExperimentsParams, ListExperime
     return {
       results: data.results,
       count: data.count,
-      next: data.next,
-      previous: data.previous,
+      next: data.next ?? null,
+      previous: data.previous ?? null,
     }
   },
 
@@ -113,8 +113,8 @@ export const listExperimentsTool: ToolConfig<ListExperimentsParams, ListExperime
           parameters: { type: 'object', description: 'Experiment parameters' },
           filters: { type: 'object', description: 'Experiment filters' },
           variants: { type: 'object', description: 'Experiment variants' },
-          start_date: { type: 'string', description: 'Start date' },
-          end_date: { type: 'string', description: 'End date' },
+          start_date: { type: 'string', description: 'Start date', optional: true },
+          end_date: { type: 'string', description: 'End date', optional: true },
           created_at: { type: 'string', description: 'Creation timestamp' },
           created_by: { type: 'object', description: 'Creator information' },
           archived: { type: 'boolean', description: 'Whether the experiment is archived' },
diff --git a/apps/sim/tools/posthog/list_feature_flags.ts b/apps/sim/tools/posthog/list_feature_flags.ts
index 6da7107a2b..cb00359e2f 100644
--- a/apps/sim/tools/posthog/list_feature_flags.ts
+++ b/apps/sim/tools/posthog/list_feature_flags.ts
@@ -91,8 +91,8 @@ export const listFeatureFlagsTool: ToolConfig<ListFeatureFlagsParams, ListFeatur
     return {
       results: data.results,
       count: data.count,
-      next: data.next,
-      previous: data.previous,
+      next: data.next ?? null,
+      previous: data.previous ?? null,
     }
   },
 
@@ -115,6 +115,7 @@ export const listFeatureFlagsTool: ToolConfig<ListFeatureFlagsParams, ListFeatur
           rollout_percentage: {
             type: 'number',
             description: 'Rollout percentage (if applicable)',
+            optional: true,
           },
           ensure_experience_continuity: {
             type: 'boolean',
diff --git a/apps/sim/tools/posthog/list_property_definitions.ts b/apps/sim/tools/posthog/list_property_definitions.ts
index b820def539..1b2724c4da 100644
--- a/apps/sim/tools/posthog/list_property_definitions.ts
+++ b/apps/sim/tools/posthog/list_property_definitions.ts
@@ -119,22 +119,22 @@ export const listPropertyDefinitionsTool: ToolConfig<
 
     return {
       count: data.count,
-      next: data.next,
-      previous: data.previous,
+      next: data.next ?? null,
+      previous: data.previous ?? null,
       results: data.results.map((property: any) => ({
         id: property.id,
         name: property.name,
         description: property.description || '',
         tags: property.tags || [],
         is_numerical: property.is_numerical || false,
-        is_seen_on_filtered_events: property.is_seen_on_filtered_events,
+        is_seen_on_filtered_events: property.is_seen_on_filtered_events ?? null,
         property_type: property.property_type,
         type: property.type,
-        volume_30_day: property.volume_30_day,
-        query_usage_30_day: property.query_usage_30_day,
+        volume_30_day: property.volume_30_day ?? null,
+        query_usage_30_day: property.query_usage_30_day ?? null,
         created_at: property.created_at,
         updated_at: property.updated_at,
-        updated_by: property.updated_by,
+        updated_by: property.updated_by ?? null,
       })),
     }
   },
@@ -147,10 +147,12 @@ export const listPropertyDefinitionsTool: ToolConfig<
     next: {
       type: 'string',
       description: 'URL for the next page of results',
+      optional: true,
     },
     previous: {
       type: 'string',
       description: 'URL for the previous page of results',
+      optional: true,
     },
     results: {
       type: 'array',
@@ -166,16 +168,19 @@ export const listPropertyDefinitionsTool: ToolConfig<
           is_seen_on_filtered_events: {
             type: 'boolean',
             description: 'Whether the property is seen on filtered events',
+            optional: true,
           },
           property_type: { type: 'string', description: 'The data type of the property' },
           type: { type: 'string', description: 'Property type: event, person, or group' },
           volume_30_day: {
             type: 'number',
             description: 'Number of times property was seen in the last 30 days',
+            optional: true,
           },
           query_usage_30_day: {
             type: 'number',
             description: 'Number of times this property was queried in the last 30 days',
+            optional: true,
           },
           created_at: {
             type: 'string',
@@ -185,7 +190,11 @@ export const listPropertyDefinitionsTool: ToolConfig<
             type: 'string',
             description: 'ISO timestamp when the property was updated',
           },
-          updated_by: { type: 'object', description: 'User who last updated the property' },
+          updated_by: {
+            type: 'object',
+            description: 'User who last updated the property',
+            optional: true,
+          },
         },
       },
     },
diff --git a/apps/sim/tools/posthog/list_recording_playlists.ts b/apps/sim/tools/posthog/list_recording_playlists.ts
index dd2f512d96..cd7685c6e4 100644
--- a/apps/sim/tools/posthog/list_recording_playlists.ts
+++ b/apps/sim/tools/posthog/list_recording_playlists.ts
@@ -113,8 +113,8 @@ export const listRecordingPlaylistsTool: ToolConfig<
       output: {
         playlists: data.results || [],
         count: data.count || 0,
-        next: data.next,
-        previous: data.previous,
+        next: data.next ?? null,
+        previous: data.previous ?? null,
       },
     }
   },
diff --git a/apps/sim/tools/posthog/list_session_recordings.ts b/apps/sim/tools/posthog/list_session_recordings.ts
index 7eaa185e10..21aa2a888b 100644
--- a/apps/sim/tools/posthog/list_session_recordings.ts
+++ b/apps/sim/tools/posthog/list_session_recordings.ts
@@ -112,8 +112,8 @@ export const listSessionRecordingsTool: ToolConfig<
       output: {
         recordings: data.results || [],
         count: data.count || 0,
-        next: data.next,
-        previous: data.previous,
+        next: data.next ?? null,
+        previous: data.previous ?? null,
       },
     }
   },
diff --git a/apps/sim/tools/posthog/list_surveys.ts b/apps/sim/tools/posthog/list_surveys.ts
index ff8f955819..83aeb641ca 100644
--- a/apps/sim/tools/posthog/list_surveys.ts
+++ b/apps/sim/tools/posthog/list_surveys.ts
@@ -109,8 +109,8 @@ export const listSurveysTool: ToolConfig<PostHogListSurveysParams, PostHogListSu
       output: {
         surveys: data.results || [],
         count: data.count || 0,
-        next: data.next,
-        previous: data.previous,
+        next: data.next ?? null,
+        previous: data.previous ?? null,
       },
     }
   },
diff --git a/apps/sim/tools/posthog/query.ts b/apps/sim/tools/posthog/query.ts
index b845ea378c..a31f5359ce 100644
--- a/apps/sim/tools/posthog/query.ts
+++ b/apps/sim/tools/posthog/query.ts
@@ -15,7 +15,7 @@ export interface PostHogQueryResponse {
     columns?: string[]
     types?: string[]
     hogql?: string
-    hasMore?: boolean
+    has_more?: boolean
   }
 }
 
@@ -121,7 +121,7 @@ export const queryTool: ToolConfig<PostHogQueryParams, PostHogQueryResponse> = {
         columns: data.columns || undefined,
         types: data.types || undefined,
         hogql: data.hogql || undefined,
-        hasMore: data.hasMore || false,
+        has_more: data.hasMore || false,
       },
     }
   },
@@ -156,7 +156,7 @@ export const queryTool: ToolConfig<PostHogQueryParams, PostHogQueryResponse> = {
       description: 'The actual HogQL query that was executed',
       optional: true,
     },
-    hasMore: {
+    has_more: {
       type: 'boolean',
       description: 'Whether there are more results available',
       optional: true,
diff --git a/apps/sim/tools/posthog/update_event_definition.ts b/apps/sim/tools/posthog/update_event_definition.ts
index 2b26e46d50..8f3a5593ce 100644
--- a/apps/sim/tools/posthog/update_event_definition.ts
+++ b/apps/sim/tools/posthog/update_event_definition.ts
@@ -127,15 +127,15 @@ export const updateEventDefinitionTool: ToolConfig<
       name: data.name,
       description: data.description || '',
       tags: data.tags || [],
-      volume_30_day: data.volume_30_day,
-      query_usage_30_day: data.query_usage_30_day,
+      volume_30_day: data.volume_30_day ?? null,
+      query_usage_30_day: data.query_usage_30_day ?? null,
       created_at: data.created_at,
-      last_seen_at: data.last_seen_at,
+      last_seen_at: data.last_seen_at ?? null,
       updated_at: data.updated_at,
-      updated_by: data.updated_by,
+      updated_by: data.updated_by ?? null,
       verified: data.verified || false,
-      verified_at: data.verified_at,
-      verified_by: data.verified_by,
+      verified_at: data.verified_at ?? null,
+      verified_by: data.verified_by ?? null,
     }
   },
 
@@ -159,10 +159,12 @@ export const updateEventDefinitionTool: ToolConfig<
     volume_30_day: {
       type: 'number',
       description: 'Number of events received in the last 30 days',
+      optional: true,
     },
     query_usage_30_day: {
       type: 'number',
       description: 'Number of times this event was queried in the last 30 days',
+      optional: true,
     },
     created_at: {
       type: 'string',
@@ -171,6 +173,7 @@ export const updateEventDefinitionTool: ToolConfig<
     last_seen_at: {
       type: 'string',
       description: 'ISO timestamp when the event was last seen',
+      optional: true,
     },
     updated_at: {
       type: 'string',
@@ -179,6 +182,7 @@ export const updateEventDefinitionTool: ToolConfig<
     updated_by: {
       type: 'object',
       description: 'User who last updated the event',
+      optional: true,
     },
     verified: {
       type: 'boolean',
@@ -187,10 +191,12 @@ export const updateEventDefinitionTool: ToolConfig<
     verified_at: {
       type: 'string',
       description: 'ISO timestamp when the event was verified',
+      optional: true,
     },
     verified_by: {
       type: 'string',
       description: 'User who verified the event',
+      optional: true,
     },
   },
 }
diff --git a/apps/sim/tools/posthog/update_property_definition.ts b/apps/sim/tools/posthog/update_property_definition.ts
index 0e4ff5cc21..1c74bbaa29 100644
--- a/apps/sim/tools/posthog/update_property_definition.ts
+++ b/apps/sim/tools/posthog/update_property_definition.ts
@@ -143,18 +143,18 @@ export const updatePropertyDefinitionTool: ToolConfig<
       description: data.description || '',
       tags: data.tags || [],
       is_numerical: data.is_numerical || false,
-      is_seen_on_filtered_events: data.is_seen_on_filtered_events,
+      is_seen_on_filtered_events: data.is_seen_on_filtered_events ?? null,
       property_type: data.property_type,
       type: data.type,
-      volume_30_day: data.volume_30_day,
-      query_usage_30_day: data.query_usage_30_day,
+      volume_30_day: data.volume_30_day ?? null,
+      query_usage_30_day: data.query_usage_30_day ?? null,
       created_at: data.created_at,
       updated_at: data.updated_at,
-      updated_by: data.updated_by,
+      updated_by: data.updated_by ?? null,
       verified: data.verified || false,
-      verified_at: data.verified_at,
-      verified_by: data.verified_by,
-      example: data.example,
+      verified_at: data.verified_at ?? null,
+      verified_by: data.verified_by ?? null,
+      example: data.example ?? null,
     }
   },
 
@@ -182,6 +182,7 @@ export const updatePropertyDefinitionTool: ToolConfig<
     is_seen_on_filtered_events: {
       type: 'boolean',
       description: 'Whether the property is seen on filtered events',
+      optional: true,
     },
     property_type: {
       type: 'string',
@@ -194,10 +195,12 @@ export const updatePropertyDefinitionTool: ToolConfig<
     volume_30_day: {
       type: 'number',
       description: 'Number of times property was seen in the last 30 days',
+      optional: true,
     },
     query_usage_30_day: {
       type: 'number',
       description: 'Number of times this property was queried in the last 30 days',
+      optional: true,
     },
     created_at: {
       type: 'string',
@@ -210,6 +213,7 @@ export const updatePropertyDefinitionTool: ToolConfig<
     updated_by: {
       type: 'object',
       description: 'User who last updated the property',
+      optional: true,
     },
     verified: {
       type: 'boolean',
@@ -218,14 +222,17 @@ export const updatePropertyDefinitionTool: ToolConfig<
     verified_at: {
       type: 'string',
       description: 'ISO timestamp when the property was verified',
+      optional: true,
     },
     verified_by: {
       type: 'string',
       description: 'User who verified the property',
+      optional: true,
     },
     example: {
       type: 'string',
       description: 'Example value for the property',
+      optional: true,
     },
   },
 }
diff --git a/apps/sim/tools/rds/index.ts b/apps/sim/tools/rds/index.ts
index 49bf773775..ad87b43015 100644
--- a/apps/sim/tools/rds/index.ts
+++ b/apps/sim/tools/rds/index.ts
@@ -1,11 +1,13 @@
 import { deleteTool } from './delete'
 import { executeTool } from './execute'
 import { insertTool } from './insert'
+import { introspectTool } from './introspect'
 import { queryTool } from './query'
 import { updateTool } from './update'
 
 export const rdsDeleteTool = deleteTool
 export const rdsExecuteTool = executeTool
 export const rdsInsertTool = insertTool
+export const rdsIntrospectTool = introspectTool
 export const rdsQueryTool = queryTool
 export const rdsUpdateTool = updateTool
diff --git a/apps/sim/tools/rds/introspect.ts b/apps/sim/tools/rds/introspect.ts
new file mode 100644
index 0000000000..b73474d731
--- /dev/null
+++ b/apps/sim/tools/rds/introspect.ts
@@ -0,0 +1,109 @@
+import type { RdsIntrospectParams, RdsIntrospectResponse } from '@/tools/rds/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const introspectTool: ToolConfig<RdsIntrospectParams, RdsIntrospectResponse> = {
+  id: 'rds_introspect',
+  name: 'RDS Introspect',
+  description:
+    'Introspect Amazon RDS Aurora database schema to retrieve table structures, columns, and relationships',
+  version: '1.0',
+
+  params: {
+    region: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'AWS region (e.g., us-east-1)',
+    },
+    accessKeyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'AWS access key ID',
+    },
+    secretAccessKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'AWS secret access key',
+    },
+    resourceArn: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'ARN of the Aurora DB cluster',
+    },
+    secretArn: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'ARN of the Secrets Manager secret containing DB credentials',
+    },
+    database: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Database name (optional)',
+    },
+    schema: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Schema to introspect (default: public for PostgreSQL, database name for MySQL)',
+    },
+    engine: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description:
+        'Database engine (aurora-postgresql or aurora-mysql). Auto-detected if not provided.',
+    },
+  },
+
+  request: {
+    url: '/api/tools/rds/introspect',
+    method: 'POST',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      region: params.region,
+      accessKeyId: params.accessKeyId,
+      secretAccessKey: params.secretAccessKey,
+      resourceArn: params.resourceArn,
+      secretArn: params.secretArn,
+      ...(params.database && { database: params.database }),
+      ...(params.schema && { schema: params.schema }),
+      ...(params.engine && { engine: params.engine }),
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error || 'RDS introspection failed')
+    }
+
+    return {
+      success: true,
+      output: {
+        message: data.message || 'Schema introspection completed successfully',
+        engine: data.engine || 'unknown',
+        tables: data.tables || [],
+        schemas: data.schemas || [],
+      },
+      error: undefined,
+    }
+  },
+
+  outputs: {
+    message: { type: 'string', description: 'Operation status message' },
+    engine: { type: 'string', description: 'Detected database engine type' },
+    tables: {
+      type: 'array',
+      description: 'Array of table schemas with columns, keys, and indexes',
+    },
+    schemas: { type: 'array', description: 'List of available schemas in the database' },
+  },
+}
diff --git a/apps/sim/tools/rds/types.ts b/apps/sim/tools/rds/types.ts
index dcc1af0ce6..b43a8939ca 100644
--- a/apps/sim/tools/rds/types.ts
+++ b/apps/sim/tools/rds/types.ts
@@ -33,6 +33,11 @@ export interface RdsExecuteParams extends RdsConnectionConfig {
   query: string
 }
 
+export interface RdsIntrospectParams extends RdsConnectionConfig {
+  schema?: string
+  engine?: 'aurora-postgresql' | 'aurora-mysql'
+}
+
 export interface RdsBaseResponse extends ToolResponse {
   output: {
     message: string
@@ -48,3 +53,43 @@ export interface RdsUpdateResponse extends RdsBaseResponse {}
 export interface RdsDeleteResponse extends RdsBaseResponse {}
 export interface RdsExecuteResponse extends RdsBaseResponse {}
 export interface RdsResponse extends RdsBaseResponse {}
+
+export interface RdsTableColumn {
+  name: string
+  type: string
+  nullable: boolean
+  default: string | null
+  isPrimaryKey: boolean
+  isForeignKey: boolean
+  references?: {
+    table: string
+    column: string
+  }
+}
+
+export interface RdsTableSchema {
+  name: string
+  schema: string
+  columns: RdsTableColumn[]
+  primaryKey: string[]
+  foreignKeys: Array<{
+    column: string
+    referencesTable: string
+    referencesColumn: string
+  }>
+  indexes: Array<{
+    name: string
+    columns: string[]
+    unique: boolean
+  }>
+}
+
+export interface RdsIntrospectResponse extends ToolResponse {
+  output: {
+    message: string
+    engine: string
+    tables: RdsTableSchema[]
+    schemas: string[]
+  }
+  error?: string
+}
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index dae22573d8..05bcb9f5a3 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -84,12 +84,19 @@ import {
 } from '@/tools/confluence'
 import {
   cursorAddFollowupTool,
+  cursorAddFollowupV2Tool,
   cursorDeleteAgentTool,
+  cursorDeleteAgentV2Tool,
   cursorGetAgentTool,
+  cursorGetAgentV2Tool,
   cursorGetConversationTool,
+  cursorGetConversationV2Tool,
   cursorLaunchAgentTool,
+  cursorLaunchAgentV2Tool,
   cursorListAgentsTool,
+  cursorListAgentsV2Tool,
   cursorStopAgentTool,
+  cursorStopAgentV2Tool,
 } from '@/tools/cursor'
 import {
   datadogCancelDowntimeTool,
@@ -158,6 +165,7 @@ import { duckduckgoSearchTool } from '@/tools/duckduckgo'
 import {
   dynamodbDeleteTool,
   dynamodbGetTool,
+  dynamodbIntrospectTool,
   dynamodbPutTool,
   dynamodbQueryTool,
   dynamodbScanTool,
@@ -174,6 +182,7 @@ import {
   elasticsearchGetDocumentTool,
   elasticsearchGetIndexTool,
   elasticsearchIndexDocumentTool,
+  elasticsearchListIndicesTool,
   elasticsearchSearchTool,
   elasticsearchUpdateDocumentTool,
 } from '@/tools/elasticsearch'
@@ -209,57 +218,109 @@ import {
 import { functionExecuteTool } from '@/tools/function'
 import {
   githubAddAssigneesTool,
+  githubAddAssigneesV2Tool,
   githubAddLabelsTool,
+  githubAddLabelsV2Tool,
   githubCancelWorkflowRunTool,
+  githubCancelWorkflowRunV2Tool,
   githubCloseIssueTool,
+  githubCloseIssueV2Tool,
   githubClosePRTool,
+  githubClosePRV2Tool,
   githubCommentTool,
+  githubCommentV2Tool,
   githubCreateBranchTool,
+  githubCreateBranchV2Tool,
   githubCreateFileTool,
+  githubCreateFileV2Tool,
   githubCreateIssueTool,
+  githubCreateIssueV2Tool,
   githubCreatePRTool,
+  githubCreatePRV2Tool,
   githubCreateProjectTool,
+  githubCreateProjectV2Tool,
   githubCreateReleaseTool,
+  githubCreateReleaseV2Tool,
   githubDeleteBranchTool,
+  githubDeleteBranchV2Tool,
   githubDeleteCommentTool,
+  githubDeleteCommentV2Tool,
   githubDeleteFileTool,
+  githubDeleteFileV2Tool,
   githubDeleteProjectTool,
+  githubDeleteProjectV2Tool,
   githubDeleteReleaseTool,
+  githubDeleteReleaseV2Tool,
   githubGetBranchProtectionTool,
+  githubGetBranchProtectionV2Tool,
   githubGetBranchTool,
+  githubGetBranchV2Tool,
   githubGetFileContentTool,
+  githubGetFileContentV2Tool,
   githubGetIssueTool,
+  githubGetIssueV2Tool,
   githubGetPRFilesTool,
+  githubGetPRFilesV2Tool,
   githubGetProjectTool,
+  githubGetProjectV2Tool,
   githubGetReleaseTool,
+  githubGetReleaseV2Tool,
   githubGetTreeTool,
+  githubGetTreeV2Tool,
   githubGetWorkflowRunTool,
+  githubGetWorkflowRunV2Tool,
   githubGetWorkflowTool,
+  githubGetWorkflowV2Tool,
   githubIssueCommentTool,
+  githubIssueCommentV2Tool,
   githubLatestCommitTool,
+  githubLatestCommitV2Tool,
   githubListBranchesTool,
+  githubListBranchesV2Tool,
   githubListIssueCommentsTool,
+  githubListIssueCommentsV2Tool,
   githubListIssuesTool,
+  githubListIssuesV2Tool,
   githubListPRCommentsTool,
+  githubListPRCommentsV2Tool,
   githubListPRsTool,
+  githubListPRsV2Tool,
   githubListProjectsTool,
+  githubListProjectsV2Tool,
   githubListReleasesTool,
+  githubListReleasesV2Tool,
   githubListWorkflowRunsTool,
+  githubListWorkflowRunsV2Tool,
   githubListWorkflowsTool,
+  githubListWorkflowsV2Tool,
   githubMergePRTool,
+  githubMergePRV2Tool,
   githubPrTool,
+  githubPrV2Tool,
   githubRemoveLabelTool,
+  githubRemoveLabelV2Tool,
   githubRepoInfoTool,
+  githubRepoInfoV2Tool,
   githubRequestReviewersTool,
+  githubRequestReviewersV2Tool,
   githubRerunWorkflowTool,
+  githubRerunWorkflowV2Tool,
   githubTriggerWorkflowTool,
+  githubTriggerWorkflowV2Tool,
   githubUpdateBranchProtectionTool,
+  githubUpdateBranchProtectionV2Tool,
   githubUpdateCommentTool,
+  githubUpdateCommentV2Tool,
   githubUpdateFileTool,
+  githubUpdateFileV2Tool,
   githubUpdateIssueTool,
+  githubUpdateIssueV2Tool,
   githubUpdatePRTool,
+  githubUpdatePRV2Tool,
   githubUpdateProjectTool,
+  githubUpdateProjectV2Tool,
   githubUpdateReleaseTool,
+  githubUpdateReleaseV2Tool,
 } from '@/tools/github'
 import {
   gitlabCancelPipelineTool,
@@ -284,25 +345,42 @@ import {
 } from '@/tools/gitlab'
 import {
   gmailAddLabelTool,
+  gmailAddLabelV2Tool,
   gmailArchiveTool,
+  gmailArchiveV2Tool,
   gmailDeleteTool,
+  gmailDeleteV2Tool,
   gmailDraftTool,
+  gmailDraftV2Tool,
   gmailMarkReadTool,
+  gmailMarkReadV2Tool,
   gmailMarkUnreadTool,
+  gmailMarkUnreadV2Tool,
   gmailMoveTool,
+  gmailMoveV2Tool,
   gmailReadTool,
+  gmailReadV2Tool,
   gmailRemoveLabelTool,
+  gmailRemoveLabelV2Tool,
   gmailSearchTool,
+  gmailSearchV2Tool,
   gmailSendTool,
+  gmailSendV2Tool,
   gmailUnarchiveTool,
+  gmailUnarchiveV2Tool,
 } from '@/tools/gmail'
 import { googleSearchTool } from '@/tools/google'
 import {
   googleCalendarCreateTool,
+  googleCalendarCreateV2Tool,
   googleCalendarGetTool,
+  googleCalendarGetV2Tool,
   googleCalendarInviteTool,
+  googleCalendarInviteV2Tool,
   googleCalendarListTool,
+  googleCalendarListV2Tool,
   googleCalendarQuickAddTool,
+  googleCalendarQuickAddV2Tool,
 } from '@/tools/google_calendar'
 import { googleDocsCreateTool, googleDocsReadTool, googleDocsWriteTool } from '@/tools/google_docs'
 import {
@@ -461,21 +539,37 @@ import {
 } from '@/tools/incidentio'
 import {
   intercomCreateCompanyTool,
+  intercomCreateCompanyV2Tool,
   intercomCreateContactTool,
+  intercomCreateContactV2Tool,
   intercomCreateMessageTool,
+  intercomCreateMessageV2Tool,
   intercomCreateTicketTool,
+  intercomCreateTicketV2Tool,
   intercomDeleteContactTool,
+  intercomDeleteContactV2Tool,
   intercomGetCompanyTool,
+  intercomGetCompanyV2Tool,
   intercomGetContactTool,
+  intercomGetContactV2Tool,
   intercomGetConversationTool,
+  intercomGetConversationV2Tool,
   intercomGetTicketTool,
+  intercomGetTicketV2Tool,
   intercomListCompaniesTool,
+  intercomListCompaniesV2Tool,
   intercomListContactsTool,
+  intercomListContactsV2Tool,
   intercomListConversationsTool,
+  intercomListConversationsV2Tool,
   intercomReplyConversationTool,
+  intercomReplyConversationV2Tool,
   intercomSearchContactsTool,
+  intercomSearchContactsV2Tool,
   intercomSearchConversationsTool,
+  intercomSearchConversationsV2Tool,
   intercomUpdateContactTool,
+  intercomUpdateContactV2Tool,
 } from '@/tools/intercom'
 import { jinaReadUrlTool, jinaSearchTool } from '@/tools/jina'
 import {
@@ -549,6 +643,7 @@ import {
   knowledgeSearchTool,
   knowledgeUploadChunkTool,
 } from '@/tools/knowledge'
+import { lemlistGetActivitiesTool, lemlistGetLeadTool, lemlistSendEmailTool } from '@/tools/lemlist'
 import {
   linearAddLabelToIssueTool,
   linearAddLabelToProjectTool,
@@ -761,6 +856,7 @@ import {
   mongodbDeleteTool,
   mongodbExecuteTool,
   mongodbInsertTool,
+  mongodbIntrospectTool,
   mongodbQueryTool,
   mongodbUpdateTool,
 } from '@/tools/mongodb'
@@ -768,6 +864,7 @@ import {
   mysqlDeleteTool,
   mysqlExecuteTool,
   mysqlInsertTool,
+  mysqlIntrospectTool,
   mysqlQueryTool,
   mysqlUpdateTool,
 } from '@/tools/mysql'
@@ -775,18 +872,28 @@ import {
   neo4jCreateTool,
   neo4jDeleteTool,
   neo4jExecuteTool,
+  neo4jIntrospectTool,
   neo4jMergeTool,
   neo4jQueryTool,
   neo4jUpdateTool,
 } from '@/tools/neo4j'
 import {
+  notionAddDatabaseRowTool,
   notionCreateDatabaseTool,
+  notionCreateDatabaseV2Tool,
   notionCreatePageTool,
+  notionCreatePageV2Tool,
   notionQueryDatabaseTool,
+  notionQueryDatabaseV2Tool,
   notionReadDatabaseTool,
+  notionReadDatabaseV2Tool,
   notionReadTool,
+  notionReadV2Tool,
   notionSearchTool,
+  notionSearchV2Tool,
+  notionUpdatePageV2Tool,
   notionWriteTool,
+  notionWriteV2Tool,
 } from '@/tools/notion'
 import {
   onedriveCreateFolderTool,
@@ -859,6 +966,7 @@ import {
   postgresDeleteTool,
   postgresExecuteTool,
   postgresInsertTool,
+  postgresIntrospectTool,
   postgresQueryTool,
   postgresUpdateTool,
 } from '@/tools/postgresql'
@@ -912,6 +1020,7 @@ import {
   rdsDeleteTool,
   rdsExecuteTool,
   rdsInsertTool,
+  rdsIntrospectTool,
   rdsQueryTool,
   rdsUpdateTool,
 } from '@/tools/rds'
@@ -1230,6 +1339,7 @@ import {
   supabaseDeleteTool,
   supabaseGetRowTool,
   supabaseInsertTool,
+  supabaseIntrospectTool,
   supabaseQueryTool,
   supabaseRpcTool,
   supabaseStorageCopyTool,
@@ -1607,7 +1717,9 @@ export const tools: Record<string, ToolConfig> = {
   slack_delete_message: slackDeleteMessageTool,
   slack_add_reaction: slackAddReactionTool,
   github_repo_info: githubRepoInfoTool,
+  github_repo_info_v2: githubRepoInfoV2Tool,
   github_latest_commit: githubLatestCommitTool,
+  github_latest_commit_v2: githubLatestCommitV2Tool,
   serper_search: serperSearchTool,
   servicenow_create_record: servicenowCreateRecordTool,
   servicenow_read_record: servicenowReadRecordTool,
@@ -1627,6 +1739,7 @@ export const tools: Record<string, ToolConfig> = {
   supabase_text_search: supabaseTextSearchTool,
   supabase_vector_search: supabaseVectorSearchTool,
   supabase_rpc: supabaseRpcTool,
+  supabase_introspect: supabaseIntrospectTool,
   supabase_storage_upload: supabaseStorageUploadTool,
   supabase_storage_download: supabaseStorageDownloadTool,
   supabase_storage_list: supabaseStorageListTool,
@@ -1670,18 +1783,40 @@ export const tools: Record<string, ToolConfig> = {
   notion_query_database: notionQueryDatabaseTool,
   notion_search: notionSearchTool,
   notion_create_database: notionCreateDatabaseTool,
+  // Notion V2 tools
+  notion_read_v2: notionReadV2Tool,
+  notion_read_database_v2: notionReadDatabaseV2Tool,
+  notion_write_v2: notionWriteV2Tool,
+  notion_create_page_v2: notionCreatePageV2Tool,
+  notion_query_database_v2: notionQueryDatabaseV2Tool,
+  notion_search_v2: notionSearchV2Tool,
+  notion_create_database_v2: notionCreateDatabaseV2Tool,
+  notion_update_page_v2: notionUpdatePageV2Tool,
+  notion_add_database_row_v2: notionAddDatabaseRowTool,
   gmail_send: gmailSendTool,
+  gmail_send_v2: gmailSendV2Tool,
   gmail_read: gmailReadTool,
+  gmail_read_v2: gmailReadV2Tool,
   gmail_search: gmailSearchTool,
+  gmail_search_v2: gmailSearchV2Tool,
   gmail_draft: gmailDraftTool,
+  gmail_draft_v2: gmailDraftV2Tool,
   gmail_move: gmailMoveTool,
+  gmail_move_v2: gmailMoveV2Tool,
   gmail_mark_read: gmailMarkReadTool,
+  gmail_mark_read_v2: gmailMarkReadV2Tool,
   gmail_mark_unread: gmailMarkUnreadTool,
+  gmail_mark_unread_v2: gmailMarkUnreadV2Tool,
   gmail_archive: gmailArchiveTool,
+  gmail_archive_v2: gmailArchiveV2Tool,
   gmail_unarchive: gmailUnarchiveTool,
+  gmail_unarchive_v2: gmailUnarchiveV2Tool,
   gmail_delete: gmailDeleteTool,
+  gmail_delete_v2: gmailDeleteV2Tool,
   gmail_add_label: gmailAddLabelTool,
+  gmail_add_label_v2: gmailAddLabelV2Tool,
   gmail_remove_label: gmailRemoveLabelTool,
+  gmail_remove_label_v2: gmailRemoveLabelV2Tool,
   whatsapp_send_message: whatsappSendMessageTool,
   x_write: xWriteTool,
   x_read: xReadTool,
@@ -1715,17 +1850,20 @@ export const tools: Record<string, ToolConfig> = {
   postgresql_update: postgresUpdateTool,
   postgresql_delete: postgresDeleteTool,
   postgresql_execute: postgresExecuteTool,
+  postgresql_introspect: postgresIntrospectTool,
   rds_query: rdsQueryTool,
   rds_insert: rdsInsertTool,
   rds_update: rdsUpdateTool,
   rds_delete: rdsDeleteTool,
   rds_execute: rdsExecuteTool,
+  rds_introspect: rdsIntrospectTool,
   dynamodb_get: dynamodbGetTool,
   dynamodb_put: dynamodbPutTool,
   dynamodb_query: dynamodbQueryTool,
   dynamodb_scan: dynamodbScanTool,
   dynamodb_update: dynamodbUpdateTool,
   dynamodb_delete: dynamodbDeleteTool,
+  dynamodb_introspect: dynamodbIntrospectTool,
   dropbox_upload: dropboxUploadTool,
   dropbox_download: dropboxDownloadTool,
   dropbox_list_folder: dropboxListFolderTool,
@@ -1742,67 +1880,120 @@ export const tools: Record<string, ToolConfig> = {
   mongodb_update: mongodbUpdateTool,
   mongodb_delete: mongodbDeleteTool,
   mongodb_execute: mongodbExecuteTool,
+  mongodb_introspect: mongodbIntrospectTool,
   mysql_query: mysqlQueryTool,
   mysql_insert: mysqlInsertTool,
   mysql_update: mysqlUpdateTool,
   mysql_delete: mysqlDeleteTool,
   mysql_execute: mysqlExecuteTool,
+  mysql_introspect: mysqlIntrospectTool,
   neo4j_query: neo4jQueryTool,
   neo4j_create: neo4jCreateTool,
   neo4j_merge: neo4jMergeTool,
   neo4j_update: neo4jUpdateTool,
   neo4j_delete: neo4jDeleteTool,
   neo4j_execute: neo4jExecuteTool,
+  neo4j_introspect: neo4jIntrospectTool,
   github_pr: githubPrTool,
+  github_pr_v2: githubPrV2Tool,
   github_comment: githubCommentTool,
+  github_comment_v2: githubCommentV2Tool,
   github_issue_comment: githubIssueCommentTool,
+  github_issue_comment_v2: githubIssueCommentV2Tool,
   github_list_issue_comments: githubListIssueCommentsTool,
+  github_list_issue_comments_v2: githubListIssueCommentsV2Tool,
   github_update_comment: githubUpdateCommentTool,
+  github_update_comment_v2: githubUpdateCommentV2Tool,
   github_delete_comment: githubDeleteCommentTool,
+  github_delete_comment_v2: githubDeleteCommentV2Tool,
   github_list_pr_comments: githubListPRCommentsTool,
+  github_list_pr_comments_v2: githubListPRCommentsV2Tool,
   github_create_pr: githubCreatePRTool,
+  github_create_pr_v2: githubCreatePRV2Tool,
   github_update_pr: githubUpdatePRTool,
+  github_update_pr_v2: githubUpdatePRV2Tool,
   github_merge_pr: githubMergePRTool,
+  github_merge_pr_v2: githubMergePRV2Tool,
   github_list_prs: githubListPRsTool,
+  github_list_prs_v2: githubListPRsV2Tool,
   github_get_pr_files: githubGetPRFilesTool,
+  github_get_pr_files_v2: githubGetPRFilesV2Tool,
   github_close_pr: githubClosePRTool,
+  github_close_pr_v2: githubClosePRV2Tool,
   github_request_reviewers: githubRequestReviewersTool,
+  github_request_reviewers_v2: githubRequestReviewersV2Tool,
   github_get_file_content: githubGetFileContentTool,
+  github_get_file_content_v2: githubGetFileContentV2Tool,
   github_create_file: githubCreateFileTool,
+  github_create_file_v2: githubCreateFileV2Tool,
   github_update_file: githubUpdateFileTool,
+  github_update_file_v2: githubUpdateFileV2Tool,
   github_delete_file: githubDeleteFileTool,
+  github_delete_file_v2: githubDeleteFileV2Tool,
   github_get_tree: githubGetTreeTool,
+  github_get_tree_v2: githubGetTreeV2Tool,
   github_list_branches: githubListBranchesTool,
+  github_list_branches_v2: githubListBranchesV2Tool,
   github_get_branch: githubGetBranchTool,
+  github_get_branch_v2: githubGetBranchV2Tool,
   github_create_branch: githubCreateBranchTool,
+  github_create_branch_v2: githubCreateBranchV2Tool,
   github_delete_branch: githubDeleteBranchTool,
+  github_delete_branch_v2: githubDeleteBranchV2Tool,
   github_get_branch_protection: githubGetBranchProtectionTool,
+  github_get_branch_protection_v2: githubGetBranchProtectionV2Tool,
   github_update_branch_protection: githubUpdateBranchProtectionTool,
+  github_update_branch_protection_v2: githubUpdateBranchProtectionV2Tool,
   github_create_issue: githubCreateIssueTool,
+  github_create_issue_v2: githubCreateIssueV2Tool,
   github_update_issue: githubUpdateIssueTool,
+  github_update_issue_v2: githubUpdateIssueV2Tool,
   github_list_issues: githubListIssuesTool,
+  github_list_issues_v2: githubListIssuesV2Tool,
   github_get_issue: githubGetIssueTool,
+  github_get_issue_v2: githubGetIssueV2Tool,
   github_close_issue: githubCloseIssueTool,
+  github_close_issue_v2: githubCloseIssueV2Tool,
   github_add_labels: githubAddLabelsTool,
+  github_add_labels_v2: githubAddLabelsV2Tool,
   github_remove_label: githubRemoveLabelTool,
+  github_remove_label_v2: githubRemoveLabelV2Tool,
   github_add_assignees: githubAddAssigneesTool,
+  github_add_assignees_v2: githubAddAssigneesV2Tool,
   github_create_release: githubCreateReleaseTool,
+  github_create_release_v2: githubCreateReleaseV2Tool,
   github_update_release: githubUpdateReleaseTool,
+  github_update_release_v2: githubUpdateReleaseV2Tool,
   github_list_releases: githubListReleasesTool,
+  github_list_releases_v2: githubListReleasesV2Tool,
   github_get_release: githubGetReleaseTool,
+  github_get_release_v2: githubGetReleaseV2Tool,
   github_delete_release: githubDeleteReleaseTool,
+  github_delete_release_v2: githubDeleteReleaseV2Tool,
   github_list_workflows: githubListWorkflowsTool,
+  github_list_workflows_v2: githubListWorkflowsV2Tool,
   github_get_workflow: githubGetWorkflowTool,
+  github_get_workflow_v2: githubGetWorkflowV2Tool,
   github_trigger_workflow: githubTriggerWorkflowTool,
+  github_trigger_workflow_v2: githubTriggerWorkflowV2Tool,
   github_list_workflow_runs: githubListWorkflowRunsTool,
+  github_list_workflow_runs_v2: githubListWorkflowRunsV2Tool,
   github_get_workflow_run: githubGetWorkflowRunTool,
+  github_get_workflow_run_v2: githubGetWorkflowRunV2Tool,
   github_cancel_workflow_run: githubCancelWorkflowRunTool,
+  github_cancel_workflow_run_v2: githubCancelWorkflowRunV2Tool,
   github_rerun_workflow: githubRerunWorkflowTool,
+  github_rerun_workflow_v2: githubRerunWorkflowV2Tool,
   github_list_projects: githubListProjectsTool,
+  github_list_projects_v2: githubListProjectsV2Tool,
   github_get_project: githubGetProjectTool,
+  github_get_project_v2: githubGetProjectV2Tool,
   github_create_project: githubCreateProjectTool,
+  github_create_project_v2: githubCreateProjectV2Tool,
   github_update_project: githubUpdateProjectTool,
+  github_update_project_v2: githubUpdateProjectV2Tool,
   github_delete_project: githubDeleteProjectTool,
+  github_delete_project_v2: githubDeleteProjectV2Tool,
   gitlab_list_projects: gitlabListProjectsTool,
   gitlab_get_project: gitlabGetProjectTool,
   gitlab_list_issues: gitlabListIssuesTool,
@@ -1844,6 +2035,7 @@ export const tools: Record<string, ToolConfig> = {
   elasticsearch_create_index: elasticsearchCreateIndexTool,
   elasticsearch_delete_index: elasticsearchDeleteIndexTool,
   elasticsearch_get_index: elasticsearchGetIndexTool,
+  elasticsearch_list_indices: elasticsearchListIndicesTool,
   elasticsearch_cluster_health: elasticsearchClusterHealthTool,
   elasticsearch_cluster_stats: elasticsearchClusterStatsTool,
   exa_search: exaSearchTool,
@@ -1959,12 +2151,19 @@ export const tools: Record<string, ToolConfig> = {
   confluence_get_space: confluenceGetSpaceTool,
   confluence_list_spaces: confluenceListSpacesTool,
   cursor_list_agents: cursorListAgentsTool,
+  cursor_list_agents_v2: cursorListAgentsV2Tool,
   cursor_get_agent: cursorGetAgentTool,
+  cursor_get_agent_v2: cursorGetAgentV2Tool,
   cursor_get_conversation: cursorGetConversationTool,
+  cursor_get_conversation_v2: cursorGetConversationV2Tool,
   cursor_launch_agent: cursorLaunchAgentTool,
+  cursor_launch_agent_v2: cursorLaunchAgentV2Tool,
   cursor_add_followup: cursorAddFollowupTool,
+  cursor_add_followup_v2: cursorAddFollowupV2Tool,
   cursor_stop_agent: cursorStopAgentTool,
+  cursor_stop_agent_v2: cursorStopAgentV2Tool,
   cursor_delete_agent: cursorDeleteAgentTool,
+  cursor_delete_agent_v2: cursorDeleteAgentV2Tool,
   trello_list_lists: trelloListListsTool,
   trello_list_cards: trelloListCardsTool,
   trello_create_card: trelloCreateCardTool,
@@ -2218,6 +2417,9 @@ export const tools: Record<string, ToolConfig> = {
   linear_update_project_status: linearUpdateProjectStatusTool,
   linear_delete_project_status: linearDeleteProjectStatusTool,
   linear_list_project_statuses: linearListProjectStatusesTool,
+  lemlist_get_activities: lemlistGetActivitiesTool,
+  lemlist_get_lead: lemlistGetLeadTool,
+  lemlist_send_email: lemlistSendEmailTool,
   shopify_create_product: shopifyCreateProductTool,
   shopify_get_product: shopifyGetProductTool,
   shopify_list_products: shopifyListProductsTool,
@@ -2262,10 +2464,15 @@ export const tools: Record<string, ToolConfig> = {
   microsoft_planner_get_task_details: microsoftPlannerGetTaskDetailsTool,
   microsoft_planner_update_task_details: microsoftPlannerUpdateTaskDetailsTool,
   google_calendar_create: googleCalendarCreateTool,
+  google_calendar_create_v2: googleCalendarCreateV2Tool,
   google_calendar_get: googleCalendarGetTool,
+  google_calendar_get_v2: googleCalendarGetV2Tool,
   google_calendar_list: googleCalendarListTool,
+  google_calendar_list_v2: googleCalendarListV2Tool,
   google_calendar_quick_add: googleCalendarQuickAddTool,
+  google_calendar_quick_add_v2: googleCalendarQuickAddV2Tool,
   google_calendar_invite: googleCalendarInviteTool,
+  google_calendar_invite_v2: googleCalendarInviteV2Tool,
   google_forms_get_responses: googleFormsGetResponsesTool,
   workflow_executor: workflowExecutorTool,
   wealthbox_read_contact: wealthboxReadContactTool,
@@ -2575,21 +2782,37 @@ export const tools: Record<string, ToolConfig> = {
   zendesk_search: zendeskSearchTool,
   zendesk_search_count: zendeskSearchCountTool,
   intercom_create_contact: intercomCreateContactTool,
+  intercom_create_contact_v2: intercomCreateContactV2Tool,
   intercom_get_contact: intercomGetContactTool,
+  intercom_get_contact_v2: intercomGetContactV2Tool,
   intercom_update_contact: intercomUpdateContactTool,
+  intercom_update_contact_v2: intercomUpdateContactV2Tool,
   intercom_list_contacts: intercomListContactsTool,
+  intercom_list_contacts_v2: intercomListContactsV2Tool,
   intercom_search_contacts: intercomSearchContactsTool,
+  intercom_search_contacts_v2: intercomSearchContactsV2Tool,
   intercom_delete_contact: intercomDeleteContactTool,
+  intercom_delete_contact_v2: intercomDeleteContactV2Tool,
   intercom_create_company: intercomCreateCompanyTool,
+  intercom_create_company_v2: intercomCreateCompanyV2Tool,
   intercom_get_company: intercomGetCompanyTool,
+  intercom_get_company_v2: intercomGetCompanyV2Tool,
   intercom_list_companies: intercomListCompaniesTool,
+  intercom_list_companies_v2: intercomListCompaniesV2Tool,
   intercom_get_conversation: intercomGetConversationTool,
+  intercom_get_conversation_v2: intercomGetConversationV2Tool,
   intercom_list_conversations: intercomListConversationsTool,
+  intercom_list_conversations_v2: intercomListConversationsV2Tool,
   intercom_reply_conversation: intercomReplyConversationTool,
+  intercom_reply_conversation_v2: intercomReplyConversationV2Tool,
   intercom_search_conversations: intercomSearchConversationsTool,
+  intercom_search_conversations_v2: intercomSearchConversationsV2Tool,
   intercom_create_ticket: intercomCreateTicketTool,
+  intercom_create_ticket_v2: intercomCreateTicketV2Tool,
   intercom_get_ticket: intercomGetTicketTool,
+  intercom_get_ticket_v2: intercomGetTicketV2Tool,
   intercom_create_message: intercomCreateMessageTool,
+  intercom_create_message_v2: intercomCreateMessageV2Tool,
   sentry_issues_list: listIssuesTool,
   sentry_issues_get: getIssueTool,
   sentry_issues_update: updateIssueTool,
diff --git a/apps/sim/tools/salesforce/create_account.ts b/apps/sim/tools/salesforce/create_account.ts
index 01f4f4496e..c7043a440c 100644
--- a/apps/sim/tools/salesforce/create_account.ts
+++ b/apps/sim/tools/salesforce/create_account.ts
@@ -203,9 +203,6 @@ export const salesforceCreateAccountTool: ToolConfig<
         id: data.id,
         success: data.success,
         created: true,
-        metadata: {
-          operation: 'create_account' as const,
-        },
       },
     }
   },
@@ -219,7 +216,6 @@ export const salesforceCreateAccountTool: ToolConfig<
         id: { type: 'string', description: 'Created account ID' },
         success: { type: 'boolean', description: 'Salesforce operation success' },
         created: { type: 'boolean', description: 'Whether account was created' },
-        metadata: { type: 'object', description: 'Operation metadata' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/create_case.ts b/apps/sim/tools/salesforce/create_case.ts
index 09214ac2e4..bb873c5979 100644
--- a/apps/sim/tools/salesforce/create_case.ts
+++ b/apps/sim/tools/salesforce/create_case.ts
@@ -108,13 +108,20 @@ export const salesforceCreateCaseTool: ToolConfig<
         id: data.id,
         success: data.success,
         created: true,
-        metadata: { operation: 'create_case' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Created case' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Created case data',
+      properties: {
+        id: { type: 'string', description: 'Created case ID' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
+        created: { type: 'boolean', description: 'Whether case was created' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/create_contact.ts b/apps/sim/tools/salesforce/create_contact.ts
index 68241198b1..8b464bcb1e 100644
--- a/apps/sim/tools/salesforce/create_contact.ts
+++ b/apps/sim/tools/salesforce/create_contact.ts
@@ -142,7 +142,6 @@ export const salesforceCreateContactTool: ToolConfig<
         id: data.id,
         success: data.success,
         created: true,
-        metadata: { operation: 'create_contact' as const },
       },
     }
   },
@@ -156,7 +155,6 @@ export const salesforceCreateContactTool: ToolConfig<
         id: { type: 'string', description: 'Created contact ID' },
         success: { type: 'boolean', description: 'Salesforce operation success' },
         created: { type: 'boolean', description: 'Whether contact was created' },
-        metadata: { type: 'object', description: 'Operation metadata' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/create_lead.ts b/apps/sim/tools/salesforce/create_lead.ts
index 93d92f0c2c..7cc1e0d53e 100644
--- a/apps/sim/tools/salesforce/create_lead.ts
+++ b/apps/sim/tools/salesforce/create_lead.ts
@@ -94,13 +94,20 @@ export const salesforceCreateLeadTool: ToolConfig<
         id: data.id,
         success: data.success,
         created: true,
-        metadata: { operation: 'create_lead' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Created lead' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Created lead data',
+      properties: {
+        id: { type: 'string', description: 'Created lead ID' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
+        created: { type: 'boolean', description: 'Whether lead was created' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/create_opportunity.ts b/apps/sim/tools/salesforce/create_opportunity.ts
index eba10e3b6a..7971459742 100644
--- a/apps/sim/tools/salesforce/create_opportunity.ts
+++ b/apps/sim/tools/salesforce/create_opportunity.ts
@@ -99,13 +99,20 @@ export const salesforceCreateOpportunityTool: ToolConfig<
         id: data.id,
         success: data.success,
         created: true,
-        metadata: { operation: 'create_opportunity' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Created opportunity' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Created opportunity data',
+      properties: {
+        id: { type: 'string', description: 'Created opportunity ID' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
+        created: { type: 'boolean', description: 'Whether opportunity was created' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/create_task.ts b/apps/sim/tools/salesforce/create_task.ts
index c815185d75..a1c726b6ca 100644
--- a/apps/sim/tools/salesforce/create_task.ts
+++ b/apps/sim/tools/salesforce/create_task.ts
@@ -108,13 +108,20 @@ export const salesforceCreateTaskTool: ToolConfig<
         id: data.id,
         success: data.success,
         created: true,
-        metadata: { operation: 'create_task' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Created task' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Created task data',
+      properties: {
+        id: { type: 'string', description: 'Created task ID' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
+        created: { type: 'boolean', description: 'Whether task was created' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/delete_account.ts b/apps/sim/tools/salesforce/delete_account.ts
index 5d51d3c5c0..5693df781e 100644
--- a/apps/sim/tools/salesforce/delete_account.ts
+++ b/apps/sim/tools/salesforce/delete_account.ts
@@ -109,9 +109,6 @@ export const salesforceDeleteAccountTool: ToolConfig<
       output: {
         id: params?.accountId || '',
         deleted: true,
-        metadata: {
-          operation: 'delete_account' as const,
-        },
       },
     }
   },
@@ -124,7 +121,6 @@ export const salesforceDeleteAccountTool: ToolConfig<
       properties: {
         id: { type: 'string', description: 'Deleted account ID' },
         deleted: { type: 'boolean', description: 'Whether account was deleted' },
-        metadata: { type: 'object', description: 'Operation metadata' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/delete_case.ts b/apps/sim/tools/salesforce/delete_case.ts
index d2fbbb31ea..29d9b01de0 100644
--- a/apps/sim/tools/salesforce/delete_case.ts
+++ b/apps/sim/tools/salesforce/delete_case.ts
@@ -62,13 +62,19 @@ export const salesforceDeleteCaseTool: ToolConfig<
       output: {
         id: params?.caseId || '',
         deleted: true,
-        metadata: { operation: 'delete_case' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Deleted case' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Deleted case data',
+      properties: {
+        id: { type: 'string', description: 'Deleted case ID' },
+        deleted: { type: 'boolean', description: 'Whether case was deleted' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/delete_contact.ts b/apps/sim/tools/salesforce/delete_contact.ts
index c91fbed196..2aee53caae 100644
--- a/apps/sim/tools/salesforce/delete_contact.ts
+++ b/apps/sim/tools/salesforce/delete_contact.ts
@@ -56,7 +56,6 @@ export const salesforceDeleteContactTool: ToolConfig<
       output: {
         id: params?.contactId || '',
         deleted: true,
-        metadata: { operation: 'delete_contact' as const },
       },
     }
   },
@@ -69,7 +68,6 @@ export const salesforceDeleteContactTool: ToolConfig<
       properties: {
         id: { type: 'string', description: 'Deleted contact ID' },
         deleted: { type: 'boolean', description: 'Whether contact was deleted' },
-        metadata: { type: 'object', description: 'Operation metadata' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/delete_lead.ts b/apps/sim/tools/salesforce/delete_lead.ts
index aa8dc2f2bc..aee2a1c32e 100644
--- a/apps/sim/tools/salesforce/delete_lead.ts
+++ b/apps/sim/tools/salesforce/delete_lead.ts
@@ -48,13 +48,19 @@ export const salesforceDeleteLeadTool: ToolConfig<
       output: {
         id: params?.leadId || '',
         deleted: true,
-        metadata: { operation: 'delete_lead' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Deleted lead' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Deleted lead data',
+      properties: {
+        id: { type: 'string', description: 'Deleted lead ID' },
+        deleted: { type: 'boolean', description: 'Whether lead was deleted' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/delete_opportunity.ts b/apps/sim/tools/salesforce/delete_opportunity.ts
index 826c2a9639..aef1142865 100644
--- a/apps/sim/tools/salesforce/delete_opportunity.ts
+++ b/apps/sim/tools/salesforce/delete_opportunity.ts
@@ -48,13 +48,19 @@ export const salesforceDeleteOpportunityTool: ToolConfig<
       output: {
         id: params?.opportunityId || '',
         deleted: true,
-        metadata: { operation: 'delete_opportunity' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Deleted opportunity' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Deleted opportunity data',
+      properties: {
+        id: { type: 'string', description: 'Deleted opportunity ID' },
+        deleted: { type: 'boolean', description: 'Whether opportunity was deleted' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/delete_task.ts b/apps/sim/tools/salesforce/delete_task.ts
index ec606fbefc..659adaf0b5 100644
--- a/apps/sim/tools/salesforce/delete_task.ts
+++ b/apps/sim/tools/salesforce/delete_task.ts
@@ -62,13 +62,19 @@ export const salesforceDeleteTaskTool: ToolConfig<
       output: {
         id: params?.taskId || '',
         deleted: true,
-        metadata: { operation: 'delete_task' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Deleted task' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Deleted task data',
+      properties: {
+        id: { type: 'string', description: 'Deleted task ID' },
+        deleted: { type: 'boolean', description: 'Whether task was deleted' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/describe_object.ts b/apps/sim/tools/salesforce/describe_object.ts
index 74f357c827..f807decd98 100644
--- a/apps/sim/tools/salesforce/describe_object.ts
+++ b/apps/sim/tools/salesforce/describe_object.ts
@@ -74,24 +74,21 @@ export const salesforceDescribeObjectTool: ToolConfig<
         label: data.label,
         labelPlural: data.labelPlural,
         fields: data.fields,
-        keyPrefix: data.keyPrefix,
+        keyPrefix: data.keyPrefix ?? null,
         queryable: data.queryable,
         createable: data.createable,
         updateable: data.updateable,
         deletable: data.deletable,
         childRelationships: data.childRelationships,
         recordTypeInfos: data.recordTypeInfos,
-        metadata: {
-          operation: 'describe_object',
-          fieldCount: data.fields?.length || 0,
-        },
+        fieldCount: data.fields?.length || 0,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Object metadata',
@@ -100,15 +97,19 @@ export const salesforceDescribeObjectTool: ToolConfig<
         label: { type: 'string', description: 'Display label' },
         labelPlural: { type: 'string', description: 'Plural display label' },
         fields: { type: 'array', description: 'Array of field definitions' },
-        keyPrefix: { type: 'string', description: 'ID prefix for this object type' },
+        keyPrefix: {
+          type: 'string',
+          description: 'ID prefix for this object type',
+          optional: true,
+        },
         queryable: { type: 'boolean', description: 'Whether object can be queried' },
         createable: { type: 'boolean', description: 'Whether records can be created' },
         updateable: { type: 'boolean', description: 'Whether records can be updated' },
         deletable: { type: 'boolean', description: 'Whether records can be deleted' },
         childRelationships: { type: 'array', description: 'Child relationship definitions' },
         recordTypeInfos: { type: 'array', description: 'Record type information' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        fieldCount: { type: 'number', description: 'Number of fields in the object' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/get_accounts.ts b/apps/sim/tools/salesforce/get_accounts.ts
index f861af7065..36d42c751b 100644
--- a/apps/sim/tools/salesforce/get_accounts.ts
+++ b/apps/sim/tools/salesforce/get_accounts.ts
@@ -138,12 +138,11 @@ export const salesforceGetAccountsTool: ToolConfig<
       output: {
         accounts,
         paging: {
-          nextRecordsUrl: data.nextRecordsUrl,
+          nextRecordsUrl: data.nextRecordsUrl ?? null,
           totalSize: data.totalSize || accounts.length,
           done: data.done !== false,
         },
         metadata: {
-          operation: 'get_accounts' as const,
           totalReturned: accounts.length,
           hasMore: !data.done,
         },
@@ -158,19 +157,29 @@ export const salesforceGetAccountsTool: ToolConfig<
       type: 'object',
       description: 'Accounts data',
       properties: {
-        accounts: {
-          type: 'array',
-          description: 'Array of account objects',
-        },
+        accounts: { type: 'array', description: 'Array of account objects' },
         paging: {
           type: 'object',
           description: 'Pagination information',
+          properties: {
+            nextRecordsUrl: {
+              type: 'string',
+              description: 'URL for next page of results',
+              optional: true,
+            },
+            totalSize: { type: 'number', description: 'Total number of records' },
+            done: { type: 'boolean', description: 'Whether all records returned' },
+          },
         },
         metadata: {
           type: 'object',
-          description: 'Operation metadata',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: { type: 'number', description: 'Number of accounts returned' },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
         },
-        success: { type: 'boolean', description: 'Operation success status' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/get_cases.ts b/apps/sim/tools/salesforce/get_cases.ts
index 469bc4e4f8..e48c7f17b6 100644
--- a/apps/sim/tools/salesforce/get_cases.ts
+++ b/apps/sim/tools/salesforce/get_cases.ts
@@ -74,7 +74,7 @@ export const salesforceGetCasesTool: ToolConfig<
     if (params?.caseId) {
       return {
         success: true,
-        output: { case: data, metadata: { operation: 'get_cases' }, success: true },
+        output: { case: data, success: true },
       }
     }
     const cases = data.records || []
@@ -83,18 +83,50 @@ export const salesforceGetCasesTool: ToolConfig<
       output: {
         cases,
         paging: {
-          nextRecordsUrl: data.nextRecordsUrl,
+          nextRecordsUrl: data.nextRecordsUrl ?? null,
           totalSize: data.totalSize || cases.length,
           done: data.done !== false,
         },
-        metadata: { operation: 'get_cases', totalReturned: cases.length, hasMore: !data.done },
+        metadata: {
+          totalReturned: cases.length,
+          hasMore: !data.done,
+        },
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Case data' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Case data',
+      properties: {
+        case: { type: 'object', description: 'Single case object (when caseId provided)' },
+        cases: { type: 'array', description: 'Array of case objects (when listing)' },
+        paging: {
+          type: 'object',
+          description: 'Pagination information',
+          properties: {
+            nextRecordsUrl: {
+              type: 'string',
+              description: 'URL for next page of results',
+              optional: true,
+            },
+            totalSize: { type: 'number', description: 'Total number of records' },
+            done: { type: 'boolean', description: 'Whether all records returned' },
+          },
+        },
+        metadata: {
+          type: 'object',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: { type: 'number', description: 'Number of cases returned' },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
+        },
+        success: { type: 'boolean', description: 'Operation success status' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/get_contacts.ts b/apps/sim/tools/salesforce/get_contacts.ts
index 11408c8196..a3a9abd09d 100644
--- a/apps/sim/tools/salesforce/get_contacts.ts
+++ b/apps/sim/tools/salesforce/get_contacts.ts
@@ -95,10 +95,7 @@ export const salesforceGetContactsTool: ToolConfig<
         success: true,
         output: {
           contact: data,
-          metadata: {
-            operation: 'get_contacts' as const,
-            singleContact: true,
-          },
+          singleContact: true,
           success: true,
         },
       }
@@ -111,16 +108,15 @@ export const salesforceGetContactsTool: ToolConfig<
       output: {
         contacts,
         paging: {
-          nextRecordsUrl: data.nextRecordsUrl,
+          nextRecordsUrl: data.nextRecordsUrl ?? null,
           totalSize: data.totalSize || contacts.length,
           done: data.done !== false,
         },
         metadata: {
-          operation: 'get_contacts' as const,
           totalReturned: contacts.length,
           hasMore: !data.done,
-          singleContact: false,
         },
+        singleContact: false,
         success: true,
       },
     }
@@ -134,9 +130,29 @@ export const salesforceGetContactsTool: ToolConfig<
       properties: {
         contacts: { type: 'array', description: 'Array of contacts (list query)' },
         contact: { type: 'object', description: 'Single contact (by ID)' },
-        paging: { type: 'object', description: 'Pagination info (list query)' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success' },
+        paging: {
+          type: 'object',
+          description: 'Pagination information',
+          properties: {
+            nextRecordsUrl: {
+              type: 'string',
+              description: 'URL for next page of results',
+              optional: true,
+            },
+            totalSize: { type: 'number', description: 'Total number of records' },
+            done: { type: 'boolean', description: 'Whether all records returned' },
+          },
+        },
+        metadata: {
+          type: 'object',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: { type: 'number', description: 'Number of contacts returned' },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
+        },
+        singleContact: { type: 'boolean', description: 'Whether single contact was returned' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/get_dashboard.ts b/apps/sim/tools/salesforce/get_dashboard.ts
index 246443e911..a0e70b0e58 100644
--- a/apps/sim/tools/salesforce/get_dashboard.ts
+++ b/apps/sim/tools/salesforce/get_dashboard.ts
@@ -71,19 +71,16 @@ export const salesforceGetDashboardTool: ToolConfig<
         dashboard: data,
         dashboardId: params?.dashboardId || '',
         components: data.componentData || [],
-        metadata: {
-          operation: 'get_dashboard',
-          dashboardName: data.name,
-          folderId: data.folderId,
-          runningUser: data.runningUser,
-        },
+        dashboardName: data.name ?? null,
+        folderId: data.folderId ?? null,
+        runningUser: data.runningUser ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Dashboard data',
@@ -91,8 +88,14 @@ export const salesforceGetDashboardTool: ToolConfig<
         dashboard: { type: 'object', description: 'Dashboard details' },
         dashboardId: { type: 'string', description: 'Dashboard ID' },
         components: { type: 'array', description: 'Dashboard component data' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        dashboardName: { type: 'string', description: 'Dashboard name', optional: true },
+        folderId: {
+          type: 'string',
+          description: 'Folder ID containing the dashboard',
+          optional: true,
+        },
+        runningUser: { type: 'object', description: 'Running user information', optional: true },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/get_leads.ts b/apps/sim/tools/salesforce/get_leads.ts
index de6834abce..c95252819d 100644
--- a/apps/sim/tools/salesforce/get_leads.ts
+++ b/apps/sim/tools/salesforce/get_leads.ts
@@ -75,7 +75,7 @@ export const salesforceGetLeadsTool: ToolConfig<
         success: true,
         output: {
           lead: data,
-          metadata: { operation: 'get_leads', singleLead: true },
+          singleLead: true,
           success: true,
         },
       }
@@ -86,18 +86,51 @@ export const salesforceGetLeadsTool: ToolConfig<
       output: {
         leads,
         paging: {
-          nextRecordsUrl: data.nextRecordsUrl,
+          nextRecordsUrl: data.nextRecordsUrl ?? null,
           totalSize: data.totalSize || leads.length,
           done: data.done !== false,
         },
-        metadata: { operation: 'get_leads', totalReturned: leads.length, hasMore: !data.done },
+        metadata: {
+          totalReturned: leads.length,
+          hasMore: !data.done,
+        },
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
-    output: { type: 'object', description: 'Lead data' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Lead data',
+      properties: {
+        lead: { type: 'object', description: 'Single lead object (when leadId provided)' },
+        leads: { type: 'array', description: 'Array of lead objects (when listing)' },
+        paging: {
+          type: 'object',
+          description: 'Pagination information',
+          properties: {
+            nextRecordsUrl: {
+              type: 'string',
+              description: 'URL for next page of results',
+              optional: true,
+            },
+            totalSize: { type: 'number', description: 'Total number of records' },
+            done: { type: 'boolean', description: 'Whether all records returned' },
+          },
+        },
+        metadata: {
+          type: 'object',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: { type: 'number', description: 'Number of leads returned' },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
+        },
+        singleLead: { type: 'boolean', description: 'Whether single lead was returned' },
+        success: { type: 'boolean', description: 'Operation success status' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/get_opportunities.ts b/apps/sim/tools/salesforce/get_opportunities.ts
index 084459b21c..9b48d93ce5 100644
--- a/apps/sim/tools/salesforce/get_opportunities.ts
+++ b/apps/sim/tools/salesforce/get_opportunities.ts
@@ -76,7 +76,7 @@ export const salesforceGetOpportunitiesTool: ToolConfig<
     if (params?.opportunityId) {
       return {
         success: true,
-        output: { opportunity: data, metadata: { operation: 'get_opportunities' }, success: true },
+        output: { opportunity: data, success: true },
       }
     }
     const opportunities = data.records || []
@@ -85,12 +85,11 @@ export const salesforceGetOpportunitiesTool: ToolConfig<
       output: {
         opportunities,
         paging: {
-          nextRecordsUrl: data.nextRecordsUrl,
+          nextRecordsUrl: data.nextRecordsUrl ?? null,
           totalSize: data.totalSize || opportunities.length,
           done: data.done !== false,
         },
         metadata: {
-          operation: 'get_opportunities',
           totalReturned: opportunities.length,
           hasMore: !data.done,
         },
@@ -100,7 +99,42 @@ export const salesforceGetOpportunitiesTool: ToolConfig<
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Opportunity data' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Opportunity data',
+      properties: {
+        opportunity: {
+          type: 'object',
+          description: 'Single opportunity object (when opportunityId provided)',
+        },
+        opportunities: {
+          type: 'array',
+          description: 'Array of opportunity objects (when listing)',
+        },
+        paging: {
+          type: 'object',
+          description: 'Pagination information',
+          properties: {
+            nextRecordsUrl: {
+              type: 'string',
+              description: 'URL for next page of results',
+              optional: true,
+            },
+            totalSize: { type: 'number', description: 'Total number of records' },
+            done: { type: 'boolean', description: 'Whether all records returned' },
+          },
+        },
+        metadata: {
+          type: 'object',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: { type: 'number', description: 'Number of opportunities returned' },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
+        },
+        success: { type: 'boolean', description: 'Operation success status' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/get_report.ts b/apps/sim/tools/salesforce/get_report.ts
index 49ddbfb4bf..b05ba7f060 100644
--- a/apps/sim/tools/salesforce/get_report.ts
+++ b/apps/sim/tools/salesforce/get_report.ts
@@ -70,24 +70,20 @@ export const salesforceGetReportTool: ToolConfig<
       output: {
         report: data,
         reportId: params?.reportId || '',
-        metadata: {
-          operation: 'get_report',
-        },
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Report metadata',
       properties: {
         report: { type: 'object', description: 'Report metadata object' },
         reportId: { type: 'string', description: 'Report ID' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/get_tasks.ts b/apps/sim/tools/salesforce/get_tasks.ts
index 358dfa29ac..b20324c5fc 100644
--- a/apps/sim/tools/salesforce/get_tasks.ts
+++ b/apps/sim/tools/salesforce/get_tasks.ts
@@ -85,7 +85,7 @@ export const salesforceGetTasksTool: ToolConfig<
     if (params?.taskId) {
       return {
         success: true,
-        output: { task: data, metadata: { operation: 'get_tasks' }, success: true },
+        output: { task: data, success: true },
       }
     }
     const tasks = data.records || []
@@ -94,18 +94,50 @@ export const salesforceGetTasksTool: ToolConfig<
       output: {
         tasks,
         paging: {
-          nextRecordsUrl: data.nextRecordsUrl,
+          nextRecordsUrl: data.nextRecordsUrl ?? null,
           totalSize: data.totalSize || tasks.length,
           done: data.done !== false,
         },
-        metadata: { operation: 'get_tasks', totalReturned: tasks.length, hasMore: !data.done },
+        metadata: {
+          totalReturned: tasks.length,
+          hasMore: !data.done,
+        },
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Task data' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Task data',
+      properties: {
+        task: { type: 'object', description: 'Single task object (when taskId provided)' },
+        tasks: { type: 'array', description: 'Array of task objects (when listing)' },
+        paging: {
+          type: 'object',
+          description: 'Pagination information',
+          properties: {
+            nextRecordsUrl: {
+              type: 'string',
+              description: 'URL for next page of results',
+              optional: true,
+            },
+            totalSize: { type: 'number', description: 'Total number of records' },
+            done: { type: 'boolean', description: 'Whether all records returned' },
+          },
+        },
+        metadata: {
+          type: 'object',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: { type: 'number', description: 'Number of tasks returned' },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
+        },
+        success: { type: 'boolean', description: 'Operation success status' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/list_dashboards.ts b/apps/sim/tools/salesforce/list_dashboards.ts
index cbbb5df757..519a399e04 100644
--- a/apps/sim/tools/salesforce/list_dashboards.ts
+++ b/apps/sim/tools/salesforce/list_dashboards.ts
@@ -75,24 +75,21 @@ export const salesforceListDashboardsTool: ToolConfig<
       success: true,
       output: {
         dashboards,
-        metadata: {
-          operation: 'list_dashboards',
-          totalReturned: dashboards.length,
-        },
+        totalReturned: dashboards.length,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Dashboards data',
       properties: {
         dashboards: { type: 'array', description: 'Array of dashboard objects' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        totalReturned: { type: 'number', description: 'Number of dashboards returned' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/list_objects.ts b/apps/sim/tools/salesforce/list_objects.ts
index dc4f3aff03..8e48369062 100644
--- a/apps/sim/tools/salesforce/list_objects.ts
+++ b/apps/sim/tools/salesforce/list_objects.ts
@@ -62,28 +62,25 @@ export const salesforceListObjectsTool: ToolConfig<
       success: true,
       output: {
         objects,
-        encoding: data.encoding,
-        maxBatchSize: data.maxBatchSize,
-        metadata: {
-          operation: 'list_objects',
-          totalReturned: objects.length,
-        },
+        encoding: data.encoding ?? null,
+        maxBatchSize: data.maxBatchSize ?? null,
+        totalReturned: objects.length,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Objects list',
       properties: {
         objects: { type: 'array', description: 'Array of available Salesforce objects' },
-        encoding: { type: 'string', description: 'Encoding used' },
-        maxBatchSize: { type: 'number', description: 'Maximum batch size' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        encoding: { type: 'string', description: 'Encoding used', optional: true },
+        maxBatchSize: { type: 'number', description: 'Maximum batch size', optional: true },
+        totalReturned: { type: 'number', description: 'Number of objects returned' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/list_report_types.ts b/apps/sim/tools/salesforce/list_report_types.ts
index 3c5ff278a5..10dfd40086 100644
--- a/apps/sim/tools/salesforce/list_report_types.ts
+++ b/apps/sim/tools/salesforce/list_report_types.ts
@@ -60,24 +60,21 @@ export const salesforceListReportTypesTool: ToolConfig<
       success: true,
       output: {
         reportTypes: data,
-        metadata: {
-          operation: 'list_report_types',
-          totalReturned: Array.isArray(data) ? data.length : 0,
-        },
+        totalReturned: Array.isArray(data) ? data.length : 0,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Report types data',
       properties: {
         reportTypes: { type: 'array', description: 'Array of report type objects' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        totalReturned: { type: 'number', description: 'Number of report types returned' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/list_reports.ts b/apps/sim/tools/salesforce/list_reports.ts
index 546256f229..af225c6649 100644
--- a/apps/sim/tools/salesforce/list_reports.ts
+++ b/apps/sim/tools/salesforce/list_reports.ts
@@ -90,24 +90,21 @@ export const salesforceListReportsTool: ToolConfig<
       success: true,
       output: {
         reports,
-        metadata: {
-          operation: 'list_reports',
-          totalReturned: reports.length,
-        },
+        totalReturned: reports.length,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Reports data',
       properties: {
         reports: { type: 'array', description: 'Array of report objects' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        totalReturned: { type: 'number', description: 'Number of reports returned' },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/query.ts b/apps/sim/tools/salesforce/query.ts
index 88c2c2f970..b2f69359ff 100644
--- a/apps/sim/tools/salesforce/query.ts
+++ b/apps/sim/tools/salesforce/query.ts
@@ -70,10 +70,9 @@ export const salesforceQueryTool: ToolConfig<SalesforceQueryParams, SalesforceQu
         records,
         totalSize: data.totalSize || records.length,
         done: data.done !== false,
-        nextRecordsUrl: data.nextRecordsUrl,
+        nextRecordsUrl: data.nextRecordsUrl ?? null,
         query: params?.query || '',
         metadata: {
-          operation: 'query',
           totalReturned: records.length,
           hasMore: !data.done,
         },
@@ -83,7 +82,7 @@ export const salesforceQueryTool: ToolConfig<SalesforceQueryParams, SalesforceQu
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Query results',
@@ -91,10 +90,24 @@ export const salesforceQueryTool: ToolConfig<SalesforceQueryParams, SalesforceQu
         records: { type: 'array', description: 'Array of record objects' },
         totalSize: { type: 'number', description: 'Total number of records matching query' },
         done: { type: 'boolean', description: 'Whether all records have been returned' },
-        nextRecordsUrl: { type: 'string', description: 'URL to fetch next batch of records' },
+        nextRecordsUrl: {
+          type: 'string',
+          description: 'URL to fetch next batch of records',
+          optional: true,
+        },
         query: { type: 'string', description: 'The executed SOQL query' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        metadata: {
+          type: 'object',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: {
+              type: 'number',
+              description: 'Number of records returned in this response',
+            },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
+        },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/query_more.ts b/apps/sim/tools/salesforce/query_more.ts
index 5ccab67f1f..87376f256f 100644
--- a/apps/sim/tools/salesforce/query_more.ts
+++ b/apps/sim/tools/salesforce/query_more.ts
@@ -79,9 +79,8 @@ export const salesforceQueryMoreTool: ToolConfig<
         records,
         totalSize: data.totalSize || records.length,
         done: data.done !== false,
-        nextRecordsUrl: data.nextRecordsUrl,
+        nextRecordsUrl: data.nextRecordsUrl ?? null,
         metadata: {
-          operation: 'query_more',
           totalReturned: records.length,
           hasMore: !data.done,
         },
@@ -91,7 +90,7 @@ export const salesforceQueryMoreTool: ToolConfig<
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Query results',
@@ -99,9 +98,23 @@ export const salesforceQueryMoreTool: ToolConfig<
         records: { type: 'array', description: 'Array of record objects' },
         totalSize: { type: 'number', description: 'Total number of records matching query' },
         done: { type: 'boolean', description: 'Whether all records have been returned' },
-        nextRecordsUrl: { type: 'string', description: 'URL to fetch next batch of records' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        nextRecordsUrl: {
+          type: 'string',
+          description: 'URL to fetch next batch of records',
+          optional: true,
+        },
+        metadata: {
+          type: 'object',
+          description: 'Response metadata',
+          properties: {
+            totalReturned: {
+              type: 'number',
+              description: 'Number of records returned in this response',
+            },
+            hasMore: { type: 'boolean', description: 'Whether more records exist' },
+          },
+        },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/refresh_dashboard.ts b/apps/sim/tools/salesforce/refresh_dashboard.ts
index 559bafe84e..ccf881327b 100644
--- a/apps/sim/tools/salesforce/refresh_dashboard.ts
+++ b/apps/sim/tools/salesforce/refresh_dashboard.ts
@@ -72,19 +72,16 @@ export const salesforceRefreshDashboardTool: ToolConfig<
         dashboard: data,
         dashboardId: params?.dashboardId || '',
         components: data.componentData || [],
-        status: data.status,
-        metadata: {
-          operation: 'refresh_dashboard',
-          dashboardName: data.name,
-          refreshDate: data.refreshDate,
-        },
+        status: data.status ?? null,
+        dashboardName: data.name ?? null,
+        refreshDate: data.refreshDate ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Refreshed dashboard data',
@@ -92,9 +89,14 @@ export const salesforceRefreshDashboardTool: ToolConfig<
         dashboard: { type: 'object', description: 'Dashboard details' },
         dashboardId: { type: 'string', description: 'Dashboard ID' },
         components: { type: 'array', description: 'Dashboard component data' },
-        status: { type: 'object', description: 'Dashboard status' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        status: { type: 'object', description: 'Dashboard status', optional: true },
+        dashboardName: { type: 'string', description: 'Dashboard name', optional: true },
+        refreshDate: {
+          type: 'string',
+          description: 'Date when dashboard was refreshed',
+          optional: true,
+        },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/run_report.ts b/apps/sim/tools/salesforce/run_report.ts
index a61d827ce6..ced168ef34 100644
--- a/apps/sim/tools/salesforce/run_report.ts
+++ b/apps/sim/tools/salesforce/run_report.ts
@@ -98,39 +98,49 @@ export const salesforceRunReportTool: ToolConfig<
       success: true,
       output: {
         reportId: params?.reportId || '',
-        reportMetadata: data.reportMetadata,
-        reportExtendedMetadata: data.reportExtendedMetadata,
-        factMap: data.factMap,
-        groupingsDown: data.groupingsDown,
-        groupingsAcross: data.groupingsAcross,
-        hasDetailRows: data.hasDetailRows,
-        allData: data.allData,
-        metadata: {
-          operation: 'run_report',
-          reportName: data.reportMetadata?.name,
-          reportFormat: data.reportMetadata?.reportFormat,
-        },
+        reportMetadata: data.reportMetadata ?? null,
+        reportExtendedMetadata: data.reportExtendedMetadata ?? null,
+        factMap: data.factMap ?? null,
+        groupingsDown: data.groupingsDown ?? null,
+        groupingsAcross: data.groupingsAcross ?? null,
+        hasDetailRows: data.hasDetailRows ?? null,
+        allData: data.allData ?? null,
+        reportName: data.reportMetadata?.name ?? null,
+        reportFormat: data.reportMetadata?.reportFormat ?? null,
         success: true,
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success status' },
+    success: { type: 'boolean', description: 'Operation success status' },
     output: {
       type: 'object',
       description: 'Report results',
       properties: {
         reportId: { type: 'string', description: 'Report ID' },
-        reportMetadata: { type: 'object', description: 'Report metadata' },
-        reportExtendedMetadata: { type: 'object', description: 'Extended metadata' },
-        factMap: { type: 'object', description: 'Report data organized by groupings' },
-        groupingsDown: { type: 'object', description: 'Row groupings' },
-        groupingsAcross: { type: 'object', description: 'Column groupings' },
-        hasDetailRows: { type: 'boolean', description: 'Whether report has detail rows' },
-        allData: { type: 'boolean', description: 'Whether all data is returned' },
-        metadata: { type: 'object', description: 'Operation metadata' },
-        success: { type: 'boolean', description: 'Operation success status' },
+        reportMetadata: { type: 'object', description: 'Report metadata', optional: true },
+        reportExtendedMetadata: {
+          type: 'object',
+          description: 'Extended metadata',
+          optional: true,
+        },
+        factMap: {
+          type: 'object',
+          description: 'Report data organized by groupings',
+          optional: true,
+        },
+        groupingsDown: { type: 'object', description: 'Row groupings', optional: true },
+        groupingsAcross: { type: 'object', description: 'Column groupings', optional: true },
+        hasDetailRows: {
+          type: 'boolean',
+          description: 'Whether report has detail rows',
+          optional: true,
+        },
+        allData: { type: 'boolean', description: 'Whether all data is returned', optional: true },
+        reportName: { type: 'string', description: 'Report name', optional: true },
+        reportFormat: { type: 'string', description: 'Report format type', optional: true },
+        success: { type: 'boolean', description: 'Salesforce operation success' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/types.ts b/apps/sim/tools/salesforce/types.ts
index 21769103e0..29b3350a7f 100644
--- a/apps/sim/tools/salesforce/types.ts
+++ b/apps/sim/tools/salesforce/types.ts
@@ -49,8 +49,7 @@ export interface SalesforceGetAccountsResponse extends ToolResponse {
   output: {
     accounts: SalesforceAccount[]
     paging?: SalesforcePaging
-    metadata: {
-      operation: 'get_accounts'
+    metadata?: {
       totalReturned: number
       hasMore: boolean
     }
@@ -80,9 +79,6 @@ export interface SalesforceCreateAccountResponse {
     id: string
     success: boolean
     created: boolean
-    metadata: {
-      operation: 'create_account'
-    }
   }
 }
 
@@ -108,9 +104,6 @@ export interface SalesforceUpdateAccountResponse {
   output: {
     id: string
     updated: boolean
-    metadata: {
-      operation: 'update_account'
-    }
   }
 }
 
@@ -123,9 +116,6 @@ export interface SalesforceDeleteAccountResponse {
   output: {
     id: string
     deleted: boolean
-    metadata: {
-      operation: 'delete_account'
-    }
   }
 }
 
@@ -142,12 +132,11 @@ export interface SalesforceGetContactsResponse {
     contacts?: any[]
     contact?: any
     paging?: SalesforcePaging
-    metadata: {
-      operation: 'get_contacts'
-      totalReturned?: number
-      hasMore?: boolean
-      singleContact?: boolean
+    metadata?: {
+      totalReturned: number
+      hasMore: boolean
     }
+    singleContact?: boolean
     success: boolean
   }
 }
@@ -174,7 +163,6 @@ export interface SalesforceCreateContactResponse {
     id: string
     success: boolean
     created: boolean
-    metadata: { operation: 'create_contact' }
   }
 }
 
@@ -200,7 +188,6 @@ export interface SalesforceUpdateContactResponse {
   output: {
     id: string
     updated: boolean
-    metadata: { operation: 'update_contact' }
   }
 }
 
@@ -213,7 +200,6 @@ export interface SalesforceDeleteContactResponse {
   output: {
     id: string
     deleted: boolean
-    metadata: { operation: 'delete_contact' }
   }
 }
 
@@ -230,12 +216,11 @@ export interface SalesforceGetLeadsResponse {
     lead?: any
     leads?: any[]
     paging?: SalesforcePaging
-    metadata: {
-      operation: 'get_leads'
-      totalReturned?: number
-      hasMore?: boolean
-      singleLead?: boolean
+    metadata?: {
+      totalReturned: number
+      hasMore: boolean
     }
+    singleLead?: boolean
     success: boolean
   }
 }
@@ -258,9 +243,6 @@ export interface SalesforceCreateLeadResponse {
     id: string
     success: boolean
     created: boolean
-    metadata: {
-      operation: 'create_lead'
-    }
   }
 }
 
@@ -282,9 +264,6 @@ export interface SalesforceUpdateLeadResponse {
   output: {
     id: string
     updated: boolean
-    metadata: {
-      operation: 'update_lead'
-    }
   }
 }
 
@@ -297,9 +276,6 @@ export interface SalesforceDeleteLeadResponse {
   output: {
     id: string
     deleted: boolean
-    metadata: {
-      operation: 'delete_lead'
-    }
   }
 }
 
@@ -316,10 +292,9 @@ export interface SalesforceGetOpportunitiesResponse {
     opportunity?: any
     opportunities?: any[]
     paging?: SalesforcePaging
-    metadata: {
-      operation: 'get_opportunities'
-      totalReturned?: number
-      hasMore?: boolean
+    metadata?: {
+      totalReturned: number
+      hasMore: boolean
     }
     success: boolean
   }
@@ -341,9 +316,6 @@ export interface SalesforceCreateOpportunityResponse {
     id: string
     success: boolean
     created: boolean
-    metadata: {
-      operation: 'create_opportunity'
-    }
   }
 }
 
@@ -363,9 +335,6 @@ export interface SalesforceUpdateOpportunityResponse {
   output: {
     id: string
     updated: boolean
-    metadata: {
-      operation: 'update_opportunity'
-    }
   }
 }
 
@@ -378,9 +347,6 @@ export interface SalesforceDeleteOpportunityResponse {
   output: {
     id: string
     deleted: boolean
-    metadata: {
-      operation: 'delete_opportunity'
-    }
   }
 }
 
@@ -397,10 +363,9 @@ export interface SalesforceGetCasesResponse {
     case?: any
     cases?: any[]
     paging?: SalesforcePaging
-    metadata: {
-      operation: 'get_cases'
-      totalReturned?: number
-      hasMore?: boolean
+    metadata?: {
+      totalReturned: number
+      hasMore: boolean
     }
     success: boolean
   }
@@ -422,9 +387,6 @@ export interface SalesforceCreateCaseResponse {
     id: string
     success: boolean
     created: boolean
-    metadata: {
-      operation: 'create_case'
-    }
   }
 }
 
@@ -441,9 +403,6 @@ export interface SalesforceUpdateCaseResponse {
   output: {
     id: string
     updated: boolean
-    metadata: {
-      operation: 'update_case'
-    }
   }
 }
 
@@ -456,9 +415,6 @@ export interface SalesforceDeleteCaseResponse {
   output: {
     id: string
     deleted: boolean
-    metadata: {
-      operation: 'delete_case'
-    }
   }
 }
 
@@ -475,10 +431,9 @@ export interface SalesforceGetTasksResponse {
     task?: any
     tasks?: any[]
     paging?: SalesforcePaging
-    metadata: {
-      operation: 'get_tasks'
-      totalReturned?: number
-      hasMore?: boolean
+    metadata?: {
+      totalReturned: number
+      hasMore: boolean
     }
     success: boolean
   }
@@ -500,9 +455,6 @@ export interface SalesforceCreateTaskResponse {
     id: string
     success: boolean
     created: boolean
-    metadata: {
-      operation: 'create_task'
-    }
   }
 }
 
@@ -520,9 +472,6 @@ export interface SalesforceUpdateTaskResponse {
   output: {
     id: string
     updated: boolean
-    metadata: {
-      operation: 'update_task'
-    }
   }
 }
 
@@ -535,9 +484,6 @@ export interface SalesforceDeleteTaskResponse {
   output: {
     id: string
     deleted: boolean
-    metadata: {
-      operation: 'delete_task'
-    }
   }
 }
 
@@ -550,10 +496,7 @@ export interface SalesforceListReportsResponse {
   success: boolean
   output: {
     reports: any[]
-    metadata: {
-      operation: 'list_reports'
-      totalReturned: number
-    }
+    totalReturned: number
     success: boolean
   }
 }
@@ -567,9 +510,6 @@ export interface SalesforceGetReportResponse {
   output: {
     report: any
     reportId: string
-    metadata: {
-      operation: 'get_report'
-    }
     success: boolean
   }
 }
@@ -591,11 +531,8 @@ export interface SalesforceRunReportResponse {
     groupingsAcross?: any
     hasDetailRows?: boolean
     allData?: boolean
-    metadata: {
-      operation: 'run_report'
-      reportName?: string
-      reportFormat?: string
-    }
+    reportName?: string
+    reportFormat?: string
     success: boolean
   }
 }
@@ -606,10 +543,7 @@ export interface SalesforceListReportTypesResponse {
   success: boolean
   output: {
     reportTypes: any[]
-    metadata: {
-      operation: 'list_report_types'
-      totalReturned: number
-    }
+    totalReturned: number
     success: boolean
   }
 }
@@ -622,10 +556,7 @@ export interface SalesforceListDashboardsResponse {
   success: boolean
   output: {
     dashboards: any[]
-    metadata: {
-      operation: 'list_dashboards'
-      totalReturned: number
-    }
+    totalReturned: number
     success: boolean
   }
 }
@@ -640,12 +571,9 @@ export interface SalesforceGetDashboardResponse {
     dashboard: any
     dashboardId: string
     components: any[]
-    metadata: {
-      operation: 'get_dashboard'
-      dashboardName?: string
-      folderId?: string
-      runningUser?: any
-    }
+    dashboardName?: string
+    folderId?: string
+    runningUser?: any
     success: boolean
   }
 }
@@ -661,11 +589,8 @@ export interface SalesforceRefreshDashboardResponse {
     dashboardId: string
     components: any[]
     status?: any
-    metadata: {
-      operation: 'refresh_dashboard'
-      dashboardName?: string
-      refreshDate?: string
-    }
+    dashboardName?: string
+    refreshDate?: string
     success: boolean
   }
 }
@@ -683,7 +608,6 @@ export interface SalesforceQueryResponse {
     nextRecordsUrl?: string
     query: string
     metadata: {
-      operation: 'query'
       totalReturned: number
       hasMore: boolean
     }
@@ -703,7 +627,6 @@ export interface SalesforceQueryMoreResponse {
     done: boolean
     nextRecordsUrl?: string
     metadata: {
-      operation: 'query_more'
       totalReturned: number
       hasMore: boolean
     }
@@ -729,10 +652,7 @@ export interface SalesforceDescribeObjectResponse {
     deletable?: boolean
     childRelationships?: any[]
     recordTypeInfos?: any[]
-    metadata: {
-      operation: 'describe_object'
-      fieldCount: number
-    }
+    fieldCount: number
     success: boolean
   }
 }
@@ -745,10 +665,7 @@ export interface SalesforceListObjectsResponse {
     objects: any[]
     encoding?: string
     maxBatchSize?: number
-    metadata: {
-      operation: 'list_objects'
-      totalReturned: number
-    }
+    totalReturned: number
     success: boolean
   }
 }
diff --git a/apps/sim/tools/salesforce/update_account.ts b/apps/sim/tools/salesforce/update_account.ts
index b56b15a739..6b60b8e5c7 100644
--- a/apps/sim/tools/salesforce/update_account.ts
+++ b/apps/sim/tools/salesforce/update_account.ts
@@ -206,9 +206,6 @@ export const salesforceUpdateAccountTool: ToolConfig<
       output: {
         id: params?.accountId || '',
         updated: true,
-        metadata: {
-          operation: 'update_account' as const,
-        },
       },
     }
   },
@@ -221,7 +218,6 @@ export const salesforceUpdateAccountTool: ToolConfig<
       properties: {
         id: { type: 'string', description: 'Updated account ID' },
         updated: { type: 'boolean', description: 'Whether account was updated' },
-        metadata: { type: 'object', description: 'Operation metadata' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/update_case.ts b/apps/sim/tools/salesforce/update_case.ts
index abe818a9c1..d9de3c46b1 100644
--- a/apps/sim/tools/salesforce/update_case.ts
+++ b/apps/sim/tools/salesforce/update_case.ts
@@ -95,13 +95,19 @@ export const salesforceUpdateCaseTool: ToolConfig<
       output: {
         id: params?.caseId || '',
         updated: true,
-        metadata: { operation: 'update_case' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Updated case' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Updated case data',
+      properties: {
+        id: { type: 'string', description: 'Updated case ID' },
+        updated: { type: 'boolean', description: 'Whether case was updated' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/update_contact.ts b/apps/sim/tools/salesforce/update_contact.ts
index e4df3b5743..65d11d71f9 100644
--- a/apps/sim/tools/salesforce/update_contact.ts
+++ b/apps/sim/tools/salesforce/update_contact.ts
@@ -147,7 +147,6 @@ export const salesforceUpdateContactTool: ToolConfig<
       output: {
         id: params?.contactId || '',
         updated: true,
-        metadata: { operation: 'update_contact' as const },
       },
     }
   },
@@ -160,7 +159,6 @@ export const salesforceUpdateContactTool: ToolConfig<
       properties: {
         id: { type: 'string', description: 'Updated contact ID' },
         updated: { type: 'boolean', description: 'Whether contact was updated' },
-        metadata: { type: 'object', description: 'Operation metadata' },
       },
     },
   },
diff --git a/apps/sim/tools/salesforce/update_lead.ts b/apps/sim/tools/salesforce/update_lead.ts
index e4727db6b2..7f5d4e1ca4 100644
--- a/apps/sim/tools/salesforce/update_lead.ts
+++ b/apps/sim/tools/salesforce/update_lead.ts
@@ -98,13 +98,19 @@ export const salesforceUpdateLeadTool: ToolConfig<
       output: {
         id: params?.leadId || '',
         updated: true,
-        metadata: { operation: 'update_lead' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Updated lead' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Updated lead data',
+      properties: {
+        id: { type: 'string', description: 'Updated lead ID' },
+        updated: { type: 'boolean', description: 'Whether lead was updated' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/update_opportunity.ts b/apps/sim/tools/salesforce/update_opportunity.ts
index 2872daa4cc..fa1d5a60ff 100644
--- a/apps/sim/tools/salesforce/update_opportunity.ts
+++ b/apps/sim/tools/salesforce/update_opportunity.ts
@@ -99,13 +99,19 @@ export const salesforceUpdateOpportunityTool: ToolConfig<
       output: {
         id: params?.opportunityId || '',
         updated: true,
-        metadata: { operation: 'update_opportunity' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Updated opportunity' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Updated opportunity data',
+      properties: {
+        id: { type: 'string', description: 'Updated opportunity ID' },
+        updated: { type: 'boolean', description: 'Whether opportunity was updated' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/salesforce/update_task.ts b/apps/sim/tools/salesforce/update_task.ts
index 3eaa6b4dca..14c74976f3 100644
--- a/apps/sim/tools/salesforce/update_task.ts
+++ b/apps/sim/tools/salesforce/update_task.ts
@@ -102,13 +102,19 @@ export const salesforceUpdateTaskTool: ToolConfig<
       output: {
         id: params?.taskId || '',
         updated: true,
-        metadata: { operation: 'update_task' },
       },
     }
   },
 
   outputs: {
-    success: { type: 'boolean', description: 'Success' },
-    output: { type: 'object', description: 'Updated task' },
+    success: { type: 'boolean', description: 'Operation success status' },
+    output: {
+      type: 'object',
+      description: 'Updated task data',
+      properties: {
+        id: { type: 'string', description: 'Updated task ID' },
+        updated: { type: 'boolean', description: 'Whether task was updated' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/sentry/events_get.ts b/apps/sim/tools/sentry/events_get.ts
index bf532c2d23..8b616ed8ef 100644
--- a/apps/sim/tools/sentry/events_get.ts
+++ b/apps/sim/tools/sentry/events_get.ts
@@ -58,8 +58,8 @@ export const getEventTool: ToolConfig<SentryGetEventParams, SentryGetEventRespon
           groupID: event.groupID,
           message: event.message || '',
           title: event.title,
-          location: event.location,
-          culprit: event.culprit,
+          location: event.location ?? null,
+          culprit: event.culprit ?? null,
           dateCreated: event.dateCreated,
           dateReceived: event.dateReceived,
           user: event.user
@@ -77,12 +77,16 @@ export const getEventTool: ToolConfig<SentryGetEventParams, SentryGetEventRespon
               value: tag.value,
             })) || [],
           contexts: event.contexts || {},
-          platform: event.platform,
-          type: event.type,
-          metadata: event.metadata || {},
+          platform: event.platform ?? null,
+          type: event.type ?? null,
+          metadata: {
+            type: event.metadata?.type || null,
+            value: event.metadata?.value || null,
+            function: event.metadata?.function || null,
+          },
           entries: event.entries || [],
           errors: event.errors || [],
-          dist: event.dist,
+          dist: event.dist ?? null,
           fingerprints: event.fingerprints || [],
           sdk: event.sdk
             ? {
@@ -106,8 +110,12 @@ export const getEventTool: ToolConfig<SentryGetEventParams, SentryGetEventRespon
         groupID: { type: 'string', description: 'Issue group ID this event belongs to' },
         message: { type: 'string', description: 'Event message' },
         title: { type: 'string', description: 'Event title' },
-        location: { type: 'string', description: 'Location information' },
-        culprit: { type: 'string', description: 'Function or location that caused the event' },
+        location: { type: 'string', description: 'Location information', optional: true },
+        culprit: {
+          type: 'string',
+          description: 'Function or location that caused the event',
+          optional: true,
+        },
         dateCreated: { type: 'string', description: 'When the event was created (ISO timestamp)' },
         dateReceived: {
           type: 'string',
@@ -139,11 +147,24 @@ export const getEventTool: ToolConfig<SentryGetEventParams, SentryGetEventRespon
           type: 'object',
           description: 'Additional context data (device, OS, browser, etc.)',
         },
-        platform: { type: 'string', description: 'Platform where the event occurred' },
-        type: { type: 'string', description: 'Event type (error, transaction, etc.)' },
+        platform: {
+          type: 'string',
+          description: 'Platform where the event occurred',
+          optional: true,
+        },
+        type: {
+          type: 'string',
+          description: 'Event type (error, transaction, etc.)',
+          optional: true,
+        },
         metadata: {
           type: 'object',
-          description: 'Metadata about the event including error type and value',
+          description: 'Error metadata',
+          properties: {
+            type: { type: 'string', description: 'Type of error (e.g., TypeError, ValueError)' },
+            value: { type: 'string', description: 'Error message or value' },
+            function: { type: 'string', description: 'Function where the error occurred' },
+          },
         },
         entries: {
           type: 'array',
@@ -153,7 +174,7 @@ export const getEventTool: ToolConfig<SentryGetEventParams, SentryGetEventRespon
           type: 'array',
           description: 'Processing errors that occurred',
         },
-        dist: { type: 'string', description: 'Distribution identifier' },
+        dist: { type: 'string', description: 'Distribution identifier', optional: true },
         fingerprints: {
           type: 'array',
           description: 'Fingerprints used for grouping events',
diff --git a/apps/sim/tools/sentry/events_list.ts b/apps/sim/tools/sentry/events_list.ts
index 136034db55..f272dded18 100644
--- a/apps/sim/tools/sentry/events_list.ts
+++ b/apps/sim/tools/sentry/events_list.ts
@@ -128,8 +128,8 @@ export const listEventsTool: ToolConfig<SentryListEventsParams, SentryListEvents
           groupID: event.groupID,
           message: event.message || '',
           title: event.title,
-          location: event.location,
-          culprit: event.culprit,
+          location: event.location ?? null,
+          culprit: event.culprit ?? null,
           dateCreated: event.dateCreated,
           dateReceived: event.dateReceived,
           user: event.user
@@ -147,12 +147,16 @@ export const listEventsTool: ToolConfig<SentryListEventsParams, SentryListEvents
               value: tag.value,
             })) || [],
           contexts: event.contexts || {},
-          platform: event.platform,
-          type: event.type,
-          metadata: event.metadata || {},
+          platform: event.platform ?? null,
+          type: event.type ?? null,
+          metadata: {
+            type: event.metadata?.type || null,
+            value: event.metadata?.value || null,
+            function: event.metadata?.function || null,
+          },
           entries: event.entries || [],
           errors: event.errors || [],
-          dist: event.dist,
+          dist: event.dist ?? null,
           fingerprints: event.fingerprints || [],
           sdk: event.sdk
             ? {
@@ -161,8 +165,10 @@ export const listEventsTool: ToolConfig<SentryListEventsParams, SentryListEvents
               }
             : null,
         })),
-        nextCursor,
-        hasMore,
+        metadata: {
+          nextCursor,
+          hasMore,
+        },
       },
     }
   },
@@ -180,7 +186,12 @@ export const listEventsTool: ToolConfig<SentryListEventsParams, SentryListEvents
           groupID: { type: 'string', description: 'Issue group ID' },
           message: { type: 'string', description: 'Event message' },
           title: { type: 'string', description: 'Event title' },
-          culprit: { type: 'string', description: 'Function or location that caused the event' },
+          location: { type: 'string', description: 'Location information', optional: true },
+          culprit: {
+            type: 'string',
+            description: 'Function or location that caused the event',
+            optional: true,
+          },
           dateCreated: {
             type: 'string',
             description: 'When the event was created (ISO timestamp)',
@@ -197,6 +208,7 @@ export const listEventsTool: ToolConfig<SentryListEventsParams, SentryListEvents
               email: { type: 'string', description: 'User email' },
               username: { type: 'string', description: 'Username' },
               ipAddress: { type: 'string', description: 'IP address' },
+              name: { type: 'string', description: 'User display name' },
             },
           },
           tags: {
@@ -210,18 +222,50 @@ export const listEventsTool: ToolConfig<SentryListEventsParams, SentryListEvents
               },
             },
           },
-          platform: { type: 'string', description: 'Platform where the event occurred' },
-          type: { type: 'string', description: 'Event type' },
+          contexts: { type: 'object', description: 'Additional context data (device, OS, etc.)' },
+          platform: {
+            type: 'string',
+            description: 'Platform where the event occurred',
+            optional: true,
+          },
+          type: { type: 'string', description: 'Event type', optional: true },
+          metadata: {
+            type: 'object',
+            description: 'Error metadata',
+            properties: {
+              type: { type: 'string', description: 'Type of error (e.g., TypeError)' },
+              value: { type: 'string', description: 'Error message or value' },
+              function: { type: 'string', description: 'Function where the error occurred' },
+            },
+          },
+          entries: { type: 'array', description: 'Event entries (exception, breadcrumbs, etc.)' },
+          errors: { type: 'array', description: 'Processing errors' },
+          dist: { type: 'string', description: 'Distribution identifier', optional: true },
+          fingerprints: { type: 'array', description: 'Fingerprints for grouping' },
+          sdk: {
+            type: 'object',
+            description: 'SDK information',
+            properties: {
+              name: { type: 'string', description: 'SDK name' },
+              version: { type: 'string', description: 'SDK version' },
+            },
+          },
         },
       },
     },
-    nextCursor: {
-      type: 'string',
-      description: 'Cursor for the next page of results (if available)',
-    },
-    hasMore: {
-      type: 'boolean',
-      description: 'Whether there are more results available',
+    metadata: {
+      type: 'object',
+      description: 'Pagination metadata',
+      properties: {
+        nextCursor: {
+          type: 'string',
+          description: 'Cursor for the next page of results (if available)',
+        },
+        hasMore: {
+          type: 'boolean',
+          description: 'Whether there are more results available',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/sentry/issues_get.ts b/apps/sim/tools/sentry/issues_get.ts
index 530c336783..6f8ed83589 100644
--- a/apps/sim/tools/sentry/issues_get.ts
+++ b/apps/sim/tools/sentry/issues_get.ts
@@ -49,22 +49,26 @@ export const getIssueTool: ToolConfig<SentryGetIssueParams, SentryGetIssueRespon
           id: issue.id,
           shortId: issue.shortId,
           title: issue.title,
-          culprit: issue.culprit,
+          culprit: issue.culprit ?? null,
           permalink: issue.permalink,
-          logger: issue.logger,
+          logger: issue.logger ?? null,
           level: issue.level,
           status: issue.status,
           statusDetails: issue.statusDetails || {},
           isPublic: issue.isPublic,
-          platform: issue.platform,
+          platform: issue.platform ?? null,
           project: {
             id: issue.project?.id || '',
             name: issue.project?.name || '',
             slug: issue.project?.slug || '',
             platform: issue.project?.platform || '',
           },
-          type: issue.type,
-          metadata: issue.metadata || {},
+          type: issue.type ?? null,
+          metadata: {
+            type: issue.metadata?.type || null,
+            value: issue.metadata?.value || null,
+            function: issue.metadata?.function || null,
+          },
           numComments: issue.numComments || 0,
           assignedTo: issue.assignedTo
             ? {
@@ -75,7 +79,7 @@ export const getIssueTool: ToolConfig<SentryGetIssueParams, SentryGetIssueRespon
             : null,
           isBookmarked: issue.isBookmarked,
           isSubscribed: issue.isSubscribed,
-          subscriptionDetails: issue.subscriptionDetails,
+          subscriptionDetails: issue.subscriptionDetails ?? null,
           hasSeen: issue.hasSeen,
           annotations: issue.annotations || [],
           isUnhandled: issue.isUnhandled,
@@ -97,9 +101,17 @@ export const getIssueTool: ToolConfig<SentryGetIssueParams, SentryGetIssueRespon
         id: { type: 'string', description: 'Unique issue ID' },
         shortId: { type: 'string', description: 'Short issue identifier' },
         title: { type: 'string', description: 'Issue title' },
-        culprit: { type: 'string', description: 'Function or location that caused the issue' },
+        culprit: {
+          type: 'string',
+          description: 'Function or location that caused the issue',
+          optional: true,
+        },
         permalink: { type: 'string', description: 'Direct link to the issue in Sentry' },
-        logger: { type: 'string', description: 'Logger name that reported the issue' },
+        logger: {
+          type: 'string',
+          description: 'Logger name that reported the issue',
+          optional: true,
+        },
         level: { type: 'string', description: 'Severity level (error, warning, info, etc.)' },
         status: { type: 'string', description: 'Current issue status' },
         statusDetails: {
@@ -107,7 +119,11 @@ export const getIssueTool: ToolConfig<SentryGetIssueParams, SentryGetIssueRespon
           description: 'Additional details about the status',
         },
         isPublic: { type: 'boolean', description: 'Whether the issue is publicly visible' },
-        platform: { type: 'string', description: 'Platform where the issue occurred' },
+        platform: {
+          type: 'string',
+          description: 'Platform where the issue occurred',
+          optional: true,
+        },
         project: {
           type: 'object',
           description: 'Project information',
@@ -118,8 +134,16 @@ export const getIssueTool: ToolConfig<SentryGetIssueParams, SentryGetIssueRespon
             platform: { type: 'string', description: 'Project platform' },
           },
         },
-        type: { type: 'string', description: 'Issue type' },
-        metadata: { type: 'object', description: 'Additional metadata about the issue' },
+        type: { type: 'string', description: 'Issue type', optional: true },
+        metadata: {
+          type: 'object',
+          description: 'Error metadata',
+          properties: {
+            type: { type: 'string', description: 'Type of error (e.g., TypeError, ValueError)' },
+            value: { type: 'string', description: 'Error message or value' },
+            function: { type: 'string', description: 'Function where the error occurred' },
+          },
+        },
         numComments: { type: 'number', description: 'Number of comments on the issue' },
         assignedTo: {
           type: 'object',
diff --git a/apps/sim/tools/sentry/issues_list.ts b/apps/sim/tools/sentry/issues_list.ts
index cf9592f8a9..01c5c44e97 100644
--- a/apps/sim/tools/sentry/issues_list.ts
+++ b/apps/sim/tools/sentry/issues_list.ts
@@ -136,22 +136,26 @@ export const listIssuesTool: ToolConfig<SentryListIssuesParams, SentryListIssues
           id: issue.id,
           shortId: issue.shortId,
           title: issue.title,
-          culprit: issue.culprit,
+          culprit: issue.culprit ?? null,
           permalink: issue.permalink,
-          logger: issue.logger,
+          logger: issue.logger ?? null,
           level: issue.level,
           status: issue.status,
           statusDetails: issue.statusDetails || {},
           isPublic: issue.isPublic,
-          platform: issue.platform,
+          platform: issue.platform ?? null,
           project: {
             id: issue.project?.id || '',
             name: issue.project?.name || '',
             slug: issue.project?.slug || '',
             platform: issue.project?.platform || '',
           },
-          type: issue.type,
-          metadata: issue.metadata || {},
+          type: issue.type ?? null,
+          metadata: {
+            type: issue.metadata?.type || null,
+            value: issue.metadata?.value || null,
+            function: issue.metadata?.function || null,
+          },
           numComments: issue.numComments || 0,
           assignedTo: issue.assignedTo
             ? {
@@ -162,7 +166,7 @@ export const listIssuesTool: ToolConfig<SentryListIssuesParams, SentryListIssues
             : null,
           isBookmarked: issue.isBookmarked,
           isSubscribed: issue.isSubscribed,
-          subscriptionDetails: issue.subscriptionDetails,
+          subscriptionDetails: issue.subscriptionDetails ?? null,
           hasSeen: issue.hasSeen,
           annotations: issue.annotations || [],
           isUnhandled: issue.isUnhandled,
@@ -172,8 +176,10 @@ export const listIssuesTool: ToolConfig<SentryListIssuesParams, SentryListIssues
           lastSeen: issue.lastSeen,
           stats: issue.stats || {},
         })),
-        nextCursor,
-        hasMore,
+        metadata: {
+          nextCursor,
+          hasMore,
+        },
       },
     }
   },
@@ -188,12 +194,26 @@ export const listIssuesTool: ToolConfig<SentryListIssuesParams, SentryListIssues
           id: { type: 'string', description: 'Unique issue ID' },
           shortId: { type: 'string', description: 'Short issue identifier' },
           title: { type: 'string', description: 'Issue title' },
-          culprit: { type: 'string', description: 'Function or location that caused the issue' },
+          culprit: {
+            type: 'string',
+            description: 'Function or location that caused the issue',
+            optional: true,
+          },
           permalink: { type: 'string', description: 'Direct link to the issue in Sentry' },
-          logger: { type: 'string', description: 'Logger name that reported the issue' },
+          logger: {
+            type: 'string',
+            description: 'Logger name that reported the issue',
+            optional: true,
+          },
           level: { type: 'string', description: 'Severity level (error, warning, info, etc.)' },
           status: { type: 'string', description: 'Current issue status' },
-          platform: { type: 'string', description: 'Platform where the issue occurred' },
+          statusDetails: { type: 'object', description: 'Additional details about the status' },
+          isPublic: { type: 'boolean', description: 'Whether the issue is publicly visible' },
+          platform: {
+            type: 'string',
+            description: 'Platform where the issue occurred',
+            optional: true,
+          },
           project: {
             type: 'object',
             description: 'Project information',
@@ -204,6 +224,31 @@ export const listIssuesTool: ToolConfig<SentryListIssuesParams, SentryListIssues
               platform: { type: 'string', description: 'Project platform' },
             },
           },
+          type: { type: 'string', description: 'Issue type', optional: true },
+          metadata: {
+            type: 'object',
+            description: 'Error metadata',
+            properties: {
+              type: { type: 'string', description: 'Type of error (e.g., TypeError)' },
+              value: { type: 'string', description: 'Error message or value' },
+              function: { type: 'string', description: 'Function where the error occurred' },
+            },
+          },
+          numComments: { type: 'number', description: 'Number of comments on the issue' },
+          assignedTo: {
+            type: 'object',
+            description: 'User assigned to the issue',
+            properties: {
+              id: { type: 'string', description: 'User ID' },
+              name: { type: 'string', description: 'User name' },
+              email: { type: 'string', description: 'User email' },
+            },
+          },
+          isBookmarked: { type: 'boolean', description: 'Whether the issue is bookmarked' },
+          isSubscribed: { type: 'boolean', description: 'Whether subscribed to updates' },
+          hasSeen: { type: 'boolean', description: 'Whether the user has seen this issue' },
+          annotations: { type: 'array', description: 'Issue annotations' },
+          isUnhandled: { type: 'boolean', description: 'Whether the issue is unhandled' },
           count: { type: 'string', description: 'Total number of occurrences' },
           userCount: { type: 'number', description: 'Number of unique users affected' },
           firstSeen: {
@@ -211,16 +256,23 @@ export const listIssuesTool: ToolConfig<SentryListIssuesParams, SentryListIssues
             description: 'When the issue was first seen (ISO timestamp)',
           },
           lastSeen: { type: 'string', description: 'When the issue was last seen (ISO timestamp)' },
+          stats: { type: 'object', description: 'Statistical information about the issue' },
         },
       },
     },
-    nextCursor: {
-      type: 'string',
-      description: 'Cursor for the next page of results (if available)',
-    },
-    hasMore: {
-      type: 'boolean',
-      description: 'Whether there are more results available',
+    metadata: {
+      type: 'object',
+      description: 'Pagination metadata',
+      properties: {
+        nextCursor: {
+          type: 'string',
+          description: 'Cursor for the next page of results (if available)',
+        },
+        hasMore: {
+          type: 'boolean',
+          description: 'Whether there are more results available',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/sentry/issues_update.ts b/apps/sim/tools/sentry/issues_update.ts
index 74255388c6..127e9fb87e 100644
--- a/apps/sim/tools/sentry/issues_update.ts
+++ b/apps/sim/tools/sentry/issues_update.ts
@@ -105,22 +105,26 @@ export const updateIssueTool: ToolConfig<SentryUpdateIssueParams, SentryUpdateIs
           id: issue.id,
           shortId: issue.shortId,
           title: issue.title,
-          culprit: issue.culprit,
+          culprit: issue.culprit ?? null,
           permalink: issue.permalink,
-          logger: issue.logger,
+          logger: issue.logger ?? null,
           level: issue.level,
           status: issue.status,
           statusDetails: issue.statusDetails || {},
           isPublic: issue.isPublic,
-          platform: issue.platform,
+          platform: issue.platform ?? null,
           project: {
             id: issue.project?.id || '',
             name: issue.project?.name || '',
             slug: issue.project?.slug || '',
             platform: issue.project?.platform || '',
           },
-          type: issue.type,
-          metadata: issue.metadata || {},
+          type: issue.type ?? null,
+          metadata: {
+            type: issue.metadata?.type || null,
+            value: issue.metadata?.value || null,
+            function: issue.metadata?.function || null,
+          },
           numComments: issue.numComments || 0,
           assignedTo: issue.assignedTo
             ? {
@@ -131,7 +135,7 @@ export const updateIssueTool: ToolConfig<SentryUpdateIssueParams, SentryUpdateIs
             : null,
           isBookmarked: issue.isBookmarked,
           isSubscribed: issue.isSubscribed,
-          subscriptionDetails: issue.subscriptionDetails,
+          subscriptionDetails: issue.subscriptionDetails ?? null,
           hasSeen: issue.hasSeen,
           annotations: issue.annotations || [],
           isUnhandled: issue.isUnhandled,
diff --git a/apps/sim/tools/sentry/projects_create.ts b/apps/sim/tools/sentry/projects_create.ts
index f607a3f0bb..277773ac66 100644
--- a/apps/sim/tools/sentry/projects_create.ts
+++ b/apps/sim/tools/sentry/projects_create.ts
@@ -94,13 +94,13 @@ export const createProjectTool: ToolConfig<SentryCreateProjectParams, SentryCrea
             id: project.id,
             slug: project.slug,
             name: project.name,
-            platform: project.platform,
+            platform: project.platform ?? null,
             dateCreated: project.dateCreated,
             isBookmarked: project.isBookmarked,
             isMember: project.isMember,
             features: project.features || [],
-            firstEvent: project.firstEvent,
-            firstTransactionEvent: project.firstTransactionEvent,
+            firstEvent: project.firstEvent ?? null,
+            firstTransactionEvent: project.firstTransactionEvent ?? null,
             access: project.access || [],
             hasAccess: project.hasAccess,
             hasMinifiedStackTrace: project.hasMinifiedStackTrace,
@@ -125,8 +125,8 @@ export const createProjectTool: ToolConfig<SentryCreateProjectParams, SentryCrea
                 name: team.name,
                 slug: team.slug,
               })) || [],
-            status: project.status,
-            color: project.color,
+            status: project.status ?? null,
+            color: project.color ?? null,
             isPublic: project.isPublic,
           },
         },
@@ -141,11 +141,16 @@ export const createProjectTool: ToolConfig<SentryCreateProjectParams, SentryCrea
           id: { type: 'string', description: 'Unique project ID' },
           slug: { type: 'string', description: 'URL-friendly project identifier' },
           name: { type: 'string', description: 'Project name' },
-          platform: { type: 'string', description: 'Platform/language' },
+          platform: { type: 'string', description: 'Platform/language', optional: true },
           dateCreated: {
             type: 'string',
             description: 'When the project was created (ISO timestamp)',
           },
+          isBookmarked: { type: 'boolean', description: 'Whether the project is bookmarked' },
+          isMember: { type: 'boolean', description: 'Whether the user is a member' },
+          hasAccess: { type: 'boolean', description: 'Whether the user has access' },
+          features: { type: 'array', description: 'Enabled features' },
+          firstEvent: { type: 'string', description: 'First event timestamp', optional: true },
           organization: {
             type: 'object',
             description: 'Organization information',
@@ -155,6 +160,15 @@ export const createProjectTool: ToolConfig<SentryCreateProjectParams, SentryCrea
               name: { type: 'string', description: 'Organization name' },
             },
           },
+          team: {
+            type: 'object',
+            description: 'Primary team for the project',
+            properties: {
+              id: { type: 'string', description: 'Team ID' },
+              name: { type: 'string', description: 'Team name' },
+              slug: { type: 'string', description: 'Team slug' },
+            },
+          },
           teams: {
             type: 'array',
             description: 'Teams associated with the project',
@@ -167,6 +181,9 @@ export const createProjectTool: ToolConfig<SentryCreateProjectParams, SentryCrea
               },
             },
           },
+          status: { type: 'string', description: 'Project status', optional: true },
+          color: { type: 'string', description: 'Project color code', optional: true },
+          isPublic: { type: 'boolean', description: 'Whether the project is public' },
         },
       },
     },
diff --git a/apps/sim/tools/sentry/projects_get.ts b/apps/sim/tools/sentry/projects_get.ts
index eb703fe9d1..3886db05a4 100644
--- a/apps/sim/tools/sentry/projects_get.ts
+++ b/apps/sim/tools/sentry/projects_get.ts
@@ -49,13 +49,13 @@ export const getProjectTool: ToolConfig<SentryGetProjectParams, SentryGetProject
           id: project.id,
           slug: project.slug,
           name: project.name,
-          platform: project.platform,
+          platform: project.platform ?? null,
           dateCreated: project.dateCreated,
           isBookmarked: project.isBookmarked,
           isMember: project.isMember,
           features: project.features || [],
-          firstEvent: project.firstEvent,
-          firstTransactionEvent: project.firstTransactionEvent,
+          firstEvent: project.firstEvent ?? null,
+          firstTransactionEvent: project.firstTransactionEvent ?? null,
           access: project.access || [],
           hasAccess: project.hasAccess,
           hasMinifiedStackTrace: project.hasMinifiedStackTrace,
@@ -80,8 +80,8 @@ export const getProjectTool: ToolConfig<SentryGetProjectParams, SentryGetProject
               name: team.name,
               slug: team.slug,
             })) || [],
-          status: project.status,
-          color: project.color,
+          status: project.status ?? null,
+          color: project.color ?? null,
           isPublic: project.isPublic,
         },
       },
@@ -96,7 +96,11 @@ export const getProjectTool: ToolConfig<SentryGetProjectParams, SentryGetProject
         id: { type: 'string', description: 'Unique project ID' },
         slug: { type: 'string', description: 'URL-friendly project identifier' },
         name: { type: 'string', description: 'Project name' },
-        platform: { type: 'string', description: 'Platform/language (e.g., javascript, python)' },
+        platform: {
+          type: 'string',
+          description: 'Platform/language (e.g., javascript, python)',
+          optional: true,
+        },
         dateCreated: {
           type: 'string',
           description: 'When the project was created (ISO timestamp)',
@@ -111,7 +115,14 @@ export const getProjectTool: ToolConfig<SentryGetProjectParams, SentryGetProject
         firstEvent: {
           type: 'string',
           description: 'When the first event was received (ISO timestamp)',
+          optional: true,
         },
+        firstTransactionEvent: {
+          type: 'string',
+          description: 'When the first transaction event was received',
+          optional: true,
+        },
+        access: { type: 'array', description: 'Access permissions' },
         organization: {
           type: 'object',
           description: 'Organization information',
@@ -121,6 +132,15 @@ export const getProjectTool: ToolConfig<SentryGetProjectParams, SentryGetProject
             name: { type: 'string', description: 'Organization name' },
           },
         },
+        team: {
+          type: 'object',
+          description: 'Primary team for the project',
+          properties: {
+            id: { type: 'string', description: 'Team ID' },
+            name: { type: 'string', description: 'Team name' },
+            slug: { type: 'string', description: 'Team slug' },
+          },
+        },
         teams: {
           type: 'array',
           description: 'Teams associated with the project',
@@ -133,10 +153,15 @@ export const getProjectTool: ToolConfig<SentryGetProjectParams, SentryGetProject
             },
           },
         },
-        status: { type: 'string', description: 'Project status' },
-        color: { type: 'string', description: 'Project color code' },
+        status: { type: 'string', description: 'Project status', optional: true },
+        color: { type: 'string', description: 'Project color code', optional: true },
         isPublic: { type: 'boolean', description: 'Whether the project is publicly visible' },
+        isInternal: { type: 'boolean', description: 'Whether the project is internal' },
         hasAccess: { type: 'boolean', description: 'Whether the user has access to this project' },
+        hasMinifiedStackTrace: {
+          type: 'boolean',
+          description: 'Whether minified stack traces are available',
+        },
         hasMonitors: {
           type: 'boolean',
           description: 'Whether the project has monitors configured',
diff --git a/apps/sim/tools/sentry/projects_list.ts b/apps/sim/tools/sentry/projects_list.ts
index 475c468402..8bc849d12c 100644
--- a/apps/sim/tools/sentry/projects_list.ts
+++ b/apps/sim/tools/sentry/projects_list.ts
@@ -82,13 +82,13 @@ export const listProjectsTool: ToolConfig<SentryListProjectsParams, SentryListPr
           id: project.id,
           slug: project.slug,
           name: project.name,
-          platform: project.platform,
+          platform: project.platform ?? null,
           dateCreated: project.dateCreated,
           isBookmarked: project.isBookmarked,
           isMember: project.isMember,
           features: project.features || [],
-          firstEvent: project.firstEvent,
-          firstTransactionEvent: project.firstTransactionEvent,
+          firstEvent: project.firstEvent ?? null,
+          firstTransactionEvent: project.firstTransactionEvent ?? null,
           access: project.access || [],
           hasAccess: project.hasAccess,
           hasMinifiedStackTrace: project.hasMinifiedStackTrace,
@@ -113,12 +113,14 @@ export const listProjectsTool: ToolConfig<SentryListProjectsParams, SentryListPr
               name: team.name,
               slug: team.slug,
             })) || [],
-          status: project.status,
-          color: project.color,
+          status: project.status ?? null,
+          color: project.color ?? null,
           isPublic: project.isPublic,
         })),
-        nextCursor,
-        hasMore,
+        metadata: {
+          nextCursor,
+          hasMore,
+        },
       },
     }
   },
@@ -133,7 +135,11 @@ export const listProjectsTool: ToolConfig<SentryListProjectsParams, SentryListPr
           id: { type: 'string', description: 'Unique project ID' },
           slug: { type: 'string', description: 'URL-friendly project identifier' },
           name: { type: 'string', description: 'Project name' },
-          platform: { type: 'string', description: 'Platform/language (e.g., javascript, python)' },
+          platform: {
+            type: 'string',
+            description: 'Platform/language (e.g., javascript, python)',
+            optional: true,
+          },
           dateCreated: {
             type: 'string',
             description: 'When the project was created (ISO timestamp)',
@@ -162,18 +168,24 @@ export const listProjectsTool: ToolConfig<SentryListProjectsParams, SentryListPr
               },
             },
           },
-          status: { type: 'string', description: 'Project status' },
+          status: { type: 'string', description: 'Project status', optional: true },
           isPublic: { type: 'boolean', description: 'Whether the project is publicly visible' },
         },
       },
     },
-    nextCursor: {
-      type: 'string',
-      description: 'Cursor for the next page of results (if available)',
-    },
-    hasMore: {
-      type: 'boolean',
-      description: 'Whether there are more results available',
+    metadata: {
+      type: 'object',
+      description: 'Pagination metadata',
+      properties: {
+        nextCursor: {
+          type: 'string',
+          description: 'Cursor for the next page of results (if available)',
+        },
+        hasMore: {
+          type: 'boolean',
+          description: 'Whether there are more results available',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/sentry/projects_update.ts b/apps/sim/tools/sentry/projects_update.ts
index 2135a3067a..0fb9e276bc 100644
--- a/apps/sim/tools/sentry/projects_update.ts
+++ b/apps/sim/tools/sentry/projects_update.ts
@@ -115,13 +115,13 @@ export const updateProjectTool: ToolConfig<SentryUpdateProjectParams, SentryUpda
             id: project.id,
             slug: project.slug,
             name: project.name,
-            platform: project.platform,
+            platform: project.platform ?? null,
             dateCreated: project.dateCreated,
             isBookmarked: project.isBookmarked,
             isMember: project.isMember,
             features: project.features || [],
-            firstEvent: project.firstEvent,
-            firstTransactionEvent: project.firstTransactionEvent,
+            firstEvent: project.firstEvent ?? null,
+            firstTransactionEvent: project.firstTransactionEvent ?? null,
             access: project.access || [],
             hasAccess: project.hasAccess,
             hasMinifiedStackTrace: project.hasMinifiedStackTrace,
@@ -146,8 +146,8 @@ export const updateProjectTool: ToolConfig<SentryUpdateProjectParams, SentryUpda
                 name: team.name,
                 slug: team.slug,
               })) || [],
-            status: project.status,
-            color: project.color,
+            status: project.status ?? null,
+            color: project.color ?? null,
             isPublic: project.isPublic,
           },
         },
@@ -162,7 +162,7 @@ export const updateProjectTool: ToolConfig<SentryUpdateProjectParams, SentryUpda
           id: { type: 'string', description: 'Unique project ID' },
           slug: { type: 'string', description: 'URL-friendly project identifier' },
           name: { type: 'string', description: 'Project name' },
-          platform: { type: 'string', description: 'Platform/language' },
+          platform: { type: 'string', description: 'Platform/language', optional: true },
           isBookmarked: { type: 'boolean', description: 'Whether the project is bookmarked' },
           organization: {
             type: 'object',
@@ -176,6 +176,14 @@ export const updateProjectTool: ToolConfig<SentryUpdateProjectParams, SentryUpda
           teams: {
             type: 'array',
             description: 'Teams associated with the project',
+            items: {
+              type: 'object',
+              properties: {
+                id: { type: 'string', description: 'Team ID' },
+                name: { type: 'string', description: 'Team name' },
+                slug: { type: 'string', description: 'Team slug' },
+              },
+            },
           },
         },
       },
diff --git a/apps/sim/tools/sentry/releases_create.ts b/apps/sim/tools/sentry/releases_create.ts
index fae8f65573..1a81f59c1a 100644
--- a/apps/sim/tools/sentry/releases_create.ts
+++ b/apps/sim/tools/sentry/releases_create.ts
@@ -113,11 +113,11 @@ export const createReleaseTool: ToolConfig<SentryCreateReleaseParams, SentryCrea
             id: release.id,
             version: release.version,
             shortVersion: release.shortVersion,
-            ref: release.ref,
-            url: release.url,
-            dateReleased: release.dateReleased,
+            ref: release.ref ?? null,
+            url: release.url ?? null,
+            dateReleased: release.dateReleased ?? null,
             dateCreated: release.dateCreated,
-            dateStarted: release.dateStarted,
+            dateStarted: release.dateStarted ?? null,
             data: release.data || {},
             newGroups: release.newGroups || 0,
             owner: release.owner
@@ -157,8 +157,8 @@ export const createReleaseTool: ToolConfig<SentryCreateReleaseParams, SentryCrea
                 slug: project.slug,
                 platform: project.platform,
               })) || [],
-            firstEvent: release.firstEvent,
-            lastEvent: release.lastEvent,
+            firstEvent: release.firstEvent ?? null,
+            lastEvent: release.lastEvent ?? null,
             versionInfo: {
               buildHash: release.versionInfo?.buildHash || null,
               version: {
@@ -179,17 +179,69 @@ export const createReleaseTool: ToolConfig<SentryCreateReleaseParams, SentryCrea
           id: { type: 'string', description: 'Unique release ID' },
           version: { type: 'string', description: 'Release version identifier' },
           shortVersion: { type: 'string', description: 'Shortened version identifier' },
-          ref: { type: 'string', description: 'Git reference (commit SHA, tag, or branch)' },
-          url: { type: 'string', description: 'URL to the release' },
+          ref: {
+            type: 'string',
+            description: 'Git reference (commit SHA, tag, or branch)',
+            optional: true,
+          },
+          url: { type: 'string', description: 'URL to the release', optional: true },
           dateReleased: {
             type: 'string',
             description: 'When the release was deployed (ISO timestamp)',
+            optional: true,
           },
           dateCreated: {
             type: 'string',
             description: 'When the release was created (ISO timestamp)',
           },
+          dateStarted: {
+            type: 'string',
+            description: 'When the release started (ISO timestamp)',
+            optional: true,
+          },
+          newGroups: { type: 'number', description: 'Number of new issues introduced' },
           commitCount: { type: 'number', description: 'Number of commits in this release' },
+          deployCount: { type: 'number', description: 'Number of deploys for this release' },
+          owner: {
+            type: 'object',
+            description: 'Release owner',
+            properties: {
+              id: { type: 'string', description: 'Owner ID' },
+              name: { type: 'string', description: 'Owner name' },
+              email: { type: 'string', description: 'Owner email' },
+            },
+          },
+          lastCommit: {
+            type: 'object',
+            description: 'Last commit in the release',
+            properties: {
+              id: { type: 'string', description: 'Commit SHA' },
+              message: { type: 'string', description: 'Commit message' },
+              dateCreated: { type: 'string', description: 'Commit timestamp' },
+            },
+          },
+          lastDeploy: {
+            type: 'object',
+            description: 'Last deploy of the release',
+            properties: {
+              id: { type: 'string', description: 'Deploy ID' },
+              environment: { type: 'string', description: 'Deploy environment' },
+              dateStarted: { type: 'string', description: 'Deploy start timestamp' },
+              dateFinished: { type: 'string', description: 'Deploy finish timestamp' },
+            },
+          },
+          authors: {
+            type: 'array',
+            description: 'Authors of commits in the release',
+            items: {
+              type: 'object',
+              properties: {
+                id: { type: 'string', description: 'Author ID' },
+                name: { type: 'string', description: 'Author name' },
+                email: { type: 'string', description: 'Author email' },
+              },
+            },
+          },
           projects: {
             type: 'array',
             description: 'Projects associated with this release',
@@ -199,7 +251,25 @@ export const createReleaseTool: ToolConfig<SentryCreateReleaseParams, SentryCrea
                 id: { type: 'string', description: 'Project ID' },
                 name: { type: 'string', description: 'Project name' },
                 slug: { type: 'string', description: 'Project slug' },
+                platform: { type: 'string', description: 'Project platform' },
+              },
+            },
+          },
+          firstEvent: { type: 'string', description: 'First event timestamp', optional: true },
+          lastEvent: { type: 'string', description: 'Last event timestamp', optional: true },
+          versionInfo: {
+            type: 'object',
+            description: 'Version metadata',
+            properties: {
+              buildHash: { type: 'string', description: 'Build hash' },
+              version: {
+                type: 'object',
+                description: 'Version details',
+                properties: {
+                  raw: { type: 'string', description: 'Raw version string' },
+                },
               },
+              package: { type: 'string', description: 'Package name' },
             },
           },
         },
diff --git a/apps/sim/tools/sentry/releases_deploy.ts b/apps/sim/tools/sentry/releases_deploy.ts
index c9c9641c11..036b466b02 100644
--- a/apps/sim/tools/sentry/releases_deploy.ts
+++ b/apps/sim/tools/sentry/releases_deploy.ts
@@ -102,10 +102,10 @@ export const createDeployTool: ToolConfig<SentryCreateDeployParams, SentryCreate
         deploy: {
           id: deploy.id,
           environment: deploy.environment,
-          name: deploy.name,
-          url: deploy.url,
+          name: deploy.name ?? null,
+          url: deploy.url ?? null,
           dateStarted: deploy.dateStarted,
-          dateFinished: deploy.dateFinished,
+          dateFinished: deploy.dateFinished ?? null,
         },
       },
     }
@@ -121,8 +121,8 @@ export const createDeployTool: ToolConfig<SentryCreateDeployParams, SentryCreate
           type: 'string',
           description: 'Environment name where the release was deployed',
         },
-        name: { type: 'string', description: 'Name of the deploy' },
-        url: { type: 'string', description: 'URL pointing to the deploy' },
+        name: { type: 'string', description: 'Name of the deploy', optional: true },
+        url: { type: 'string', description: 'URL pointing to the deploy', optional: true },
         dateStarted: {
           type: 'string',
           description: 'When the deploy started (ISO timestamp)',
@@ -130,6 +130,7 @@ export const createDeployTool: ToolConfig<SentryCreateDeployParams, SentryCreate
         dateFinished: {
           type: 'string',
           description: 'When the deploy finished (ISO timestamp)',
+          optional: true,
         },
       },
     },
diff --git a/apps/sim/tools/sentry/releases_list.ts b/apps/sim/tools/sentry/releases_list.ts
index 96a1b53e1b..af070a72cb 100644
--- a/apps/sim/tools/sentry/releases_list.ts
+++ b/apps/sim/tools/sentry/releases_list.ts
@@ -102,11 +102,11 @@ export const listReleasesTool: ToolConfig<SentryListReleasesParams, SentryListRe
           id: release.id,
           version: release.version,
           shortVersion: release.shortVersion,
-          ref: release.ref,
-          url: release.url,
-          dateReleased: release.dateReleased,
+          ref: release.ref ?? null,
+          url: release.url ?? null,
+          dateReleased: release.dateReleased ?? null,
           dateCreated: release.dateCreated,
-          dateStarted: release.dateStarted,
+          dateStarted: release.dateStarted ?? null,
           data: release.data || {},
           newGroups: release.newGroups || 0,
           owner: release.owner
@@ -146,8 +146,8 @@ export const listReleasesTool: ToolConfig<SentryListReleasesParams, SentryListRe
               slug: project.slug,
               platform: project.platform,
             })) || [],
-          firstEvent: release.firstEvent,
-          lastEvent: release.lastEvent,
+          firstEvent: release.firstEvent ?? null,
+          lastEvent: release.lastEvent ?? null,
           versionInfo: {
             buildHash: release.versionInfo?.buildHash || null,
             version: {
@@ -156,8 +156,10 @@ export const listReleasesTool: ToolConfig<SentryListReleasesParams, SentryListRe
             package: release.versionInfo?.package || null,
           },
         })),
-        nextCursor,
-        hasMore,
+        metadata: {
+          nextCursor,
+          hasMore,
+        },
       },
     }
   },
@@ -172,16 +174,30 @@ export const listReleasesTool: ToolConfig<SentryListReleasesParams, SentryListRe
           id: { type: 'string', description: 'Unique release ID' },
           version: { type: 'string', description: 'Release version identifier' },
           shortVersion: { type: 'string', description: 'Shortened version identifier' },
-          ref: { type: 'string', description: 'Git reference (commit SHA, tag, or branch)' },
-          url: { type: 'string', description: 'URL to the release (e.g., GitHub release page)' },
+          ref: {
+            type: 'string',
+            description: 'Git reference (commit SHA, tag, or branch)',
+            optional: true,
+          },
+          url: {
+            type: 'string',
+            description: 'URL to the release (e.g., GitHub release page)',
+            optional: true,
+          },
           dateReleased: {
             type: 'string',
             description: 'When the release was deployed (ISO timestamp)',
+            optional: true,
           },
           dateCreated: {
             type: 'string',
             description: 'When the release was created (ISO timestamp)',
           },
+          dateStarted: {
+            type: 'string',
+            description: 'When the release started (ISO timestamp)',
+            optional: true,
+          },
           newGroups: {
             type: 'number',
             description: 'Number of new issues introduced in this release',
@@ -197,6 +213,37 @@ export const listReleasesTool: ToolConfig<SentryListReleasesParams, SentryListRe
           },
           commitCount: { type: 'number', description: 'Number of commits in this release' },
           deployCount: { type: 'number', description: 'Number of deploys for this release' },
+          lastCommit: {
+            type: 'object',
+            description: 'Last commit in the release',
+            properties: {
+              id: { type: 'string', description: 'Commit SHA' },
+              message: { type: 'string', description: 'Commit message' },
+              dateCreated: { type: 'string', description: 'Commit timestamp' },
+            },
+          },
+          lastDeploy: {
+            type: 'object',
+            description: 'Last deploy of the release',
+            properties: {
+              id: { type: 'string', description: 'Deploy ID' },
+              environment: { type: 'string', description: 'Deploy environment' },
+              dateStarted: { type: 'string', description: 'Deploy start timestamp' },
+              dateFinished: { type: 'string', description: 'Deploy finish timestamp' },
+            },
+          },
+          authors: {
+            type: 'array',
+            description: 'Authors of commits in the release',
+            items: {
+              type: 'object',
+              properties: {
+                id: { type: 'string', description: 'Author ID' },
+                name: { type: 'string', description: 'Author name' },
+                email: { type: 'string', description: 'Author email' },
+              },
+            },
+          },
           projects: {
             type: 'array',
             description: 'Projects associated with this release',
@@ -210,16 +257,39 @@ export const listReleasesTool: ToolConfig<SentryListReleasesParams, SentryListRe
               },
             },
           },
+          firstEvent: { type: 'string', description: 'First event timestamp', optional: true },
+          lastEvent: { type: 'string', description: 'Last event timestamp', optional: true },
+          versionInfo: {
+            type: 'object',
+            description: 'Version metadata',
+            properties: {
+              buildHash: { type: 'string', description: 'Build hash' },
+              version: {
+                type: 'object',
+                description: 'Version details',
+                properties: {
+                  raw: { type: 'string', description: 'Raw version string' },
+                },
+              },
+              package: { type: 'string', description: 'Package name' },
+            },
+          },
         },
       },
     },
-    nextCursor: {
-      type: 'string',
-      description: 'Cursor for the next page of results (if available)',
-    },
-    hasMore: {
-      type: 'boolean',
-      description: 'Whether there are more results available',
+    metadata: {
+      type: 'object',
+      description: 'Pagination metadata',
+      properties: {
+        nextCursor: {
+          type: 'string',
+          description: 'Cursor for the next page of results (if available)',
+        },
+        hasMore: {
+          type: 'boolean',
+          description: 'Whether there are more results available',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/sentry/types.ts b/apps/sim/tools/sentry/types.ts
index 642c3cd364..5904dd77ef 100644
--- a/apps/sim/tools/sentry/types.ts
+++ b/apps/sim/tools/sentry/types.ts
@@ -1,15 +1,16 @@
 import type { ToolResponse } from '@/tools/types'
 
-// Base parameter interface shared across all Sentry tools
+/**
+ * Base parameter interface shared across all Sentry tools
+ */
 export interface SentryBaseParams {
   apiKey: string
   organizationSlug: string
 }
 
-// ============================================================================
-// ISSUE TYPES
-// ============================================================================
-
+/**
+ * Sentry issue representation
+ */
 export interface SentryIssue {
   id: string
   shortId: string
@@ -29,7 +30,11 @@ export interface SentryIssue {
     platform: string
   }
   type: string
-  metadata: Record<string, any>
+  metadata: {
+    type: string | null
+    value: string | null
+    function: string | null
+  }
   numComments: number
   assignedTo: {
     id: string
@@ -62,8 +67,10 @@ export interface SentryListIssuesParams extends SentryBaseParams {
 export interface SentryListIssuesResponse extends ToolResponse {
   output: {
     issues: SentryIssue[]
-    nextCursor?: string
-    hasMore: boolean
+    metadata: {
+      nextCursor?: string
+      hasMore: boolean
+    }
   }
 }
 
@@ -92,10 +99,9 @@ export interface SentryUpdateIssueResponse extends ToolResponse {
   }
 }
 
-// ============================================================================
-// PROJECT TYPES
-// ============================================================================
-
+/**
+ * Sentry project representation
+ */
 export interface SentryProject {
   id: string
   slug: string
@@ -143,8 +149,10 @@ export interface SentryListProjectsParams extends SentryBaseParams {
 export interface SentryListProjectsResponse extends ToolResponse {
   output: {
     projects: SentryProject[]
-    nextCursor?: string
-    hasMore: boolean
+    metadata: {
+      nextCursor?: string
+      hasMore: boolean
+    }
   }
 }
 
@@ -188,10 +196,9 @@ export interface SentryUpdateProjectResponse extends ToolResponse {
   }
 }
 
-// ============================================================================
-// EVENT TYPES
-// ============================================================================
-
+/**
+ * Sentry event representation
+ */
 export interface SentryEvent {
   id: string
   eventID: string
@@ -217,7 +224,11 @@ export interface SentryEvent {
   contexts: Record<string, any>
   platform: string
   type: string
-  metadata: Record<string, any>
+  metadata: {
+    type: string | null
+    value: string | null
+    function: string | null
+  }
   entries: Array<{
     type: string
     data: Record<string, any>
@@ -247,8 +258,10 @@ export interface SentryListEventsParams extends SentryBaseParams {
 export interface SentryListEventsResponse extends ToolResponse {
   output: {
     events: SentryEvent[]
-    nextCursor?: string
-    hasMore: boolean
+    metadata: {
+      nextCursor?: string
+      hasMore: boolean
+    }
   }
 }
 
@@ -263,10 +276,9 @@ export interface SentryGetEventResponse extends ToolResponse {
   }
 }
 
-// ============================================================================
-// RELEASE TYPES
-// ============================================================================
-
+/**
+ * Sentry release representation
+ */
 export interface SentryRelease {
   id: string
   version: string
@@ -328,8 +340,10 @@ export interface SentryListReleasesParams extends SentryBaseParams {
 export interface SentryListReleasesResponse extends ToolResponse {
   output: {
     releases: SentryRelease[]
-    nextCursor?: string
-    hasMore: boolean
+    metadata: {
+      nextCursor?: string
+      hasMore: boolean
+    }
   }
 }
 
@@ -337,9 +351,9 @@ export interface SentryCreateReleaseParams extends SentryBaseParams {
   version: string
   ref?: string
   url?: string
-  projects: string // Comma-separated list of project slugs
+  projects: string
   dateReleased?: string
-  commits?: string // JSON string of commit objects
+  commits?: string
 }
 
 export interface SentryCreateReleaseResponse extends ToolResponse {
@@ -370,10 +384,9 @@ export interface SentryCreateDeployResponse extends ToolResponse {
   }
 }
 
-// ============================================================================
-// UNION RESPONSE TYPE
-// ============================================================================
-
+/**
+ * Union response type for all Sentry operations
+ */
 export type SentryResponse =
   | SentryListIssuesResponse
   | SentryGetIssueResponse
diff --git a/apps/sim/tools/stripe/cancel_payment_intent.ts b/apps/sim/tools/stripe/cancel_payment_intent.ts
index 4487c11150..0ed05fdbc5 100644
--- a/apps/sim/tools/stripe/cancel_payment_intent.ts
+++ b/apps/sim/tools/stripe/cancel_payment_intent.ts
@@ -72,6 +72,13 @@ export const stripeCancelPaymentIntentTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Payment Intent metadata including ID, status, amount, and currency',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/cancel_subscription.ts b/apps/sim/tools/stripe/cancel_subscription.ts
index 1d9722abf7..5b27816f52 100644
--- a/apps/sim/tools/stripe/cancel_subscription.ts
+++ b/apps/sim/tools/stripe/cancel_subscription.ts
@@ -81,6 +81,12 @@ export const stripeCancelSubscriptionTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Subscription metadata including ID, status, and customer',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        customer: { type: 'string', description: 'Associated customer ID' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/capture_charge.ts b/apps/sim/tools/stripe/capture_charge.ts
index f5086fcf1f..8aa5b7666b 100644
--- a/apps/sim/tools/stripe/capture_charge.ts
+++ b/apps/sim/tools/stripe/capture_charge.ts
@@ -69,6 +69,14 @@ export const stripeCaptureChargeTool: ToolConfig<CaptureChargeParams, ChargeResp
     metadata: {
       type: 'json',
       description: 'Charge metadata including ID, status, amount, currency, and paid status',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+        paid: { type: 'boolean', description: 'Whether payment has been received' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/capture_payment_intent.ts b/apps/sim/tools/stripe/capture_payment_intent.ts
index 5cd034942d..364ad9ea95 100644
--- a/apps/sim/tools/stripe/capture_payment_intent.ts
+++ b/apps/sim/tools/stripe/capture_payment_intent.ts
@@ -71,6 +71,13 @@ export const stripeCapturePaymentIntentTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Payment Intent metadata including ID, status, amount, and currency',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/confirm_payment_intent.ts b/apps/sim/tools/stripe/confirm_payment_intent.ts
index f4dc6d8997..19ccfd0c0e 100644
--- a/apps/sim/tools/stripe/confirm_payment_intent.ts
+++ b/apps/sim/tools/stripe/confirm_payment_intent.ts
@@ -69,6 +69,13 @@ export const stripeConfirmPaymentIntentTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Payment Intent metadata including ID, status, amount, and currency',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/create_charge.ts b/apps/sim/tools/stripe/create_charge.ts
index 1ad87dab8b..cc27915f96 100644
--- a/apps/sim/tools/stripe/create_charge.ts
+++ b/apps/sim/tools/stripe/create_charge.ts
@@ -110,6 +110,13 @@ export const stripeCreateChargeTool: ToolConfig<CreateChargeParams, ChargeRespon
     metadata: {
       type: 'json',
       description: 'Charge metadata including ID, status, amount, currency, and paid status',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+        paid: { type: 'boolean', description: 'Whether payment has been received' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/create_customer.ts b/apps/sim/tools/stripe/create_customer.ts
index 8a6e3319cb..fa1faed450 100644
--- a/apps/sim/tools/stripe/create_customer.ts
+++ b/apps/sim/tools/stripe/create_customer.ts
@@ -98,8 +98,8 @@ export const stripeCreateCustomerTool: ToolConfig<CreateCustomerParams, Customer
         customer: data,
         metadata: {
           id: data.id,
-          email: data.email,
-          name: data.name,
+          email: data.email ?? null,
+          name: data.name ?? null,
         },
       },
     }
@@ -113,6 +113,11 @@ export const stripeCreateCustomerTool: ToolConfig<CreateCustomerParams, Customer
     metadata: {
       type: 'json',
       description: 'Customer metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        email: { type: 'string', description: 'Customer email address', optional: true },
+        name: { type: 'string', description: 'Display name', optional: true },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/create_invoice.ts b/apps/sim/tools/stripe/create_invoice.ts
index 04427f76d7..ab508c1abe 100644
--- a/apps/sim/tools/stripe/create_invoice.ts
+++ b/apps/sim/tools/stripe/create_invoice.ts
@@ -97,6 +97,15 @@ export const stripeCreateInvoiceTool: ToolConfig<CreateInvoiceParams, InvoiceRes
     metadata: {
       type: 'json',
       description: 'Invoice metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount_due: {
+          type: 'number',
+          description: 'Amount remaining to be paid in smallest currency unit',
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/create_payment_intent.ts b/apps/sim/tools/stripe/create_payment_intent.ts
index 537ab6c827..c4615c53b5 100644
--- a/apps/sim/tools/stripe/create_payment_intent.ts
+++ b/apps/sim/tools/stripe/create_payment_intent.ts
@@ -123,6 +123,12 @@ export const stripeCreatePaymentIntentTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Payment Intent metadata including ID, status, amount, and currency',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/create_price.ts b/apps/sim/tools/stripe/create_price.ts
index da0cada1d1..5944949f51 100644
--- a/apps/sim/tools/stripe/create_price.ts
+++ b/apps/sim/tools/stripe/create_price.ts
@@ -94,7 +94,7 @@ export const stripeCreatePriceTool: ToolConfig<CreatePriceParams, PriceResponse>
         metadata: {
           id: data.id,
           product: data.product,
-          unit_amount: data.unit_amount,
+          unit_amount: data.unit_amount ?? null,
           currency: data.currency,
         },
       },
@@ -109,6 +109,16 @@ export const stripeCreatePriceTool: ToolConfig<CreatePriceParams, PriceResponse>
     metadata: {
       type: 'json',
       description: 'Price metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        product: { type: 'string', description: 'Associated product ID' },
+        unit_amount: {
+          type: 'number',
+          description: 'Amount in smallest currency unit (e.g., cents)',
+          optional: true,
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/create_product.ts b/apps/sim/tools/stripe/create_product.ts
index aa7ba507f7..ba72925eb9 100644
--- a/apps/sim/tools/stripe/create_product.ts
+++ b/apps/sim/tools/stripe/create_product.ts
@@ -99,6 +99,11 @@ export const stripeCreateProductTool: ToolConfig<CreateProductParams, ProductRes
     metadata: {
       type: 'json',
       description: 'Product metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        name: { type: 'string', description: 'Display name' },
+        active: { type: 'boolean', description: 'Whether the resource is currently active' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/create_subscription.ts b/apps/sim/tools/stripe/create_subscription.ts
index de24e9e3dd..b1af9f8a05 100644
--- a/apps/sim/tools/stripe/create_subscription.ts
+++ b/apps/sim/tools/stripe/create_subscription.ts
@@ -119,6 +119,11 @@ export const stripeCreateSubscriptionTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Subscription metadata including ID, status, and customer',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        customer: { type: 'string', description: 'Associated customer ID' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/delete_customer.ts b/apps/sim/tools/stripe/delete_customer.ts
index 14a5ec0619..964c9380a2 100644
--- a/apps/sim/tools/stripe/delete_customer.ts
+++ b/apps/sim/tools/stripe/delete_customer.ts
@@ -38,10 +38,6 @@ export const stripeDeleteCustomerTool: ToolConfig<DeleteCustomerParams, Customer
       output: {
         deleted: data.deleted,
         id: data.id,
-        metadata: {
-          id: data.id,
-          deleted: data.deleted,
-        },
       },
     }
   },
@@ -55,9 +51,5 @@ export const stripeDeleteCustomerTool: ToolConfig<DeleteCustomerParams, Customer
       type: 'string',
       description: 'The ID of the deleted customer',
     },
-    metadata: {
-      type: 'json',
-      description: 'Deletion metadata',
-    },
   },
 }
diff --git a/apps/sim/tools/stripe/delete_invoice.ts b/apps/sim/tools/stripe/delete_invoice.ts
index 80e5db160e..4db2c24bc9 100644
--- a/apps/sim/tools/stripe/delete_invoice.ts
+++ b/apps/sim/tools/stripe/delete_invoice.ts
@@ -38,10 +38,6 @@ export const stripeDeleteInvoiceTool: ToolConfig<DeleteInvoiceParams, InvoiceDel
       output: {
         deleted: data.deleted,
         id: data.id,
-        metadata: {
-          id: data.id,
-          deleted: data.deleted,
-        },
       },
     }
   },
@@ -55,9 +51,5 @@ export const stripeDeleteInvoiceTool: ToolConfig<DeleteInvoiceParams, InvoiceDel
       type: 'string',
       description: 'The ID of the deleted invoice',
     },
-    metadata: {
-      type: 'json',
-      description: 'Deletion metadata',
-    },
   },
 }
diff --git a/apps/sim/tools/stripe/delete_product.ts b/apps/sim/tools/stripe/delete_product.ts
index 2d205f4803..3145aa3e4b 100644
--- a/apps/sim/tools/stripe/delete_product.ts
+++ b/apps/sim/tools/stripe/delete_product.ts
@@ -38,10 +38,6 @@ export const stripeDeleteProductTool: ToolConfig<DeleteProductParams, ProductDel
       output: {
         deleted: data.deleted,
         id: data.id,
-        metadata: {
-          id: data.id,
-          deleted: data.deleted,
-        },
       },
     }
   },
@@ -55,9 +51,5 @@ export const stripeDeleteProductTool: ToolConfig<DeleteProductParams, ProductDel
       type: 'string',
       description: 'The ID of the deleted product',
     },
-    metadata: {
-      type: 'json',
-      description: 'Deletion metadata',
-    },
   },
 }
diff --git a/apps/sim/tools/stripe/finalize_invoice.ts b/apps/sim/tools/stripe/finalize_invoice.ts
index bd327fea5a..08203036ed 100644
--- a/apps/sim/tools/stripe/finalize_invoice.ts
+++ b/apps/sim/tools/stripe/finalize_invoice.ts
@@ -70,6 +70,16 @@ export const stripeFinalizeInvoiceTool: ToolConfig<FinalizeInvoiceParams, Invoic
     metadata: {
       type: 'json',
       description: 'Invoice metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount_due: {
+          type: 'number',
+          description: 'Amount remaining to be paid in smallest currency unit',
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_charges.ts b/apps/sim/tools/stripe/list_charges.ts
index 493c55d461..820b80ba22 100644
--- a/apps/sim/tools/stripe/list_charges.ts
+++ b/apps/sim/tools/stripe/list_charges.ts
@@ -75,6 +75,10 @@ export const stripeListChargesTool: ToolConfig<ListChargesParams, ChargeListResp
     metadata: {
       type: 'json',
       description: 'List metadata including count and has_more',
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_customers.ts b/apps/sim/tools/stripe/list_customers.ts
index 02f4ed7b97..5b9b9b9c8d 100644
--- a/apps/sim/tools/stripe/list_customers.ts
+++ b/apps/sim/tools/stripe/list_customers.ts
@@ -75,6 +75,11 @@ export const stripeListCustomersTool: ToolConfig<ListCustomersParams, CustomerLi
     metadata: {
       type: 'json',
       description: 'List metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_events.ts b/apps/sim/tools/stripe/list_events.ts
index 8dc230c57a..5a263a72d9 100644
--- a/apps/sim/tools/stripe/list_events.ts
+++ b/apps/sim/tools/stripe/list_events.ts
@@ -75,6 +75,11 @@ export const stripeListEventsTool: ToolConfig<ListEventsParams, EventListRespons
     metadata: {
       type: 'json',
       description: 'List metadata including count and has_more',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_invoices.ts b/apps/sim/tools/stripe/list_invoices.ts
index a7c876d832..2ac48abb98 100644
--- a/apps/sim/tools/stripe/list_invoices.ts
+++ b/apps/sim/tools/stripe/list_invoices.ts
@@ -71,6 +71,11 @@ export const stripeListInvoicesTool: ToolConfig<ListInvoicesParams, InvoiceListR
     metadata: {
       type: 'json',
       description: 'List metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_payment_intents.ts b/apps/sim/tools/stripe/list_payment_intents.ts
index 35c46677e4..7f54ae5861 100644
--- a/apps/sim/tools/stripe/list_payment_intents.ts
+++ b/apps/sim/tools/stripe/list_payment_intents.ts
@@ -78,6 +78,11 @@ export const stripeListPaymentIntentsTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'List metadata including count and has_more',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_prices.ts b/apps/sim/tools/stripe/list_prices.ts
index 8be6800ad2..d63dcbe512 100644
--- a/apps/sim/tools/stripe/list_prices.ts
+++ b/apps/sim/tools/stripe/list_prices.ts
@@ -71,6 +71,11 @@ export const stripeListPricesTool: ToolConfig<ListPricesParams, PriceListRespons
     metadata: {
       type: 'json',
       description: 'List metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_products.ts b/apps/sim/tools/stripe/list_products.ts
index 65262608da..27e06128fa 100644
--- a/apps/sim/tools/stripe/list_products.ts
+++ b/apps/sim/tools/stripe/list_products.ts
@@ -64,6 +64,11 @@ export const stripeListProductsTool: ToolConfig<ListProductsParams, ProductListR
     metadata: {
       type: 'json',
       description: 'List metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/list_subscriptions.ts b/apps/sim/tools/stripe/list_subscriptions.ts
index 08b9eac22e..4e459f6200 100644
--- a/apps/sim/tools/stripe/list_subscriptions.ts
+++ b/apps/sim/tools/stripe/list_subscriptions.ts
@@ -82,6 +82,11 @@ export const stripeListSubscriptionsTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'List metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/pay_invoice.ts b/apps/sim/tools/stripe/pay_invoice.ts
index 56ef0fbc29..5cf011e548 100644
--- a/apps/sim/tools/stripe/pay_invoice.ts
+++ b/apps/sim/tools/stripe/pay_invoice.ts
@@ -68,6 +68,16 @@ export const stripePayInvoiceTool: ToolConfig<PayInvoiceParams, InvoiceResponse>
     metadata: {
       type: 'json',
       description: 'Invoice metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount_due: {
+          type: 'number',
+          description: 'Amount remaining to be paid in smallest currency unit',
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/resume_subscription.ts b/apps/sim/tools/stripe/resume_subscription.ts
index a2512be07e..ed3e0c2750 100644
--- a/apps/sim/tools/stripe/resume_subscription.ts
+++ b/apps/sim/tools/stripe/resume_subscription.ts
@@ -61,6 +61,12 @@ export const stripeResumeSubscriptionTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Subscription metadata including ID, status, and customer',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        customer: { type: 'string', description: 'Associated customer ID' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_charge.ts b/apps/sim/tools/stripe/retrieve_charge.ts
index 8d2d719857..1477cf564f 100644
--- a/apps/sim/tools/stripe/retrieve_charge.ts
+++ b/apps/sim/tools/stripe/retrieve_charge.ts
@@ -56,6 +56,14 @@ export const stripeRetrieveChargeTool: ToolConfig<RetrieveChargeParams, ChargeRe
     metadata: {
       type: 'json',
       description: 'Charge metadata including ID, status, amount, currency, and paid status',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+        paid: { type: 'boolean', description: 'Whether payment has been received' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_customer.ts b/apps/sim/tools/stripe/retrieve_customer.ts
index 7188e31d8c..c1fd2aaa24 100644
--- a/apps/sim/tools/stripe/retrieve_customer.ts
+++ b/apps/sim/tools/stripe/retrieve_customer.ts
@@ -39,8 +39,8 @@ export const stripeRetrieveCustomerTool: ToolConfig<RetrieveCustomerParams, Cust
         customer: data,
         metadata: {
           id: data.id,
-          email: data.email,
-          name: data.name,
+          email: data.email ?? null,
+          name: data.name ?? null,
         },
       },
     }
@@ -54,6 +54,12 @@ export const stripeRetrieveCustomerTool: ToolConfig<RetrieveCustomerParams, Cust
     metadata: {
       type: 'json',
       description: 'Customer metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        email: { type: 'string', description: 'Customer email address', optional: true },
+        name: { type: 'string', description: 'Display name', optional: true },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_event.ts b/apps/sim/tools/stripe/retrieve_event.ts
index 870b93839b..b37eefe440 100644
--- a/apps/sim/tools/stripe/retrieve_event.ts
+++ b/apps/sim/tools/stripe/retrieve_event.ts
@@ -54,6 +54,12 @@ export const stripeRetrieveEventTool: ToolConfig<RetrieveEventParams, EventRespo
     metadata: {
       type: 'json',
       description: 'Event metadata including ID, type, and created timestamp',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        type: { type: 'string', description: 'Event type identifier' },
+        created: { type: 'number', description: 'Unix timestamp of creation' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_invoice.ts b/apps/sim/tools/stripe/retrieve_invoice.ts
index 69fad20cad..f8165f5af7 100644
--- a/apps/sim/tools/stripe/retrieve_invoice.ts
+++ b/apps/sim/tools/stripe/retrieve_invoice.ts
@@ -55,6 +55,16 @@ export const stripeRetrieveInvoiceTool: ToolConfig<RetrieveInvoiceParams, Invoic
     metadata: {
       type: 'json',
       description: 'Invoice metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount_due: {
+          type: 'number',
+          description: 'Amount remaining to be paid in smallest currency unit',
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_payment_intent.ts b/apps/sim/tools/stripe/retrieve_payment_intent.ts
index 1c70cabac6..8be2953992 100644
--- a/apps/sim/tools/stripe/retrieve_payment_intent.ts
+++ b/apps/sim/tools/stripe/retrieve_payment_intent.ts
@@ -58,6 +58,13 @@ export const stripeRetrievePaymentIntentTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Payment Intent metadata including ID, status, amount, and currency',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_price.ts b/apps/sim/tools/stripe/retrieve_price.ts
index 67cbd6fed8..b8a297eb15 100644
--- a/apps/sim/tools/stripe/retrieve_price.ts
+++ b/apps/sim/tools/stripe/retrieve_price.ts
@@ -40,7 +40,7 @@ export const stripeRetrievePriceTool: ToolConfig<RetrievePriceParams, PriceRespo
         metadata: {
           id: data.id,
           product: data.product,
-          unit_amount: data.unit_amount,
+          unit_amount: data.unit_amount ?? null,
           currency: data.currency,
         },
       },
@@ -55,6 +55,17 @@ export const stripeRetrievePriceTool: ToolConfig<RetrievePriceParams, PriceRespo
     metadata: {
       type: 'json',
       description: 'Price metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        product: { type: 'string', description: 'Associated product ID' },
+        unit_amount: {
+          type: 'number',
+          description: 'Amount in smallest currency unit (e.g., cents)',
+          optional: true,
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_product.ts b/apps/sim/tools/stripe/retrieve_product.ts
index b8c496c156..9292e2708e 100644
--- a/apps/sim/tools/stripe/retrieve_product.ts
+++ b/apps/sim/tools/stripe/retrieve_product.ts
@@ -54,6 +54,12 @@ export const stripeRetrieveProductTool: ToolConfig<RetrieveProductParams, Produc
     metadata: {
       type: 'json',
       description: 'Product metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        name: { type: 'string', description: 'Display name' },
+        active: { type: 'boolean', description: 'Whether the resource is currently active' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/retrieve_subscription.ts b/apps/sim/tools/stripe/retrieve_subscription.ts
index 1ce90a6a76..9f3f4eb0f0 100644
--- a/apps/sim/tools/stripe/retrieve_subscription.ts
+++ b/apps/sim/tools/stripe/retrieve_subscription.ts
@@ -57,6 +57,12 @@ export const stripeRetrieveSubscriptionTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Subscription metadata including ID, status, and customer',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        customer: { type: 'string', description: 'Associated customer ID' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/search_charges.ts b/apps/sim/tools/stripe/search_charges.ts
index 1e32e4c7c0..0480c949b9 100644
--- a/apps/sim/tools/stripe/search_charges.ts
+++ b/apps/sim/tools/stripe/search_charges.ts
@@ -64,6 +64,11 @@ export const stripeSearchChargesTool: ToolConfig<SearchChargesParams, ChargeList
     metadata: {
       type: 'json',
       description: 'Search metadata including count and has_more',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/search_customers.ts b/apps/sim/tools/stripe/search_customers.ts
index f5d730246e..2e368844d8 100644
--- a/apps/sim/tools/stripe/search_customers.ts
+++ b/apps/sim/tools/stripe/search_customers.ts
@@ -64,6 +64,11 @@ export const stripeSearchCustomersTool: ToolConfig<SearchCustomersParams, Custom
     metadata: {
       type: 'json',
       description: 'Search metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/search_invoices.ts b/apps/sim/tools/stripe/search_invoices.ts
index 2a20511ac3..91cc67d8fc 100644
--- a/apps/sim/tools/stripe/search_invoices.ts
+++ b/apps/sim/tools/stripe/search_invoices.ts
@@ -64,6 +64,11 @@ export const stripeSearchInvoicesTool: ToolConfig<SearchInvoicesParams, InvoiceL
     metadata: {
       type: 'json',
       description: 'Search metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/search_payment_intents.ts b/apps/sim/tools/stripe/search_payment_intents.ts
index 9223d3dc9d..b6140a4099 100644
--- a/apps/sim/tools/stripe/search_payment_intents.ts
+++ b/apps/sim/tools/stripe/search_payment_intents.ts
@@ -67,6 +67,11 @@ export const stripeSearchPaymentIntentsTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Search metadata including count and has_more',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/search_prices.ts b/apps/sim/tools/stripe/search_prices.ts
index b0b5ce553e..9d22233502 100644
--- a/apps/sim/tools/stripe/search_prices.ts
+++ b/apps/sim/tools/stripe/search_prices.ts
@@ -64,6 +64,11 @@ export const stripeSearchPricesTool: ToolConfig<SearchPricesParams, PriceListRes
     metadata: {
       type: 'json',
       description: 'Search metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/search_products.ts b/apps/sim/tools/stripe/search_products.ts
index 5ef20a9be6..652735c16e 100644
--- a/apps/sim/tools/stripe/search_products.ts
+++ b/apps/sim/tools/stripe/search_products.ts
@@ -64,6 +64,11 @@ export const stripeSearchProductsTool: ToolConfig<SearchProductsParams, ProductL
     metadata: {
       type: 'json',
       description: 'Search metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/search_subscriptions.ts b/apps/sim/tools/stripe/search_subscriptions.ts
index afc74306e0..99c29e7c40 100644
--- a/apps/sim/tools/stripe/search_subscriptions.ts
+++ b/apps/sim/tools/stripe/search_subscriptions.ts
@@ -67,6 +67,11 @@ export const stripeSearchSubscriptionsTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Search metadata',
+
+      properties: {
+        count: { type: 'number', description: 'Number of items returned' },
+        has_more: { type: 'boolean', description: 'Whether more items exist beyond this page' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/send_invoice.ts b/apps/sim/tools/stripe/send_invoice.ts
index 3179d3c7f0..412055d48c 100644
--- a/apps/sim/tools/stripe/send_invoice.ts
+++ b/apps/sim/tools/stripe/send_invoice.ts
@@ -55,6 +55,16 @@ export const stripeSendInvoiceTool: ToolConfig<SendInvoiceParams, InvoiceRespons
     metadata: {
       type: 'json',
       description: 'Invoice metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount_due: {
+          type: 'number',
+          description: 'Amount remaining to be paid in smallest currency unit',
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/types.ts b/apps/sim/tools/stripe/types.ts
index 5a4a2d471f..2d9b6f72db 100644
--- a/apps/sim/tools/stripe/types.ts
+++ b/apps/sim/tools/stripe/types.ts
@@ -199,10 +199,6 @@ export interface CustomerDeleteResponse extends ToolResponse {
   output: {
     deleted: boolean
     id: string
-    metadata: {
-      id: string
-      deleted: boolean
-    }
   }
 }
 
@@ -410,10 +406,6 @@ export interface InvoiceDeleteResponse extends ToolResponse {
   output: {
     deleted: boolean
     id: string
-    metadata: {
-      id: string
-      deleted: boolean
-    }
   }
 }
 
@@ -583,10 +575,6 @@ export interface ProductDeleteResponse extends ToolResponse {
   output: {
     deleted: boolean
     id: string
-    metadata: {
-      id: string
-      deleted: boolean
-    }
   }
 }
 
diff --git a/apps/sim/tools/stripe/update_charge.ts b/apps/sim/tools/stripe/update_charge.ts
index 919384622c..daadbd6c7b 100644
--- a/apps/sim/tools/stripe/update_charge.ts
+++ b/apps/sim/tools/stripe/update_charge.ts
@@ -81,6 +81,13 @@ export const stripeUpdateChargeTool: ToolConfig<UpdateChargeParams, ChargeRespon
     metadata: {
       type: 'json',
       description: 'Charge metadata including ID, status, amount, currency, and paid status',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+        paid: { type: 'boolean', description: 'Whether payment has been received' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/update_customer.ts b/apps/sim/tools/stripe/update_customer.ts
index 576d5b32ef..b34a76a77f 100644
--- a/apps/sim/tools/stripe/update_customer.ts
+++ b/apps/sim/tools/stripe/update_customer.ts
@@ -97,8 +97,8 @@ export const stripeUpdateCustomerTool: ToolConfig<UpdateCustomerParams, Customer
         customer: data,
         metadata: {
           id: data.id,
-          email: data.email,
-          name: data.name,
+          email: data.email ?? null,
+          name: data.name ?? null,
         },
       },
     }
@@ -112,6 +112,11 @@ export const stripeUpdateCustomerTool: ToolConfig<UpdateCustomerParams, Customer
     metadata: {
       type: 'json',
       description: 'Customer metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        email: { type: 'string', description: 'Customer email address', optional: true },
+        name: { type: 'string', description: 'Display name', optional: true },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/update_invoice.ts b/apps/sim/tools/stripe/update_invoice.ts
index fe643201fc..957bc6cbd5 100644
--- a/apps/sim/tools/stripe/update_invoice.ts
+++ b/apps/sim/tools/stripe/update_invoice.ts
@@ -89,6 +89,15 @@ export const stripeUpdateInvoiceTool: ToolConfig<UpdateInvoiceParams, InvoiceRes
     metadata: {
       type: 'json',
       description: 'Invoice metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount_due: {
+          type: 'number',
+          description: 'Amount remaining to be paid in smallest currency unit',
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/update_payment_intent.ts b/apps/sim/tools/stripe/update_payment_intent.ts
index f9035a0a76..9e47310739 100644
--- a/apps/sim/tools/stripe/update_payment_intent.ts
+++ b/apps/sim/tools/stripe/update_payment_intent.ts
@@ -104,6 +104,12 @@ export const stripeUpdatePaymentIntentTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Payment Intent metadata including ID, status, amount, and currency',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount: { type: 'number', description: 'Amount in smallest currency unit (e.g., cents)' },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/update_price.ts b/apps/sim/tools/stripe/update_price.ts
index e0dff2a2d6..d6b5603460 100644
--- a/apps/sim/tools/stripe/update_price.ts
+++ b/apps/sim/tools/stripe/update_price.ts
@@ -65,7 +65,7 @@ export const stripeUpdatePriceTool: ToolConfig<UpdatePriceParams, PriceResponse>
         metadata: {
           id: data.id,
           product: data.product,
-          unit_amount: data.unit_amount,
+          unit_amount: data.unit_amount ?? null,
           currency: data.currency,
         },
       },
@@ -80,6 +80,16 @@ export const stripeUpdatePriceTool: ToolConfig<UpdatePriceParams, PriceResponse>
     metadata: {
       type: 'json',
       description: 'Price metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        product: { type: 'string', description: 'Associated product ID' },
+        unit_amount: {
+          type: 'number',
+          description: 'Amount in smallest currency unit (e.g., cents)',
+          optional: true,
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/update_product.ts b/apps/sim/tools/stripe/update_product.ts
index 3eafb4b1d7..99b5bd1f68 100644
--- a/apps/sim/tools/stripe/update_product.ts
+++ b/apps/sim/tools/stripe/update_product.ts
@@ -105,6 +105,11 @@ export const stripeUpdateProductTool: ToolConfig<UpdateProductParams, ProductRes
     metadata: {
       type: 'json',
       description: 'Product metadata',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        name: { type: 'string', description: 'Display name' },
+        active: { type: 'boolean', description: 'Whether the resource is currently active' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/update_subscription.ts b/apps/sim/tools/stripe/update_subscription.ts
index 0ded075d97..f4f76cfa5b 100644
--- a/apps/sim/tools/stripe/update_subscription.ts
+++ b/apps/sim/tools/stripe/update_subscription.ts
@@ -99,6 +99,11 @@ export const stripeUpdateSubscriptionTool: ToolConfig<
     metadata: {
       type: 'json',
       description: 'Subscription metadata including ID, status, and customer',
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        customer: { type: 'string', description: 'Associated customer ID' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/stripe/void_invoice.ts b/apps/sim/tools/stripe/void_invoice.ts
index b7064cd326..2291550c93 100644
--- a/apps/sim/tools/stripe/void_invoice.ts
+++ b/apps/sim/tools/stripe/void_invoice.ts
@@ -55,6 +55,16 @@ export const stripeVoidInvoiceTool: ToolConfig<VoidInvoiceParams, InvoiceRespons
     metadata: {
       type: 'json',
       description: 'Invoice metadata',
+
+      properties: {
+        id: { type: 'string', description: 'Stripe unique identifier' },
+        status: { type: 'string', description: 'Current state of the resource' },
+        amount_due: {
+          type: 'number',
+          description: 'Amount remaining to be paid in smallest currency unit',
+        },
+        currency: { type: 'string', description: 'Three-letter ISO currency code (lowercase)' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/supabase/index.ts b/apps/sim/tools/supabase/index.ts
index c7be85af4e..d4fed32da3 100644
--- a/apps/sim/tools/supabase/index.ts
+++ b/apps/sim/tools/supabase/index.ts
@@ -2,6 +2,7 @@ import { countTool } from '@/tools/supabase/count'
 import { deleteTool } from '@/tools/supabase/delete'
 import { getRowTool } from '@/tools/supabase/get_row'
 import { insertTool } from '@/tools/supabase/insert'
+import { introspectTool } from '@/tools/supabase/introspect'
 import { queryTool } from '@/tools/supabase/query'
 import { rpcTool } from '@/tools/supabase/rpc'
 import { storageCopyTool } from '@/tools/supabase/storage_copy'
@@ -28,6 +29,7 @@ export const supabaseDeleteTool = deleteTool
 export const supabaseUpsertTool = upsertTool
 export const supabaseVectorSearchTool = vectorSearchTool
 export const supabaseRpcTool = rpcTool
+export const supabaseIntrospectTool = introspectTool
 export const supabaseTextSearchTool = textSearchTool
 export const supabaseCountTool = countTool
 export const supabaseStorageUploadTool = storageUploadTool
diff --git a/apps/sim/tools/supabase/introspect.ts b/apps/sim/tools/supabase/introspect.ts
new file mode 100644
index 0000000000..4032d54f78
--- /dev/null
+++ b/apps/sim/tools/supabase/introspect.ts
@@ -0,0 +1,560 @@
+import { createLogger } from '@sim/logger'
+import type {
+  SupabaseColumnSchema,
+  SupabaseIntrospectParams,
+  SupabaseIntrospectResponse,
+  SupabaseTableSchema,
+} from '@/tools/supabase/types'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('SupabaseIntrospect')
+
+/**
+ * SQL query to introspect database schema
+ * This query retrieves all tables, columns, primary keys, foreign keys, and indexes
+ */
+const INTROSPECTION_SQL = `
+WITH table_info AS (
+  SELECT
+    t.table_schema,
+    t.table_name
+  FROM information_schema.tables t
+  WHERE t.table_type = 'BASE TABLE'
+    AND t.table_schema NOT IN ('pg_catalog', 'information_schema', 'auth', 'storage', 'realtime', 'supabase_functions', 'supabase_migrations', 'extensions', 'graphql', 'graphql_public', 'pgsodium', 'pgsodium_masks', 'vault', 'pgbouncer', '_timescaledb_internal', '_timescaledb_config', '_timescaledb_catalog', '_timescaledb_cache')
+),
+columns_info AS (
+  SELECT
+    c.table_schema,
+    c.table_name,
+    c.column_name,
+    c.data_type,
+    c.is_nullable,
+    c.column_default,
+    c.ordinal_position
+  FROM information_schema.columns c
+  INNER JOIN table_info t ON c.table_schema = t.table_schema AND c.table_name = t.table_name
+),
+pk_info AS (
+  SELECT
+    tc.table_schema,
+    tc.table_name,
+    kcu.column_name
+  FROM information_schema.table_constraints tc
+  JOIN information_schema.key_column_usage kcu
+    ON tc.constraint_name = kcu.constraint_name
+    AND tc.table_schema = kcu.table_schema
+  WHERE tc.constraint_type = 'PRIMARY KEY'
+),
+fk_info AS (
+  SELECT
+    tc.table_schema,
+    tc.table_name,
+    kcu.column_name,
+    ccu.table_name AS foreign_table_name,
+    ccu.column_name AS foreign_column_name
+  FROM information_schema.table_constraints tc
+  JOIN information_schema.key_column_usage kcu
+    ON tc.constraint_name = kcu.constraint_name
+    AND tc.table_schema = kcu.table_schema
+  JOIN information_schema.constraint_column_usage ccu
+    ON ccu.constraint_name = tc.constraint_name
+  WHERE tc.constraint_type = 'FOREIGN KEY'
+),
+index_info AS (
+  SELECT
+    schemaname AS table_schema,
+    tablename AS table_name,
+    indexname AS index_name,
+    CASE WHEN indexdef LIKE '%UNIQUE%' THEN true ELSE false END AS is_unique,
+    indexdef
+  FROM pg_indexes
+  WHERE schemaname NOT IN ('pg_catalog', 'information_schema', 'auth', 'storage', 'realtime', 'supabase_functions', 'supabase_migrations', 'extensions', 'graphql', 'graphql_public', 'pgsodium', 'pgsodium_masks', 'vault', 'pgbouncer', '_timescaledb_internal', '_timescaledb_config', '_timescaledb_catalog', '_timescaledb_cache')
+)
+SELECT json_build_object(
+  'tables', (
+    SELECT json_agg(
+      json_build_object(
+        'schema', t.table_schema,
+        'name', t.table_name,
+        'columns', (
+          SELECT json_agg(
+            json_build_object(
+              'name', c.column_name,
+              'type', c.data_type,
+              'nullable', c.is_nullable = 'YES',
+              'default', c.column_default,
+              'isPrimaryKey', EXISTS (
+                SELECT 1 FROM pk_info pk
+                WHERE pk.table_schema = c.table_schema
+                  AND pk.table_name = c.table_name
+                  AND pk.column_name = c.column_name
+              ),
+              'isForeignKey', EXISTS (
+                SELECT 1 FROM fk_info fk
+                WHERE fk.table_schema = c.table_schema
+                  AND fk.table_name = c.table_name
+                  AND fk.column_name = c.column_name
+              ),
+              'references', (
+                SELECT json_build_object('table', fk.foreign_table_name, 'column', fk.foreign_column_name)
+                FROM fk_info fk
+                WHERE fk.table_schema = c.table_schema
+                  AND fk.table_name = c.table_name
+                  AND fk.column_name = c.column_name
+                LIMIT 1
+              )
+            )
+            ORDER BY c.ordinal_position
+          )
+          FROM columns_info c
+          WHERE c.table_schema = t.table_schema AND c.table_name = t.table_name
+        ),
+        'primaryKey', (
+          SELECT COALESCE(json_agg(pk.column_name), '[]'::json)
+          FROM pk_info pk
+          WHERE pk.table_schema = t.table_schema AND pk.table_name = t.table_name
+        ),
+        'foreignKeys', (
+          SELECT COALESCE(json_agg(
+            json_build_object(
+              'column', fk.column_name,
+              'referencesTable', fk.foreign_table_name,
+              'referencesColumn', fk.foreign_column_name
+            )
+          ), '[]'::json)
+          FROM fk_info fk
+          WHERE fk.table_schema = t.table_schema AND fk.table_name = t.table_name
+        ),
+        'indexes', (
+          SELECT COALESCE(json_agg(
+            json_build_object(
+              'name', idx.index_name,
+              'unique', idx.is_unique,
+              'definition', idx.indexdef
+            )
+          ), '[]'::json)
+          FROM index_info idx
+          WHERE idx.table_schema = t.table_schema AND idx.table_name = t.table_name
+        )
+      )
+    )
+    FROM table_info t
+  ),
+  'schemas', (
+    SELECT COALESCE(json_agg(DISTINCT table_schema), '[]'::json)
+    FROM table_info
+  )
+) AS result;
+`
+
+/**
+ * Escapes a value for single-quoted SQL strings by doubling single quotes
+ */
+function escapeSqlString(value: string): string {
+  if (!value || value.length > 63) {
+    throw new Error(`Invalid value: ${value}`)
+  }
+  return value.replace(/'/g, "''")
+}
+
+/**
+ * SQL query filtered by specific schema
+ */
+const getSchemaFilteredSQL = (schema: string) => {
+  const safeSchema = escapeSqlString(schema)
+  return `
+WITH table_info AS (
+  SELECT
+    t.table_schema,
+    t.table_name
+  FROM information_schema.tables t
+  WHERE t.table_type = 'BASE TABLE'
+    AND t.table_schema = '${safeSchema}'
+),
+columns_info AS (
+  SELECT
+    c.table_schema,
+    c.table_name,
+    c.column_name,
+    c.data_type,
+    c.is_nullable,
+    c.column_default,
+    c.ordinal_position
+  FROM information_schema.columns c
+  INNER JOIN table_info t ON c.table_schema = t.table_schema AND c.table_name = t.table_name
+),
+pk_info AS (
+  SELECT
+    tc.table_schema,
+    tc.table_name,
+    kcu.column_name
+  FROM information_schema.table_constraints tc
+  JOIN information_schema.key_column_usage kcu
+    ON tc.constraint_name = kcu.constraint_name
+    AND tc.table_schema = kcu.table_schema
+  WHERE tc.constraint_type = 'PRIMARY KEY'
+    AND tc.table_schema = '${safeSchema}'
+),
+fk_info AS (
+  SELECT
+    tc.table_schema,
+    tc.table_name,
+    kcu.column_name,
+    ccu.table_name AS foreign_table_name,
+    ccu.column_name AS foreign_column_name
+  FROM information_schema.table_constraints tc
+  JOIN information_schema.key_column_usage kcu
+    ON tc.constraint_name = kcu.constraint_name
+    AND tc.table_schema = kcu.table_schema
+  JOIN information_schema.constraint_column_usage ccu
+    ON ccu.constraint_name = tc.constraint_name
+  WHERE tc.constraint_type = 'FOREIGN KEY'
+    AND tc.table_schema = '${safeSchema}'
+),
+index_info AS (
+  SELECT
+    schemaname AS table_schema,
+    tablename AS table_name,
+    indexname AS index_name,
+    CASE WHEN indexdef LIKE '%UNIQUE%' THEN true ELSE false END AS is_unique,
+    indexdef
+  FROM pg_indexes
+  WHERE schemaname = '${safeSchema}'
+)
+SELECT json_build_object(
+  'tables', (
+    SELECT json_agg(
+      json_build_object(
+        'schema', t.table_schema,
+        'name', t.table_name,
+        'columns', (
+          SELECT json_agg(
+            json_build_object(
+              'name', c.column_name,
+              'type', c.data_type,
+              'nullable', c.is_nullable = 'YES',
+              'default', c.column_default,
+              'isPrimaryKey', EXISTS (
+                SELECT 1 FROM pk_info pk
+                WHERE pk.table_schema = c.table_schema
+                  AND pk.table_name = c.table_name
+                  AND pk.column_name = c.column_name
+              ),
+              'isForeignKey', EXISTS (
+                SELECT 1 FROM fk_info fk
+                WHERE fk.table_schema = c.table_schema
+                  AND fk.table_name = c.table_name
+                  AND fk.column_name = c.column_name
+              ),
+              'references', (
+                SELECT json_build_object('table', fk.foreign_table_name, 'column', fk.foreign_column_name)
+                FROM fk_info fk
+                WHERE fk.table_schema = c.table_schema
+                  AND fk.table_name = c.table_name
+                  AND fk.column_name = c.column_name
+                LIMIT 1
+              )
+            )
+            ORDER BY c.ordinal_position
+          )
+          FROM columns_info c
+          WHERE c.table_schema = t.table_schema AND c.table_name = t.table_name
+        ),
+        'primaryKey', (
+          SELECT COALESCE(json_agg(pk.column_name), '[]'::json)
+          FROM pk_info pk
+          WHERE pk.table_schema = t.table_schema AND pk.table_name = t.table_name
+        ),
+        'foreignKeys', (
+          SELECT COALESCE(json_agg(
+            json_build_object(
+              'column', fk.column_name,
+              'referencesTable', fk.foreign_table_name,
+              'referencesColumn', fk.foreign_column_name
+            )
+          ), '[]'::json)
+          FROM fk_info fk
+          WHERE fk.table_schema = t.table_schema AND fk.table_name = t.table_name
+        ),
+        'indexes', (
+          SELECT COALESCE(json_agg(
+            json_build_object(
+              'name', idx.index_name,
+              'unique', idx.is_unique,
+              'definition', idx.indexdef
+            )
+          ), '[]'::json)
+          FROM index_info idx
+          WHERE idx.table_schema = t.table_schema AND idx.table_name = t.table_name
+        )
+      )
+    )
+    FROM table_info t
+  ),
+  'schemas', (
+    SELECT COALESCE(json_agg(DISTINCT table_schema), '[]'::json)
+    FROM table_info
+  )
+) AS result;
+`
+}
+
+/**
+ * Tool for introspecting Supabase database schema
+ * Uses raw SQL execution via PostgREST to retrieve table structures
+ */
+export const introspectTool: ToolConfig<SupabaseIntrospectParams, SupabaseIntrospectResponse> = {
+  id: 'supabase_introspect',
+  name: 'Supabase Introspect',
+  description:
+    'Introspect Supabase database schema to get table structures, columns, and relationships',
+  version: '1.0',
+
+  params: {
+    projectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Supabase project ID (e.g., jdrkgepadsdopsntdlom)',
+    },
+    schema: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Database schema to introspect (defaults to all user schemas, commonly "public")',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Supabase service role secret key',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      return `https://${params.projectId}.supabase.co/rest/v1/rpc/`
+    },
+    method: 'POST',
+    headers: (params) => ({
+      apikey: params.apiKey,
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+    }),
+    body: () => ({}),
+  },
+
+  directExecution: async (
+    params: SupabaseIntrospectParams
+  ): Promise<SupabaseIntrospectResponse> => {
+    const { apiKey, projectId, schema } = params
+
+    try {
+      const sqlQuery = schema ? getSchemaFilteredSQL(schema) : INTROSPECTION_SQL
+
+      const response = await fetch(`https://${projectId}.supabase.co/rest/v1/rpc/`, {
+        method: 'POST',
+        headers: {
+          apikey: apiKey,
+          Authorization: `Bearer ${apiKey}`,
+          'Content-Type': 'application/json',
+          Prefer: 'return=representation',
+        },
+        body: JSON.stringify({
+          query: sqlQuery,
+        }),
+      })
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        logger.warn('Direct RPC call failed, attempting alternative approach', {
+          status: response.status,
+        })
+
+        const pgResponse = await fetch(`https://${projectId}.supabase.co/rest/v1/?select=*`, {
+          method: 'GET',
+          headers: {
+            apikey: apiKey,
+            Authorization: `Bearer ${apiKey}`,
+            Accept: 'application/openapi+json',
+          },
+        })
+
+        if (!pgResponse.ok) {
+          throw new Error(`Failed to introspect database: ${errorText}`)
+        }
+
+        const openApiSpec = await pgResponse.json()
+        const tables = parseOpenApiSpec(openApiSpec, schema)
+
+        return {
+          success: true,
+          output: {
+            message: `Successfully introspected ${tables.length} table(s) from database schema`,
+            tables,
+            schemas: [...new Set(tables.map((t) => t.schema))],
+          },
+        }
+      }
+
+      const data = await response.json()
+      const result = Array.isArray(data) && data.length > 0 ? data[0].result : data.result || data
+
+      const tables: SupabaseTableSchema[] = (result.tables || []).map((table: any) => ({
+        name: table.name,
+        schema: table.schema,
+        columns: (table.columns || []).map((col: any) => ({
+          name: col.name,
+          type: col.type,
+          nullable: col.nullable,
+          default: col.default,
+          isPrimaryKey: col.isPrimaryKey,
+          isForeignKey: col.isForeignKey,
+          references: col.references,
+        })),
+        primaryKey: table.primaryKey || [],
+        foreignKeys: table.foreignKeys || [],
+        indexes: (table.indexes || []).map((idx: any) => ({
+          name: idx.name,
+          columns: parseIndexColumns(idx.definition || ''),
+          unique: idx.unique,
+        })),
+      }))
+
+      return {
+        success: true,
+        output: {
+          message: `Successfully introspected ${tables.length} table(s) from database`,
+          tables,
+          schemas: result.schemas || [],
+        },
+      }
+    } catch (error) {
+      logger.error('Supabase introspection failed', { error })
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+      return {
+        success: false,
+        output: {
+          message: 'Failed to introspect database schema',
+          tables: [],
+          schemas: [],
+        },
+        error: errorMessage,
+      }
+    }
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        message: 'Schema introspection completed',
+        tables: data.tables || [],
+        schemas: data.schemas || [],
+      },
+    }
+  },
+
+  outputs: {
+    message: { type: 'string', description: 'Operation status message' },
+    tables: {
+      type: 'array',
+      description: 'Array of table schemas with columns, keys, and indexes',
+      items: {
+        type: 'object',
+        properties: {
+          name: { type: 'string', description: 'Table name' },
+          schema: { type: 'string', description: 'Database schema name' },
+          columns: { type: 'array', description: 'Array of column definitions' },
+          primaryKey: { type: 'array', description: 'Array of primary key column names' },
+          foreignKeys: { type: 'array', description: 'Array of foreign key relationships' },
+          indexes: { type: 'array', description: 'Array of index definitions' },
+        },
+      },
+    },
+    schemas: { type: 'array', description: 'List of schemas found in the database' },
+  },
+}
+
+/**
+ * Parse index definition to extract column names
+ */
+function parseIndexColumns(indexDef: string): string[] {
+  const match = indexDef.match(/\(([^)]+)\)/)
+  if (match) {
+    return match[1].split(',').map((col) => col.trim().replace(/"/g, ''))
+  }
+  return []
+}
+
+/**
+ * Parse OpenAPI spec to extract table schema information
+ * This is a fallback method when direct SQL execution is not available
+ */
+function parseOpenApiSpec(spec: any, filterSchema?: string): SupabaseTableSchema[] {
+  const tables: SupabaseTableSchema[] = []
+  const definitions = spec.definitions || spec.components?.schemas || {}
+
+  for (const [tableName, tableDef] of Object.entries(definitions)) {
+    if (tableName.startsWith('_') || tableName === 'Error') continue
+
+    const definition = tableDef as any
+    const properties = definition.properties || {}
+    const required = definition.required || []
+
+    const columns: SupabaseColumnSchema[] = []
+    const primaryKey: string[] = []
+    const foreignKeys: Array<{
+      column: string
+      referencesTable: string
+      referencesColumn: string
+    }> = []
+
+    for (const [colName, colDef] of Object.entries(properties)) {
+      const col = colDef as any
+      const isPK = col.description?.includes('primary key') || colName === 'id'
+      const fkMatch = col.description?.match(/references\s+(\w+)\.(\w+)/)
+
+      const column: SupabaseColumnSchema = {
+        name: colName,
+        type: col.format || col.type || 'unknown',
+        nullable: !required.includes(colName),
+        default: col.default || null,
+        isPrimaryKey: isPK,
+        isForeignKey: !!fkMatch,
+      }
+
+      if (fkMatch) {
+        column.references = { table: fkMatch[1], column: fkMatch[2] }
+        foreignKeys.push({
+          column: colName,
+          referencesTable: fkMatch[1],
+          referencesColumn: fkMatch[2],
+        })
+      }
+
+      if (isPK) {
+        primaryKey.push(colName)
+      }
+
+      columns.push(column)
+    }
+
+    const schemaName = filterSchema || 'public'
+
+    if (!filterSchema || schemaName === filterSchema) {
+      tables.push({
+        name: tableName,
+        schema: schemaName,
+        columns,
+        primaryKey,
+        foreignKeys,
+        indexes: [],
+      })
+    }
+  }
+
+  return tables
+}
diff --git a/apps/sim/tools/supabase/types.ts b/apps/sim/tools/supabase/types.ts
index ee11e87dcd..2ccb6232b5 100644
--- a/apps/sim/tools/supabase/types.ts
+++ b/apps/sim/tools/supabase/types.ts
@@ -274,3 +274,49 @@ export interface SupabaseStorageCreateSignedUrlResponse extends ToolResponse {
   }
   error?: string
 }
+
+/**
+ * Parameters for introspecting a Supabase database schema
+ */
+export interface SupabaseIntrospectParams {
+  apiKey: string
+  projectId: string
+  schema?: string
+}
+
+/**
+ * Column information for a database table
+ */
+export interface SupabaseColumnSchema {
+  name: string
+  type: string
+  nullable: boolean
+  default: string | null
+  isPrimaryKey: boolean
+  isForeignKey: boolean
+  references?: { table: string; column: string }
+}
+
+/**
+ * Table schema information including columns, keys, and indexes
+ */
+export interface SupabaseTableSchema {
+  name: string
+  schema: string
+  columns: SupabaseColumnSchema[]
+  primaryKey: string[]
+  foreignKeys: Array<{ column: string; referencesTable: string; referencesColumn: string }>
+  indexes: Array<{ name: string; columns: string[]; unique: boolean }>
+}
+
+/**
+ * Response from the introspect operation
+ */
+export interface SupabaseIntrospectResponse extends ToolResponse {
+  output: {
+    message: string
+    tables: SupabaseTableSchema[]
+    schemas: string[]
+  }
+  error?: string
+}
diff --git a/apps/sim/tools/types.ts b/apps/sim/tools/types.ts
index 44071a2001..b307cb9d74 100644
--- a/apps/sim/tools/types.ts
+++ b/apps/sim/tools/types.ts
@@ -61,7 +61,6 @@ export interface ToolConfig<P = any, R = any> {
     }
   >
 
-  // Output schema - what this tool produces
   outputs?: Record<
     string,
     {
@@ -69,8 +68,8 @@ export interface ToolConfig<P = any, R = any> {
       description?: string
       optional?: boolean
       fileConfig?: {
-        mimeType?: string // Expected MIME type for file outputs
-        extension?: string // Expected file extension
+        mimeType?: string
+        extension?: string
       }
       items?: {
         type: string
diff --git a/apps/sim/tools/utils.ts b/apps/sim/tools/utils.ts
index eb5026a334..4d0a2593c1 100644
--- a/apps/sim/tools/utils.ts
+++ b/apps/sim/tools/utils.ts
@@ -8,6 +8,67 @@ import type { TableRow, ToolConfig, ToolResponse } from '@/tools/types'
 
 const logger = createLogger('ToolsUtils')
 
+/**
+ * Strips version suffix (_v2, _v3, etc.) from a tool ID or name
+ * @example stripVersionSuffix('notion_search_v2') => 'notion_search'
+ * @example stripVersionSuffix('github_create_pr_v3') => 'github_create_pr'
+ */
+export function stripVersionSuffix(name: string): string {
+  return name.replace(/_v\d+$/, '')
+}
+
+/**
+ * Filters a tools map to return only the latest version of each tool.
+ * If both `notion_search` and `notion_search_v2` exist, only `notion_search_v2` is returned.
+ * @param toolsMap Record of tool ID to ToolConfig
+ * @returns Filtered record containing only the latest version of each tool
+ */
+export function getLatestVersionTools(
+  toolsMap: Record<string, ToolConfig>
+): Record<string, ToolConfig> {
+  const latestTools: Record<string, ToolConfig> = {}
+  const baseNameToVersions: Record<string, { toolId: string; version: number }[]> = {}
+
+  for (const toolId of Object.keys(toolsMap)) {
+    const baseName = stripVersionSuffix(toolId)
+    const versionMatch = toolId.match(/_v(\d+)$/)
+    const version = versionMatch ? Number.parseInt(versionMatch[1], 10) : 1
+
+    if (!baseNameToVersions[baseName]) {
+      baseNameToVersions[baseName] = []
+    }
+    baseNameToVersions[baseName].push({ toolId, version })
+  }
+
+  for (const versions of Object.values(baseNameToVersions)) {
+    const latest = versions.reduce((prev, curr) => (curr.version > prev.version ? curr : prev))
+    latestTools[latest.toolId] = toolsMap[latest.toolId]
+  }
+
+  return latestTools
+}
+
+/**
+ * Resolves a tool name to its actual tool ID in the registry.
+ * Handles both stripped names (e.g., 'notion_search') and versioned names (e.g., 'notion_search_v2').
+ * @param toolName The tool name to resolve (may or may not have version suffix)
+ * @returns The actual tool ID in the registry, or the original name if not found
+ */
+export function resolveToolId(toolName: string): string {
+  if (tools[toolName]) {
+    return toolName
+  }
+
+  const latestTools = getLatestVersionTools(tools)
+  for (const toolId of Object.keys(latestTools)) {
+    if (stripVersionSuffix(toolId) === toolName) {
+      return toolId
+    }
+  }
+
+  return toolName
+}
+
 /**
  * Transforms a table from the store format to a key-value object
  * @param table Array of table rows from the store
diff --git a/apps/sim/tools/wealthbox/read_contact.ts b/apps/sim/tools/wealthbox/read_contact.ts
index af0511e5c7..7c25c8a121 100644
--- a/apps/sim/tools/wealthbox/read_contact.ts
+++ b/apps/sim/tools/wealthbox/read_contact.ts
@@ -47,7 +47,7 @@ export const wealthboxReadContactTool: ToolConfig<WealthboxReadParams, Wealthbox
     },
   },
 
-  transformResponse: async (response: Response, params?: WealthboxReadParams) => {
+  transformResponse: async (response: Response) => {
     const data = await response.json()
 
     // Format contact information into readable content
@@ -82,8 +82,8 @@ export const wealthboxReadContactTool: ToolConfig<WealthboxReadParams, Wealthbox
         content,
         contact,
         metadata: {
-          operation: 'read_contact' as const,
-          contactId: params?.contactId || contact.id?.toString() || '',
+          itemId: contact.id?.toString() ?? null,
+          contactId: contact.id?.toString() ?? null,
           itemType: 'contact' as const,
         },
       },
@@ -102,8 +102,8 @@ export const wealthboxReadContactTool: ToolConfig<WealthboxReadParams, Wealthbox
           type: 'object',
           description: 'Operation metadata',
           properties: {
-            operation: { type: 'string', description: 'The operation performed' },
-            contactId: { type: 'string', description: 'ID of the contact' },
+            itemId: { type: 'string', description: 'ID of the contact', optional: true },
+            contactId: { type: 'string', description: 'ID of the contact', optional: true },
             itemType: { type: 'string', description: 'Type of item (contact)' },
           },
         },
diff --git a/apps/sim/tools/wealthbox/read_note.ts b/apps/sim/tools/wealthbox/read_note.ts
index 55cec5a408..49cc820035 100644
--- a/apps/sim/tools/wealthbox/read_note.ts
+++ b/apps/sim/tools/wealthbox/read_note.ts
@@ -47,7 +47,7 @@ export const wealthboxReadNoteTool: ToolConfig<WealthboxReadParams, WealthboxRea
     },
   },
 
-  transformResponse: async (response: Response, params?: WealthboxReadParams) => {
+  transformResponse: async (response: Response) => {
     const data = await response.json()
 
     // Format note information into readable content
@@ -86,8 +86,8 @@ export const wealthboxReadNoteTool: ToolConfig<WealthboxReadParams, WealthboxRea
         content,
         note,
         metadata: {
-          operation: 'read_note' as const,
-          noteId: params?.noteId || note.id?.toString() || '',
+          itemId: note.id?.toString() ?? null,
+          noteId: note.id?.toString() ?? null,
           itemType: 'note' as const,
         },
       },
@@ -106,8 +106,8 @@ export const wealthboxReadNoteTool: ToolConfig<WealthboxReadParams, WealthboxRea
           type: 'object',
           description: 'Operation metadata',
           properties: {
-            operation: { type: 'string', description: 'The operation performed' },
-            noteId: { type: 'string', description: 'ID of the note' },
+            itemId: { type: 'string', description: 'ID of the note', optional: true },
+            noteId: { type: 'string', description: 'ID of the note', optional: true },
             itemType: { type: 'string', description: 'Type of item (note)' },
           },
         },
diff --git a/apps/sim/tools/wealthbox/read_task.ts b/apps/sim/tools/wealthbox/read_task.ts
index 35c17edc08..5e34a0424d 100644
--- a/apps/sim/tools/wealthbox/read_task.ts
+++ b/apps/sim/tools/wealthbox/read_task.ts
@@ -44,7 +44,7 @@ export const wealthboxReadTaskTool: ToolConfig<WealthboxReadParams, WealthboxRea
     },
   },
 
-  transformResponse: async (response: Response, params?: WealthboxReadParams) => {
+  transformResponse: async (response: Response) => {
     const data = await response.json()
 
     // Format task information into readable content
@@ -84,8 +84,8 @@ export const wealthboxReadTaskTool: ToolConfig<WealthboxReadParams, WealthboxRea
         content,
         task,
         metadata: {
-          operation: 'read_task' as const,
-          taskId: params?.taskId || task.id?.toString() || '',
+          itemId: task.id?.toString() ?? null,
+          taskId: task.id?.toString() ?? null,
           itemType: 'task' as const,
         },
       },
@@ -104,8 +104,8 @@ export const wealthboxReadTaskTool: ToolConfig<WealthboxReadParams, WealthboxRea
           type: 'object',
           description: 'Operation metadata',
           properties: {
-            operation: { type: 'string', description: 'The operation performed' },
-            taskId: { type: 'string', description: 'ID of the task' },
+            itemId: { type: 'string', description: 'ID of the task', optional: true },
+            taskId: { type: 'string', description: 'ID of the task', optional: true },
             itemType: { type: 'string', description: 'Type of item (task)' },
           },
         },
diff --git a/apps/sim/tools/wealthbox/types.ts b/apps/sim/tools/wealthbox/types.ts
index 461fe856f0..e7d3e48224 100644
--- a/apps/sim/tools/wealthbox/types.ts
+++ b/apps/sim/tools/wealthbox/types.ts
@@ -55,15 +55,10 @@ export interface WealthboxTask {
 
 // Unified metadata structure
 export interface WealthboxMetadata {
-  operation:
-    | 'read_note'
-    | 'write_note'
-    | 'read_contact'
-    | 'write_contact'
-    | 'read_task'
-    | 'write_task'
   itemId?: string
+  noteId?: string
   contactId?: string
+  taskId?: string
   itemType: 'note' | 'contact' | 'task'
   totalItems?: number
 }
diff --git a/apps/sim/tools/wealthbox/utils.ts b/apps/sim/tools/wealthbox/utils.ts
index 8edef405d4..34c072ced2 100644
--- a/apps/sim/tools/wealthbox/utils.ts
+++ b/apps/sim/tools/wealthbox/utils.ts
@@ -108,7 +108,6 @@ export const formatNoteResponse = (data: any): WealthboxWriteResponse => {
       output: {
         note: undefined,
         metadata: {
-          operation: 'write_note' as const,
           itemType: 'note' as const,
         },
       },
@@ -121,25 +120,21 @@ export const formatNoteResponse = (data: any): WealthboxWriteResponse => {
       note: data,
       success: true,
       metadata: {
-        operation: 'write_note' as const,
-        itemId: data.id?.toString() || '',
+        itemId: data.id?.toString() ?? null,
+        noteId: data.id?.toString() ?? null,
         itemType: 'note' as const,
       },
     },
   }
 }
 
-export const formatTaskResponse = (
-  data: any,
-  params?: WealthboxWriteParams
-): WealthboxWriteResponse => {
+export const formatTaskResponse = (data: any): WealthboxWriteResponse => {
   if (!data) {
     return {
       success: false,
       output: {
         task: undefined,
         metadata: {
-          operation: 'write_task' as const,
           itemType: 'task' as const,
         },
       },
@@ -152,8 +147,8 @@ export const formatTaskResponse = (
       task: data,
       success: true,
       metadata: {
-        operation: 'write_task' as const,
-        itemId: data.id?.toString() || params?.taskId || '',
+        itemId: data.id?.toString() ?? null,
+        taskId: data.id?.toString() ?? null,
         itemType: 'task' as const,
       },
     },
diff --git a/apps/sim/tools/wealthbox/write_contact.ts b/apps/sim/tools/wealthbox/write_contact.ts
index 13011055ee..3345b6bc85 100644
--- a/apps/sim/tools/wealthbox/write_contact.ts
+++ b/apps/sim/tools/wealthbox/write_contact.ts
@@ -92,8 +92,8 @@ export const wealthboxWriteContactTool: ToolConfig<WealthboxWriteParams, Wealthb
         contact,
         success: true,
         metadata: {
-          operation: 'write_contact' as const,
-          contactId: contact.id?.toString() || '',
+          itemId: contact.id?.toString() ?? null,
+          contactId: contact.id?.toString() ?? null,
           itemType: 'contact' as const,
         },
       },
@@ -112,8 +112,16 @@ export const wealthboxWriteContactTool: ToolConfig<WealthboxWriteParams, Wealthb
           type: 'object',
           description: 'Operation metadata',
           properties: {
-            operation: { type: 'string', description: 'The operation performed' },
-            itemId: { type: 'string', description: 'ID of the created/updated contact' },
+            itemId: {
+              type: 'string',
+              description: 'ID of the created/updated contact',
+              optional: true,
+            },
+            contactId: {
+              type: 'string',
+              description: 'ID of the created/updated contact',
+              optional: true,
+            },
             itemType: { type: 'string', description: 'Type of item (contact)' },
           },
         },
diff --git a/apps/sim/tools/wealthbox/write_note.ts b/apps/sim/tools/wealthbox/write_note.ts
index d4c365aee9..c9f225512a 100644
--- a/apps/sim/tools/wealthbox/write_note.ts
+++ b/apps/sim/tools/wealthbox/write_note.ts
@@ -65,8 +65,16 @@ export const wealthboxWriteNoteTool: ToolConfig<WealthboxWriteParams, WealthboxW
           type: 'object',
           description: 'Operation metadata',
           properties: {
-            operation: { type: 'string', description: 'The operation performed' },
-            itemId: { type: 'string', description: 'ID of the created/updated note' },
+            itemId: {
+              type: 'string',
+              description: 'ID of the created/updated note',
+              optional: true,
+            },
+            noteId: {
+              type: 'string',
+              description: 'ID of the created/updated note',
+              optional: true,
+            },
             itemType: { type: 'string', description: 'Type of item (note)' },
           },
         },
diff --git a/apps/sim/tools/wealthbox/write_task.ts b/apps/sim/tools/wealthbox/write_task.ts
index 094a1ce4ff..b1e7308ebb 100644
--- a/apps/sim/tools/wealthbox/write_task.ts
+++ b/apps/sim/tools/wealthbox/write_task.ts
@@ -66,9 +66,9 @@ export const wealthboxWriteTaskTool: ToolConfig<WealthboxWriteParams, WealthboxW
     },
   },
 
-  transformResponse: async (response: Response, params?: WealthboxWriteParams) => {
+  transformResponse: async (response: Response) => {
     const data = await response.json()
-    return formatTaskResponse(data, params)
+    return formatTaskResponse(data)
   },
 
   outputs: {
@@ -83,8 +83,16 @@ export const wealthboxWriteTaskTool: ToolConfig<WealthboxWriteParams, WealthboxW
           type: 'object',
           description: 'Operation metadata',
           properties: {
-            operation: { type: 'string', description: 'The operation performed' },
-            itemId: { type: 'string', description: 'ID of the created/updated task' },
+            itemId: {
+              type: 'string',
+              description: 'ID of the created/updated task',
+              optional: true,
+            },
+            taskId: {
+              type: 'string',
+              description: 'ID of the created/updated task',
+              optional: true,
+            },
             itemType: { type: 'string', description: 'Type of item (task)' },
           },
         },
diff --git a/apps/sim/tools/zendesk/autocomplete_organizations.ts b/apps/sim/tools/zendesk/autocomplete_organizations.ts
index 62c351ae70..c4429a5f4a 100644
--- a/apps/sim/tools/zendesk/autocomplete_organizations.ts
+++ b/apps/sim/tools/zendesk/autocomplete_organizations.ts
@@ -18,13 +18,13 @@ export interface ZendeskAutocompleteOrganizationsResponse {
   output: {
     organizations: any[]
     paging?: {
-      nextPage?: string | null
-      previousPage?: string | null
+      next_page?: string | null
+      previous_page?: string | null
       count: number
     }
     metadata: {
-      operation: 'autocomplete_organizations'
-      totalReturned: number
+      total_returned: number
+      has_more: boolean
     }
     success: boolean
   }
@@ -115,13 +115,13 @@ export const zendeskAutocompleteOrganizationsTool: ToolConfig<
       output: {
         organizations,
         paging: {
-          nextPage: data.next_page,
-          previousPage: data.previous_page,
+          next_page: data.next_page ?? null,
+          previous_page: data.previous_page ?? null,
           count: data.count || organizations.length,
         },
         metadata: {
-          operation: 'autocomplete_organizations' as const,
-          totalReturned: organizations.length,
+          total_returned: organizations.length,
+          has_more: !!data.next_page,
         },
         success: true,
       },
@@ -130,7 +130,29 @@ export const zendeskAutocompleteOrganizationsTool: ToolConfig<
 
   outputs: {
     organizations: { type: 'array', description: 'Array of organization objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: {
+      type: 'object',
+      description: 'Pagination information',
+      properties: {
+        next_page: { type: 'string', description: 'URL for next page of results', optional: true },
+        previous_page: {
+          type: 'string',
+          description: 'URL for previous page of results',
+          optional: true,
+        },
+        count: { type: 'number', description: 'Total count of organizations' },
+      },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Response metadata',
+      properties: {
+        total_returned: {
+          type: 'number',
+          description: 'Number of organizations returned in this response',
+        },
+        has_more: { type: 'boolean', description: 'Whether more organizations are available' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/zendesk/create_organization.ts b/apps/sim/tools/zendesk/create_organization.ts
index 76ddb40804..ff8daf781d 100644
--- a/apps/sim/tools/zendesk/create_organization.ts
+++ b/apps/sim/tools/zendesk/create_organization.ts
@@ -20,10 +20,7 @@ export interface ZendeskCreateOrganizationResponse {
   success: boolean
   output: {
     organization: any
-    metadata: {
-      operation: 'create_organization'
-      organizationId: string
-    }
+    organization_id: number
     success: boolean
   }
 }
@@ -141,17 +138,14 @@ export const zendeskCreateOrganizationTool: ToolConfig<
       success: true,
       output: {
         organization: data.organization,
-        metadata: {
-          operation: 'create_organization' as const,
-          organizationId: data.organization?.id,
-        },
+        organization_id: data.organization?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    organization: { type: 'object', description: 'Created organization object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    organization: { type: 'json', description: 'Created organization object' },
+    organization_id: { type: 'number', description: 'The created organization ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/create_organizations_bulk.ts b/apps/sim/tools/zendesk/create_organizations_bulk.ts
index 00bf5590fa..2b9b9c5b38 100644
--- a/apps/sim/tools/zendesk/create_organizations_bulk.ts
+++ b/apps/sim/tools/zendesk/create_organizations_bulk.ts
@@ -14,11 +14,8 @@ export interface ZendeskCreateOrganizationsBulkParams {
 export interface ZendeskCreateOrganizationsBulkResponse {
   success: boolean
   output: {
-    jobStatus: any
-    metadata: {
-      operation: 'create_organizations_bulk'
-      jobId: string
-    }
+    job_status: any
+    job_id: string
     success: boolean
   }
 }
@@ -92,18 +89,15 @@ export const zendeskCreateOrganizationsBulkTool: ToolConfig<
     return {
       success: true,
       output: {
-        jobStatus: data.job_status,
-        metadata: {
-          operation: 'create_organizations_bulk' as const,
-          jobId: data.job_status?.id,
-        },
+        job_status: data.job_status,
+        job_id: data.job_status?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    jobStatus: { type: 'object', description: 'Job status object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    job_status: { type: 'object', description: 'Job status object' },
+    job_id: { type: 'string', description: 'The bulk operation job ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/create_ticket.ts b/apps/sim/tools/zendesk/create_ticket.ts
index 00a4b6492f..935a006631 100644
--- a/apps/sim/tools/zendesk/create_ticket.ts
+++ b/apps/sim/tools/zendesk/create_ticket.ts
@@ -24,10 +24,7 @@ export interface ZendeskCreateTicketResponse {
   success: boolean
   output: {
     ticket: any
-    metadata: {
-      operation: 'create_ticket'
-      ticketId: string
-    }
+    ticket_id: number
     success: boolean
   }
 }
@@ -173,10 +170,7 @@ export const zendeskCreateTicketTool: ToolConfig<
       success: true,
       output: {
         ticket: data.ticket,
-        metadata: {
-          operation: 'create_ticket' as const,
-          ticketId: data.ticket?.id,
-        },
+        ticket_id: data.ticket?.id,
         success: true,
       },
     }
@@ -184,6 +178,6 @@ export const zendeskCreateTicketTool: ToolConfig<
 
   outputs: {
     ticket: { type: 'object', description: 'Created ticket object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    ticket_id: { type: 'number', description: 'The created ticket ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/create_tickets_bulk.ts b/apps/sim/tools/zendesk/create_tickets_bulk.ts
index 89ce852b8f..c3e447b109 100644
--- a/apps/sim/tools/zendesk/create_tickets_bulk.ts
+++ b/apps/sim/tools/zendesk/create_tickets_bulk.ts
@@ -14,11 +14,8 @@ export interface ZendeskCreateTicketsBulkParams {
 export interface ZendeskCreateTicketsBulkResponse {
   success: boolean
   output: {
-    jobStatus: any
-    metadata: {
-      operation: 'create_tickets_bulk'
-      jobId?: string
-    }
+    job_status: any
+    job_id?: string
     success: boolean
   }
 }
@@ -93,18 +90,15 @@ export const zendeskCreateTicketsBulkTool: ToolConfig<
     return {
       success: true,
       output: {
-        jobStatus: data.job_status,
-        metadata: {
-          operation: 'create_tickets_bulk' as const,
-          jobId: data.job_status?.id,
-        },
+        job_status: data.job_status,
+        job_id: data.job_status?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    jobStatus: { type: 'object', description: 'Job status object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    job_status: { type: 'object', description: 'Job status object' },
+    job_id: { type: 'string', description: 'The bulk operation job ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/create_user.ts b/apps/sim/tools/zendesk/create_user.ts
index 409ab08b74..2f860eae5e 100644
--- a/apps/sim/tools/zendesk/create_user.ts
+++ b/apps/sim/tools/zendesk/create_user.ts
@@ -22,10 +22,7 @@ export interface ZendeskCreateUserResponse {
   success: boolean
   output: {
     user: any
-    metadata: {
-      operation: 'create_user'
-      userId: string
-    }
+    user_id: number
     success: boolean
   }
 }
@@ -153,10 +150,7 @@ export const zendeskCreateUserTool: ToolConfig<ZendeskCreateUserParams, ZendeskC
         success: true,
         output: {
           user: data.user,
-          metadata: {
-            operation: 'create_user' as const,
-            userId: data.user?.id,
-          },
+          user_id: data.user?.id,
           success: true,
         },
       }
@@ -164,6 +158,6 @@ export const zendeskCreateUserTool: ToolConfig<ZendeskCreateUserParams, ZendeskC
 
     outputs: {
       user: { type: 'object', description: 'Created user object' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      user_id: { type: 'number', description: 'The created user ID' },
     },
   }
diff --git a/apps/sim/tools/zendesk/create_users_bulk.ts b/apps/sim/tools/zendesk/create_users_bulk.ts
index 602e9df962..ea2bc029e3 100644
--- a/apps/sim/tools/zendesk/create_users_bulk.ts
+++ b/apps/sim/tools/zendesk/create_users_bulk.ts
@@ -14,11 +14,8 @@ export interface ZendeskCreateUsersBulkParams {
 export interface ZendeskCreateUsersBulkResponse {
   success: boolean
   output: {
-    jobStatus: any
-    metadata: {
-      operation: 'create_users_bulk'
-      jobId: string
-    }
+    job_status: any
+    job_id: string
     success: boolean
   }
 }
@@ -92,18 +89,15 @@ export const zendeskCreateUsersBulkTool: ToolConfig<
     return {
       success: true,
       output: {
-        jobStatus: data.job_status,
-        metadata: {
-          operation: 'create_users_bulk' as const,
-          jobId: data.job_status?.id,
-        },
+        job_status: data.job_status,
+        job_id: data.job_status?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    jobStatus: { type: 'object', description: 'Job status object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    job_status: { type: 'object', description: 'Job status object' },
+    job_id: { type: 'string', description: 'The bulk operation job ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/delete_organization.ts b/apps/sim/tools/zendesk/delete_organization.ts
index 2d46d9b59d..e48e347f6d 100644
--- a/apps/sim/tools/zendesk/delete_organization.ts
+++ b/apps/sim/tools/zendesk/delete_organization.ts
@@ -15,10 +15,7 @@ export interface ZendeskDeleteOrganizationResponse {
   success: boolean
   output: {
     deleted: boolean
-    metadata: {
-      operation: 'delete_organization'
-      organizationId: string
-    }
+    organization_id: string
     success: boolean
   }
 }
@@ -83,17 +80,14 @@ export const zendeskDeleteOrganizationTool: ToolConfig<
       success: true,
       output: {
         deleted: true,
-        metadata: {
-          operation: 'delete_organization' as const,
-          organizationId: params?.organizationId || '',
-        },
+        organization_id: params?.organizationId || '',
         success: true,
       },
     }
   },
 
   outputs: {
-    deleted: { type: 'boolean', description: 'Deletion success' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    deleted: { type: 'boolean', description: 'Whether the organization was successfully deleted' },
+    organization_id: { type: 'string', description: 'The deleted organization ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/delete_ticket.ts b/apps/sim/tools/zendesk/delete_ticket.ts
index 57d1f00f4a..9b20d39547 100644
--- a/apps/sim/tools/zendesk/delete_ticket.ts
+++ b/apps/sim/tools/zendesk/delete_ticket.ts
@@ -15,10 +15,7 @@ export interface ZendeskDeleteTicketResponse {
   success: boolean
   output: {
     deleted: boolean
-    metadata: {
-      operation: 'delete_ticket'
-      ticketId: string
-    }
+    ticket_id: string
     success: boolean
   }
 }
@@ -83,10 +80,7 @@ export const zendeskDeleteTicketTool: ToolConfig<
       success: true,
       output: {
         deleted: true,
-        metadata: {
-          operation: 'delete_ticket' as const,
-          ticketId: params?.ticketId || '',
-        },
+        ticket_id: params?.ticketId || '',
         success: true,
       },
     }
@@ -94,6 +88,6 @@ export const zendeskDeleteTicketTool: ToolConfig<
 
   outputs: {
     deleted: { type: 'boolean', description: 'Deletion success' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    ticket_id: { type: 'string', description: 'The deleted ticket ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/delete_user.ts b/apps/sim/tools/zendesk/delete_user.ts
index 10272d9f23..51d53f34a8 100644
--- a/apps/sim/tools/zendesk/delete_user.ts
+++ b/apps/sim/tools/zendesk/delete_user.ts
@@ -15,10 +15,7 @@ export interface ZendeskDeleteUserResponse {
   success: boolean
   output: {
     deleted: boolean
-    metadata: {
-      operation: 'delete_user'
-      userId: string
-    }
+    user_id: string
     success: boolean
   }
 }
@@ -81,10 +78,7 @@ export const zendeskDeleteUserTool: ToolConfig<ZendeskDeleteUserParams, ZendeskD
         success: true,
         output: {
           deleted: true,
-          metadata: {
-            operation: 'delete_user' as const,
-            userId: params?.userId || '',
-          },
+          user_id: params?.userId || '',
           success: true,
         },
       }
@@ -92,6 +86,6 @@ export const zendeskDeleteUserTool: ToolConfig<ZendeskDeleteUserParams, ZendeskD
 
     outputs: {
       deleted: { type: 'boolean', description: 'Deletion success' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      user_id: { type: 'string', description: 'The deleted user ID' },
     },
   }
diff --git a/apps/sim/tools/zendesk/get_current_user.ts b/apps/sim/tools/zendesk/get_current_user.ts
index 3dab79f832..3662ed01f2 100644
--- a/apps/sim/tools/zendesk/get_current_user.ts
+++ b/apps/sim/tools/zendesk/get_current_user.ts
@@ -14,9 +14,7 @@ export interface ZendeskGetCurrentUserResponse {
   success: boolean
   output: {
     user: any
-    metadata: {
-      operation: 'get_current_user'
-    }
+    user_id: number
     success: boolean
   }
 }
@@ -76,9 +74,7 @@ export const zendeskGetCurrentUserTool: ToolConfig<
       success: true,
       output: {
         user: data.user,
-        metadata: {
-          operation: 'get_current_user' as const,
-        },
+        user_id: data.user?.id,
         success: true,
       },
     }
@@ -86,6 +82,6 @@ export const zendeskGetCurrentUserTool: ToolConfig<
 
   outputs: {
     user: { type: 'object', description: 'Current user object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    user_id: { type: 'number', description: 'The current user ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/get_organization.ts b/apps/sim/tools/zendesk/get_organization.ts
index b52789386e..1fb79f0e1f 100644
--- a/apps/sim/tools/zendesk/get_organization.ts
+++ b/apps/sim/tools/zendesk/get_organization.ts
@@ -15,9 +15,7 @@ export interface ZendeskGetOrganizationResponse {
   success: boolean
   output: {
     organization: any
-    metadata: {
-      operation: 'get_organization'
-    }
+    organization_id: number
     success: boolean
   }
 }
@@ -83,16 +81,14 @@ export const zendeskGetOrganizationTool: ToolConfig<
       success: true,
       output: {
         organization: data.organization,
-        metadata: {
-          operation: 'get_organization' as const,
-        },
+        organization_id: data.organization?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    organization: { type: 'object', description: 'Organization object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    organization: { type: 'json', description: 'Organization object' },
+    organization_id: { type: 'number', description: 'The organization ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/get_organizations.ts b/apps/sim/tools/zendesk/get_organizations.ts
index b1693f5fe1..d70f1adb17 100644
--- a/apps/sim/tools/zendesk/get_organizations.ts
+++ b/apps/sim/tools/zendesk/get_organizations.ts
@@ -17,13 +17,13 @@ export interface ZendeskGetOrganizationsResponse {
   output: {
     organizations: any[]
     paging?: {
-      nextPage?: string | null
-      previousPage?: string | null
+      next_page?: string | null
+      previous_page?: string | null
       count: number
     }
     metadata: {
-      operation: 'get_organizations'
-      totalReturned: number
+      total_returned: number
+      has_more: boolean
     }
     success: boolean
   }
@@ -106,13 +106,13 @@ export const zendeskGetOrganizationsTool: ToolConfig<
       output: {
         organizations,
         paging: {
-          nextPage: data.next_page,
-          previousPage: data.previous_page,
+          next_page: data.next_page ?? null,
+          previous_page: data.previous_page ?? null,
           count: data.count || organizations.length,
         },
         metadata: {
-          operation: 'get_organizations' as const,
-          totalReturned: organizations.length,
+          total_returned: organizations.length,
+          has_more: !!data.next_page,
         },
         success: true,
       },
@@ -121,7 +121,29 @@ export const zendeskGetOrganizationsTool: ToolConfig<
 
   outputs: {
     organizations: { type: 'array', description: 'Array of organization objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: {
+      type: 'object',
+      description: 'Pagination information',
+      properties: {
+        next_page: { type: 'string', description: 'URL for next page of results', optional: true },
+        previous_page: {
+          type: 'string',
+          description: 'URL for previous page of results',
+          optional: true,
+        },
+        count: { type: 'number', description: 'Total count of organizations' },
+      },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Response metadata',
+      properties: {
+        total_returned: {
+          type: 'number',
+          description: 'Number of organizations returned in this response',
+        },
+        has_more: { type: 'boolean', description: 'Whether more organizations are available' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/zendesk/get_ticket.ts b/apps/sim/tools/zendesk/get_ticket.ts
index 60e214217d..4483eea815 100644
--- a/apps/sim/tools/zendesk/get_ticket.ts
+++ b/apps/sim/tools/zendesk/get_ticket.ts
@@ -15,9 +15,7 @@ export interface ZendeskGetTicketResponse {
   success: boolean
   output: {
     ticket: any
-    metadata: {
-      operation: 'get_ticket'
-    }
+    ticket_id: number
     success: boolean
   }
 }
@@ -81,9 +79,7 @@ export const zendeskGetTicketTool: ToolConfig<ZendeskGetTicketParams, ZendeskGet
       success: true,
       output: {
         ticket: data.ticket,
-        metadata: {
-          operation: 'get_ticket' as const,
-        },
+        ticket_id: data.ticket?.id,
         success: true,
       },
     }
@@ -91,6 +87,6 @@ export const zendeskGetTicketTool: ToolConfig<ZendeskGetTicketParams, ZendeskGet
 
   outputs: {
     ticket: { type: 'object', description: 'Ticket object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    ticket_id: { type: 'number', description: 'The ticket ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/get_tickets.ts b/apps/sim/tools/zendesk/get_tickets.ts
index 4655c8118d..f776b25db7 100644
--- a/apps/sim/tools/zendesk/get_tickets.ts
+++ b/apps/sim/tools/zendesk/get_tickets.ts
@@ -24,13 +24,13 @@ export interface ZendeskGetTicketsResponse {
   output: {
     tickets: any[]
     paging?: {
-      nextPage?: string | null
-      previousPage?: string | null
+      next_page?: string | null
+      previous_page?: string | null
       count: number
     }
     metadata: {
-      operation: 'get_tickets'
-      totalReturned: number
+      total_returned: number
+      has_more: boolean
     }
     success: boolean
   }
@@ -185,13 +185,13 @@ export const zendeskGetTicketsTool: ToolConfig<ZendeskGetTicketsParams, ZendeskG
         output: {
           tickets,
           paging: {
-            nextPage: data.next_page,
-            previousPage: data.previous_page,
+            next_page: data.next_page ?? null,
+            previous_page: data.previous_page ?? null,
             count: data.count || tickets.length,
           },
           metadata: {
-            operation: 'get_tickets' as const,
-            totalReturned: tickets.length,
+            total_returned: tickets.length,
+            has_more: !!data.next_page,
           },
           success: true,
         },
@@ -200,7 +200,33 @@ export const zendeskGetTicketsTool: ToolConfig<ZendeskGetTicketsParams, ZendeskG
 
     outputs: {
       tickets: { type: 'array', description: 'Array of ticket objects' },
-      paging: { type: 'object', description: 'Pagination information' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      paging: {
+        type: 'object',
+        description: 'Pagination information',
+        properties: {
+          next_page: {
+            type: 'string',
+            description: 'URL for next page of results',
+            optional: true,
+          },
+          previous_page: {
+            type: 'string',
+            description: 'URL for previous page of results',
+            optional: true,
+          },
+          count: { type: 'number', description: 'Total count of tickets' },
+        },
+      },
+      metadata: {
+        type: 'object',
+        description: 'Response metadata',
+        properties: {
+          total_returned: {
+            type: 'number',
+            description: 'Number of tickets returned in this response',
+          },
+          has_more: { type: 'boolean', description: 'Whether more tickets are available' },
+        },
+      },
     },
   }
diff --git a/apps/sim/tools/zendesk/get_user.ts b/apps/sim/tools/zendesk/get_user.ts
index aef66f5da8..214b199080 100644
--- a/apps/sim/tools/zendesk/get_user.ts
+++ b/apps/sim/tools/zendesk/get_user.ts
@@ -15,9 +15,7 @@ export interface ZendeskGetUserResponse {
   success: boolean
   output: {
     user: any
-    metadata: {
-      operation: 'get_user'
-    }
+    user_id: number
     success: boolean
   }
 }
@@ -80,9 +78,7 @@ export const zendeskGetUserTool: ToolConfig<ZendeskGetUserParams, ZendeskGetUser
       success: true,
       output: {
         user: data.user,
-        metadata: {
-          operation: 'get_user' as const,
-        },
+        user_id: data.user?.id,
         success: true,
       },
     }
@@ -90,6 +86,6 @@ export const zendeskGetUserTool: ToolConfig<ZendeskGetUserParams, ZendeskGetUser
 
   outputs: {
     user: { type: 'object', description: 'User object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    user_id: { type: 'number', description: 'The user ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/get_users.ts b/apps/sim/tools/zendesk/get_users.ts
index 8e5a011eaa..1510e8d601 100644
--- a/apps/sim/tools/zendesk/get_users.ts
+++ b/apps/sim/tools/zendesk/get_users.ts
@@ -19,13 +19,13 @@ export interface ZendeskGetUsersResponse {
   output: {
     users: any[]
     paging?: {
-      nextPage?: string | null
-      previousPage?: string | null
+      next_page?: string | null
+      previous_page?: string | null
       count: number
     }
     metadata: {
-      operation: 'get_users'
-      totalReturned: number
+      total_returned: number
+      has_more: boolean
     }
     success: boolean
   }
@@ -119,13 +119,13 @@ export const zendeskGetUsersTool: ToolConfig<ZendeskGetUsersParams, ZendeskGetUs
       output: {
         users,
         paging: {
-          nextPage: data.next_page,
-          previousPage: data.previous_page,
+          next_page: data.next_page ?? null,
+          previous_page: data.previous_page ?? null,
           count: data.count || users.length,
         },
         metadata: {
-          operation: 'get_users' as const,
-          totalReturned: users.length,
+          total_returned: users.length,
+          has_more: !!data.next_page,
         },
         success: true,
       },
@@ -134,7 +134,29 @@ export const zendeskGetUsersTool: ToolConfig<ZendeskGetUsersParams, ZendeskGetUs
 
   outputs: {
     users: { type: 'array', description: 'Array of user objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: {
+      type: 'object',
+      description: 'Pagination information',
+      properties: {
+        next_page: { type: 'string', description: 'URL for next page of results', optional: true },
+        previous_page: {
+          type: 'string',
+          description: 'URL for previous page of results',
+          optional: true,
+        },
+        count: { type: 'number', description: 'Total count of users' },
+      },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Response metadata',
+      properties: {
+        total_returned: {
+          type: 'number',
+          description: 'Number of users returned in this response',
+        },
+        has_more: { type: 'boolean', description: 'Whether more users are available' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/zendesk/merge_tickets.ts b/apps/sim/tools/zendesk/merge_tickets.ts
index 213a63f509..8ecb88b19c 100644
--- a/apps/sim/tools/zendesk/merge_tickets.ts
+++ b/apps/sim/tools/zendesk/merge_tickets.ts
@@ -16,12 +16,9 @@ export interface ZendeskMergeTicketsParams {
 export interface ZendeskMergeTicketsResponse {
   success: boolean
   output: {
-    jobStatus: any
-    metadata: {
-      operation: 'merge_tickets'
-      jobId?: string
-      targetTicketId: string
-    }
+    job_status: any
+    job_id?: string
+    target_ticket_id: string
     success: boolean
   }
 }
@@ -109,19 +106,20 @@ export const zendeskMergeTicketsTool: ToolConfig<
     return {
       success: true,
       output: {
-        jobStatus: data.job_status,
-        metadata: {
-          operation: 'merge_tickets' as const,
-          jobId: data.job_status?.id,
-          targetTicketId: params?.targetTicketId || '',
-        },
+        job_status: data.job_status,
+        job_id: data.job_status?.id,
+        target_ticket_id: params?.targetTicketId || '',
         success: true,
       },
     }
   },
 
   outputs: {
-    jobStatus: { type: 'object', description: 'Job status object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    job_status: { type: 'object', description: 'Job status object' },
+    job_id: { type: 'string', description: 'The merge job ID' },
+    target_ticket_id: {
+      type: 'string',
+      description: 'The target ticket ID that tickets were merged into',
+    },
   },
 }
diff --git a/apps/sim/tools/zendesk/search.ts b/apps/sim/tools/zendesk/search.ts
index 1615c1d059..e3c1ad90d0 100644
--- a/apps/sim/tools/zendesk/search.ts
+++ b/apps/sim/tools/zendesk/search.ts
@@ -20,13 +20,13 @@ export interface ZendeskSearchResponse {
   output: {
     results: any[]
     paging?: {
-      nextPage?: string | null
-      previousPage?: string | null
+      next_page?: string | null
+      previous_page?: string | null
       count: number
     }
     metadata: {
-      operation: 'search'
-      totalReturned: number
+      total_returned: number
+      has_more: boolean
     }
     success: boolean
   }
@@ -127,13 +127,13 @@ export const zendeskSearchTool: ToolConfig<ZendeskSearchParams, ZendeskSearchRes
       output: {
         results,
         paging: {
-          nextPage: data.next_page,
-          previousPage: data.previous_page,
+          next_page: data.next_page ?? null,
+          previous_page: data.previous_page ?? null,
           count: data.count || results.length,
         },
         metadata: {
-          operation: 'search' as const,
-          totalReturned: results.length,
+          total_returned: results.length,
+          has_more: !!data.next_page,
         },
         success: true,
       },
@@ -142,7 +142,29 @@ export const zendeskSearchTool: ToolConfig<ZendeskSearchParams, ZendeskSearchRes
 
   outputs: {
     results: { type: 'array', description: 'Array of result objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: {
+      type: 'object',
+      description: 'Pagination information',
+      properties: {
+        next_page: { type: 'string', description: 'URL for next page of results', optional: true },
+        previous_page: {
+          type: 'string',
+          description: 'URL for previous page of results',
+          optional: true,
+        },
+        count: { type: 'number', description: 'Total count of results' },
+      },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Response metadata',
+      properties: {
+        total_returned: {
+          type: 'number',
+          description: 'Number of results returned in this response',
+        },
+        has_more: { type: 'boolean', description: 'Whether more results are available' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/zendesk/search_count.ts b/apps/sim/tools/zendesk/search_count.ts
index 74c9e927ec..14d16c3299 100644
--- a/apps/sim/tools/zendesk/search_count.ts
+++ b/apps/sim/tools/zendesk/search_count.ts
@@ -15,9 +15,6 @@ export interface ZendeskSearchCountResponse {
   success: boolean
   output: {
     count: number
-    metadata: {
-      operation: 'search_count'
-    }
     success: boolean
   }
 }
@@ -90,9 +87,6 @@ export const zendeskSearchCountTool: ToolConfig<
       success: true,
       output: {
         count: data.count || 0,
-        metadata: {
-          operation: 'search_count' as const,
-        },
         success: true,
       },
     }
@@ -100,6 +94,5 @@ export const zendeskSearchCountTool: ToolConfig<
 
   outputs: {
     count: { type: 'number', description: 'Number of matching results' },
-    metadata: { type: 'object', description: 'Operation metadata' },
   },
 }
diff --git a/apps/sim/tools/zendesk/search_users.ts b/apps/sim/tools/zendesk/search_users.ts
index 02c0610cec..13f1f637bf 100644
--- a/apps/sim/tools/zendesk/search_users.ts
+++ b/apps/sim/tools/zendesk/search_users.ts
@@ -19,13 +19,13 @@ export interface ZendeskSearchUsersResponse {
   output: {
     users: any[]
     paging?: {
-      nextPage?: string | null
-      previousPage?: string | null
+      next_page?: string | null
+      previous_page?: string | null
       count: number
     }
     metadata: {
-      operation: 'search_users'
-      totalReturned: number
+      total_returned: number
+      has_more: boolean
     }
     success: boolean
   }
@@ -122,13 +122,13 @@ export const zendeskSearchUsersTool: ToolConfig<
       output: {
         users,
         paging: {
-          nextPage: data.next_page,
-          previousPage: data.previous_page,
+          next_page: data.next_page ?? null,
+          previous_page: data.previous_page ?? null,
           count: data.count || users.length,
         },
         metadata: {
-          operation: 'search_users' as const,
-          totalReturned: users.length,
+          total_returned: users.length,
+          has_more: !!data.next_page,
         },
         success: true,
       },
@@ -137,7 +137,29 @@ export const zendeskSearchUsersTool: ToolConfig<
 
   outputs: {
     users: { type: 'array', description: 'Array of user objects' },
-    paging: { type: 'object', description: 'Pagination information' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    paging: {
+      type: 'object',
+      description: 'Pagination information',
+      properties: {
+        next_page: { type: 'string', description: 'URL for next page of results', optional: true },
+        previous_page: {
+          type: 'string',
+          description: 'URL for previous page of results',
+          optional: true,
+        },
+        count: { type: 'number', description: 'Total count of users' },
+      },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Response metadata',
+      properties: {
+        total_returned: {
+          type: 'number',
+          description: 'Number of users returned in this response',
+        },
+        has_more: { type: 'boolean', description: 'Whether more users are available' },
+      },
+    },
   },
 }
diff --git a/apps/sim/tools/zendesk/types.ts b/apps/sim/tools/zendesk/types.ts
index ea91645172..0f99556300 100644
--- a/apps/sim/tools/zendesk/types.ts
+++ b/apps/sim/tools/zendesk/types.ts
@@ -15,20 +15,22 @@ export interface ZendeskPaginationParams {
 }
 
 export interface ZendeskPagingInfo {
-  nextPage?: string | null
-  previousPage?: string | null
+  next_page?: string | null
+  previous_page?: string | null
   count: number
 }
 
+export interface ZendeskListMetadata {
+  total_returned: number
+  has_more: boolean
+}
+
 export interface ZendeskResponse<T> {
   success: boolean
   output: {
     data?: T
     paging?: ZendeskPagingInfo
-    metadata: {
-      operation: string
-      [key: string]: any
-    }
+    metadata?: ZendeskListMetadata
     success: boolean
   }
 }
diff --git a/apps/sim/tools/zendesk/update_organization.ts b/apps/sim/tools/zendesk/update_organization.ts
index 8024062134..21093cb168 100644
--- a/apps/sim/tools/zendesk/update_organization.ts
+++ b/apps/sim/tools/zendesk/update_organization.ts
@@ -21,10 +21,7 @@ export interface ZendeskUpdateOrganizationResponse {
   success: boolean
   output: {
     organization: any
-    metadata: {
-      operation: 'update_organization'
-      organizationId: string
-    }
+    organization_id: number
     success: boolean
   }
 }
@@ -147,17 +144,14 @@ export const zendeskUpdateOrganizationTool: ToolConfig<
       success: true,
       output: {
         organization: data.organization,
-        metadata: {
-          operation: 'update_organization' as const,
-          organizationId: data.organization?.id,
-        },
+        organization_id: data.organization?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    organization: { type: 'object', description: 'Updated organization object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    organization: { type: 'json', description: 'Updated organization object' },
+    organization_id: { type: 'number', description: 'The updated organization ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/update_ticket.ts b/apps/sim/tools/zendesk/update_ticket.ts
index 5377c6bdf0..de9e9cb586 100644
--- a/apps/sim/tools/zendesk/update_ticket.ts
+++ b/apps/sim/tools/zendesk/update_ticket.ts
@@ -24,10 +24,7 @@ export interface ZendeskUpdateTicketResponse {
   success: boolean
   output: {
     ticket: any
-    metadata: {
-      operation: 'update_ticket'
-      ticketId: string
-    }
+    ticket_id: number
     success: boolean
   }
 }
@@ -171,10 +168,7 @@ export const zendeskUpdateTicketTool: ToolConfig<
       success: true,
       output: {
         ticket: data.ticket,
-        metadata: {
-          operation: 'update_ticket' as const,
-          ticketId: data.ticket?.id,
-        },
+        ticket_id: data.ticket?.id,
         success: true,
       },
     }
@@ -182,6 +176,6 @@ export const zendeskUpdateTicketTool: ToolConfig<
 
   outputs: {
     ticket: { type: 'object', description: 'Updated ticket object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    ticket_id: { type: 'number', description: 'The updated ticket ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/update_tickets_bulk.ts b/apps/sim/tools/zendesk/update_tickets_bulk.ts
index aafa14841e..220709bdce 100644
--- a/apps/sim/tools/zendesk/update_tickets_bulk.ts
+++ b/apps/sim/tools/zendesk/update_tickets_bulk.ts
@@ -19,11 +19,8 @@ export interface ZendeskUpdateTicketsBulkParams {
 export interface ZendeskUpdateTicketsBulkResponse {
   success: boolean
   output: {
-    jobStatus: any
-    metadata: {
-      operation: 'update_tickets_bulk'
-      jobId?: string
-    }
+    job_status: any
+    job_id?: string
     success: boolean
   }
 }
@@ -130,18 +127,15 @@ export const zendeskUpdateTicketsBulkTool: ToolConfig<
     return {
       success: true,
       output: {
-        jobStatus: data.job_status,
-        metadata: {
-          operation: 'update_tickets_bulk' as const,
-          jobId: data.job_status?.id,
-        },
+        job_status: data.job_status,
+        job_id: data.job_status?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    jobStatus: { type: 'object', description: 'Job status object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    job_status: { type: 'object', description: 'Job status object' },
+    job_id: { type: 'string', description: 'The bulk operation job ID' },
   },
 }
diff --git a/apps/sim/tools/zendesk/update_user.ts b/apps/sim/tools/zendesk/update_user.ts
index 261a971b9b..22ff2df6d9 100644
--- a/apps/sim/tools/zendesk/update_user.ts
+++ b/apps/sim/tools/zendesk/update_user.ts
@@ -23,10 +23,7 @@ export interface ZendeskUpdateUserResponse {
   success: boolean
   output: {
     user: any
-    metadata: {
-      operation: 'update_user'
-      userId: string
-    }
+    user_id: number
     success: boolean
   }
 }
@@ -160,17 +157,14 @@ export const zendeskUpdateUserTool: ToolConfig<ZendeskUpdateUserParams, ZendeskU
         success: true,
         output: {
           user: data.user,
-          metadata: {
-            operation: 'update_user' as const,
-            userId: data.user?.id,
-          },
+          user_id: data.user?.id,
           success: true,
         },
       }
     },
 
     outputs: {
-      user: { type: 'object', description: 'Updated user object' },
-      metadata: { type: 'object', description: 'Operation metadata' },
+      user: { type: 'json', description: 'Updated user object' },
+      user_id: { type: 'number', description: 'The updated user ID' },
     },
   }
diff --git a/apps/sim/tools/zendesk/update_users_bulk.ts b/apps/sim/tools/zendesk/update_users_bulk.ts
index 0b3a04ab03..57b2ac50fe 100644
--- a/apps/sim/tools/zendesk/update_users_bulk.ts
+++ b/apps/sim/tools/zendesk/update_users_bulk.ts
@@ -14,11 +14,8 @@ export interface ZendeskUpdateUsersBulkParams {
 export interface ZendeskUpdateUsersBulkResponse {
   success: boolean
   output: {
-    jobStatus: any
-    metadata: {
-      operation: 'update_users_bulk'
-      jobId: string
-    }
+    job_status: any
+    job_id: string
     success: boolean
   }
 }
@@ -92,18 +89,15 @@ export const zendeskUpdateUsersBulkTool: ToolConfig<
     return {
       success: true,
       output: {
-        jobStatus: data.job_status,
-        metadata: {
-          operation: 'update_users_bulk' as const,
-          jobId: data.job_status?.id,
-        },
+        job_status: data.job_status,
+        job_id: data.job_status?.id,
         success: true,
       },
     }
   },
 
   outputs: {
-    jobStatus: { type: 'object', description: 'Job status object' },
-    metadata: { type: 'object', description: 'Operation metadata' },
+    job_status: { type: 'object', description: 'Job status object' },
+    job_id: { type: 'string', description: 'The bulk operation job ID' },
   },
 }
diff --git a/apps/sim/triggers/constants.ts b/apps/sim/triggers/constants.ts
index d731246248..6c082b76f8 100644
--- a/apps/sim/triggers/constants.ts
+++ b/apps/sim/triggers/constants.ts
@@ -26,20 +26,13 @@ export const TRIGGER_PERSISTED_SUBBLOCK_IDS: string[] = [
   'selectedTriggerId',
   'webhookId',
   'triggerPath',
-  'testUrl',
-  'testUrlExpiresAt',
 ]
 
 /**
  * Trigger-related subblock IDs that represent runtime metadata. They should remain
  * in the workflow state but must not be modified or cleared by diff operations.
  */
-export const TRIGGER_RUNTIME_SUBBLOCK_IDS: string[] = [
-  'webhookId',
-  'triggerPath',
-  'testUrl',
-  'testUrlExpiresAt',
-]
+export const TRIGGER_RUNTIME_SUBBLOCK_IDS: string[] = ['webhookId', 'triggerPath']
 
 /**
  * Maximum number of consecutive failures before a trigger (schedule/webhook) is auto-disabled.
diff --git a/apps/sim/triggers/index.ts b/apps/sim/triggers/index.ts
index 3bc5fe793e..d4c517e9c5 100644
--- a/apps/sim/triggers/index.ts
+++ b/apps/sim/triggers/index.ts
@@ -66,3 +66,115 @@ export function isTriggerValid(triggerId: string): boolean {
 }
 
 export type { TriggerConfig, TriggerRegistry } from '@/triggers/types'
+
+/**
+ * Options for building trigger subBlocks
+ */
+export interface BuildTriggerSubBlocksOptions {
+  /** The trigger ID (e.g., 'lemlist_email_replied') */
+  triggerId: string
+  /** Dropdown options for selecting trigger type */
+  triggerOptions: Array<{ label: string; id: string }>
+  /** Whether to include the trigger type dropdown (only for primary trigger) */
+  includeDropdown?: boolean
+  /** HTML setup instructions to display */
+  setupInstructions: string
+  /** Additional fields to insert before the save button (e.g., campaign filters) */
+  extraFields?: SubBlockConfig[]
+  /** Webhook URL placeholder text */
+  webhookPlaceholder?: string
+}
+
+/**
+ * Generic builder for trigger subBlocks.
+ * Creates a consistent structure: [dropdown?] -> webhookUrl -> extraFields -> save -> instructions
+ *
+ * Usage:
+ * - Primary trigger: `buildTriggerSubBlocks({ ...options, includeDropdown: true })`
+ * - Secondary triggers: `buildTriggerSubBlocks({ ...options })` (no dropdown)
+ *
+ * @example
+ * ```typescript
+ * // Primary trigger (with dropdown)
+ * subBlocks: buildTriggerSubBlocks({
+ *   triggerId: 'service_event_a',
+ *   triggerOptions: serviceTriggerOptions,
+ *   includeDropdown: true,
+ *   setupInstructions: serviceSetupInstructions('eventA'),
+ * })
+ *
+ * // Secondary trigger (no dropdown)
+ * subBlocks: buildTriggerSubBlocks({
+ *   triggerId: 'service_event_b',
+ *   triggerOptions: serviceTriggerOptions,
+ *   setupInstructions: serviceSetupInstructions('eventB'),
+ * })
+ * ```
+ */
+export function buildTriggerSubBlocks(options: BuildTriggerSubBlocksOptions): SubBlockConfig[] {
+  const {
+    triggerId,
+    triggerOptions,
+    includeDropdown = false,
+    setupInstructions,
+    extraFields = [],
+    webhookPlaceholder = 'Webhook URL will be generated',
+  } = options
+
+  const blocks: SubBlockConfig[] = []
+
+  // Only the primary trigger includes the dropdown
+  if (includeDropdown) {
+    blocks.push({
+      id: 'selectedTriggerId',
+      title: 'Trigger Type',
+      type: 'dropdown',
+      mode: 'trigger',
+      options: triggerOptions,
+      value: () => triggerId,
+      required: true,
+    })
+  }
+
+  // Webhook URL display (common to all triggers)
+  blocks.push({
+    id: 'webhookUrlDisplay',
+    title: 'Webhook URL',
+    type: 'short-input',
+    readOnly: true,
+    showCopyButton: true,
+    useWebhookUrl: true,
+    placeholder: webhookPlaceholder,
+    mode: 'trigger',
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  })
+
+  // Insert any extra fields (campaign filters, event types, etc.)
+  if (extraFields.length > 0) {
+    blocks.push(...extraFields)
+  }
+
+  // Save button
+  blocks.push({
+    id: 'triggerSave',
+    title: '',
+    type: 'trigger-save',
+    hideFromPreview: true,
+    mode: 'trigger',
+    triggerId: triggerId,
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  })
+
+  // Setup instructions
+  blocks.push({
+    id: 'triggerInstructions',
+    title: 'Setup Instructions',
+    hideFromPreview: true,
+    type: 'text',
+    defaultValue: setupInstructions,
+    mode: 'trigger',
+    condition: { field: 'selectedTriggerId', value: triggerId },
+  })
+
+  return blocks
+}
diff --git a/apps/sim/triggers/lemlist/email_bounced.ts b/apps/sim/triggers/lemlist/email_bounced.ts
new file mode 100644
index 0000000000..cd79184716
--- /dev/null
+++ b/apps/sim/triggers/lemlist/email_bounced.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildActivityOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist Email Bounced Trigger
+ * Triggers when an email bounces in a Lemlist campaign
+ */
+export const lemlistEmailBouncedTrigger: TriggerConfig = {
+  id: 'lemlist_email_bounced',
+  name: 'Lemlist Email Bounced',
+  provider: 'lemlist',
+  description: 'Trigger workflow when an email bounces',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_email_bounced',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('emailsBounced'),
+    extraFields: buildLemlistExtraFields('lemlist_email_bounced'),
+  }),
+
+  outputs: buildActivityOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/email_clicked.ts b/apps/sim/triggers/lemlist/email_clicked.ts
new file mode 100644
index 0000000000..a1da3ff6ba
--- /dev/null
+++ b/apps/sim/triggers/lemlist/email_clicked.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildActivityOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist Email Clicked Trigger
+ * Triggers when a lead clicks a link in an email
+ */
+export const lemlistEmailClickedTrigger: TriggerConfig = {
+  id: 'lemlist_email_clicked',
+  name: 'Lemlist Email Clicked',
+  provider: 'lemlist',
+  description: 'Trigger workflow when a lead clicks a link in an email',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_email_clicked',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('emailsClicked'),
+    extraFields: buildLemlistExtraFields('lemlist_email_clicked'),
+  }),
+
+  outputs: buildActivityOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/email_opened.ts b/apps/sim/triggers/lemlist/email_opened.ts
new file mode 100644
index 0000000000..12c6638e81
--- /dev/null
+++ b/apps/sim/triggers/lemlist/email_opened.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildActivityOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist Email Opened Trigger
+ * Triggers when a lead opens an email in a Lemlist campaign
+ */
+export const lemlistEmailOpenedTrigger: TriggerConfig = {
+  id: 'lemlist_email_opened',
+  name: 'Lemlist Email Opened',
+  provider: 'lemlist',
+  description: 'Trigger workflow when a lead opens an email',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_email_opened',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('emailsOpened'),
+    extraFields: buildLemlistExtraFields('lemlist_email_opened'),
+  }),
+
+  outputs: buildActivityOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/email_replied.ts b/apps/sim/triggers/lemlist/email_replied.ts
new file mode 100644
index 0000000000..bb95476b3a
--- /dev/null
+++ b/apps/sim/triggers/lemlist/email_replied.ts
@@ -0,0 +1,41 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildEmailReplyOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist Email Replied Trigger
+ * Triggers when a lead replies to an email in a Lemlist campaign
+ *
+ * This is the PRIMARY trigger - it includes the dropdown for selecting trigger type.
+ */
+export const lemlistEmailRepliedTrigger: TriggerConfig = {
+  id: 'lemlist_email_replied',
+  name: 'Lemlist Email Replied',
+  provider: 'lemlist',
+  description: 'Trigger workflow when a lead replies to an email',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_email_replied',
+    triggerOptions: lemlistTriggerOptions,
+    includeDropdown: true,
+    setupInstructions: lemlistSetupInstructions('emailsReplied'),
+    extraFields: buildLemlistExtraFields('lemlist_email_replied'),
+  }),
+
+  outputs: buildEmailReplyOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/email_sent.ts b/apps/sim/triggers/lemlist/email_sent.ts
new file mode 100644
index 0000000000..f45bdf4aaa
--- /dev/null
+++ b/apps/sim/triggers/lemlist/email_sent.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildActivityOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist Email Sent Trigger
+ * Triggers when an email is sent in a Lemlist campaign
+ */
+export const lemlistEmailSentTrigger: TriggerConfig = {
+  id: 'lemlist_email_sent',
+  name: 'Lemlist Email Sent',
+  provider: 'lemlist',
+  description: 'Trigger workflow when an email is sent',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_email_sent',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('emailsSent'),
+    extraFields: buildLemlistExtraFields('lemlist_email_sent'),
+  }),
+
+  outputs: buildActivityOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/index.ts b/apps/sim/triggers/lemlist/index.ts
new file mode 100644
index 0000000000..8b0fce9561
--- /dev/null
+++ b/apps/sim/triggers/lemlist/index.ts
@@ -0,0 +1,14 @@
+/**
+ * Lemlist Triggers
+ * Export all Lemlist webhook triggers
+ */
+
+export { lemlistEmailBouncedTrigger } from './email_bounced'
+export { lemlistEmailClickedTrigger } from './email_clicked'
+export { lemlistEmailOpenedTrigger } from './email_opened'
+export { lemlistEmailRepliedTrigger } from './email_replied'
+export { lemlistEmailSentTrigger } from './email_sent'
+export { lemlistInterestedTrigger } from './interested'
+export { lemlistLinkedInRepliedTrigger } from './linkedin_replied'
+export { lemlistNotInterestedTrigger } from './not_interested'
+export { lemlistWebhookTrigger } from './webhook'
diff --git a/apps/sim/triggers/lemlist/interested.ts b/apps/sim/triggers/lemlist/interested.ts
new file mode 100644
index 0000000000..e85ea40e9a
--- /dev/null
+++ b/apps/sim/triggers/lemlist/interested.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildActivityOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist Interested Trigger
+ * Triggers when a lead is marked as interested in a Lemlist campaign
+ */
+export const lemlistInterestedTrigger: TriggerConfig = {
+  id: 'lemlist_interested',
+  name: 'Lemlist Lead Interested',
+  provider: 'lemlist',
+  description: 'Trigger workflow when a lead is marked as interested',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_interested',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('interested'),
+    extraFields: buildLemlistExtraFields('lemlist_interested'),
+  }),
+
+  outputs: buildActivityOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/linkedin_replied.ts b/apps/sim/triggers/lemlist/linkedin_replied.ts
new file mode 100644
index 0000000000..e3ccae016f
--- /dev/null
+++ b/apps/sim/triggers/lemlist/linkedin_replied.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildLemlistExtraFields,
+  buildLinkedInReplyOutputs,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist LinkedIn Replied Trigger
+ * Triggers when a lead replies to a LinkedIn message in a Lemlist campaign
+ */
+export const lemlistLinkedInRepliedTrigger: TriggerConfig = {
+  id: 'lemlist_linkedin_replied',
+  name: 'Lemlist LinkedIn Replied',
+  provider: 'lemlist',
+  description: 'Trigger workflow when a lead replies to a LinkedIn message',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_linkedin_replied',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('linkedinReplied'),
+    extraFields: buildLemlistExtraFields('lemlist_linkedin_replied'),
+  }),
+
+  outputs: buildLinkedInReplyOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/not_interested.ts b/apps/sim/triggers/lemlist/not_interested.ts
new file mode 100644
index 0000000000..5581429012
--- /dev/null
+++ b/apps/sim/triggers/lemlist/not_interested.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildActivityOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Lemlist Not Interested Trigger
+ * Triggers when a lead is marked as not interested in a Lemlist campaign
+ */
+export const lemlistNotInterestedTrigger: TriggerConfig = {
+  id: 'lemlist_not_interested',
+  name: 'Lemlist Lead Not Interested',
+  provider: 'lemlist',
+  description: 'Trigger workflow when a lead is marked as not interested',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_not_interested',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('notInterested'),
+    extraFields: buildLemlistExtraFields('lemlist_not_interested'),
+  }),
+
+  outputs: buildActivityOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/lemlist/utils.ts b/apps/sim/triggers/lemlist/utils.ts
new file mode 100644
index 0000000000..69fbc1d4b3
--- /dev/null
+++ b/apps/sim/triggers/lemlist/utils.ts
@@ -0,0 +1,268 @@
+import type { TriggerOutput } from '@/triggers/types'
+
+/**
+ * Shared trigger dropdown options for all Lemlist triggers
+ */
+export const lemlistTriggerOptions = [
+  { label: 'Email Replied', id: 'lemlist_email_replied' },
+  { label: 'LinkedIn Replied', id: 'lemlist_linkedin_replied' },
+  { label: 'Lead Interested', id: 'lemlist_interested' },
+  { label: 'Lead Not Interested', id: 'lemlist_not_interested' },
+  { label: 'Email Opened', id: 'lemlist_email_opened' },
+  { label: 'Email Clicked', id: 'lemlist_email_clicked' },
+  { label: 'Email Bounced', id: 'lemlist_email_bounced' },
+  { label: 'Email Sent', id: 'lemlist_email_sent' },
+  { label: 'Generic Webhook (All Events)', id: 'lemlist_webhook' },
+]
+
+/**
+ * Generates setup instructions for Lemlist webhooks
+ * The webhook is automatically created in Lemlist when you save
+ */
+export function lemlistSetupInstructions(eventType: string): string {
+  const instructions = [
+    'Enter your Lemlist API Key above.',
+    'You can find your API key in Lemlist at <strong>Settings > Integrations > API</strong>.',
+    `Click <strong>"Save Configuration"</strong> to automatically create the webhook in Lemlist for <strong>${eventType}</strong> events.`,
+    'The webhook will be automatically deleted when you remove this trigger.',
+  ]
+
+  return instructions
+    .map(
+      (instruction, index) =>
+        `<div class="mb-3"><strong>${index + 1}.</strong> ${instruction}</div>`
+    )
+    .join('')
+}
+
+/**
+ * Helper to build Lemlist-specific extra fields.
+ * Includes API key (required) and optional campaign filter.
+ * Use with the generic buildTriggerSubBlocks from @/triggers.
+ */
+export function buildLemlistExtraFields(triggerId: string) {
+  return [
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input' as const,
+      placeholder: 'Enter your Lemlist API key',
+      description: 'Required to create the webhook in Lemlist.',
+      password: true,
+      required: true,
+      mode: 'trigger' as const,
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+    {
+      id: 'campaignId',
+      title: 'Campaign ID (Optional)',
+      type: 'short-input' as const,
+      placeholder: 'cam_xxxxx (leave empty for all campaigns)',
+      description: 'Optionally scope the webhook to a specific campaign',
+      mode: 'trigger' as const,
+      condition: { field: 'selectedTriggerId', value: triggerId },
+    },
+  ]
+}
+
+/**
+ * Base activity outputs shared across all Lemlist triggers
+ */
+function buildBaseActivityOutputs(): Record<string, TriggerOutput> {
+  return {
+    type: {
+      type: 'string',
+      description: 'Activity type (emailsReplied, linkedinReplied, interested, emailsOpened, etc.)',
+    },
+    _id: {
+      type: 'string',
+      description: 'Unique activity identifier',
+    },
+    leadId: {
+      type: 'string',
+      description: 'Associated lead ID',
+    },
+    campaignId: {
+      type: 'string',
+      description: 'Campaign ID',
+    },
+    campaignName: {
+      type: 'string',
+      description: 'Campaign name',
+    },
+    sequenceId: {
+      type: 'string',
+      description: 'Sequence ID within the campaign',
+    },
+    stepId: {
+      type: 'string',
+      description: 'Step ID that triggered this activity',
+    },
+    createdAt: {
+      type: 'string',
+      description: 'When the activity occurred (ISO 8601)',
+    },
+  }
+}
+
+/**
+ * Lead outputs - information about the lead
+ */
+function buildLeadOutputs(): Record<string, TriggerOutput> {
+  return {
+    lead: {
+      _id: {
+        type: 'string',
+        description: 'Lead unique identifier',
+      },
+      email: {
+        type: 'string',
+        description: 'Lead email address',
+      },
+      firstName: {
+        type: 'string',
+        description: 'Lead first name',
+      },
+      lastName: {
+        type: 'string',
+        description: 'Lead last name',
+      },
+      companyName: {
+        type: 'string',
+        description: 'Lead company name',
+      },
+      phone: {
+        type: 'string',
+        description: 'Lead phone number',
+      },
+      linkedinUrl: {
+        type: 'string',
+        description: 'Lead LinkedIn profile URL',
+      },
+      picture: {
+        type: 'string',
+        description: 'Lead profile picture URL',
+      },
+      icebreaker: {
+        type: 'string',
+        description: 'Personalized icebreaker text',
+      },
+      timezone: {
+        type: 'string',
+        description: 'Lead timezone (e.g., America/New_York)',
+      },
+      isUnsubscribed: {
+        type: 'boolean',
+        description: 'Whether the lead is unsubscribed',
+      },
+    },
+  }
+}
+
+/**
+ * Standard activity outputs (activity + lead data)
+ */
+export function buildActivityOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all activity-specific data',
+    },
+  }
+}
+
+/**
+ * Email-specific outputs (includes message content for replies)
+ */
+export function buildEmailReplyOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    messageId: {
+      type: 'string',
+      description: 'Email message ID',
+    },
+    subject: {
+      type: 'string',
+      description: 'Email subject line',
+    },
+    text: {
+      type: 'string',
+      description: 'Email reply text content',
+    },
+    html: {
+      type: 'string',
+      description: 'Email reply HTML content',
+    },
+    sentAt: {
+      type: 'string',
+      description: 'When the reply was sent',
+    },
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all email data',
+    },
+  }
+}
+
+/**
+ * LinkedIn-specific outputs (includes message content)
+ */
+export function buildLinkedInReplyOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    messageId: {
+      type: 'string',
+      description: 'LinkedIn message ID',
+    },
+    text: {
+      type: 'string',
+      description: 'LinkedIn message text content',
+    },
+    sentAt: {
+      type: 'string',
+      description: 'When the message was sent',
+    },
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all LinkedIn data',
+    },
+  }
+}
+
+/**
+ * All outputs for generic webhook (activity + lead + all possible fields)
+ */
+export function buildAllOutputs(): Record<string, TriggerOutput> {
+  return {
+    ...buildBaseActivityOutputs(),
+    ...buildLeadOutputs(),
+    messageId: {
+      type: 'string',
+      description: 'Message ID (for email/LinkedIn events)',
+    },
+    subject: {
+      type: 'string',
+      description: 'Email subject (for email events)',
+    },
+    text: {
+      type: 'string',
+      description: 'Message text content',
+    },
+    html: {
+      type: 'string',
+      description: 'Message HTML content (for email events)',
+    },
+    sentAt: {
+      type: 'string',
+      description: 'When the message was sent',
+    },
+    webhook: {
+      type: 'json',
+      description: 'Full webhook payload with all data',
+    },
+  }
+}
diff --git a/apps/sim/triggers/lemlist/webhook.ts b/apps/sim/triggers/lemlist/webhook.ts
new file mode 100644
index 0000000000..289d8dead6
--- /dev/null
+++ b/apps/sim/triggers/lemlist/webhook.ts
@@ -0,0 +1,38 @@
+import { LemlistIcon } from '@/components/icons'
+import { buildTriggerSubBlocks } from '@/triggers'
+import {
+  buildAllOutputs,
+  buildLemlistExtraFields,
+  lemlistSetupInstructions,
+  lemlistTriggerOptions,
+} from '@/triggers/lemlist/utils'
+import type { TriggerConfig } from '@/triggers/types'
+
+/**
+ * Generic Lemlist Webhook Trigger
+ * Captures all Lemlist webhook events with optional filtering
+ */
+export const lemlistWebhookTrigger: TriggerConfig = {
+  id: 'lemlist_webhook',
+  name: 'Lemlist Webhook (All Events)',
+  provider: 'lemlist',
+  description: 'Trigger workflow on any Lemlist webhook event',
+  version: '1.0.0',
+  icon: LemlistIcon,
+
+  subBlocks: buildTriggerSubBlocks({
+    triggerId: 'lemlist_webhook',
+    triggerOptions: lemlistTriggerOptions,
+    setupInstructions: lemlistSetupInstructions('All Events (no type filter)'),
+    extraFields: buildLemlistExtraFields('lemlist_webhook'),
+  }),
+
+  outputs: buildAllOutputs(),
+
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
+}
diff --git a/apps/sim/triggers/registry.ts b/apps/sim/triggers/registry.ts
index 155f5cc424..1851d70d99 100644
--- a/apps/sim/triggers/registry.ts
+++ b/apps/sim/triggers/registry.ts
@@ -65,6 +65,17 @@ import {
   jiraWebhookTrigger,
   jiraWorklogCreatedTrigger,
 } from '@/triggers/jira'
+import {
+  lemlistEmailBouncedTrigger,
+  lemlistEmailClickedTrigger,
+  lemlistEmailOpenedTrigger,
+  lemlistEmailRepliedTrigger,
+  lemlistEmailSentTrigger,
+  lemlistInterestedTrigger,
+  lemlistLinkedInRepliedTrigger,
+  lemlistNotInterestedTrigger,
+  lemlistWebhookTrigger,
+} from '@/triggers/lemlist'
 import {
   linearCommentCreatedTrigger,
   linearCommentUpdatedTrigger,
@@ -139,6 +150,15 @@ export const TRIGGER_REGISTRY: TriggerRegistry = {
   jira_issue_deleted: jiraIssueDeletedTrigger,
   jira_issue_commented: jiraIssueCommentedTrigger,
   jira_worklog_created: jiraWorklogCreatedTrigger,
+  lemlist_webhook: lemlistWebhookTrigger,
+  lemlist_email_replied: lemlistEmailRepliedTrigger,
+  lemlist_email_opened: lemlistEmailOpenedTrigger,
+  lemlist_email_clicked: lemlistEmailClickedTrigger,
+  lemlist_email_sent: lemlistEmailSentTrigger,
+  lemlist_email_bounced: lemlistEmailBouncedTrigger,
+  lemlist_linkedin_replied: lemlistLinkedInRepliedTrigger,
+  lemlist_interested: lemlistInterestedTrigger,
+  lemlist_not_interested: lemlistNotInterestedTrigger,
   linear_webhook: linearWebhookTrigger,
   linear_issue_created: linearIssueCreatedTrigger,
   linear_issue_updated: linearIssueUpdatedTrigger,
diff --git a/bun.lock b/bun.lock
index ad4825181d..bbfe3d9a25 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "simstudio",
@@ -11,7 +12,7 @@
         "drizzle-kit": "^0.31.4",
         "husky": "9.1.7",
         "lint-staged": "16.0.0",
-        "turbo": "2.7.3",
+        "turbo": "2.7.4",
       },
     },
     "apps/docs": {
@@ -3379,19 +3380,19 @@
 
     "tunnel-agent": ["tunnel-agent@0.6.0", "", { "dependencies": { "safe-buffer": "^5.0.1" } }, "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="],
 
-    "turbo": ["turbo@2.7.3", "", { "optionalDependencies": { "turbo-darwin-64": "2.7.3", "turbo-darwin-arm64": "2.7.3", "turbo-linux-64": "2.7.3", "turbo-linux-arm64": "2.7.3", "turbo-windows-64": "2.7.3", "turbo-windows-arm64": "2.7.3" }, "bin": { "turbo": "bin/turbo" } }, "sha512-+HjKlP4OfYk+qzvWNETA3cUO5UuK6b5MSc2UJOKyvBceKucQoQGb2g7HlC2H1GHdkfKrk4YF1VPvROkhVZDDLQ=="],
+    "turbo": ["turbo@2.7.4", "", { "optionalDependencies": { "turbo-darwin-64": "2.7.4", "turbo-darwin-arm64": "2.7.4", "turbo-linux-64": "2.7.4", "turbo-linux-arm64": "2.7.4", "turbo-windows-64": "2.7.4", "turbo-windows-arm64": "2.7.4" }, "bin": { "turbo": "bin/turbo" } }, "sha512-bkO4AddmDishzJB2ze7aYYPaejMoJVfS0XnaR6RCdXFOY8JGJfQE+l9fKiV7uDPa5Ut44gmOWJL3894CIMeH9g=="],
 
-    "turbo-darwin-64": ["turbo-darwin-64@2.7.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-aZHhvRiRHXbJw1EcEAq4aws1hsVVUZ9DPuSFaq9VVFAKCup7niIEwc22glxb7240yYEr1vLafdQ2U294Vcwz+w=="],
+    "turbo-darwin-64": ["turbo-darwin-64@2.7.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-xDR30ltfkSsRfGzABBckvl1nz1cZ3ssTujvdj+TPwOweeDRvZ0e06t5DS0rmRBvyKpgGs42K/EK6Mn2qLlFY9A=="],
 
-    "turbo-darwin-arm64": ["turbo-darwin-arm64@2.7.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-CkVrHSq+Bnhl9sX2LQgqQYVfLTWC2gvI74C4758OmU0djfrssDKU9d4YQF0AYXXhIIRZipSXfxClQziIMD+EAg=="],
+    "turbo-darwin-arm64": ["turbo-darwin-arm64@2.7.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-P7sjqXtOL/+nYWPvcDGWhi8wf8M8mZHHB8XEzw2VX7VJrS8IGHyJHGD1AYfDvhAEcr7pnk3gGifz3/xyhI655w=="],
 
-    "turbo-linux-64": ["turbo-linux-64@2.7.3", "", { "os": "linux", "cpu": "x64" }, "sha512-GqDsCNnzzr89kMaLGpRALyigUklzgxIrSy2pHZVXyifgczvYPnLglex78Aj3T2gu+T3trPPH2iJ+pWucVOCC2Q=="],
+    "turbo-linux-64": ["turbo-linux-64@2.7.4", "", { "os": "linux", "cpu": "x64" }, "sha512-GofFOxRO/IhG8BcPyMSSB3Y2+oKQotsaYbHxL9yD6JPb20/o35eo+zUSyazOtilAwDHnak5dorAJFoFU8MIg2A=="],
 
-    "turbo-linux-arm64": ["turbo-linux-arm64@2.7.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-NdCDTfIcIo3dWjsiaAHlxu5gW61Ed/8maah1IAF/9E3EtX0aAHNiBMbuYLZaR4vRJ7BeVkYB6xKWRtdFLZ0y3g=="],
+    "turbo-linux-arm64": ["turbo-linux-arm64@2.7.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-+RQKgNjksVPxYAyAgmDV7w/1qj++qca+nSNTAOKGOfJiDtSvRKoci89oftJ6anGs00uamLKVEQ712TI/tfNAIw=="],
 
-    "turbo-windows-64": ["turbo-windows-64@2.7.3", "", { "os": "win32", "cpu": "x64" }, "sha512-7bVvO987daXGSJVYBoG8R4Q+csT1pKIgLJYZevXRQ0Hqw0Vv4mKme/TOjYXs9Qb1xMKh51Tb3bXKDbd8/4G08g=="],
+    "turbo-windows-64": ["turbo-windows-64@2.7.4", "", { "os": "win32", "cpu": "x64" }, "sha512-rfak1+g+ON3czs1mDYsCS4X74ZmK6gOgRQTXjDICtzvR4o61paqtgAYtNPofcVsMWeF4wvCajSeoAkkeAnQ1kg=="],
 
-    "turbo-windows-arm64": ["turbo-windows-arm64@2.7.3", "", { "os": "win32", "cpu": "arm64" }, "sha512-nTodweTbPmkvwMu/a55XvjMsPtuyUSC+sV7f/SR57K36rB2I0YG21qNETN+00LOTUW9B3omd8XkiXJkt4kx/cw=="],
+    "turbo-windows-arm64": ["turbo-windows-arm64@2.7.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-1ZgBNjNRbDu/fPeqXuX9i26x3CJ/Y1gcwUpQ+Vp7kN9Un6RZ9kzs164f/knrjcu5E+szCRexVjRSJay1k5jApA=="],
 
     "tweetnacl": ["tweetnacl@0.14.5", "", {}, "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="],
 
diff --git a/helm/sim/values.yaml b/helm/sim/values.yaml
index 24e794a9ca..2141fff2a8 100644
--- a/helm/sim/values.yaml
+++ b/helm/sim/values.yaml
@@ -147,6 +147,10 @@ app:
     BLACKLISTED_PROVIDERS: ""                            # Comma-separated provider IDs to hide from UI (e.g., "openai,anthropic,google")
     BLACKLISTED_MODELS: ""                               # Comma-separated model names/prefixes to hide (e.g., "gpt-4,claude-*")
 
+    # Invitation Control
+    DISABLE_INVITATIONS: ""                              # Set to "true" to disable workspace invitations globally
+    NEXT_PUBLIC_DISABLE_INVITATIONS: ""                  # Set to "true" to hide invitation UI elements
+
     # SSO Configuration (Enterprise Single Sign-On)
     # Set to "true" AFTER running the SSO registration script
     SSO_ENABLED: ""                                       # Enable SSO authentication ("true" to enable)
diff --git a/package.json b/package.json
index 4fa9176e0b..c56bf40391 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "drizzle-kit": "^0.31.4",
     "husky": "9.1.7",
     "lint-staged": "16.0.0",
-    "turbo": "2.7.3"
+    "turbo": "2.7.4"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx,json,css,scss}": [
diff --git a/scripts/generate-docs.ts b/scripts/generate-docs.ts
index 965606afdc..58de760abd 100755
--- a/scripts/generate-docs.ts
+++ b/scripts/generate-docs.ts
@@ -75,37 +75,78 @@ async function generateIconMapping(): Promise<Record<string, string>> {
 
     for (const blockFile of blockFiles) {
       const fileContent = fs.readFileSync(blockFile, 'utf-8')
-      const blockConfig = extractBlockConfig(fileContent)
 
-      if (!blockConfig?.type || !blockConfig.iconName) {
-        continue
-      }
+      // For icon mapping, we need ALL blocks including hidden ones
+      // because V2 blocks inherit icons from legacy blocks via spread
+      // First, extract the primary icon from the file (usually the legacy block's icon)
+      const primaryIcon = extractIconName(fileContent)
 
-      // Skip blocks that don't have documentation (same logic as generateBlockDoc)
-      if (
-        blockConfig.type.includes('_trigger') ||
-        blockConfig.type.includes('_webhook') ||
-        blockConfig.type.includes('rss')
-      ) {
-        continue
-      }
+      // Find all block exports and their types
+      const exportRegex = /export\s+const\s+(\w+)Block\s*:\s*BlockConfig[^=]*=\s*\{/g
+      let match
 
-      if (
-        (blockConfig.category === 'blocks' &&
-          blockConfig.type !== 'memory' &&
-          blockConfig.type !== 'knowledge') ||
-        blockConfig.type === 'evaluator' ||
-        blockConfig.type === 'number' ||
-        blockConfig.type === 'webhook' ||
-        blockConfig.type === 'schedule' ||
-        blockConfig.type === 'mcp' ||
-        blockConfig.type === 'generic_webhook' ||
-        blockConfig.type === 'rss'
-      ) {
-        continue
-      }
+      while ((match = exportRegex.exec(fileContent)) !== null) {
+        const blockName = match[1]
+        const startIndex = match.index + match[0].length - 1
+
+        // Extract the block content
+        let braceCount = 1
+        let endIndex = startIndex + 1
 
-      iconMapping[blockConfig.type] = blockConfig.iconName
+        while (endIndex < fileContent.length && braceCount > 0) {
+          if (fileContent[endIndex] === '{') braceCount++
+          else if (fileContent[endIndex] === '}') braceCount--
+          endIndex++
+        }
+
+        if (braceCount === 0) {
+          const blockContent = fileContent.substring(startIndex, endIndex)
+
+          // Check hideFromToolbar - skip hidden blocks for docs but NOT for icon mapping
+          const hideFromToolbar = /hideFromToolbar\s*:\s*true/.test(blockContent)
+
+          // Get block type
+          const blockType =
+            extractStringPropertyFromContent(blockContent, 'type') || blockName.toLowerCase()
+
+          // Get icon - either from this block or inherited from primary
+          const iconName = extractIconNameFromContent(blockContent) || primaryIcon
+
+          if (!blockType || !iconName) {
+            continue
+          }
+
+          // Skip trigger/webhook/rss blocks
+          if (
+            blockType.includes('_trigger') ||
+            blockType.includes('_webhook') ||
+            blockType.includes('rss')
+          ) {
+            continue
+          }
+
+          // Get category for additional filtering
+          const category = extractStringPropertyFromContent(blockContent, 'category') || 'misc'
+
+          if (
+            (category === 'blocks' && blockType !== 'memory' && blockType !== 'knowledge') ||
+            blockType === 'evaluator' ||
+            blockType === 'number' ||
+            blockType === 'webhook' ||
+            blockType === 'schedule' ||
+            blockType === 'mcp' ||
+            blockType === 'generic_webhook' ||
+            blockType === 'rss'
+          ) {
+            continue
+          }
+
+          // Only add non-hidden blocks to icon mapping (docs won't be generated for hidden)
+          if (!hideFromToolbar) {
+            iconMapping[blockType] = iconName
+          }
+        }
+      }
     }
 
     console.log(`✓ Generated icon mapping for ${Object.keys(iconMapping).length} blocks`)
@@ -159,31 +200,72 @@ ${mappingEntries}
   }
 }
 
-function extractBlockConfig(fileContent: string): BlockConfig | null {
-  try {
-    const exportMatch = fileContent.match(/export\s+const\s+(\w+)Block\s*:/)
+/**
+ * Extract ALL block configs from a file, filtering out hidden blocks
+ */
+function extractAllBlockConfigs(fileContent: string): BlockConfig[] {
+  const configs: BlockConfig[] = []
 
-    if (!exportMatch) {
-      console.warn('No block export found in file')
-      return null
+  // Find all block exports in the file
+  const exportRegex = /export\s+const\s+(\w+)Block\s*:\s*BlockConfig[^=]*=\s*\{/g
+  let match
+
+  while ((match = exportRegex.exec(fileContent)) !== null) {
+    const blockName = match[1]
+    const startIndex = match.index + match[0].length - 1 // Position of opening brace
+
+    // Extract the block content by matching braces
+    let braceCount = 1
+    let endIndex = startIndex + 1
+
+    while (endIndex < fileContent.length && braceCount > 0) {
+      if (fileContent[endIndex] === '{') braceCount++
+      else if (fileContent[endIndex] === '}') braceCount--
+      endIndex++
     }
 
-    const blockName = exportMatch[1]
-    const blockType = findBlockType(fileContent, blockName)
+    if (braceCount === 0) {
+      const blockContent = fileContent.substring(startIndex, endIndex)
+
+      // Check if this block has hideFromToolbar: true
+      const hideFromToolbar = /hideFromToolbar\s*:\s*true/.test(blockContent)
+      if (hideFromToolbar) {
+        console.log(`Skipping ${blockName}Block - hideFromToolbar is true`)
+        continue
+      }
 
-    const name = extractStringProperty(fileContent, 'name') || `${blockName} Block`
-    const description = extractStringProperty(fileContent, 'description') || ''
-    const longDescription = extractStringProperty(fileContent, 'longDescription') || ''
-    const category = extractStringProperty(fileContent, 'category') || 'misc'
-    const bgColor = extractStringProperty(fileContent, 'bgColor') || '#F5F5F5'
-    const iconName = extractIconName(fileContent) || ''
+      const config = extractBlockConfigFromContent(blockContent, blockName)
+      if (config) {
+        configs.push(config)
+      }
+    }
+  }
 
-    const outputs = extractOutputs(fileContent)
+  return configs
+}
 
-    const toolsAccess = extractToolsAccess(fileContent)
+/**
+ * Extract block config from a specific block's content
+ */
+function extractBlockConfigFromContent(
+  blockContent: string,
+  blockName: string
+): BlockConfig | null {
+  try {
+    const blockType =
+      extractStringPropertyFromContent(blockContent, 'type') || blockName.toLowerCase()
+    const name = extractStringPropertyFromContent(blockContent, 'name') || `${blockName} Block`
+    const description = extractStringPropertyFromContent(blockContent, 'description') || ''
+    const longDescription = extractStringPropertyFromContent(blockContent, 'longDescription') || ''
+    const category = extractStringPropertyFromContent(blockContent, 'category') || 'misc'
+    const bgColor = extractStringPropertyFromContent(blockContent, 'bgColor') || '#F5F5F5'
+    const iconName = extractIconNameFromContent(blockContent) || ''
+
+    const outputs = extractOutputsFromContent(blockContent)
+    const toolsAccess = extractToolsAccessFromContent(blockContent)
 
     return {
-      type: blockType || blockName.toLowerCase(),
+      type: blockType,
       name,
       description,
       longDescription,
@@ -196,11 +278,136 @@ function extractBlockConfig(fileContent: string): BlockConfig | null {
       },
     }
   } catch (error) {
-    console.error('Error extracting block configuration:', error)
+    console.error(`Error extracting block configuration for ${blockName}:`, error)
     return null
   }
 }
 
+/**
+ * Strip version suffix (e.g., _v2, _v3) from a type for display purposes
+ * The internal type remains unchanged for icon mapping
+ */
+function stripVersionSuffix(type: string): string {
+  return type.replace(/_v\d+$/, '')
+}
+
+function extractStringPropertyFromContent(content: string, propName: string): string | null {
+  const singleQuoteMatch = content.match(new RegExp(`${propName}\\s*:\\s*'([^']*)'`, 'm'))
+  if (singleQuoteMatch) return singleQuoteMatch[1]
+
+  const doubleQuoteMatch = content.match(new RegExp(`${propName}\\s*:\\s*"([^"]*)"`, 'm'))
+  if (doubleQuoteMatch) return doubleQuoteMatch[1]
+
+  const templateMatch = content.match(new RegExp(`${propName}\\s*:\\s*\`([^\`]+)\``, 's'))
+  if (templateMatch) {
+    let templateContent = templateMatch[1]
+    templateContent = templateContent.replace(/\$\{[^}]+\}/g, '')
+    templateContent = templateContent.replace(/\s+/g, ' ').trim()
+    return templateContent
+  }
+
+  return null
+}
+
+function extractIconNameFromContent(content: string): string | null {
+  const iconMatch = content.match(/icon\s*:\s*(\w+Icon)/)
+  return iconMatch ? iconMatch[1] : null
+}
+
+function extractOutputsFromContent(content: string): Record<string, any> {
+  const outputsStart = content.search(/outputs\s*:\s*{/)
+  if (outputsStart === -1) return {}
+
+  const openBracePos = content.indexOf('{', outputsStart)
+  if (openBracePos === -1) return {}
+
+  let braceCount = 1
+  let pos = openBracePos + 1
+
+  while (pos < content.length && braceCount > 0) {
+    if (content[pos] === '{') braceCount++
+    else if (content[pos] === '}') braceCount--
+    pos++
+  }
+
+  if (braceCount === 0) {
+    const outputsContent = content.substring(openBracePos + 1, pos - 1).trim()
+    const outputs: Record<string, any> = {}
+
+    const fieldRegex = /(\w+)\s*:\s*{/g
+    let match
+    const fieldPositions: Array<{ name: string; start: number }> = []
+
+    while ((match = fieldRegex.exec(outputsContent)) !== null) {
+      fieldPositions.push({
+        name: match[1],
+        start: match.index + match[0].length - 1,
+      })
+    }
+
+    fieldPositions.forEach((field) => {
+      const startPos = field.start
+      let braceCount = 1
+      let endPos = startPos + 1
+
+      while (endPos < outputsContent.length && braceCount > 0) {
+        if (outputsContent[endPos] === '{') braceCount++
+        else if (outputsContent[endPos] === '}') braceCount--
+        endPos++
+      }
+
+      if (braceCount === 0) {
+        const fieldContent = outputsContent.substring(startPos + 1, endPos - 1).trim()
+
+        const typeMatch = fieldContent.match(/type\s*:\s*['"](.*?)['"]/)
+        const descriptionMatch = fieldContent.match(/description\s*:\s*['"](.*?)['"]/)
+
+        if (typeMatch) {
+          outputs[field.name] = {
+            type: typeMatch[1],
+            description: descriptionMatch
+              ? descriptionMatch[1]
+              : `${field.name} output from the block`,
+          }
+        }
+      }
+    })
+
+    if (Object.keys(outputs).length > 0) {
+      return outputs
+    }
+  }
+
+  return {}
+}
+
+function extractToolsAccessFromContent(content: string): string[] {
+  const accessMatch = content.match(/access\s*:\s*\[\s*([^\]]+)\s*\]/)
+  if (!accessMatch) return []
+
+  const accessContent = accessMatch[1]
+  const tools: string[] = []
+
+  const toolMatches = accessContent.match(/['"]([^'"]+)['"]/g)
+  if (toolMatches) {
+    toolMatches.forEach((toolText) => {
+      const match = toolText.match(/['"]([^'"]+)['"]/)
+      if (match) {
+        tools.push(match[1])
+      }
+    })
+  }
+
+  return tools
+}
+
+// Legacy function for backward compatibility (icon mapping, etc.)
+function extractBlockConfig(fileContent: string): BlockConfig | null {
+  const configs = extractAllBlockConfigs(fileContent)
+  // Return first non-hidden block for legacy code paths
+  return configs.length > 0 ? configs[0] : null
+}
+
 function findBlockType(content: string, blockName: string): string {
   const blockExportRegex = new RegExp(
     `export\\s+const\\s+${blockName}Block\\s*:[^{]*{[\\s\\S]*?type\\s*:\\s*['"]([^'"]+)['"][\\s\\S]*?}`,
@@ -393,12 +600,43 @@ function extractToolInfo(
   outputs: Record<string, any>
 } | null {
   try {
+    // First, try to find the specific tool definition by its ID
+    // Look for: id: 'toolName' or id: "toolName"
+    const toolIdRegex = new RegExp(`id:\\s*['"]${toolName}['"]`)
+    const toolIdMatch = fileContent.match(toolIdRegex)
+
+    let toolContent = fileContent
+    if (toolIdMatch && toolIdMatch.index !== undefined) {
+      // Find the tool definition block that contains this ID
+      // Search backwards for 'export const' or start of object
+      const beforeId = fileContent.substring(0, toolIdMatch.index)
+      const exportMatch = beforeId.match(/export\s+const\s+\w+[^=]*=\s*\{[\s\S]*$/)
+
+      if (exportMatch && exportMatch.index !== undefined) {
+        const startIndex = exportMatch.index + exportMatch[0].length - 1
+        let braceCount = 1
+        let endIndex = startIndex + 1
+
+        while (endIndex < fileContent.length && braceCount > 0) {
+          if (fileContent[endIndex] === '{') braceCount++
+          else if (fileContent[endIndex] === '}') braceCount--
+          endIndex++
+        }
+
+        if (braceCount === 0) {
+          toolContent = fileContent.substring(startIndex, endIndex)
+        }
+      }
+    }
+
+    // Params are often inherited via spread, so search the full file for params
     const toolConfigRegex =
       /params\s*:\s*{([\s\S]*?)},?\s*(?:outputs|oauth|request|directExecution|postProcess|transformResponse)\s*:/
     const toolConfigMatch = fileContent.match(toolConfigRegex)
 
+    // Description should come from the specific tool block if found
     const descriptionRegex = /description\s*:\s*['"](.*?)['"].*/
-    const descriptionMatch = fileContent.match(descriptionRegex)
+    const descriptionMatch = toolContent.match(descriptionRegex)
     const description = descriptionMatch ? descriptionMatch[1] : 'No description available'
 
     const params: Array<{ name: string; type: string; required: boolean; description: string }> = []
@@ -468,7 +706,7 @@ function extractToolInfo(
     let outputs: Record<string, any> = {}
     const outputsFieldRegex =
       /outputs\s*:\s*{([\s\S]*?)}\s*,?\s*(?:(?:oauth|params|request|directExecution|postProcess|transformResponse)\s*:|$|\})/
-    const outputsFieldMatch = fileContent.match(outputsFieldRegex)
+    const outputsFieldMatch = toolContent.match(outputsFieldRegex)
 
     if (outputsFieldMatch) {
       const outputsContent = outputsFieldMatch[1]
@@ -794,11 +1032,23 @@ async function getToolInfo(toolName: string): Promise<{
       toolSuffix = parts.slice(1).join('_')
     }
 
+    // Strip version suffix from tool suffix (V2 tools are in the same file as V1)
+    const strippedToolSuffix = stripVersionSuffix(toolSuffix)
+
     const possibleLocations = []
 
-    possibleLocations.push(path.join(rootDir, `apps/sim/tools/${toolPrefix}/${toolSuffix}.ts`))
+    // Try stripped suffix first (e.g., launch_agent.ts for launch_agent_v2)
+    possibleLocations.push(
+      path.join(rootDir, `apps/sim/tools/${toolPrefix}/${strippedToolSuffix}.ts`)
+    )
+
+    // Also try original suffix in case the file actually has v2 in the name
+    if (strippedToolSuffix !== toolSuffix) {
+      possibleLocations.push(path.join(rootDir, `apps/sim/tools/${toolPrefix}/${toolSuffix}.ts`))
+    }
 
-    const camelCaseSuffix = toolSuffix
+    // Also try camelCase versions
+    const camelCaseSuffix = strippedToolSuffix
       .split('_')
       .map((part, i) => (i === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)))
       .join('')
@@ -899,60 +1149,76 @@ async function generateBlockDoc(blockPath: string) {
 
     const fileContent = fs.readFileSync(blockPath, 'utf-8')
 
-    const blockConfig = extractBlockConfig(fileContent)
+    // Extract ALL block configs from the file (already filters out hideFromToolbar: true)
+    const blockConfigs = extractAllBlockConfigs(fileContent)
 
-    if (!blockConfig || !blockConfig.type) {
-      console.warn(`Skipping ${blockFileName} - not a valid block config`)
+    if (blockConfigs.length === 0) {
+      console.warn(`Skipping ${blockFileName} - no valid block configs found`)
       return
     }
 
-    if (
-      blockConfig.type.includes('_trigger') ||
-      blockConfig.type.includes('_webhook') ||
-      blockConfig.type.includes('rss')
-    ) {
-      console.log(`Skipping ${blockConfig.type} - contains '_trigger'`)
-      return
-    }
+    // Process each block config
+    for (const blockConfig of blockConfigs) {
+      if (!blockConfig.type) {
+        continue
+      }
 
-    if (
-      (blockConfig.category === 'blocks' &&
-        blockConfig.type !== 'memory' &&
-        blockConfig.type !== 'knowledge') ||
-      blockConfig.type === 'evaluator' ||
-      blockConfig.type === 'number' ||
-      blockConfig.type === 'webhook' ||
-      blockConfig.type === 'schedule' ||
-      blockConfig.type === 'mcp' ||
-      blockConfig.type === 'generic_webhook' ||
-      blockConfig.type === 'rss'
-    ) {
-      return
-    }
+      if (
+        blockConfig.type.includes('_trigger') ||
+        blockConfig.type.includes('_webhook') ||
+        blockConfig.type.includes('rss')
+      ) {
+        console.log(`Skipping ${blockConfig.type} - contains '_trigger'`)
+        continue
+      }
+
+      if (
+        (blockConfig.category === 'blocks' &&
+          blockConfig.type !== 'memory' &&
+          blockConfig.type !== 'knowledge') ||
+        blockConfig.type === 'evaluator' ||
+        blockConfig.type === 'number' ||
+        blockConfig.type === 'webhook' ||
+        blockConfig.type === 'schedule' ||
+        blockConfig.type === 'mcp' ||
+        blockConfig.type === 'generic_webhook' ||
+        blockConfig.type === 'rss'
+      ) {
+        continue
+      }
 
-    const outputFilePath = path.join(DOCS_OUTPUT_PATH, `${blockConfig.type}.mdx`)
+      // Use stripped type for file name (removes _v2, _v3 suffixes for cleaner URLs)
+      const displayType = stripVersionSuffix(blockConfig.type)
+      const outputFilePath = path.join(DOCS_OUTPUT_PATH, `${displayType}.mdx`)
 
-    let existingContent: string | null = null
-    if (fs.existsSync(outputFilePath)) {
-      existingContent = fs.readFileSync(outputFilePath, 'utf-8')
-    }
+      let existingContent: string | null = null
+      if (fs.existsSync(outputFilePath)) {
+        existingContent = fs.readFileSync(outputFilePath, 'utf-8')
+      }
 
-    const manualSections = existingContent ? extractManualContent(existingContent) : {}
+      const manualSections = existingContent ? extractManualContent(existingContent) : {}
 
-    const markdown = await generateMarkdownForBlock(blockConfig)
+      const markdown = await generateMarkdownForBlock(blockConfig, displayType)
 
-    let finalContent = markdown
-    if (Object.keys(manualSections).length > 0) {
-      finalContent = mergeWithManualContent(markdown, existingContent, manualSections)
-    }
+      let finalContent = markdown
+      if (Object.keys(manualSections).length > 0) {
+        finalContent = mergeWithManualContent(markdown, existingContent, manualSections)
+      }
 
-    fs.writeFileSync(outputFilePath, finalContent)
+      fs.writeFileSync(outputFilePath, finalContent)
+      const logType =
+        displayType !== blockConfig.type ? `${displayType} (from ${blockConfig.type})` : displayType
+      console.log(`✓ Generated docs for ${logType}`)
+    }
   } catch (error) {
     console.error(`Error processing ${blockPath}:`, error)
   }
 }
 
-async function generateMarkdownForBlock(blockConfig: BlockConfig): Promise<string> {
+async function generateMarkdownForBlock(
+  blockConfig: BlockConfig,
+  displayType?: string
+): Promise<string> {
   const {
     type,
     name,
@@ -1033,7 +1299,9 @@ async function generateMarkdownForBlock(blockConfig: BlockConfig): Promise<strin
     toolsSection = '## Tools\n\n'
 
     for (const tool of tools.access) {
-      toolsSection += `### \`${tool}\`\n\n`
+      // Strip version suffix from tool name for display
+      const displayToolName = stripVersionSuffix(tool)
+      toolsSection += `### \`${displayToolName}\`\n\n`
 
       console.log(`Getting info for tool: ${tool}`)
       const toolInfo = await getToolInfo(tool)
@@ -1134,12 +1402,88 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 ${usageInstructions}
 
 ${toolsSection}
+`
+}
+
+/**
+ * Extract all hidden block types (blocks with hideFromToolbar: true)
+ */
+async function getHiddenBlockTypes(): Promise<Set<string>> {
+  const hiddenTypes = new Set<string>()
+  const blockFiles = (await glob(`${BLOCKS_PATH}/*.ts`)).sort()
 
-## Notes
+  for (const blockFile of blockFiles) {
+    const fileContent = fs.readFileSync(blockFile, 'utf-8')
 
-- Category: \`${category}\`
-- Type: \`${type}\`
-`
+    // Find all block exports
+    const exportRegex = /export\s+const\s+(\w+)Block\s*:\s*BlockConfig[^=]*=\s*\{/g
+    let match
+
+    while ((match = exportRegex.exec(fileContent)) !== null) {
+      const startIndex = match.index + match[0].length - 1
+
+      // Extract the block content
+      let braceCount = 1
+      let endIndex = startIndex + 1
+
+      while (endIndex < fileContent.length && braceCount > 0) {
+        if (fileContent[endIndex] === '{') braceCount++
+        else if (fileContent[endIndex] === '}') braceCount--
+        endIndex++
+      }
+
+      if (braceCount === 0) {
+        const blockContent = fileContent.substring(startIndex, endIndex)
+
+        // Check if this block has hideFromToolbar: true
+        if (/hideFromToolbar\s*:\s*true/.test(blockContent)) {
+          const blockType = extractStringPropertyFromContent(blockContent, 'type')
+          if (blockType) {
+            hiddenTypes.add(blockType)
+          }
+        }
+      }
+    }
+  }
+
+  return hiddenTypes
+}
+
+/**
+ * Remove documentation files for hidden blocks
+ */
+function cleanupHiddenBlockDocs(hiddenTypes: Set<string>): void {
+  console.log('Cleaning up docs for hidden blocks...')
+
+  // Create a set of stripped hidden types (for matching doc files without version suffix)
+  const strippedHiddenTypes = new Set<string>()
+  for (const type of hiddenTypes) {
+    strippedHiddenTypes.add(stripVersionSuffix(type))
+  }
+
+  const existingDocs = fs
+    .readdirSync(DOCS_OUTPUT_PATH)
+    .filter((file: string) => file.endsWith('.mdx'))
+
+  let removedCount = 0
+
+  for (const docFile of existingDocs) {
+    const blockType = path.basename(docFile, '.mdx')
+
+    // Check both original type and stripped type (since doc files use stripped names)
+    if (hiddenTypes.has(blockType) || strippedHiddenTypes.has(blockType)) {
+      const docPath = path.join(DOCS_OUTPUT_PATH, docFile)
+      fs.unlinkSync(docPath)
+      console.log(`✓ Removed docs for hidden block: ${blockType}`)
+      removedCount++
+    }
+  }
+
+  if (removedCount > 0) {
+    console.log(`✓ Cleaned up ${removedCount} doc files for hidden blocks`)
+  } else {
+    console.log('✓ No hidden block docs to clean up')
+  }
 }
 
 async function generateAllBlockDocs() {
@@ -1151,6 +1495,13 @@ async function generateAllBlockDocs() {
     const iconMapping = await generateIconMapping()
     writeIconMapping(iconMapping)
 
+    // Get hidden block types before generating docs
+    const hiddenTypes = await getHiddenBlockTypes()
+    console.log(`Found ${hiddenTypes.size} hidden blocks: ${[...hiddenTypes].join(', ')}`)
+
+    // Clean up docs for hidden blocks
+    cleanupHiddenBlockDocs(hiddenTypes)
+
     const blockFiles = (await glob(`${BLOCKS_PATH}/*.ts`)).sort()
 
     for (const blockFile of blockFiles) {